Commit graph

12097 commits

Author SHA1 Message Date
Dmitry
787dee44b0 upstream bugfix 2025-12-22 03:06:16 +07:00
Dmitry
4f4b71e8de merge remote wizden stable 2025-12-22 00:33:29 +07:00
Princess Cheeseballs
0444896603
[Staging/Hotfix] A couple bloodstream fixes. (#41906)
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-20 12:54:14 -08:00
SlamBamActionman
c4a798632a
[Staging] Fix certain projectiles moving faster than intended (#41905)
Return to original value (25)
2025-12-19 11:28:06 -08:00
SlamBamActionman
bb95787af7
Make StaminaModifier into a status effect, apply to Hyperzine (#41902)
* Initial commit

* Probably better this way.

* Review fixes

* cleanup

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-18 19:41:08 +00:00
Hitlinemoss
4fe48ec3cc
Adds debug wizard's grimoire (#41900) 2025-12-18 19:20:38 +00:00
Samuka
1bb4b935af
Fix xenoborg modules (#41625)
* change name from heavy laser to laser cannon

* fixed some ids

* fix name and description

* change cost of upgrade modules

* remove unwield penalty

* commentary

* change name of scout modules

* same firerate as before

* typo

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

* new line at end of file

* duplicated

---------

Co-authored-by: āda <ss.adasts@gmail.com>
2025-12-18 02:17:04 +00:00
NoreUhh
926a81abe5
Give Vulps "Unique" Stomachs (#41893)
* Bit funny init?

* remove reptilianfood tag

* oops too muchgit add Resources/Prototypes/Body/Organs/vulpkanin.yml!

---------

Co-authored-by: NoreUhh <noreuhh@gmail.com>
2025-12-18 00:41:11 +00:00
Centronias
3c15d9f312
Adds BallisticAmmoSelfRefillerComponent (#38537)
* Adds BallisticAmmoSelfRefillerComponent

And uses it to replace battery-based refilling of the Syndicate L6 and Viper modules.

# Automagic Ballistic Ammo Refilling
- Add `BallisticAmmoSelfRefillerComponent`
- Handle `EmpPulseEvent` to pause refilling behavior for EMP's duration

# Supporting Changes
- Change `Content.Server.Weapons.Ranged.Systems.Update` override in `GunSystem.AutoFire.cs` to `UpdateAutoFire`
- Add `Content.Server.Weapons.Ranged.Systems.Update` to `GunSystem.cs` so that it can call `UpdateAutoFire` and `UpdateBallistic`
- Add public methods to GunSystem for use by refilling implementation
  - PauseSelfRefill
  - IsFullBallistic (same as #299)
  - CanInsertBallistic (same as #299)
  - TryBallisticInsert (same as #299)

* _timing -> Timing

* unspawned count stuff

* imagine building the code before pushing

* - apply to c20r ROW
- make predicted/shared

* revert server system import only changes

* oop

* o great and wise Slarti

* Scar comments

* field deltas + correct serializer

* review

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-12-17 22:52:32 +00:00
Nikovnik
0e76d4e5ed
Metabolizing bloodstream (#35071)
* merged chemical into bloodstream

* changed injectable to bloodstream

* separated bleeding and direct blood removal

* removed blood gain from protein

* reduced blood gain from saline

* rejuvenating fills to reference volume

* fixed blood regulation

* red mead requires stirring to make

* reverted accidental line deletion

* cleared the skeletons from the closet

* additional routing

* field rename for xeno

* removed mention of chemstream and field rename for asteroid mobs

* minor optimizations

* Revert "reduced blood gain from saline"

This reverts commit de26fd1c0d99f3019fe7dd1451a50230cc90f058.

* Revert "removed blood gain from protein"

This reverts commit 7a1648caf39fe26406db73c2a5afa389b82c612f.

* removed unused component fetch

* dead check mini refactor

* eventized blood exclusion

* quick fix

* Pain

* Commit of doom

* COMMIT

* renamed bloodMaxFactor to MaxVolumeFactor

* addressed floating point error

* returned vomiting chemicals

* blood reagent always skips the flush

* no need to mention blood reagent

* fixed passing blood flush

* adadsafasfasfassfasf

* whoops

* merge fixed injectors

* Revert "adadsafasfasfassfasf"

This reverts commit 0a5313a68dd6484d36d28d08930c76851b72ae38.

* simplify reagent removal

* enabled foreign blood transfusion

* Revert "COMMIT"

This reverts commit 19abd679cd7761ebd47bb242bd644176a3006a42.

* simplified reagent removal when modifying blood level

* removed misleading coment since the changes

* documented MetabolismExclusionEvent

* fixed negative negative modification of blood level

* fixed hypervolemia not normalizing

* constrainted blood modification

* returned bloodpack stop on fully healed

* forgot to stage this

* band aid for diona blood

* swapping GetReagent with GetPrototype

* optimize blood filtering

* multiplicative multi reagent blood level calculation

* removed unused stuff

* optimized blood calculation a tiny bit

* added per reagent blood regulation

* optimized (referenceVolume + bloodReagents) into referenceSolution

* polished coded to proper function

* forgot to stage rootable system change

* clean up, unnecessary GetBloodLevel call

* rename method name to TryAddToBloodstream instead of Chemicals

* placed overfill safety

* cleanup and final touches

* final touch

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-17 19:21:16 +00:00
slarticodefast
5facf93b4a
fix AI battery alert (#41879)
* fix AI battery alert

* fix copy paste error
2025-12-16 18:48:20 +00:00
Princess Cheeseballs
4643bb8bbb
Arcryox Metabolism Fix (#41881)
* fix arcryox metabolism

* dont change that shit wrong branch

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-16 18:42:57 +00:00
Pancake
870b8db076
Tweak Killer Tomato Size (#35866)
* Update miscellaneous.yml

y tho

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-12-16 07:10:45 +00:00
beck-thompson
186b6460c7
Add foolbox (#41473)
* Add foolbox to clown lockers

* this is beter

* updated table w/ new items

* more clown like

* Tweaks

* thank you iaada

* cleanup

* review

* fun!

* fixes and microbalance

* clowns start with it inhand now
2025-12-16 03:19:56 +00:00
Hitlinemoss
ab64807e2c
Station AI now rolls before most standard crew (#41663)
* Station AI now rolls before standard crew

* github tests are high

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-12-16 02:00:17 +00:00
Samuka
45eb268247
Fix mothership core fixture (#41745)
fix mothership core fixture
2025-12-16 01:56:34 +00:00
imatsoup
8fba285cdb
Add audio collections for Weh, Hew, and Honk to Vulps (so that they have audio when they do that) (#41610)
Vulps can weh and honk now
2025-12-16 01:32:08 +00:00
āda
49743515ee
Remove unused tags tied to unused entities (#41366)
* commit

* fix for haunted

* not a magazine

* unused sprites

* the lost tags

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2025-12-16 01:30:20 +00:00
Samuka
0fb6f26edb
Xenoborg door control module (#41546)
* add door control module

* some commentary

* can't eject stuff anymore

* make xenoborg door remote eletrify doors

* clean yml

* anchors and aliases

* not show stuff about id in xenoborg access config

* engi xenoborg can see eletrified doors
2025-12-16 01:24:54 +00:00
Princess Cheeseballs
10b989e7bf
Cryogenics evenheal + New chem "Arcyrox" (#41696)
* Cryo chems

* Actually cryo eats a lot of this stuff, should probably buff the amount you get...

* minor necrosol buff

* fuck it old recipe

* Fucked up my math, half is closer to 6 here.

* cryox

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-16 01:04:55 +00:00
JesterX666
b17ee1c882
Ignite atmosphere on explosions (#41262)
* Ignite atmosphere on explosions

* Fixed to add a temperature property

* Code review corrections

* Removed unused usings

* Correction to use TryComp instead of EntityManager to make it prettier

* Code review corrections

* Code review corrections

* Corrections

* misc fixes

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-12-15 23:27:40 +00:00
Samuka
d53fe69b86
Repairing borgs now takes multiple doafters (#41638)
* borg repair is now multiple doafters

* is a float now

* use else

* remove random new line i added for some reason

* add new line at the end of the file

* add documentation

* made repair system super robust

* borg heal faster from crit

* forgot to make it a datafield

* less overpower

* cant repair futher than the threshold for alive if not alive or dead

* fix math

* more math

* fixes

* some comentary

* more accurate

* simple solution

* new solution

* better numbers

* more accurate

* use helper function

* fine tunning the number

* better way to restart the doafter

* update AutoDoAfter

* not used

* more clear

* remove inline if

* improve helper methods

* updare pop up message

* another unused

* nuke consecutive repair bonus

* increase the repair (so it doesn't take ages to fix a borg)

* back to 10 per repair

* heal evenly

* fix for edge case

* fix

* fix

* it works now

* add / fix comments

* small clean up

* make easier to understand

* use FixedPoint2.Zero

* make it smaller

* add support for group even heal

* ops

* easier to read

* typo

* make the HealEvenly better

* rename to GetDamage

* negative value

* Update Content.Shared/Repairable/RepairableSystem.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-12-15 12:15:22 +00:00
MissKay1994
83e1a6a8eb
Prevent Initial Infected from rolling on evac (#41863)
evac ambuzol
2025-12-15 11:11:29 +00:00
Pieter-Jan Briers
c65dba54b3
Revert "Remove most unknown shuttle events" (#41862)
Revert "Remove most unknown shuttle events (#41860)"

This reverts commit 6c9ef19e9e.
2025-12-15 04:29:35 +00:00
Nox
bfb0c1791e
ERT Overhaul 2/3: Equipment (#38105)
* fixed naming

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added equipment to be used by ERT.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added flamethrower suffix

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added hydra filled with frag grenades

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made basic grenades centcomm restricted

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made energy swords central command contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Parented ERT backpacks to syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Revert "Parented ERT backpacks to syndicate ones"

This reverts commit 615526512d90ea17c0e452ed24fdb351f54740bc.

:wq#

* Updated labels and containers

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added ERT survival box with double emergency tank

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* removed flamethrower

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made C4 CC contra, reverted Incen to syni contra

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* reverted contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* revert the rest of the contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Heisentest

* Added label component to spray bottles.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added suffixes to the space cleaner bottles

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
2025-12-15 03:47:28 +00:00
Meara
2b08ae480d
Adds crowbar to Mediborg Rescue Module (#41861)
Added crowbar to Borg Rescue module.
2025-12-15 03:46:39 +00:00
Nox
5f6c08e101
ERT Overhaul 1/3: Apparel (#37855)
* Initial commit: Added ERT web vest and sprites, added ERT magboots.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added duffle bag and magboots

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Half finished updating the web vest

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Removed unused items

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added ERT chest rig, changed sprites of backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Parented all ERT hardsuit stats to nukie hardsuits

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Parented ERT backpacks to syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* changed size of ERT backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Unparented ERT duffels from syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed belt sprites

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed ERT medic backpack sprite

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added explosion resistance to backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Removed ERT duffel bag.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
2025-12-15 03:43:57 +00:00
Pieter-Jan Briers
6c9ef19e9e
Remove most unknown shuttle events (#41860)
All except the hostile ones (which is like, three. I didn't even know we had hostile ones other t han loneop)

These are complete content slop bloat
2025-12-15 03:30:50 +00:00
āda
4d76c13051
Rollersakes heisen bounty (#41859)
commit

Co-authored-by: iaada <iaada@users.noreply.github.com>
2025-12-15 02:50:39 +00:00
ScarKy0
12992fd75b
Remove roundstart tools from some cyborgs (#41823)
* remove tools

* actually let derelict borgs keep it
2025-12-15 01:37:48 +00:00
JackspajfMain
fbb452b60d
Update to Bardrobe to add Pun Pun's outfit (#41705)
bardrobe update to add pun's outfit
2025-12-15 01:21:32 +00:00
āda
7eb797e7e5
Toys entity tables (#41840)
* ai talks

* kill cheepo

* mech figures

* finished

* touchup

* wider net

* final changes

* never final

* fix test fail

* commit

* self review

* self review 2

* buff

* nerf

* microbalance continues until i'm happy

* requested and more

* toys.yml is scary

* pace yourself, hun

* finished tables

* update related tables

* finish tables

* spawners

* new item

* other tables and cargo crate

* move board games

* commit

* last changes

* last last changes

* bounty changes

* remove pies :o(

* readjust prices

* requested microbalance

* friends for life

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2025-12-14 20:39:25 +00:00
RedSpy
cc90ac99f8
Make gun chamber empty by default (#41791)
gun chamber empty by default now

Co-authored-by: RedSpyy <empty@place.com>
2025-12-14 20:32:12 +00:00
Hitlinemoss
410b2c9945
Skeletons are now affected by Holy damage (#41757) 2025-12-14 20:20:55 +00:00
Hitlinemoss
226f910686
Assorted minor cleanup (and shotgun shell descriptions) in Resources\Prototypes\Entities\Objects\Weapons\Guns\Ammunition\ (#41841)
* YAML cleanup of shotgun rounds

* Descriptions for all shotgun ammo types

* YAML cleanup of pistol rounds

* YAML cleanup of magnum rounds (and tweaks to uranium ammo descriptions)

* YAML cleanup of rifle rounds

* YAML cleanup of toy rounds

* YAML cleanup of magnum/pistol/rifle/shotgun projectiles

* YAML cleanup of magnum/pistol/toy speedloaders

* YAML cleanup of light rifle rounds

* Descriptions for anti-materiel rounds and boxes

* YAML cleanup of base_cartridge.yml

* YAML cleanup of caseless rounds (plus minor viper-mag description tweaks)

* YAML cleanup of heavy rifle rounds

* YAML cleanup of grenades and explosives

* machine pistol magazine is now Security contraband

* Practice ammunition description updates

* Missed a magnum ammo description tweak

* Whoops, misspelled the word 'description' a lot

* Practice ammunition description updates 2!

* Better name/description for joke L6 foam dart mag

* Tweak to that last commit

* Fixed practice machine pistol magazines using real bullets
2025-12-14 20:13:52 +00:00
Borsh
6fc13a5875
Adding a random gate (#41627)
* Added random gate

* minor edit

* cleaning up my shit after trying to do something faster

* new lines

* some changes

* joke

* UI

* Long Division

* Dont use ctrl + x in 3 am

* I hope these are the final touches

* One thing, I don't know why

* noname commit

* no way, 1kk of code lines edit

* sudo rm -rf ... and something there...

* update

* sometimes its sad
2025-12-14 19:15:22 +00:00
Mehnix
a40d130f0f
Edible Produce are now also Butcherable (#36786)
Butcherable Produce

Adds Butcherable capabilities to Bananas, Mimanas, Corn, Gatfruit, Capfruit, Bungo, and Cherries.

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-12-14 02:07:28 +00:00
āda
6b3ddc6813
Five bounty arbitrage fixes (#41846)
* commit

* tweak

* more bounties

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2025-12-14 01:27:28 +00:00
NoreUhh
7d1c75c1bb
Fixed Vulp Hair layering Under Hoods and Hardsuits (#41827)
fix the freakin hair

Co-authored-by: NoreUhh <noreuhh@gmail.com>
2025-12-14 00:42:42 +00:00
āda
594ec9acff
All Figurines Entity Table (#41775)
* ai talks

* kill cheepo

* mech figures

* finished

* touchup

* wider net

* final changes

* never final

* fix test fail

* review

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2025-12-13 19:19:42 +00:00
K-Dynamic
6f5e6445b6
Preserve arbitrage by fixing a bug (#41756)
no more infinite money
2025-12-13 02:33:54 +00:00
Dmitry
50e5a073e5
Merge pull request #3468 from DIMMoon1/upstream12
Upstream12
2025-12-13 02:42:34 +07:00
NotSoDamn
d43edd522b
Removed cocnrete doubles (#3469) 2025-12-13 02:26:51 +07:00
Dmitry
ef3167e816 mapfix and mappool update 2025-12-13 02:01:09 +07:00
Connor Huffine
5944f1a817
Add KI pills to the radsuit locker (#41576)
* Add KI pills

* Add variability

* Remove unnecessary value
2025-12-12 17:45:53 +00:00
Princess Cheeseballs
6e85abf26d
Remove remote detonation/disable from the robotics console. (#41834)
End the war

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-12 10:24:31 +00:00
cloudyskies
59d0df0e7c
diona are now less debilitated by rooting in blood (#41642)
* diona are now less debilitated by rooting in blood

* Rerun tests

* Rerun tests
2025-12-12 02:00:55 +00:00
Centronias
d947dd8c6c
Smart Fridges can contain anything edible (#41830)
I'm sure this will cause zero unintended consequences
2025-12-12 01:58:22 +00:00
āda
fffbc654dd
Soap, Banana peel, and Slip entity tables (#41783)
* commit

* self review

* self review 2

* buff

* nerf

* microbalance continues until i'm happy

* requested and more

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2025-12-11 00:17:03 +00:00
Connor Huffine
4a460468d0
Improve ClothingSpeedModifier, Fix Paramedic Void Suit (#41820)
* Add RequireActivated bool

* Fix paramedic voidsuit

* Remove explicit check

This is actually unnecessarily verbose.

* Improve comment

* Update Content.Shared/Clothing/ClothingSpeedModifierSystem.cs

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

* Add cref linking

* Change reference from system to component

* Fix missing closing tag before anyone notices

* Add clarity about when this field is used.

* Add early return if not affected by toggling

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-12-10 18:52:55 +00:00