* simple fix for "Approved by: Self" on all cargo invoices
* port of ruddygreat's bounty console improvements to DeltaV
* modified tooltips and fixed a few importing errors
* StatusLabel in BountyEntry.xaml.cs
* final stupid tweak
* removed unrelated bugfix PR that snuck into this branch somehow
* Cargo bounty fix requests
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
---------
Co-authored-by: cargomouse <dboozlebeep@gmail.com>
Co-authored-by: Jessica Harvey <itsjessagain23@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Merge pull request #838 from FoxxoTrystan/Shadekin
Shadekin
# Conflicts:
# Resources/Prototypes/Body/species_base.yml
# Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml
# Resources/Prototypes/Guidebook/species.yml
# Resources/Prototypes/Species/species_weights.yml
* Merge pull request #868 from FoxxoTrystan/Shadekin-Perf
Shadekin Performence
* Merge pull request #883 from FoxxoTrystan/Shadekin-Patch
Shadekin Patch + Markings
* Merge pull request #947 from RHSvenson/Shadekin_SurvivalBox
Added and implemented emergency boxes for nonbreathers
* Merge pull request #1861 from ilovehans10/shadekin-guidebook-typo-fixes
Shadekin guidebook typo fixes
* Mars -> Marrs (#2381)
<!-- IT'S NOT WIZDENS REPO, IF YOU WANT TO ADD YOUR CHANGES ON ALL
SERVERS, CREATE PR TO WIZDENS REPO -->
<!-- What do you propose to change with your PR? -->
Changes `@ mars` to `@ marr`s for Shadekin.
<!-- What is the reason for adding these changes? Please post links to
Discussions as well as Bug Reports here. Please describe how this will
change the game balance. -->
Parity with emote wheel. Also, `<PLAYERNAME> mars` feels weird.
(...probably because Mars as in the planet.)
<!--
If your PR contains in-game changes you must provide screenshots/videos
of the changes.
-->
<!-- check boxes for faster reviewing of your PR -->
- [X] I do not require assistance to complete the PR.
- [X] Before posting/requesting review of a PR, I have verified that the
changes work.
- [X] I have added screenshots/videos of the changes, or this PR does
not change in-game mechanics.
- [X] I affirm that my changes are licensed under the [Starlight Fork
License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE-Starlight.TXT)
and grant permission for use in this repository under its conditions.
**Changelog**
🆑 Fractalflower
- tweak: Changed Mar emote text to `@ marrs`.
* Fix shadekin guidebook resistance info (#2881)
The shadekin guidebook currently overstates the cellular resistance by
10% and vastly underestimates the bloodloss damage.
The guidebook being accurate helps guide player understanding.
<img width="563" height="669" alt="image"
src="https://github.com/user-attachments/assets/bece997a-5aa4-46f5-9b9f-2fe41dc98e97"
/>
- [X] I do not require assistance to complete the PR.
- [X] Before posting/requesting review of a PR, I have verified that the
changes work.
- [X] I have added screenshots/videos of the changes, or this PR does
not change in-game mechanics.
- [X] I affirm that my changes are licensed under the [Starlight Fork
License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE-Starlight.TXT)
and grant permission for use in this repository under its conditions.
**Changelog**
🆑 Penguinwizzard
- fix: Turns out that we were issuing wildly incorrect guidebooks on
Shadekin; an updated edition should now be available for crews.
* New Shadekin Disabilities
* Light hurts Shadekin
Shadekin should get more than a mild sunburn in extreme light
* Changes to make it work
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Foam Immunity Readded
* Flash Modifer works now
* Remove DarkLightComponent
* Add missing Locale for Markings from Den
* Fix Issues, Seperate from _DV namespace
* Yaml Linter Fixes
* ARGH
* ARGHv.2
* ARGHv.3
* Nutribatard instead of Baguette
* Exchange Nutribricks with PSB
* Cotton Baguette
* Changing away from BaseOrganic and Respirator Removal in Code
* Fulfill Content Review Requests
* Remove Eye Coloration - Unused
* Remove ShadekinPhase entirely
* Attribution correctly linked
* Review Changes
* done yml links correctly now
* yml format in shadekin effects
* Remove yml file mention and read Internal
* Readd Internals
* _StarLight -> _Starlight
* Port to Nubody and maybe fixing some fuckups
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Shadekin Yaml Errors
* Add missing markings name, add missing base_scale
* Remove Internal Removal in base_species. Make it Component based
* Add missing readonly
* Remove Non Breahter emergency boxes, Shadekin normal box
* DV Comment Fixes
* Untouched File?
* Use FlashMultiplierDurationEvent
* Add missing attribution
* Fixed scream attributions
* Shadekins can now properly succumb. Starlight#4746
---------
Co-authored-by: Matthew Herber <32679887+Happyrobot33@users.noreply.github.com>
Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com>
Co-authored-by: Rinary <rinary.super@gmail.com>
Co-authored-by: FoxxoTrystan <trystan.garnierhein@gmail.com>
Co-authored-by: Tess_the_Evil <tessawfresh@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
Co-authored-by: Vanessa <vanessalouwagie@gmail.com>
* Item offering port (#96)
* Offer item system port
* More fixes
* Make the formatting a bit more readable
* Add a missing keybind
* Add missing alert click handler and make some of the code more readable
* Duplicate offer-item-system.ftl
Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com>
* Namespace fix and prediction fixes
* Port various carrying and pseudo-item fixes from floofstation
* Refactor the offer system to hopefully bring more clarity
* Final fixes
* Final final final fixes maybe
* Sike, just do it the proper way
---------
Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com>
* fixes
* empty commit (weird test fail?)
* Moved some stuff to shared. Reorganized a bit. I could be here all day...
---------
Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com>
Co-authored-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com>
Co-authored-by: Vanessa <vanessalouwagie@gmail.com>
* my larp...
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Adds the chef kimono
The drobe thing doesn't work yet
* Adds loadout groups
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Apply suggestion from @ShepardToTheStars
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: BriBrooo <45323530+Bribrooo@users.noreply.github.com>
* Rename ChefJobShoes to ChefShoes in loadouts
Signed-off-by: BriBrooo <45323530+Bribrooo@users.noreply.github.com>
---------
Signed-off-by: BriBrooo <45323530+Bribrooo@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
The edible-swallow locale message used by pills was missing the
{$flavors} placeholder that edible-nom, edible-slurp and edible-gulp
all have. IngestionSystem always passes the computed flavor text, so
pills silently dropped it. Eating a pill now shows its taste again,
e.g. "You swallow the pill. Tastes sweet."
* Added the Space Dragon Matriarch
* moved the fireball to its own projectile thingy
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Update Resources/Prototypes/_DV/Entities/Mobs/Player/dragon.yml
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: einknusprigestoast <90181825+einknusprigestoast@users.noreply.github.com>
* Fixed Parenting (god i wish this was this easy IRL)
* Huh?
* Accidentally deleted something i didnt want to delete
* Upped Blunt regeneration
* Apply suggestion from @ShepardToTheStars
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: einknusprigestoast <90181825+einknusprigestoast@users.noreply.github.com>
* Apply suggestion from @ShepardToTheStars
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
* Apply suggestion from @ShepardToTheStars
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
---------
Signed-off-by: einknusprigestoast <90181825+einknusprigestoast@users.noreply.github.com>
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
* Reworked hitman kits, first draft
* Fixed spacing for the kits
* Update hitman-case.ftl
Rename samurai to ninja kit
* Update hitman_case_catalog.yml
* Update hitman-case.yml
* fixed .ftl error
* Added blue oni mask to ninja kit
* fix hitman_case_catalog.yml, wrong mask ID
* Replaced the high frequency blade with a medium frequency blade - this weapon has a lower reflect chance, and deals heat damage instead of shock.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Small tweak
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
* Added 3 new neck items, 1 new coat, 1 new shoe, and 2 new hats to mime loadout
Also added shoe selection to the mime loadout, new coat to the uniform printer, and new coat + boots to the autodrobe.
* Added missing newlines
* Slime people tweaks and new markings (incl. ports from Impstation)
-Removed eyes, mouth, nose, and torso bitties from base Slime person sprite
-Added them back in as optional markings (excl. mouth as Delta-V has lips already)
-Added the new "OrganSlimeEyes" to Slime people to handle eye markings
-Ported Cyclops and Droopy eyes from Impstation
-Assigned Droopy eyes as "Droopy Eyes (Left)"
-Made corresponding Droopy eyes on the right side
-Added "Four eyes" marking
-Removed eyeshadow tattoo markings from Slime people
-Added a copy into _DV's makeup directory assigned purely to Slime people
-Made new matching eyeshadows for the various new eye types
-Adjusted the marking limits to make sense with the tweaks
-Moved and reorganized the Slime Elf Ears within the _DV directories to make more sense
* Fixed Slime people full.png sprite dimensions
* -Removed "followSkinColor" from Prototypes\_Impstation\Entities\Mobs\Customization\Markings\slime.yml causing an error
* Update Resources/Prototypes/Body/Species/slime.yml
Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: ollyo <296974732+ollyoaner@users.noreply.github.com>
* Update Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml
Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: ollyo <296974732+ollyoaner@users.noreply.github.com>
* Update Resources/Prototypes/Body/Species/slime.yml
Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: ollyo <296974732+ollyoaner@users.noreply.github.com>
* - Fixed formatting and improved in line comment readability.
- Moved eyeshadow additions from makeup to Slime categories
- Added "matchskin" to relevant body markings that are meant to follow skin color
* -Returned Eyeshadow to eye markings category
-Returned Slime to whitelisted group in tattoos.yml
-Removed Eye markings limit and the requirement to have eyes
-Added two new eyes to complement the r/l eyes for more eye mixing
-Tweaked inline readability and organization
* Removed outdated prototype MatchSkin from slime.yml
---------
Signed-off-by: ollyo <296974732+ollyoaner@users.noreply.github.com>
Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
pre-commit-ci[bot]
Vanessa
Delta-V bot
nlaky
ArionGekkota
Proxy also works :3
William Lemon
jessiscah23
pathetic meowmeow
KOTOB
pootslap
freezer dog
Coryn
Vanessa
ConstantlyConfused
BriBrooo
Myra
SumofThreeParts
einknusprigestoast
github-actions[bot]
Velitation
ollyo