Commit Graph
8803 Commits
Author SHA1 Message Date
pathetic meowmeow acc9361a34 Add the ability to spawn in as a vent critter at will (#6187)
* Add the ability to spawn in as a vent critter at will

* cooldown
2026-07-05 14:29:38 -04:00
f22266d51f Port Allulalo from Impstation (#6172)
* Allulalo: finally finishing the ancient raptor species project (#3504)

* well, it loads

* sprite's

* names + starting on displacements

* more displacements

* displacements

* left hand only

* displacements

* yup

* ooa

* inhand displacements

* blood

* accent

* iv bags

* placeholder clarification

* Revert "iv bags"

This reverts commit c2aa504eab8d0673604b33e0ccaf79b406979da6.

* whitespace

* adds tooshortforUI and removes the damage modifier set

* speechsounds

* typing indicator

* basic customisation

* guidebook 1

* fixed full

* markings, displacements, speech verb

* displacement fixes

* trailing newlines

* spelling moment

* brute damage sprites and blood fix

* guidebook iteration

* injection melee + ethanotoxin + guidebook rewrite

* guidebook

* guidebook

* nitpicks + roundstart

---------

Co-authored-by: starlighthowls <starlighthowls7@gmail.com>
Co-authored-by: mqole <anactualpanacea@gmail.com>

* Allulalo tooshotforui bugfix (#3598)

* yay

* p[leebnmar

* oops

* Allulalo Markings (#3602)

* eye markings and two tails

* more

* almost got ya

* yup

* wings yay

* thank you landshark for my life btw

* still needs loc files

* Update allulalo.ftl

* I lost so much progress to git bullshit

* and who can forget dear rat boy

* touch up speech indicator at yesters request

---------

Co-authored-by: starlighthowls <starlighthowls7@gmail.com>

* Allulalo Roundstart (#3621)

* yup

* shock blanket + pleebnar fixes

* yuuup (#3655)

* Allulalo fix pass 1 (#3661)

* what if I did it all in one commit like a total moron

* yup

* untuch

* i love you spriting tool

* my birdsty

* Update allulalo.yml

* Update Species.xml

* let allulalo use holopads. (#3669)

* adds a white list for the too small component to add specific allowed entities. e.g holopads

* imp comment

* i love forgetting white space!!!!

---------

Co-authored-by: sev7ves <soapedzone@gmail.com>
Co-authored-by: beck <163376292+widgetbeck@users.noreply.github.com>

* fix (#3693)

* I need to learn to not do everything in one commit (#3750)

* mime on again (#4243)

* Small fix

* Add them to our accentless trait

* Add unable to wield system

* Fix too short for UI using old blacklist methods

* Fix duplicated localization line

* Add heavyweight drunk comp (might merge this with lightweight later)

* Why was this even added

* Revert "Add unable to wield system"

This reverts commit cbe3a10fc7.

* Revert "Fix too short for UI using old blacklist methods"

This reverts commit 833743f029.

* add TooShortForUIComponent (#3495)

* add TooShortForUIComponent

* correct documentation

* incomplete documentation

* add UnableToWieldComponent (#3496)

* Fixing this again I am dumb I cherrypicked things in the wrong order

* WHY WAS THIS EVEN ADDED THERE'S NO SPRITE EVEN ON IMPSTATION???

* Port Allulalos to Nubody

* Fix for Allulalo chems doing nothing

* Add allulalo to the guidebook species list

* Restore some accidentally deleted effects and comments

* Fix typo that made allu blood 10x more alcoholic than normal

* Delete random misplaced sprites from cherrypicking

* More of the random sprites removal (this time from the meta)

* Add missing allulalo flavor

* Removed some nonexistant fields from the species

* Add unisex cough/sneeze, comment out Wuhey and Ungh emotes

* Fix guidebook not using loc string

* I THINK this fixes that test error and it doesn't seem to break anything either so let's try

* Remove unsupported unshaded shader from eyes

* Ok last one didn't work (sorry for trial and error)

* Removed mention of HARMPACKs and Tether Guns from the guidebook.

* Blacklist allulalos from random humanoid spawns

* Add missing allulalo gulp sound

* Carriable in 1 hand allulalos, fix carrying system blocking both hands always

* Remove DV comments

---------

Co-authored-by: Kip <32859367+kipdotnet@users.noreply.github.com>
Co-authored-by: starlighthowls <starlighthowls7@gmail.com>
Co-authored-by: mqole <anactualpanacea@gmail.com>
Co-authored-by: sev7ves <58966116+sev7ves@users.noreply.github.com>
Co-authored-by: sev7ves <soapedzone@gmail.com>
Co-authored-by: beck <163376292+widgetbeck@users.noreply.github.com>
Co-authored-by: Yesteryear <208338078+yesteryuri@users.noreply.github.com>
2026-07-04 17:28:31 +10:00
d4f380dd6e Special Response Team - fake balancing number 3 (#6102)
* Pulse rifle changes

* SRT Loadout Items + Spawners

* Added SRT Suffix + Removed upstream spawners

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Typo

* *cough*

* *COUGHS*

* *sniffs*

* *coughs*

* Yeah i hate this

* Do not map suffix

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Changes to Injectors + Added Combat Nanites

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Whoops, too fast

* Coughs

* Yeah

* changes to guns and typo fix

* Removed useless lines

* Update Resources/Locale/en-US/_DV/ghost/roles/SRT-Agent.ftl

Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: einknusprigestoast <90181825+einknusprigestoast@users.noreply.github.com>

* Update Resources/Locale/en-US/_DV/reagents/meta/medicine.ftl

Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: einknusprigestoast <90181825+einknusprigestoast@users.noreply.github.com>

* Update Resources/Locale/en-US/_DV/reagents/meta/narcotic.ftl

Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: einknusprigestoast <90181825+einknusprigestoast@users.noreply.github.com>

* Update Resources/Locale/en-US/_DV/reagents/meta/narcotic.ftl

Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: einknusprigestoast <90181825+einknusprigestoast@users.noreply.github.com>

* Update Resources/Prototypes/_DV/Entities/Objects/Tools/SRTinjectors.yml

Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: einknusprigestoast <90181825+einknusprigestoast@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Mobs/Player/humanoid.yml

Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: einknusprigestoast <90181825+einknusprigestoast@users.noreply.github.com>

* Update Resources/Prototypes/_DV/Reagents/medicine.yml

Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: einknusprigestoast <90181825+einknusprigestoast@users.noreply.github.com>

* Update Resources/Prototypes/_DV/Reagents/narcotics.yml

Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: einknusprigestoast <90181825+einknusprigestoast@users.noreply.github.com>

* Update Resources/Prototypes/_DV/Entities/Objects/Tools/SRTinjectors.yml

Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: einknusprigestoast <90181825+einknusprigestoast@users.noreply.github.com>

* Update Resources/Prototypes/_DV/Entities/Objects/Tools/SRTinjectors.yml

Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: einknusprigestoast <90181825+einknusprigestoast@users.noreply.github.com>

* Removed spawn menu hides

* prickly flavor profile

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* changes to names of pngs n shit

* should change the name of the ftl?

* Rename SRT-Agent.ftl to srt-agent.ftl

Signed-off-by: einknusprigestoast <90181825+einknusprigestoast@users.noreply.github.com>

* Apply suggestion from @Stxcking

Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: einknusprigestoast <90181825+einknusprigestoast@users.noreply.github.com>

* Apply suggestion from @Stxcking

Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: einknusprigestoast <90181825+einknusprigestoast@users.noreply.github.com>

* Apply suggestion from @Stxcking

Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: einknusprigestoast <90181825+einknusprigestoast@users.noreply.github.com>

* Apply suggestion from @Stxcking

Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: einknusprigestoast <90181825+einknusprigestoast@users.noreply.github.com>

* Apply suggestion from @Stxcking

Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: einknusprigestoast <90181825+einknusprigestoast@users.noreply.github.com>

* Apply suggestion from @Stxcking

Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: einknusprigestoast <90181825+einknusprigestoast@users.noreply.github.com>

* DeltaV instead of Delta V

* i dont know why, but i cant change the names of these files, so ill just delete them and add them again

* boom

* Changes suit and equipment names to be more in line with existing ERT kit

* backpacks for some reason still show "Deathsquad backpack" so this fixes this

* letters are hard

* hypospray.yml and liner fail

---------

Signed-off-by: einknusprigestoast <90181825+einknusprigestoast@users.noreply.github.com>
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>
2026-07-04 00:54:21 -04:00
Carol 0ecb05388f Reduce blood amount of colossus and dragon to 400 (#6047)
* switched FixedPoint2 * FixedPoint2 to use long

* Revert "switched FixedPoint2 * FixedPoint2 to use long"

This reverts commit b8744f6ac3.

* Reduced blood amount to 400

---------

Signed-off-by: Carol <292806487+CarolCuchara@users.noreply.github.com>
2026-07-02 18:31:59 +02:00
Stxcking 03c85b708c Fix: Syndicate Implanters Showing up Empty (#6191)
i guess bro?
2026-07-02 07:38:01 -05:00
Carol 5619c22dd0 Scaled down knives so they fit into lockers and crates (#6171)
scaled down fixture of knives
2026-07-02 12:22:29 +00:00
Vanessa 137a8bbc87 Reverted Xeno Blood type. Reduced giant blood numbers. (#6185) 2026-07-01 20:31:49 -04:00
4e2dce4414 PORT: Selectable Cyborg Chassis from CosmicDrift (#5712)
* pickable borg subtypes but better (#706)

* borg subtype fixes I Forgot To Push (#790)

* update borg subtypes to an entity prototype based approach from SL (#884)

https: //github.com/cosmatic-drift-14/cosmatic-drift/pull/884
Co-Authored-By: lunarcomets <140772713+lunarcomets@users.noreply.github.com>

* Minor Build Error Tweak

Should be ready to add more chassis now!

* Yippee Yahoo

Handpicked some chassis sprites from AL/SL PR which are from Paradise :D

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Clean up + Comments

* CR made me sprite at gunpoint

Also switched standard and generic files for consistency and such

* the spaces were bothering me + comments

---------

Co-authored-by: lunarcomets <140772713+lunarcomets@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2026-07-01 18:49:19 -04:00
Cepelinas1 8ac1c479dd Make SuperSynths craftable + musician trinket item only (#6087)
first
2026-07-01 15:10:35 -05:00
pathetic meowmeow e9a1e53279 Fix nodecrawl connecting to invalid nodes (#6149)
* Fix nodecrawl connecting to invalid nodes

* pain

* recycled
2026-07-01 12:41:06 -05:00
Manoob 83db0f2bfe Fix carton dispenser restocking (#6123)
* Allow the smaller variants from drink cartons to be put in the soda and booze dispensers

* Bug: Remove double fail message when trying to put something in a dispenser that doesn't belong there

* Remove uneccesary line
2026-06-30 23:34:22 -04:00
TNE 3024d366a3 Disable upstream silicon "crew icons" (crew indicators) (#6159)
These do not make much sense on DeltaV rules/most silicon laws
2026-06-30 19:15:27 +00:00
pathetic meowmeow edf6525b61 Fix hands on things that are missing hands (#6150) 2026-06-30 10:19:18 -05:00
Stxcking c7afe1696b Fix: Snails and Nukie Mouse Vent Crawling (#6145)
should do it
2026-06-30 10:02:28 -05:00
Tobias Berger 0919d0f064 Merge branch 'main' into pr/5894 2026-06-29 18:59:38 +02:00
Vanessa ee18b71805 Various Crew Monitor Fixes/Tweaks (#6139)
* Various Crew Monitor Fixes/Tweaks

* comment

* comment

* Increased wireless ranges
2026-06-29 14:06:18 +00:00
29b64c1f7e Suffix and other entity naming megafix (#6091)
* Suffix and other entity naming megafix

* migration

* others

---------

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
2026-06-29 14:00:08 +00:00
f18d6803b9 PORT: DV's Pool Episode - Longue Chairs + Swim Rings + Pool Tiles & Water (#6113)
* Pool-Themed Decorations: Lounge Chairs, Umbrellas, Tiles, Swim Rings, and Pool Water (#2071)

<!-- Guidelines:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
<!-- NOTE: All code submitted to this repository is ALWAYS licensed
under the AGPL-3.0-or-later license.
The REUSE Specification headers or separate .license files indicate a
secondary license (e.g., MPL or MIT) solely to facilitate
integration for projects that do not use the AGPL license. This
secondary license does not replace the fact that AGPL-3.0-or-later
remains the primary and binding license.
Uncomment and modify the following line if you wish to change the
license from the default of AGPL.-->
<!--- LICENSE: AGPL -->
<!-- What did you change? -->

This PR adds a bunch of, well, mapper toys basically, but normal players
can obtain them too. They are:
- Pool tile and dark pool tile; obtainable via the cutter machine.
- Pool water; unobtainable without mapping/admin tools, but it's 1%
chlorine.
- Lounge chairs, constructed with steel and cloth. Deconstructible with
a screwdriver.
- Beach umbrellas, constructed with rods and cloth. Deconstructible with
a screwdriver.
- Swim rings, which can be ordered from Logistics. They're sort of like
the emergency comfort units (pillows), but they're inflatable rings and
you can pick them up.

<!-- Discuss how this would affect game balance or explain why it was
changed. Link any relevant discussions or issues. -->
These assets are needed for an upcoming map I'm making and I'm giving
them to the community early out of the kindness of my heart

<!-- Summary of code changes for easier review. -->
All YML and sprites babyyy

- Entity prototypes for chairs, umbrellas, pool water, swim rings, and
the pool tile stack items
- Some construction graphs
- A cargo product
- A floor definition
- Recipes for the tile cutter

Pool water IS drinkable because it's extremely funny. Keep in mind that
50u of pool water will only give you like 2 poison damage

<!-- Attach media if the PR makes ingame changes (clothing, items,
features, etc).
Small fixes/refactors are exempt. Media may be used in SS14 progress
reports with credit. -->

Preview of the stuff:

<img width="713" height="541" alt="image"
src="https://github.com/user-attachments/assets/42f1acc8-cc83-4356-a8e0-3c715245d120"
/>

<img width="697" height="666" alt="image"
src="https://github.com/user-attachments/assets/8597017a-9d03-4419-80c5-cf475f3206d1"
/>

sorry i forgot the pink ring

<img width="253" height="179" alt="image"
src="https://github.com/user-attachments/assets/7f738f8e-42b4-4ee4-aa75-9f08b67ded0c"
/>

sorry i forgot the white chair

<img width="206" height="140" alt="image"
src="https://github.com/user-attachments/assets/6fabe541-4821-4e88-8d64-a99f463c5253"
/>

Cargo:

<img width="633" height="461" alt="image"
src="https://github.com/user-attachments/assets/b8ae9b89-4d2f-4326-9814-d000d5e88809"
/>

Crafting menu:

<img width="266" height="454" alt="image"
src="https://github.com/user-attachments/assets/cc480ee6-0e0d-4055-93c3-e5a1c4e0687c"
/>

<img width="409" height="211" alt="image"
src="https://github.com/user-attachments/assets/41970a43-1ba8-4898-a96c-deb87a05a409"
/>

<img width="409" height="211" alt="image"
src="https://github.com/user-attachments/assets/ffc00874-e330-49eb-8aba-972c6d223a3a"
/>

Pool water:

<img width="680" height="463" alt="image"
src="https://github.com/user-attachments/assets/9abc48b0-8358-46de-89ef-41fc64989787"
/>

<!-- Confirm the following by placing an X in the brackets [X]: -->
- [x] I have read and am following the [Pull Request and Changelog
Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
- [x] I have added media to this PR or it does not require an ingame
showcase.
- [x] I have tested any changes or additions.
- [x] I can confirm this PR contains no AI-generated content, and did
not use any AI-generated content.
<!-- You should understand that not following the above may get your PR
closed at maintainer’s discretion -->

<!-- List any breaking changes, including namespaces, public
class/method/field changes, prototype renames; and provide instructions
for fixing them.
This will be posted in #codebase-changes. -->

Nope

**Changelog**
<!-- Add a Changelog entry to make players aware of new features or
changes that could affect gameplay.
Make sure to read the guidelines and take this Changelog template out of
the comment block in order for it to show up.
Changelog must have a 🆑 symbol, so the bot recognizes the changes and
adds them to the game's changelog. -->
🆑
- add: 13 colors of lounge chairs can be constructed out of steel and
cloth.
- add: 8 colors of beach umbrellas can be constructed out of rods and
cloth.
- add: Pool tile (and dark pool tile) can be produced at the cutter
machine.
- add: Logistics can now order a crate of bulk swim rings, in 11
possible colors!
- add: For mappers (and admins): there is a new "pool water" entity that
is a nice green-cyan color and contains about 1% chlorine.

---------

Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>

* Remove Umbrella + Fixes from Port

* Pool Ring Additions

* Buff Fishing Vendor

* grr

* its no longer 2am

---------

Co-authored-by: portfiend <109661617+portfiend@users.noreply.github.com>
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
2026-06-29 08:39:22 -05:00
MD360 3acbf512be Borgs must amogus. (#6126)
* We must scream

* +1 License

* Moved to _DV audio

* + Comment

* forgot space
2026-06-29 13:27:10 +00:00
Coryler 63d7c592a1 PR Review fulfillments 2026-06-29 12:44:21 +02:00
Coryler 4099d94344 PR Review Changes 2026-06-29 12:44:20 +02:00
Coryler 89dd41763b Fix Test Errors realted to wrongly set PowerState variables 2026-06-29 12:44:19 +02:00
Coryler 74ca68cfe4 Christmas Kobols comment out for now 2026-06-29 12:44:19 +02:00
ādaandiaada 0958929f64 Reduce speso value of tech disks (#43395)
commit

Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-06-29 12:44:17 +02:00
dca7952208 Fix changeling transform ability (#42107)
* fix changeling transform

* Add store UI on MapInit instead

* Apply suggestion from @slarticodefast

* Apply suggestion from @slarticodefast

---------

Co-authored-by: Jessica M <jessica@maybe.sh>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-06-29 12:44:17 +02:00
Gentleman-Bird 81fa41913b Fix: Make clockwork glass grindable (#43371)
make cGlass grindable
2026-06-29 12:44:16 +02:00
SnappingOpossum 2b86bdd407 Painting and poster random spawners to entity table spawners (#43270)
Painting and poster random spawners to tables
2026-06-29 12:44:14 +02:00
slarticodefast cb3554b579 remove all use cases of TimerComponent (#43320)
cleanup TimerComponent
2026-06-29 12:44:13 +02:00
SnappingOpossum a0788d49f8 Move remaining random spawners to entity table spawners (#43324)
Move remaining random spawners to tables
2026-06-29 12:44:13 +02:00
SnappingOpossum d494434458 Move some simple random spawners to entity table spawners (#43305)
Simple random spawners to entity tables
2026-06-29 12:44:12 +02:00
ProPeperos b6f45dc2b5 Borg charger hitbox changes (#43300)
* Borg chargers no longer rotate

* Orbing your charger NOW
2026-06-29 12:44:12 +02:00
SnappingOpossumandslarticodefast bb809cd5a0 Move salvage RandomSpawners to EntityTableSpawners (#43233)
* Move salvage RandomSpawners to EntityTableSpawners

* Spellcheck

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Apply requested changes for spawner

* Move another prob to parent selector

* Why wasn't it that before

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-06-29 12:44:11 +02:00
Vladislav Suchkovandslarticodefast 7addfbec77 Tech disk resprite and pricing changes (#37719)
* init

new disks are in. can be spawned or printed. no weights or correctly bound techs yet.

* tweak textures and naming

* make tech disks respect their tier and discipline

* make tech console respect tier weight

* yml fixes (forgo a million things)

* meow :3 reworked to use GenericVisualizer

* moved staticPrice comp to shared to support different pricing per tier

* unhardcoded prices; tweaked log messages

* cleanup

* a few fixes

* updated pricing to match weights

* lowering prices I forgor how many of them science can print

* what

* t3 texture, logger, factory

* move PriceCalculationEvent & EstimatedPriceCalculationEvent to shared

* remove static price comp; use EntProtoId for disk proto

* moved staticPrice comp back to server

* cleanup: price event, visualizer enums & yml

* ummove PriceCalculationEvent

* ummove PriceCalculationEvent attempt #2

* more unmoving

* fixes

* predict onExamine

* review changes

* small cleanup

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-06-29 12:44:10 +02:00
ScarKy0 a1b69294b2 Revert "Xenoborg extractor (#42796)"
This reverts commit 7f15e77954.
2026-06-29 12:44:10 +02:00
c7077a388c Predict reagent grinder (#42815)
* prediction!!!

* fixes

* fixes and add debug logs

* fix prediction and cleanup

* raise event on client + comp access

* reapply power state changes

* Update Content.Client/Kitchen/EntitySystems/ReagentGrinderSystem.cs

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>

* Update Content.Shared/Kitchen/Components/ReagentGrinderComponent.cs

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>

* comments and prefilled grinder protos

* t

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
2026-06-29 12:44:09 +02:00
Coryler 6f16d07fa0 Revert "Remove loadout time towels (#42536)"
This reverts commit b3ddf57affd43fa952dbae6b7439a881026191bb.
2026-06-29 12:44:09 +02:00
Coryler dedfa69f7f Removing last yml errors 2026-06-29 12:44:09 +02:00
Coryler 0e7c4ecee3 Fix Locale issues. Some yml issues I have no idea how to fix 2026-06-29 12:44:07 +02:00
Coryler c398193cfe Make more Yaml Changes to appease the Linter 2026-06-29 12:44:07 +02:00
Coryler cc5300d1ef More progress against the linter 2026-06-29 12:44:07 +02:00
Coryler e1231ab140 Move TotalDamageCondition into _DV along with some other fixes 2026-06-29 12:44:07 +02:00
a667530e18 Single item cargo orders are delivered in Parcel Wrap instead of crates (#40834)
* - rework a bunch of cargo orders to not send a crate with just one thing
  - instead sends the item, wrapped
- add ability for cargo orders to wrap the item ordered in parcel wrap
- cargo order name and descriptions are now localization strings, but still 99.99% of the time just get that info from the entity they're spawning
- small refactor to how cargo orders move around in cargo code so that the actual order proto is kept around longer
- small rework to certain restock cargo orders to halve the cost and number of items received in one order

* oop

* Suffering

* Arbitrary containers for cargo products

* I ran the tests locally and they passed, github please rerun :)

* massage Slarti's work into this.
Mainly by taking the API wrapping ability out back with the rifle q-q

* testfail fake

* wow `_applyingState` is useful, I wonder where I should've been using that in other PRs before :^)

* pr comments

* tfw the hook doesn't update the submodule

* Update Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs

Co-authored-by: āda <ss.adasts@gmail.com>

* PR comments

* fixies

* Update Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs

* Update Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.WrappedParcel.cs

* fix wrapped parcel entity name + audio

* Actually read PR comments

* Apply suggestions from code review

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>

---------

Co-authored-by: āda <ss.adasts@gmail.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
2026-06-29 12:44:06 +02:00
themias f06a3a695d Add a holy light effect to bible healing (#43189)
* save

* remove unneeded event

* Revert "remove unneeded event"

This reverts commit 779ec783094144ca978a5e9d111235e29539e8a3.

Revert "save"

This reverts commit f88e0ab18b253915f5efde5886a4701a73ffa35a.

* Use simple light effect entities with TimedDespawn
2026-06-29 12:44:05 +02:00
Taser 6398bb8080 fix bottle reagent localization (#43208) 2026-06-29 12:44:05 +02:00
Centronias 36c7e7b194 Wrapped parcels can go into mail carts (#43226)
wrapped parcels can go into mail carts

yeah, it technically allows wrapped humanoids to get in there too, but how're you gonna get something you can't pick up into inventory storage?

Also YEAH technically this allows arbitrage of carrying a ton of stuff in the mail cart, but that's no so different from just carrying a ton of stuff around in a trash cart and this at least has the cost of a bit of parcel wrap. I will tolerate no dissent
2026-06-29 12:44:04 +02:00
4186c8caa2 Weather entities (#41427)
* weather status effect entities

* proto port + fixes

* Update weather.yml

* fix visuals

* Update SharedWeatherSystem.cs

* Update SharedWeatherSystem.cs

* Update WeatherSystem.cs

* Thanks Slarti, thats a much better

* Update WeatherSystem.cs

* Update StencilOverlay.Weather.cs

* Update Content.Client/Overlays/StencilOverlay.Weather.cs

Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>

* Update Content.Shared/StatusEffectNew/Components/StatusEffectComponent.cs

Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>

* Update Content.Client/Overlays/StencilOverlay.Weather.cs

Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>

* Revise weather command help descriptions

Updated weather command help texts for clarity.

* Merge branch 'master' into ed-14-11-2025-weather-entities

* Tayrtahn review apply

* fixes and cleanup

---------

Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-06-29 12:44:02 +02:00
Rachel Lowe 1d3617ad6a Fixing issue 42759, air grenades cannot be re-triggered. (#42866)
Fixed #42759 - air grenades cannot be re-triggered
2026-06-29 12:44:01 +02:00
pathetic meowmeow f889c9f817 Initial decoupling pass on Damageable (#43103)
* Initial decoupling pass on Damageable

* ope

* e

* mroaw

* ok sure on the medibot thing

* no medibot bounds

* okidooks

* arcryox era

* cryox moment
2026-06-29 12:44:01 +02:00
August Sunandaugust-sun 1416f45199 Brings Estoc DMR accuracy to standard rifle accuracy, removes movement speed debuff (#43038)
* Removed accuracy and move speed debuffs for estoc

* introduced slight speed reduction

* typo

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
2026-06-29 12:44:01 +02:00
ProPeperos 0bc411fffd Hyper autolathe now requires the same ammount of manipulators as autolathe (#43109)
hyper lathe now requires the same ammount of manipulators as base lathe
2026-06-29 12:44:01 +02:00