Commit Graph

38456 Commits

Author SHA1 Message Date
Princess Cheeseballs ea166512c4 Balance swing at Vestine (#42302)
* AAAAAAAAAAAAAAAAAAAAAAA

* whhops

* full range whoop

* less diff any%

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:53 +02:00
Kowlin cddae22e7a Allow the admin door remote to toggle overcharge (#42370)
* Allow the admin door remote to toggle overcharge

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-04-04 16:57:53 +02:00
Quantum-cross ed14899032 Allow late join from arrivals to be considered for antagonist. (#39837)
* Allow late join from arrivals to be considered for antagonist.

* Don't use `PendingClockInComponent` to block late join antag selection, instead do an arrivals grid transform check with new helper function `IsOnArrivals`.

* Minor formatting fixes

* missing using

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
2026-04-04 16:57:53 +02:00
chaisftw 4ac5f8b1d3 Spray bottles with visible reagent contents (#42155)
* Spray bottles with visible reagent contents

* Fixed cargo catalog to correctly reference the new spray bottle rsi

* Fixed indentation on rsi meta files

* Updated copyright in spray_bottle.rsi meta

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml

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

* Updated to follow yml convention, modified to inherit from DrinkBase and renamed fill textures

* Fixed solution names

* Updated solution name in BorgMegaSprayBottle

* de-hardcode solution name

* less breaking

---------

Co-authored-by: āda <ss.adasts@gmail.com>
Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-04-04 16:57:53 +02:00
BarryNorfolk 74f7357c40 Downstream fixes for #42123 (Medical borg module rework) 2026-04-04 16:57:52 +02:00
Princess Cheeseballs 13ddcdea36 Medical Cyborg Modules Rework. (#42123)
* PUSH!!!

* Femtanyl

* eh swap em back

* My PR is ruined!!!

* review 2 electric boogaloo

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:52 +02:00
Kyle Tyo 77f524fa25 Fix holywater locale string usage. (#42378)
Update chemistry-bottles.yml
2026-04-04 16:57:52 +02:00
slarticodefast 0631053495 Fix GenpopLockerBoundUserInterface prediction (#42365)
fix genpop prediction
2026-04-04 16:57:52 +02:00
Velken e6d30f7f95 Admin: fixes description for "help osay" (#42368)
2 diff 2 me
2026-04-04 16:57:52 +02:00
SlamBamActionman 7a324cfbe2 Add the ability for station maps to track grids they are not on (#41248)
* Initial commit

* Accidentally included the nukie map changes

* Fix the gridcheck

* Addressing review

* Review change

* Review comments
2026-04-04 16:57:52 +02:00
slarticodefast dc7b12ae47 Predict BarSignBoundUserinterface (#42364)
fix bar sign prediction
2026-04-04 16:57:52 +02:00
SlamBamActionman 66ac4f1e42 Add admin logs for connecting/disconnecting players (#42363)
* Initial commit

* small tweak

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2026-04-04 16:57:52 +02:00
slarticodefast 399a86860d Fix action tooltip warnings (#42361)
fix action examine warnings
2026-04-04 16:57:24 +02:00
Perry Fraser e3e6867491 fix: clear health bar/icon overlay damage containers on update (#39288)
* fix: clear health overlay damage containers on update

* linqn't

* import

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-04-04 16:57:24 +02:00
ScarKy0 dcf776afe4 Janiborg Module Cleanup (#42330)
init
2026-04-04 16:57:24 +02:00
Pieter-Jan Briers 96640650a0 Fix warning spam from ShortKeyName (#42351) 2026-04-04 16:57:24 +02:00
BarryNorfolk fc1ea0522d Downstream fixes for #42253 (Predicted mind examine) 2026-04-04 16:57:24 +02:00
ScarKy0 e9b4130ec9 Predict Mind State Examine (#42253)
* init

* review

* i might be stupid

* docs

* datafieldn't

* update comments
2026-04-04 16:57:24 +02:00
BarryNorfolk 580ee0b13f Use NextByte to properly construct colours (#42335) 2026-04-04 16:57:24 +02:00
SolidSyn 97ed41c408 Foldable wig on clowns mask (#42208)
* Clowns base mask now has the ability to toggle the wig on and off.

* Changes the clown mask to have a foldable wig.

* Adds my credit for the wigless sprites in the meta.json

* Redid the description.

* Added an a to the description. Smiles.

* Resolved changes, thanks beck!
2026-04-04 16:57:24 +02:00
SlamBamActionman 93db96603f Add the Syndicate Delivery Console + Corpsman Medicine Bundle (#41201)
* Initial commit

* Add a note to not abuse the darrrrn machine

* Remove nukie planet (hopefully) and fix duffelbag

* jug solution name

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-04-04 16:57:24 +02:00
Hitlinemoss a0daca78de BUGFIX: Cabbage placed on taco shells no longer turns into a carrot (#42326)
BUGFIX: Cabbage places on tacos no longer looks like a carrot
2026-04-04 16:57:24 +02:00
B_Kirill 2155073625 Fix projectile deceleration (#42320) 2026-04-04 16:57:24 +02:00
ScarKy0 0115f943e6 Stake Admin Alert (#42324)
i forgot this is a thing
2026-04-04 16:57:24 +02:00
Pok 9f887379f2 Predict DrainSystem (#41711)
* DrainSystem-move-to-shared

* random

* review

* review 2

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-04-04 16:57:24 +02:00
mikey cb431459fd Increase shuttle FTL cooldown to prevent FTL spamming (#42209)
* seperate out shuttle cooldowns

* fix

* feedback

* fix spacing

* update to TimeSpan

* GOAT float

* return to TimeSpan

* add var

* clarify with seconds

* clarifying some things
2026-04-04 16:57:24 +02:00
B_Kirill 1cf546113d Add craft for bonfire and bonfire with stake (#42211)
* Add craft for bonfire and bonfire with stake

* review

* review

* nullable MaxFireStacks

* retry

* retry

* review

* I will change it and hope that they will agree with me

* Revert "I will change it and hope that they will agree with me"

This reverts commit 83823692d0116bf9aa9eceb85a10e95c88b51fb9.

* construction

Merged the graphs
Changed the bonfire stake ID to follow the proper naming scheme

* add destroy sound

* planks Instead of logs

* of course I forgot about ftl

* Slarti review + Princess review

Yes I sneaked an admeme abuse change here

* a small fix

* clamp firestacks

* This was on purpose, leave as is

This reverts commit 7d63e38b66cb63e5e50b7fac5030013e2ef508b5.

* irrelevant

* Fixtures

* cleanup

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:24 +02:00
BarryNorfolk 44e41d5019 Downstream fixes for #29413 2026-04-04 16:57:24 +02:00
Princess Cheeseballs 865277156b Allow items spawned in the smart fridge to show up as an entry. (#42268)
* Allow items spawned in the smart fridge to show up in the view

* AAAAAAAAAAAAAAAAAA

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:24 +02:00
Tayrtahn 04b9645b62 Fix broken state when attempting to escape a locker while cuffed (#42313)
Check that the DoAfter starts successfully instead of just assuming it does.
2026-04-04 16:57:24 +02:00
LevitatingTree 32d5681e9e Bring back shrug sanitization in a different form (#41236)
* Re-add chat-san & add o//

* changed o// to :?
2026-04-04 16:57:24 +02:00
Perry Fraser 0ae4843e03 fix: respect AllowedSlots for gogo hat (#39189) 2026-04-04 16:57:24 +02:00
BarryNorfolk ebefff61a2 Downstream fixes for #42292 (Handheld health analyzer) 2026-04-04 16:57:24 +02:00
āda 483989e1b1 Remove battery from the handheld health analyzer (#42292)
* commit

* review

* review 2

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-04-04 16:57:23 +02:00
Tayrtahn eb51cc6861 Fix forced vaping checking if the user's mouth is blocked instead of the target's. (#42311)
Swap user and target arguments of IngestionSystem.HasMouthAvailable call.
2026-04-04 16:57:23 +02:00
lunarcomets adef13b4db fix electrify sound effects being reversed (#42294)
* The Fix

* The Fix Part 2
2026-04-04 16:57:23 +02:00
Princess Cheeseballs a860d2e1b9 Goliath Hardsuit Fixes (#42303)
goliath hardsuit fixes

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:23 +02:00
Princess Cheeseballs b8a210d1a6 Fix Internals Sounds not working. (#42304)
ern

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:23 +02:00
JackspajfMain 45c3eedb55 Fix Capitalization on HoP's Fountain Pen (#42300)
capitalization
2026-04-04 16:57:23 +02:00
BarryNorfolk 7fdccdb89b Downstream fixes for #38878 (Yaml test for non-existent components) 2026-04-04 16:57:23 +02:00
Perry Fraser a15d8db3a2 Remove yaml'd non-existent components + test for that (#38878)
* chore: remove some unregistered components

* feat: test for components being ignored on client + server
2026-04-04 16:57:23 +02:00
Connor Huffine 584d043abb Add origin member to class (#41250)
* Add origin member to class

* whitespace

* Add comments

Added some doc polish while I was here.

* Update comments

Clarification and accuracy

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-04-04 16:57:23 +02:00
āda 2b54519baa Reorganize and clean Fun yml (#42184)
* don't look at this commit size i'm not proud

* self review

* more final changes

* more comments

* review

* review

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-04-04 16:57:23 +02:00
SomegnihT 0dd1a6708c Vox now say they become fried chicken upon taking enough heat dmg (#42280)
* Made it so that vox now say they become fried chicken upon taking enough heat dmg

* updated a comment to be more clear

* changed the name of bodyburnvox-text-other to bodyburn-vox-text-other

* forgot that I needed to also update the text in vox.yml to go with the previous commit change

* BurnBodyBehavior now takes bodyburn-text-others as default

* fixed suggested changes

* Relized I forgot to do a suggested change, I have now done it

* Update Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs

* Update Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-04-04 16:57:23 +02:00
Samuka 5b0006bde9 Xenoborg camera monitor now shows xenoborgs names (#42205)
* update camera id

* revert code changes in SharedSurveillanceCameraSystem

* why change camera id if you can just send the entity name
2026-04-04 16:57:23 +02:00
āda 8eb0d3eb32 Grappling gun rope visual change (#42207)
* sprite changes

* system changes

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-04-04 16:57:23 +02:00
ScarKy0 eac1f40d4d Predict Rotting Examine (#42254)
* init

* review

* test

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-04-04 16:57:23 +02:00
Kyle Tyo 75cb2931c5 Fix attributions for /Resources/Audio/Misc/ (#42230)
* commit

* cleanup
2026-04-04 16:57:23 +02:00
ScarKy0 caded37f81 Chameleon Projector Battery, Price Decrease (#42271)
* init

* fuck using

* glowup

* unused

* meta

* whuh

* review

* tests

* Update SharedChameleonProjectorSystem.cs
2026-04-04 16:57:23 +02:00
0-Anon 848a1e2185 Guarantee glue and lube in toybox (#42146)
Update fun.yml
2026-04-04 16:57:23 +02:00