Commit Graph

6383 Commits

Author SHA1 Message Date
Aiden b41b453e31 Prototype-ize Mind (#41384)
* Use MindBase prototype for mind creation

* Create mind.yml

* Add ContainerContainer
2026-01-26 19:22:37 +01:00
kin98 a9b49de934 Fix: obsolete warnings in SharedAbsorbentSystem (#40885)
* fix: formating warnings

* split GetAbsorbentReagents into string and protoid

* fix: changed SplitSolutionWhitout [obsolete] to use new method

* fix: missing using directive after merge

* Replaced methods with ProtoId variant
2026-01-26 19:22:37 +01:00
Sir Warock cc26f5cb0f Fix Ammo Visuals Bug (#41362)
Fix Ammo Count Updating
2026-01-26 19:22:37 +01:00
Vanessa ec041a0f22
Of Hats and Hardsuit Helmets (#5263)
* Now you can toggle your helm with a hat on

* Added container to toggleable clothing in YAML.

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

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

* Fixed YAML fail.

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2026-01-25 10:31:55 -06:00
Milon d16a306326
marked as protected trait (#5274)
* protected trait

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

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

* right

* direction

* REFLECTION

* whoopsie

* [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>
2026-01-25 10:30:18 -06:00
Milon 884cf115c6
more traits improvements (#5285)
* wowie

* whoopsie

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

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

* WHY DID I DO THAT

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2026-01-25 09:12:38 -06:00
Milon 96304b787b
add uncloneable back (#5273)
* why

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

for more information, see https://pre-commit.ci
2026-01-24 21:29:58 +00:00
Vanessa 8f130cb0bb
Migrate Chronic Pain to the New Status Effect System (#5180)
* Renamed InPain to ChronicPain. Changed references.

* Updated meds to use the name status effect system for chronic pain suppression. Standardized popup chances for all meds.

* Migrated ChronicPain to the new Status effect system. Basically re-wrote it and re-organized it.

* Cleanup and tweaks.

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

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

* Fixed cloning traits for pain.

* Addressing Milon-san's feedback uwu

* Apply suggestions from code review

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Turned floats into TimeStamps.

* Derp

* Forgot the trait lol

---------

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: Tobias Berger <toby@tobot.dev>
2026-01-23 10:24:32 +00:00
Vanessa ea2f0a21aa
Ninja Stealth Fix?/Nerf? (#5217)
* Changed up how ninja's stealth is removed after they get hit.

* Logic fix

* Update Content.Shared/Ninja/Systems/SharedSpaceNinjaSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

---------

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
2026-01-21 15:18:56 +01:00
Milon 4364eaa388
real traits system (#5208)
* holy shit?

* final touches

* this is dumb

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

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

* whatever go my integration tests

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

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

* whoopsie forgot blacklists

* load bearing loc

* minor stuff

* whoopsie

* cool

* I LOVE REFLECTION

* got a call from the stink department

* i love fluent yes

* direction changes

* waiter more migrations please

* typo ops

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
2026-01-20 12:49:59 +01:00
pootslap f05e2613df
Long range examining (#5219)
* no more up close examines

* Update Content.Shared/Examine/ExamineSystemShared.cs

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Update Content.Shared/Examine/ExamineSystemShared.cs

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

---------

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
2026-01-20 12:49:48 +01:00
Dorragon 0f3eb79aa7
Port Ready Manifest from Impstation (#5187)
Meow meow moew meow emweo
2026-01-18 12:47:07 -06:00
Tobias Berger ce5817ebd4
No more footprint prediction (#5224)
* Revert "footprints prediction (#5111)"

This reverts commit 0d0d5a17de.

* No footprint slowdown

---------

Co-authored-by: Vanessa <vanessalouwagie@gmail.com>
2026-01-16 13:07:45 -06:00
Vanessa 58e500d254
CentComm Shipyard (#5172)
* Added CentComm shipyard console. Brought some things in Shipyard console up to modern standards.

* More shipyard stuff

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

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

* PR Feedback

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2026-01-16 19:37:33 +01:00
Milon e0fd0cb2cd
tips / tutorial system (#5199)
* somewhat functional yes

* some cleanup

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

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

* review

* missed one

* why not params…

* review 2

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2026-01-14 14:23:39 -06:00
Pharaz4 dcd5733185
Some guidebook and localisation touch ups (#5178)
* - Fixed squished Ovinia and Kitsune in species page of guidebook.
- Added Skia to Minor antagonists in guidebook

* Fixed typo posession -> possession

* changed cryoxadone's dec from saying works regardless if alive or dead to needs to be alive

* added documentation

* Fixed failure to follow contribution guidelines (thanks faint)

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

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

* Fixed pump part of guide book showing vol pump max kPa as ???.

* Added empty line at bottom of ftl file

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

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>

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

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>

* Fix issue 5151

---------

Signed-off-by: Pharaz4 <143268074+Pharaz4@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>
2026-01-11 10:27:06 -06:00
Vanessa 73cbc7ecb2
Revert 'nerf melee when laying down #3173' (#5182) 2026-01-11 09:38:24 -06:00
Joe 5c6dae9400
fix: Check if RootContainer is null before referencing its members. (#5173) 2026-01-10 15:44:55 -06:00
KOTOB 3ba0c9753e
Smooth combat mode rotation (Make Flashlights Awesome) (#5163)
* its so peak
2026-01-08 18:11:25 +01:00
Vanessa c0821274f3
Might fix nukie commander not spawning (#5146)
* Might fix current commander whitelist

* Added missing DV comments
2026-01-07 10:30:02 -06:00
Milon fb98bfe575
deepfryer 2.0 (#5043)
* was it worth the hype

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

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

* minor stuff

* multi-ingredient recipe support

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

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

* oil transfer

* explosions and fire

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

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

* make the yaml linter happy

* YML recipes

* typo ops

* review

* Apply suggestions from code review

Milon told me to.

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

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

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

---------

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: Stop-Signs <stopsign221@gmail.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
2026-01-06 12:41:29 -06:00
Milon fae22b6e86
mail commands and API (#5150)
* 5 minute adventure

* ftl and comments cleanup

* [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>
2026-01-06 09:57:16 -06:00
Vanessa 334255b84d
Fixed footprint system deleting people (#5128)
Fixed footprints deleting the people who left them, and not the footprint itself lmao.
2026-01-04 19:25:48 +00:00
Milon 0d0d5a17de
footprints prediction (#5111)
* works

* shuffle stuff around

* no more fucky wuckies, fucky wuckies are GONE

* maybe this will just fix my problems?

* usings

* thats not how flying works

* review
2026-01-04 10:37:08 -06:00
Astra 2502a9fffe
New glimmer events! Foxfire & Restyle (#5102)
* Add glimmer restyle and foxfire

* Fix typo

* Fix typo

* Fix test fail and kobold hair bug (thanks to FaintSpeaker)

* Update Content.Server/_DV/StationEvents/Events/GlimmerRestyleRule.cs

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Astra <226853568+EmberAstra@users.noreply.github.com>

* Update Content.Server/_DV/StationEvents/Events/GlimmerRestyleRule.cs

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Astra <226853568+EmberAstra@users.noreply.github.com>

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

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

* Update Content.Server/_DV/StationEvents/Components/GlimmerFoxfireSpawnRuleComponent.cs

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Astra <226853568+EmberAstra@users.noreply.github.com>

* Update Content.Server/_DV/StationEvents/Components/GlimmerFoxfireSpawnRuleComponent.cs

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Astra <226853568+EmberAstra@users.noreply.github.com>

* Update Content.Server/_DV/StationEvents/Events/GlimmerFoxfireSpawnRule.cs

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Astra <226853568+EmberAstra@users.noreply.github.com>

* Update Content.Server/_DV/StationEvents/Events/GlimmerRestyleRule.cs

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Astra <226853568+EmberAstra@users.noreply.github.com>

* Only filter for potential psionics

* Lower restyle glimmer requirement

* Semicolon my beloathed

* Popup false when going bald to bald

* Update Content.Server/_DV/StationEvents/Events/GlimmerRestyleRule.cs

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

---------

Signed-off-by: Astra <226853568+EmberAstra@users.noreply.github.com>
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2026-01-03 13:56:01 +00:00
Charlie Morley d9505a1d9a
hotfix id card console (#5103)
* hotfix id card console not working due to unintentionally hidden accesses

* Update Content.Shared/Access/Components/IdCardConsoleComponent.cs

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Charlie Morley <cmorley191@gmail.com>

---------

Signed-off-by: Charlie Morley <cmorley191@gmail.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
2026-01-02 00:37:21 +00:00
Cepelinas1 0ea6fe67a0
Internal Affairs Agent Role (#5075)
* test for now

* icon fix

* text fix

* fucking around, using it more like changeling yo

* whatever failed tests

* probably works?

* fix

* test test

* messing around yet again

* removed useless file

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

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

* why the fuck do objectives work now

* fix round screen not showing up

* implanter, music track and general fixes added

* text improvement

* slightly fixed formatting

* conflict fix

* Update Resources/Prototypes/_DV/Roles/Antags/ntAgent.yml

NTAgent-round-end-name

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Cepelinas1 <kakelis01@gmail.com>

* Update Resources/Prototypes/_DV/Roles/Antags/ntAgent.yml

NTAgent-role-greeting-human

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Cepelinas1 <kakelis01@gmail.com>

---------

Signed-off-by: Cepelinas1 <kakelis01@gmail.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>
2026-01-01 14:27:31 -06:00
Sir Warock 268a1e79e5
The Jetpack Stays On During Harmbatoning (#4990)
* OneCommitOps

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

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

* Requested Changes

* Small fix

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-12-31 14:18:49 -06:00
Apachito 58cc793e86
Port Starlight's expanded makeshift items (#4984)
* 1

* 2

* remove dismantle testing changes

* add ammount handling, and add random angle

* code-side things

* code-side things

* code-side things

* 3

* 4

* 5

* 6

* changed description for now

* whoops

* 7

* 8

* 9

* Texture fix

* Tada!

I diiid iiitttt

* Delete .icon.png-autosave.kra

* 10

* test

another

* 11

* Localization fixes 2

Also some minor rebalancing of armor/shield/helmet crafting

* ROOOUND 33333

* test

wawa

* wiz

* fixes

* MORE FIXES

* MORE MORE FIXES

* Smg mag fix

* Why does it have reflet

Removed reflect chance and made the damage the same as a plasteel arming sword

* belt fix

* phosphorus addition

* improvised round bulk crafting

* Update tags

* tags update 2

* Update tags.yml

* fix tags AGAIN

* TAG FIX AGAIN

* Fixed the sound path

* Fixed missing components hopefully

* fix it hopefully

* Update tidebreaker.yml

* fixed errors

* fixed?

* Update shields.yml

* Update tools.yml

* Fixes

* Update tools.yml

* Update tools.yml

* Update tools.yml

* Update tools.yml

* Update tools.yml

* screwdriver fix 200

* Update tools.yml

* Update tools.yml

* Apply suggestions from code review

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update SharedItemSwitchSystem.cs

* review changes

* Fix server and client files

* Namespace fixes.

* Update Resources/Prototypes/Entities/Clothing/Belt/belts.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/Entities/Clothing/Belt/belts.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/Entities/Clothing/Belt/belts.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/Entities/Clothing/Belt/belts.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/Entities/Clothing/Belt/belts.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/Entities/Clothing/Belt/belts.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/_StarLight/Entities/Objects/Tools/crowbars.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/_StarLight/Entities/Objects/Tools/tools.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/_StarLight/Entities/Objects/Tools/tools.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/_StarLight/Entities/Objects/Tools/tools.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/_StarLight/Entities/Objects/Tools/tools.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/Entities/Clothing/Belt/belts.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/Entities/Clothing/Belt/belts.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/Entities/Clothing/Belt/belts.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/Entities/Clothing/Belt/belts.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/Entities/Clothing/Belt/belts.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/Entities/Clothing/Belt/belts.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/_StarLight/Recipes/Crafting/Graphs/improvised/improvised_omnitool.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/_StarLight/Recipes/Crafting/Graphs/improvised/improvised_omnitool.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/_StarLight/Recipes/Crafting/Graphs/improvised/improvised_omnitool.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/_StarLight/Recipes/Crafting/Graphs/improvised/improvised_omnitool.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/_StarLight/tags.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/_StarLight/tags.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/_StarLight/tags.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/_StarLight/tags.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/_StarLight/tags.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/_StarLight/tags.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/_StarLight/tags.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/_StarLight/tags.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/_StarLight/tags.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/_StarLight/tags.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update SharedWeaponDismantleOnShootSystem.cs

* Update Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/improvised.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

---------

Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>
Co-authored-by: KillerTheFlareon <tyler443344@outlook.com>
Co-authored-by: Matthew Herber <matthewherber@sbcglobal.net>
Co-authored-by: Athena-AI <AthenaTheAI@outlook.com>
Co-authored-by: stickycheZ101 <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>
Co-authored-by: stickycheZ101 <96800602+stickycheZ101@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: Vanessa <vanessalouwagie@gmail.com>
2025-12-31 14:08:48 -06:00
Velcroboy 810d9616aa
Add enabled version of atmos pumps, filters, and mixers (#5015)
* Add enabled version of atmos pumps, filters, and mixers

* spaces

* Comment and move entities to _DV

* Update Content.Shared/Atmos/Components/GasPressurePumpComponent.cs

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>

* Update Content.Shared/Atmos/Piping/Binary/Components/GasVolumePumpComponent.cs

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>

---------

Signed-off-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
2025-12-31 12:35:45 -06:00
Vanessa 82445918d5
Various Upstream Merge Fixes (#5066)
* Moved migrations to DV migration file.

* Buffed jug size. Oops.

* Removed time requirement from mantles.

* Added missing static packs from fabs
2025-12-30 17:28:33 +01:00
Tobias Berger 2025891fc2
Upstream Merge Changelog Fix (September/October Edition) (#5051)
* This vexes me

* Extra fixes for https://github.com/space-wizards/space-station-14/pull/41119

* Missing upmerge CL (here's hoping)

* Remove stray BOM
2025-12-29 22:43:44 +01:00
Tobias Berger 140179175c
Formatting 2025-12-29 21:45:03 +01:00
Tobias Berger 0f1076ab4c
Rename DefaultEmpDamage 2025-12-29 21:43:45 +01:00
Vanessa 33677d5b6b Reverted DeltaV-specific ID computer code. Fixes new Grant/Revoke buttons. 2025-12-29 14:16:27 -06:00
SlamBamActionman f4240bc373 [Staging] Fix certain projectiles moving faster than intended (#41905)
Return to original value (25)
2025-12-29 11:57:33 -06:00
Vanessa cf76599616 Early merge of #42158. Fixes medibots. 2025-12-29 11:41:54 -06:00
Vanessa 3e20796126 Comments. 2025-12-29 11:39:38 -06:00
Vanessa ee09eb21a2 Early merge of typo-fix (#41652) 2025-12-29 11:39:38 -06:00
Vanessa 14a91a0132 Updated damage namespaces in Mail system 2025-12-29 11:39:38 -06:00
Vanessa 0ba6dddb77 Buildable SmartFridge fixes. 2025-12-29 11:39:37 -06:00
Vanessa 4a5764d672 Added an accessible override event to BodyPart to allow surgery to work again. 2025-12-29 11:39:37 -06:00
Vanessa 69504f97ec Revert "Can't crawl over counters (#40099)"
This reverts commit 01a7fc66f011967579330b1c155c326b61fa5806.
2025-12-29 11:39:37 -06:00
Vanessa b5412c8df8 Hopefully fixed a persistant shitmed error that keeps popping up because it cannot re-parent an entity's grid 2025-12-29 11:39:37 -06:00
Princess Cheeseballs 29fa901a85 Make Nutriment Work again. (#40869)
Fix nutriment

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-29 11:39:37 -06:00
pre-commit-ci[bot] 137264c756 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2025-12-29 11:39:37 -06:00
Vanessa c345039934 Added a dummy component for BombingTarget for mapping compatibility. 2025-12-29 11:39:37 -06:00
Vanessa 43a4db57d3 Upstream merge cleanup 2025-12-29 11:39:36 -06:00
slarticodefast 7b8038df14 Cleanup BatterySystem (#41298)
* cleanup

* fix fixtures

* this belongs into the next PR

* review

* misc

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-12-29 11:39:36 -06:00
Princess Cheeseballs 74cc4bc12c Conveyors spin fix (#37468)
* Init commit

* And on the third day god said: good enough

* and on the fourth day god said: oops

* Commit of evil

* I hate conveyors

* Switch the numbas

* I hate conveyors

* Master Merge

* And on the third day, God said: Good Enough

* I hate conveyors

* AAAA

* Optimize it a bit

* Move that

* Init Commit

* Oops

* Remove that

* One last commit

* Removed one TryComp

* Remove TryComp

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-29 11:39:36 -06:00