Commit Graph

498 Commits

Author SHA1 Message Date
hereelabs
d841e5d966 Merge remote-tracking branch 'wizden/offmed-staging'
Some checks failed
Map file schema validator / YAML map schema validator (push) Has been cancelled
RSI Validator / Validate RSIs (push) Has been cancelled
RGA schema validator / YAML RGA schema validator (push) Has been cancelled
Test Packaging / Test Packaging (push) Has been cancelled
Build & Test Debug / build (ubuntu-latest) (push) Has been cancelled
Build & Test Debug / Build & Test Debug (push) Has been cancelled
YAML Linter / YAML Linter (push) Has been cancelled
Build & Test Map Renderer / build (ubuntu-latest) (push) Has been cancelled
Build & Test Map Renderer / Build & Test Debug (push) Has been cancelled
Benchmarks / Run Benchmarks (push) Waiting to run
2025-11-23 22:52:14 -05:00
Janet Blackquill
d1d939a898 rebase 2025-11-21 00:32:28 -05:00
Princess Cheeseballs
6c78ff5ab9 Fix Gas Reagent Thresholds. (#41438)
* Fix reagent gas scales

* add comment

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-11-16 00:51:26 +00:00
Princess Cheeseballs
e5b6e4bf04 Fix Entity Effect Scaling (Hopefully) for good and some other misc fixes (#41163)
* Fix the last of the entity effects bugs

* aaa

* losing it

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-11-06 21:34:53 +00:00
Janet Blackquill
340f6b02b3 Merge branch 'master' into offmed-staging 2025-11-05 16:52:49 -05:00
Centronias
e65518ff02 Make bleach a better space cleaner (#41276)
* make bleach a better space cleaner

* imagine me cherry picking just the first bad commit and then totally forgetting there was a second commit lel
2025-11-04 23:09:59 +00:00
NoreUhh
ae2067c5be Add 2 New Reagents (Felinase and Caninase) (#41136)
* Flavors, Flavor Profiles, Reagent Text

* Base Reagent and Mix reaction

* Borkinase, flavor stuff

* Final touches me thinks

* Comment out shit

* Update fun.yml

removed comments

* Update fun.yml

Increased output for borkinase and felinase

* explosive reaction

creates razorium when mixed and makes a radioactive explosion. screaming explosion funny!!!

* reagent descriptions

updated em

* chem is no longer nuclear bomb

* remove tile-break scale

* recipe change

done through web view dont kill me im lazy

* removed cellular, halved rads

done through web again, dont end me thanks

* updated locale to reflect name change

* updated reagent to reflect name change

* updated reactions to reflect name changes

---------

Co-authored-by: NoreUhh <noreuhh@gmail.com>
2025-10-31 01:02:43 +00:00
rumaks
036fef8054 Fix the ethanol guidebook entry (#41192)
change liver metabolism rate to 1
2025-10-30 20:41:13 +00:00
kosticia
87a3b4fa56 Rename kira special to the orange-lime soda (#41167)
* rename kira

* these one too

* migration

* Revert "migration"

This reverts commit ae0006ef745909c2e17b37fd18fd1d57204fe773.

* Revert "these one too"

This reverts commit 9757d2cf6898719b158e03c0f3b637cd2b55ce17.

* Revert "rename kira"

This reverts commit 170408c6f7486a6746b7a7c52cf10c597ead2608.

* bless the emo

* aaaaa

* time to end this right here and right now

* Revert "time to end this right here and right now"

This reverts commit b2c38573f9f8b5e8f736443d646d26839a0694cf.

* Revert "aaaaa"

This reverts commit 0f9451e22533b2f646211219e04103ce16d952ca.

* Revert "bless the emo"

This reverts commit 223607accf81e286481cab8d1037b1eb89a44dac.

* rename

* bikeshedding

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-10-28 19:46:56 +00:00
Princess Cheeseballs
f039432aa5 Stable merge (#41171)
* [HOTFIX] Fix status effect removal from entity effects and buckets not being draggable (#41168)

just do less work it's that easy!

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

* [Hotfix] Fix Phalanx (#41170)

feex

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

---------

Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-10-28 12:14:52 -07:00
Princess Cheeseballs
5c09eed080 [Hotfix] Fix Phalanx (#41170)
feex

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-10-28 14:33:46 -04:00
emberwinters
c8b26adb38 Diphenhydramine drowsiness maximum fix (#41169)
Update medicine.yml
2025-10-28 17:01:13 +00:00
Princess Cheeseballs
4aac3dbc9d Fix Being Drunk! (#41002)
* Drunk moment

* push

* fix test fails + a smidge of cleanup

* two smidges of cleanup

* Unpredicted so don't need the workaround

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-10-21 20:12:36 +00:00
ArtisticRoomba
2328b3faa1 Slime organs metabolizing slime restores blood level + halves slime hunger satiation when consumed by a slime organ (#32537)
* metabolizing slime restores blood level

* halved the effectiveness of hunger satiation when slime is consumed by a slime organ

* kaboom

* ref george orwell's 1984

* rewrite george orwell's 1984

* Revert "rewrite george orwell's 1984"

This reverts commit c283a38e584c477f601179ea7504ec2651d22d31.

* this is exactly like doublethink from george orwell's 1984

* this is exactly like the ministry of truth from george orwell's 1984

* this is exactly like the ministry of peace from george orwell's 1984

* i'm going to lose it just like the protagonist in george orwell's 1984
2025-10-20 00:29:16 +00:00
Princess Cheeseballs
c455386ce3 Fix Cryptobolin and make it use NewStatusEffectSystem. (#40675)
* Push

* Mercury too I guess???

* Update comment

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-10-14 02:18:53 +00:00
Princess Cheeseballs
4059c29ebc Entity effects ECS refactor (#40580)
* LOCKED THE FUCK IN

* Forgot this little fella

* Crying

* All entity effects ported, needs cleanup still

* Commit

* HEHEHEHAW

* Shelve for now

* fixe

* Big

* First big chunk of changes

* Big if true

* Commit

* IT BUILDS!!!

* Fix LINTER fails

* Cleanup

* Scale working, cut down on some evil code

* Delete old Entity Effects

* Accidentally breaking shit by fixing bugs

* Fix a bunch of effects not working

* Fix reagent thresholds

* Update damage

* Wait don't change the gas metabolisms A

* Cleanup

* more fixes

* Eh

* Misc fixes and jank

* Remove two things, add bullshit, change condition to inverted

* Remove unused "Shared" system structure

* Namespace fix

* merge conflicts/cleanup

* More fixes

* Guidebook text begins

* Shelve

* Push

* More shit to push

* Fix

* Fix merg conflicts

* BLOOD FOR THE BLOOD GOD!!!

* Mild cleanup and lists

* Fix localization and comments

* Shuffle localization around a bit.

* All done?

* Nearly everything

* Is this the end?

* Whoops forgot to remove that TODO

* Get rid of some warnings for good measure...

* It's done

* Should make those virtual in case we want to override them tbqh...

* Update Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeeds.cs

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

* Fix test fails real

* Add to codeowners

* Documentation to everything

* Forgot to push whoops

* Standardize Condition names

* Fix up metabolism a little as a treat

* review

* add IsServer checks

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>
2025-10-12 21:23:42 +00:00
āda
1250cb4d44 Organize StackPrototype with inheritance (#38412)
* In one commit like an animal

* carpet fix

* move materials, more bad commit discipline

* re-add marble

* don't also do materials in the same PR, dude

* the return of floor_tile_stacks.yml for atomizing

* resolve an old issue

* re-add det cable

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2025-10-12 01:18:12 +00:00
Janet Blackquill
61f0b79a6d Merge branch 'master' into offmed-staging 2025-10-11 00:10:57 -04:00
Hitlinemoss
04cde9a0ac Ice (the reagent) now actually does stuff (#40149)
* ice now evaporates and quenches thirst

* Ice uses BaseDrink as parent instead of Water

* Misc ice cleanup

* Ice no longer inherits Extinguish reactiveEffect

* Test fixes

* Deparented Ice from BaseDrink (was causing test fails)

* Whoops, forgot to remove the part actually causing the test fails

* Added code comments
2025-10-11 00:08:47 +00:00
Janet Blackquill
469aec2a01 thusd robust 2025-10-10 01:40:40 -04:00
Janet Blackquill
95c8a14209 Merge branch 'master' into offmed-staging 2025-10-09 22:34:06 -04:00
SlamBamActionman
33c0c46b5d Add slowdown to nocturine, buff duration and minor delay reduction (#40797)
* Yawn

* Remove yawning because it's kind of a nerf tbh

* Remove newline

* Begone, condition
2025-10-09 13:20:05 +00:00
Janet Blackquill
173f24590f resimmed offmed 2025-10-08 20:49:29 -04:00
Janet Blackquill
19f5a3e037 Merge branch 'master' into offmed-staging 2025-10-07 23:41:47 -04:00
āda
ceedfb6d39 Standardize state names in drinks yml (#40316)
* drinks_base

* drinks_special

* drinks_fun

* drinks_cans - the holy minus diff

* bottles_glass and metamorphic

* mugs

* Solar's Best Hot Drinks

* misc drinks_cups

* slight addition to base

* lint fix

* metamorphic glass

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2025-10-07 16:05:30 +00:00
Janet Blackquill
5ab241f0a7 oops robust harvest should not be painkilling non-dionaea 2025-10-04 17:27:16 -04:00
Janet Blackquill
53f4f38fda thusd less evil lung damage 2025-10-03 20:54:00 -04:00
Janet Blackquill
1fdbfe2dc1 more zombie tweaks 2025-10-03 20:28:50 -04:00
Janet Blackquill
e22951213a romerol stops bleeding 2025-10-03 19:23:49 -04:00
Janet Blackquill
db01eb5cd9 thusd eviller zeds 2025-10-03 18:15:37 -04:00
Janet Blackquill
1667aba55f thusd heart rescaling 2025-10-03 15:46:05 -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
Janet Blackquill
2c361352ee Basic medication pass 2025-10-02 21:53:57 -04:00
Janet Blackquill
8626e82a79 The nukies update 2025-10-01 19:48:39 -04:00
Janet Blackquill
ab62f7e0bd Make doxarubiadone more potent 2025-10-01 00:25:24 -04:00
Janet Blackquill
5515213c8b Dexalin and inaprovaline last longer 2025-09-30 19:38:52 -04:00
Janet Blackquill
e14feba5f9 Zombification fixes 2025-09-28 22:00:29 -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
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
SlamBamActionman
9d0a7b7729 Add contraband levels for several reagents (#40426)
* Initial commit

* Minor changes
2025-09-18 12:01:22 -07:00
rumaks
fbb9c9c524 Make ichor heal brute, burn, and toxin evenly (#39466)
* Make ichor heal brute, burn, and toxin evenly

* Nerf healing to more reasonable values
2025-09-18 11:47:25 -07:00
CawsForConcern
a8ba84ecf7 Fixes Theobromine missing from Iced Coffee (#40063)
adding ice to coffee no longer removes its theobromine
2025-09-05 00:46:44 +02:00
Winkarst-cpu
be2eeb3cb1 Cleanup: Un-hardcode reagents standout (#39752) 2025-08-19 10:40:21 -04:00
Princess Cheeseballs
6b73d320b9 [NEW STATUS SYSTEM] Drunkenness, Stuttering, Slurred Speech, and Bloodloss (#38678)
* The only commit that matters

* I had to stop playing with my cat to push this change

* Yaml removal

* Proper drunk status effect and remove shitcode

* Review changes

* whoops

* Whoops x2

* Update master fix merge conflicts

* Fix merge conflicts

* Dunk Component kill

* MORE RELAYS

* Holy fucking breaking changes

* Ough

* 46 file diff

* Fix bad commits

* Erm what the test fail?

* Fix those last two

* Merge conflicts

* Me when I fix the merge conflicts

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-08-18 16:26:29 -04:00
EnrichedCaramel
05aad3bfd2 Expand soap making, but better (#39303)
* Add lye reagent and its recipes

* Move and add soap recipes

* Add temperature to soap recipes

* Silly comments

* Remove NaHO based lye recipe due to sigynate recipe conflict.

* Typo

* Typo, again

* Change lye color and description
2025-08-15 23:59:58 -07:00
SlamBamActionman
114d00d1af Rebalance advanced Brute chems, and more (#39472)
* Initial commit

* Update based on feedback

* Minor fix

* Update to match playtest

* Update reaction behavior and test to work; max temp is no longer an inclusive value.

* Revert "Update reaction behavior and test to work; max temp is no longer an inclusive value."

This reverts commit 2a2c4a17a623cc7ddc15b63d91a1b8b441e95cea.

* Incorporate heal values & OD for adv. chems from 39464, revert adv. brutes recipes
2025-08-14 19:32:22 +02:00
Admiral-Obvious-001
0606ed5851 Retry of Advanced Chem Tweaks (#38811)
* Changed Head Branch Due To Broken Merge

* Changed Head Branch Due To Broken Merge

* Readds the removal of bic/advanced mix.

* TFW Breaking changes break changes

* TFW Breaking changes break changes
2025-07-29 14:52:42 -04:00
Princess Cheeseballs
dec2d42a1d Crawling Part 1: The Knockdownening (#36881)
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-07-20 01:54:42 +02:00