Commit Graph

6061 Commits

Author SHA1 Message Date
Janet Blackquill
173f24590f resimmed offmed 2025-10-08 20:49:29 -04:00
Janet Blackquill
847154b320 Merge branch 'master' into offmed-staging 2025-10-08 20:45:21 -04:00
UpAndLeaves
91aa169784 Slightly re-nerf zombification speed (#37445)
Initial Commit
2025-10-08 13:57:55 +00:00
B_Kirill
0c9d33d5d6 Cleanup warnings: CS0414, CS8524 (#40776)
* Cleanup

* CS8524
2025-10-08 12:43:59 +00:00
Janet Blackquill
19f5a3e037 Merge branch 'master' into offmed-staging 2025-10-07 23:41:47 -04:00
kosticia
745c6d0edc Unpredict MagnetPickupSystem.cs (#39988)
* unpredict

* predict
2025-10-07 16:09:20 +00:00
Kyle Tyo
1d827754c9 Move BrainSystem and necessary components to Shared (#40499)
* yowza

* Update Content.Shared/Body/Systems/BrainSystem.cs

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

* Update Content.Shared/Ghost/GhostOnMoveComponent.cs

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

* Update BrainSystem.cs

* Update Content.Shared/Body/Systems/BrainSystem.cs

* Update Content.Shared/Body/Systems/BrainSystem.cs

* Update Content.Shared/Body/Systems/BrainSystem.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-10-07 13:10:21 +00:00
Absotively
096f998c3f Fix species default skin tones (#40707)
fix so that all default Urist entities don't spawn with the same default human skin tone (cursed skin tone Urist McSlime)

(cherry picked from commit 8d9564c23856c342bc3a35834c462e659f5ebd5b)

Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com>
2025-10-05 20:53:58 +00:00
Janet Blackquill
fd18a985b7 Merge branch 'master' into offmed-staging 2025-10-05 14:12:34 -04:00
beck-thompson
7e3ee1d7c6 Explosives with timers now properly alert admins when detonating (#40471)
* Explosives with timers now properly alert admins when detonating

* add TODO comment

* Check if user is deleted before triggering
2025-10-04 17:51:36 +00:00
Kyle Tyo
3f0e9d6962 VomitSystem, Predict! (#39921)
* commit

* Update AdminVerbSystem.Smites.cs

* brrrrr

* reeeee

* skeet

* Update VomitSystem.cs

* didn't know i could do this.

* Update SharedForensicsSystem.cs

* Update SharedForensicsSystem.cs

* Update SharedForensicsSystem.cs

* Update ForensicsSystem.cs

* requested changes.

* Update VomitSystem.cs

* lets try this.
2025-10-04 11:57:24 +00:00
slarticodefast
5227489360 Predict EMPs (#39802)
* predicted emps

* fixes

* fix

* review
2025-10-04 11:24:42 +00:00
K-Dynamic
6661449633 Adds smart equip to pocket 1, pocket 2, and suit storage slots (#37975)
* pockets and exosuit smartequip

* add localisation
2025-10-04 01:33:59 +00:00
Janet Blackquill
53f4f38fda thusd less evil lung damage 2025-10-03 20:54:00 -04:00
Janet Blackquill
682625345a Merge branch 'master' into offmed-staging 2025-10-03 20:30:42 -04:00
Janet Blackquill
1fdbfe2dc1 more zombie tweaks 2025-10-03 20:28:50 -04:00
Nemanja
b6ab9dddc7 Fix xenoarch exceptions + misc. cleanup (#38742) 2025-10-04 00:05:04 +00:00
Janet Blackquill
065ac42398 Merge branch 'master' into offmed-staging 2025-10-03 15:40:07 -04:00
Janet Blackquill
677b79979a thusd lung damage 2025-10-03 15:39:36 -04:00
Janet Blackquill
579ea90d49 thusd refactoring 2025-10-03 12:21:48 -04:00
Kowlin
46960c0315 Conditional Meat spike logging severity (#40604)
* Reduce meatspike logging level from Extreme to High on non gibbing interactions

* Update butchering with some more conditionals

* Update Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs

Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>

* Update Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs

Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>

---------

Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
2025-10-03 11:20:18 +00:00
Janet Blackquill
09cc936b4a Make Offbrand critical count for reagent criticals 2025-10-02 21:47:34 -04:00
Janet Blackquill
68d3af3d12 Merge branch 'master' into offmed-staging 2025-10-02 20:36:12 -04:00
kosticia
9b7c87bd7e Fix anomaly shuffle particles type (#40624)
* dev it

* screw it

* Revert "screw it"

This reverts commit 5657a1d20128e630bebbaf38f4dcb4dbac28d026.

* Revert "dev it"

This reverts commit f3d7c355da17de92e43c145efbd348f8378d6146.

* slarti best

* Revert "slarti best"

This reverts commit 8de1caafb254515202aa21d2b96029a1fce24df2.

* Reapply "dev it"

This reverts commit c603940a73246f8a22a171c5559eb3f3f995e7bc.

* Reapply "screw it"

This reverts commit 468722abe7bde7e30bc3b421bc28fa90a013bd63.

* refactor: renaming +xml-doc

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
2025-10-02 20:00:39 +00:00
Leon Friedrich
de9593c0e7 Remove static IoC from client & server EntryPoint (#40562)
* Remove static IoC from client & server EntryPoint

* Fix missing log manager initialization

* file namespace
2025-10-02 14:32:56 +00:00
Janet Blackquill
8d8d1c36ef Merge branch 'master' into offmed-staging 2025-10-01 21:06:50 -04:00
Janet Blackquill
9bb09ae01b The chems update 2025-10-01 21:06:40 -04:00
Janet Blackquill
8626e82a79 The nukies update 2025-10-01 19:48:39 -04:00
K-Dynamic
9828f165b4 Increase puddle spillover volume to 50u (#38044)
* increase puddle spillover volume

* sleepy; 50u volume
2025-10-01 20:17:31 +00:00
Fildrance
c95bf3f94f fix: scan for ShowAccessReaderSettingsComponent on examiner and not on airlock (#40626)
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
2025-10-01 11:43:21 +00:00
Janet Blackquill
53a2b04077 Fix nukies test 2025-09-30 00:07:24 -04:00
Janet Blackquill
7ad04c0b38 Merge branch 'master' into offmed-staging 2025-09-29 22:48:48 -04:00
Janet Blackquill
3b7d7efff8 Fix mispredict on incoming wounds 2025-09-29 22:37:18 -04:00
Janet Blackquill
300a78a791 Fix floating damages 2025-09-29 22:20:31 -04:00
Janet Blackquill
cfe2a8f39a Make painspikes less overtuned 2025-09-29 12:29:51 -04:00
Sir Warock
f3202dcff9 Fix Shotgun ammocount not updating (#40568) 2025-09-29 10:28:28 +00:00
Janet Blackquill
8cd721516e On second thought no 2025-09-28 22:18:20 -04:00
Janet Blackquill
a9f6035cf3 A little bit of buffer goes a long way 2025-09-28 22:15:50 -04:00
Janet Blackquill
4db75b8dda Negative integration is evil 2025-09-28 22:12:35 -04:00
Janet Blackquill
fa50cda60a Forced refresh build fix 2025-09-28 21:15:56 -04:00
Janet Blackquill
d35cba6364 Merge branch 'master' into offmed-staging 2025-09-28 21:13:26 -04:00
beck-thompson
974759ba79 Fix label markup escapeing (#40600)
fix
2025-09-28 18:33:11 +00:00
Leon Friedrich
f2d4317258 Clean up some parts of ExplosionSystem (#40485)
* Clean up some parts of ExplosionSystem

* Update Content.Shared/Damage/DamageSpecifier.cs

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

* Review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-09-28 16:23:40 +00:00
Janet Blackquill
5fa17e22a1 De-MPL Offbrand 2025-09-27 22:43:24 -04:00
pathetic meowmeow
8894eca118 Offbrand medical (#3366)
* Offbrand medical

* what if we regrade

* zombies are mostly there thats it thats a wrap xd

* here's changeling

* some bonus gut punches

* start working on the guidebook

* fix rsi and yaml lints

* my agrichem so fits

* we stay rejuvenated

* my china so laked

* debrute

* fix suicide

* fix the suicide tests

* my surgery so requires laying down

* the guidebook continues

* READ KEB PAGES

* keb vascular recoupler

* read keb medicine

* fix yaml lint

* fix the EntityRemoveConstructionGraphStep

* fix overlay init

* scalpels are not a food tool

* return of the programmer art

* my line so nieuw

* boxes deserve veins too

* mrrrp yaml

* what if we redid brain damage alerts

* bloot pressure

* kill mannitol drowsiness

* get licensed

* my read so me

* get feedbacked nerd

* fine-tune the heart stoppage conditions

* cryostasis adjustments, guidebook adjustments, fix negative strain issues

* my surgery so table

* fix heart surgery and guidebook

* medicine & defibrillator pass

* iv bags and stands

* prefills

* janet gets very sidetracked

* mostly finished iv stuff

* what if we fixed the guidebook

* halve decapoid cryostasis

* my medicines so IV

* finetune cryostasis

* less logspam

* metabolism-aware iv stands and cryopods

* give people painkillers

* yaml lint real

* fix blood build

* finish rebase

* tidy up localization

* clean up my yaml beasties...

* soft curve after exceeding maximum damage

* husks/bonedeaths

Grabbag of Offmed fixes & improvements (#3461)

* CPR moment

* Mob AI fix

* Fix brain oxygenation not updating on regeneration

* sorry gamers you cannot resist the pull

* Troll combat abilities more in softcrit

praying rn (#3467)

dont have CPR be 50% (#3468)

Make offbrand murder easier to contend with (#3473)

* e

* disrupt people in softcrit when attacking them

* ok gamers we're gaming

* forgor

Hopefully final pass before Offbrand merge (#3475)

First pass of Offbrand adjustments (#3477)

Swap blood pressure values in health analyzer (#3476)

Systolic over diastolic

Co-authored-by: Kip <32859367+kipdotnet@users.noreply.github.com>

Offbrand pass 2: Mostly bugfixes (#3480)

Fix zeds causing PVS reloads (#3482)

Offbrand pass 3: I hate surgery I hate surgery I hate surgery I (#3481)

* set up surgery ui

* test fail real

Pain/braingasps (#3487)

Offmed bundle 5 - the evil one (#3489)

* Evil cavity surgery

* les borgues

* nicotine moment

* epinephrine RNG

* legalese

* test fail real

* ok jamers cope with c4

Pass 6
2025-09-27 22:36:57 -04:00
Princess Cheeseballs
d8172862c5 Edible Verb Fixes (#39933)
* You cannot drink the cannot drink

* Undo that shit

* Whoops

* Fix test fails

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-09-27 21:20:31 +00:00
Princess Cheeseballs
141d903125 Stunned Status and Knockdown Meth fix. (#39547)
* Init Commit

* Remove unused code, fix stun visuals bug

* Update Content.Shared/Stunnable/SharedStunSystem.cs

* Some initial changes

* first batch of changes

* Commit

* One line cleanup

* KnockdownStatusEffect ain't worth it.

* Fix 2 bugs

* Fixes

* Remove that actually,

* Maybe this?

* Meff fix

* Meff fix

* alert cleanup and API

* I expect update loops to be at the top.

* Fix LOC

* Address review

* Address review x 2

* Merg my PR

* Fix

* Update Content.Shared/Alert/AlertsSystem.cs

webedit

Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com>

* FIX THAT TEST FAIL!!!!

* Me when I forget to actually give you alerts

* Push

* Tests are not failing locally why are they dying on github???

* Fix test fails (real)

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com>
2025-09-27 12:19:30 +02:00
SlamBamActionman
c7117f38ac Add a sleep delay to Nocturine (NewStatusEffect version) (#40231)
* Initial commit

* Minor fix

* Why is this uncommented here? Hmmm

* No wait this can't be here, oops

* Do better time

* Also guidebook

* Review changes

* Add rejuvination, fix mispredicts
2025-09-26 13:05:34 -07:00
IProduceWidgets
80947b128a Add explosive cord. (#25875) 2025-09-25 23:33:28 +02:00
Jessica M
b2d09ba457 Rat King Refactor Part 0: Separate Rummaging from RatKingComponent. (#40530)
* separate rummager into its own component/system

* thing

* address review and entitytables

* reviews

* review

* warnings

* Update Content.Shared/RatKing/Systems/RummagerSystem.cs

---------

Co-authored-by: Jessica M <jessica@maybe.sh>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-09-25 03:50:24 +02:00