Commit Graph

437 Commits

Author SHA1 Message Date
Errant
02fe5b4ac5 HOTFIX Cryochem revert (#37844)
* Revert "Traumoxadone (#37236)"

This reverts commit 55ec2632a8.

* Revert "Cryoxadone Tweaks (#37132)"

This reverts commit 406bfa3308.

* Revert "Stelloxadone (#37131)"

This reverts commit f415ad51c3.

* whitespace test fail evasive maneuver

* changelog 1984
2025-05-26 16:49:34 +02:00
FrostRibbon
e114b9d9a0 Epinephrine Antihistamine effect, Histamines not radioactive (#37460)
* Added Epinephrine antihistamine effect when at least 45u. Removed Histamines causing Radiation damage.

* Indentation fixed

* had coffee, able to see how to fix indentation now.
2025-05-20 18:12:53 -07:00
āda
41a129e749 Pepper makes you cough (#36358) 2025-05-19 11:23:38 -07:00
Samuka-C
0d3e6986c8 Make Holy water evaporate like normal water (#37611)
holy water evaporates
2025-05-19 12:14:40 -04:00
qwerltaz
8fdac54c5a add: water vapor hurts slimes (#32751)
* water vapor hurts slimes

* 3 looks good

* Update Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-05-19 00:55:40 +02:00
ScarKy0
ff8b7cf220 Aloxadone Tweaks (#37239)
alox
2025-05-18 19:16:13 +10:00
ScarKy0
55ec2632a8 Traumoxadone (#37236)
* fuck salicylic acid

* small tweak based on playtest

* meh

* locale

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2025-05-18 19:11:59 +10:00
ScarKy0
406bfa3308 Cryoxadone Tweaks (#37132)
fuck cryox
2025-05-18 19:11:51 +10:00
ScarKy0
f415ad51c3 Stelloxadone (#37131)
init
2025-05-18 19:11:23 +10:00
Nemanja
866f1fb47b Adjust walking sounds (#36941) 2025-05-13 02:16:16 -07:00
Nemanja
38f6e6e849 Add EvenHealthChange effect (#37129)
* Add EvenHealthChange effect

* cleanup

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-05-10 14:51:28 +02:00
ScarKy0
9e582157ac Revert "Traumoxadone (#37126)"
This reverts commit efc8d8600d.
2025-05-08 18:13:33 +02:00
OnyxTheBrave
e527adea92 Fixed holy water metabolism rate (#37106)
* Fixed holy water metabolizing at 1u instead of .5u a second

* Update Resources/Prototypes/Reagents/medicine.yml

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-05-06 14:31:23 -04:00
Princess Cheeseballs
64f7fe10cc Ichor double-metabolize fix + Very minor cleanup (#37107)
Not a yaml vacation apparently
2025-05-06 14:16:13 -04:00
ScarKy0
efc8d8600d Traumoxadone (#37126)
* init

* salicylic acid
2025-05-03 00:56:47 +02:00
MissKay1994
d21906c025 Vox now can eat trash other other inedible things (#35681)
* EAT TRASH EXHALE AMMONIA

Update to files

* Forgot to port this file

* 1D4 Guidance

* Summary (required)

Suggested changes and fixes

* Cries in conflicts

* Why do we exist? To suffer?

* 1 citation for being stupid

* THE ANTIDOTE, THE ANTIDOTE FOR THE POISON

* I was inverted sir

* vox organs cleanup

* vox reagents

* guidebook

* weh

---------

Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
2025-05-01 20:16:51 +02:00
Myra
87d097bb5d Stable merge (#37050) 2025-04-29 21:54:43 +01:00
Princess Cheeseballs
84178dd534 Puddle code hotfix 2 (#37046) 2025-04-29 21:10:00 +01:00
OnyxTheBrave
5f2fb8dc82 Sheet-meister 2000 Cloth recipe (#32676)
* Sheet-meister 2000 can now make rolls of cloth

* Small Cleanup

* resolve conflicts

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-04-26 05:22:51 +02:00
Alzore
dae811746a Inaprovaline metabolizes slower for better use as a stabilizing medicine (#32293) 2025-04-24 23:03:03 -07:00
uhbg
94b46a9edc The Bartender can now make Eggnog (#34065)
* Preliminary eggnog changes (egg in shaker crashes?)

* Fixed eggnog reagent name and description

* added - to flavor

* deleted a space

* Added eggnog glass sprite

* changed fill levels to match rsi

* Added two more fill levels to eggnog

* Removed fizziness, changed physical description, and fixed rsi

---------

Co-authored-by: uhbg <29674581+uhbg@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-04-20 17:27:35 -04:00
Princess Cheeseballs
251cfbd8be Puddle Code Slipping Cleanup (#35845)
* Init Commit

* windows yelling at me to update commit

* working commit, need prediciton and more dehardcoding

* Project 0 warnings

* Working Commit (Near Final)

* ryder got confused commit

* I love Merge Conflicts :)

* Working commit, no prediction

* Forgot the yaml changes

* Comments and typos

* Apparently while the reduced launch mult of lube was initialized it was never used so I revered back to default

* Fixed an incorrect divisor

* bit of cleanup

* Prediciton fixed, and puddles now affect all entities

* FORGOT TO RENAME A VERY IMPORTANT VARIABLE OOPS

* Really big I forgor moment

* Even bigger I forgor moment

* four more merge conflicts to fix four more oopsies

* fixed actual divide by zero moment and also im very dumb

* Even bigger I forgor moment

* four more merge conflicts to fix four more oopsies

* fixed actual divide by zero moment and also im very dumb

* Fix all test fails

* code cleanup

* Webedit whitespace

* Code cleaup

* whitespace webedit

* whitespace webedit

* whitespace webedit

* whitespace removal

* Comments and cleanup

* Re-Added 20 warnings as per Ork's request

* Cleanups

* Spacing fix

* bugfixes and cleanup

* Small bugfix

* Actually dirty the slipComp for real

* Added Friction field to Reagent Prototype per design discussion

* Sliding system is kill
2025-04-20 17:27:12 -04:00
SharkSnake98
9599f582f3 New Drinks (#36287)
Co-authored-by: RedBookcase <crazykid1590@gmail.com>
Co-authored-by: SharkSnake98 <sharksnake87@gmail.com>
2025-04-18 22:12:10 -07:00
Jajsha
a6741e42c1 Un-Hardcode water evaporation & mopping behavior (#33399)
* Un-harcode slipperiness

* Make it actually work

* Prettyfy

* Cleanup GetEvaporatingReagents

* Fix mopping with space lube + wrong solutions in absorbance

* Remove LINQ and rename parameters

* Change evaporation speed to fixedpoint2

* Add evaporating speed functionality

* Remove unused imports

* Swap around reagent evaporation speed and puddle evaporation speed.

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-04-18 20:11:28 -04:00
Nemanja
83c2fdb619 Restore Artifexium Effect (#36595)
* Restore Artifexium

* popup

* small tweaks
2025-04-16 00:49:58 +02:00
Fildrance
d38042a0c0 3mo xeno archeology (first phase) (#33370)
* DAG Adjacency Matrix & Tests

* Fix sandbox type errors

* First pass on procgen

* Procgen adjustments

* Networking

* Cruft and god and beauty and analysis console

* convert to data types that dont make me want to kill myself

* starting work on console UI

* drawing nodes n shit

* damn that ui FUCKS

* XAT

* Add a bunch of basic triggers

* Fix trigger gen

* Add node info into the analysis console UI

* Add node unlocking

* more trigger cuz thats pretty cool

* final triggers + incorporate gnostic faith

* some ui changes, mostly

* Fix orphaned procgen segments

* its not random dipshit

* yeah... this one will make pjb happy....

* we call it a day for the UI

* imagine... shared power code...

* extraction WIP but we gotta sidequest momentarily

* oh hey would you look at that its the actual functionality

* distrotrased

* Small departure for randomness.

* ok yep yep indeed that is an effect very cool.

* thanos snap oldcode

* fuck it we ball

* feat: node scanner now displays triggered nodes. Removed unused old artifact systems and related code (most of it). xml-doc and minor fixups.

* refactor: most of preparations, cleanup and groundwork. also segment-related tests

* feature: all basic effects returning

* feat: finished effects lits, created weight lists for struct and handheld artifacts, fixed throw trigger and music ApplyComponent artifact effects not working

* feat: prevent non-first-time-predicted calls in shared artifact effect systems

* fix: remove gun effect from artifact effects - as it interferes with 'activate artefact' action

* fix: foam reagent selection, neat ApplyComponents art effect scenarios, handheld art is RadiationReceiver again

* fix: moved spawn/ pry&throw effect systems back to server part of code - entity duplication bugs were not quite fun

* refactor: fix protos

* refactor: fix linter

* fix: fix old artifact component names in yml

* fix: no more throwing error on artifact spawn with empty XAEFoamComponent.Reagents

* fix: removed old component usage in maps

* fix: remove more deleted components from map

* fix: ContainerContainer is now part of initial artifact entity, it won't be affecting UninitializedSaveTest

* refactor: fix tests, add loc description to toolshed commands

* Changed node scanner to tell the whole story about current artifact state

* refactor: remove excessive get of EntityCoordinates in XAE systems, removed Value access in NodeScannerDisplay

* fix: turned off TriggerInteraction, removed XAESpawn usage and system, EmpSystem now can use EntityCoordinates,

* fix: moved SharedXenoArtifactSystem.CancelUnlockingOnGraphStructureChange into RebuildXenoArtifactMetaData to lessen code coupling

* fix: XenoArtifactEffectJunkSpawn moved invalid rolls declaration

* refactor: set default value for XenoArtifactComponent.EffectsTable for tests

* fix: now explosions XAE can be activated for effect

* refactor: added some usedelay so artifactuse would'nt be spammed

* refactor: artifact-related hints improvements

* fix: artifact no longer spawns fauna into itself

* refactor: xml-doc and minor refactoring

* refactor: xml-doc for Xeno Artifact systems, renaming of questionable XAT systems

* map for playtest, TODO REVERT THIS

* fix: magboots trigger art from a mile

* refactor: bind artifact animation to unlocking state

* feat: radiation dmg now have reference to source (and artifacts won't irradiate themselves)

* fix: random artifact node durability now is rolled for max and not current value

* refactor: gas effects are more rare, hand-held artifact effects are filtered properly now, rad dmg trigger now requires only 20 dmg for activation

* feat: animations and sound effects for artifact force-use and failed finish of unlocking phase

* use only 1 file with art use animation

* refactor: minor artifact dmg triggers tuning

* feat: now nodes that CAN be unlocked are displayed with specific color in console.

* feat: now unlocking stage time is dynamic and it depends on amount of triggers player activated correctly. Failed one stops incrementing

* feat: now non-active unlocked nodes return more points if durability was not wasted

* feat: now puddle/foam effects change description of node

* fix: fix test failure

* refactor: renamed phasing effect, fixed failing test for elkridge

* minor balance changes

* refactor: split rare materials into separate effects

* feat: unlocked nodes without successor wont listen to unlocks, node unlock is not activating node

* fix: removed OnIrradiatedEvent duplicate c-tor

* revert changes of reach for playtest

* revert last row empty line removal on reach.yml

* fix: fix PVS bug, born from attempt to relay event to art nodes that were not synced yet to the client

* fix: fix elkridge for tests (again)

* refactor: xml-doc, more stuff predicted, allocation optimization in XAE/XAT systems

* refactor: naming

* refactor: extract variable refactor for XAEApplyComponentsSystem.OnActivated insides

* fix: duplicate xeno artifact unlocking sound fixed

* feat: CreatePuddle xeno artifact effect now can have min and max borders for chamicals to be drafted, minor XAECreatePuddleSystem refactor

* feat: networking for shared XAE components + xml-doc leftovers

* refactor: more xml-doc, fix XAEApplyComponentsComponent.Components not being serializable but trying to be

* refactor: xml-docs and XAEThrowThingsAroundSystem now uses circle and not box for prying tiles

* refactor: xml-docs, minor refactors

* revert XenoArtifactCommand.ArtifactPrototype being PrototId

* refactor: simplify the way ExtractionResearchLabel works

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
2025-04-15 10:34:53 +10:00
ScarKy0
cfbf620e3f Condensed gases can now be metabolized. (#31648)
* Condensed gasses can now be metabolized.

* Made condensed frezon weaker

* Liquid frezon nerf
2025-04-13 17:21:55 +02:00
āda
4c73dcc2c8 Diphenhydramine causes drowsiness (#36212)
* nap time in medbay

* suggested changes

* fake test fail
2025-04-02 23:29:52 -07:00
BWTCK
9ca6353dcd Add code comment to antifreeze reagent (#36065)
* Recolored the metamorphic glass antifreeze sprite to reflect the actual color of the chemical

* Added recolor credit in meta.json

* The antifreeze shall be blue!

* removed weird fill-5 change
2025-03-26 00:06:04 +01:00
Coolsurf6
5d296d2dbb Added Bacchus' Blessing Drink (#35306)
* added start to bacchus blessing with few more things left to do

* added sprites and trying to get the empty sprite to work

* fixed empty sprite will fill layer

* added missing fill image

* made flavor, physical description, recipe reaction and tweaked reagent threshold

* fixed fill levels

* removed name from drinks.yml, updated suffix instead

* delay is weird and broken, removing the difference

* updated copyright
2025-03-13 23:49:26 -07:00
RedBookcase
80e674a9ae Added New Cocktails and new fill level sprites to existing drinks. (#33570)
* Added New Cocktails and new fill level sprites to existing drinks

* Updated copyright info and fixed recipies for Caipirinha/Mojito.

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
2025-03-10 19:08:23 -04:00
Myra
98cca7b0f8 Change Phalanximine to be more complex, increase Arithrazine damage (#32209) 2025-03-02 13:47:11 +01:00
UpAndLeaves
20f5cbf3fd Fixed Wehxplosion yaml error (#34837) 2025-02-02 22:31:32 +01:00
Boaz1111
db1b0a9144 Separates frost oil into coldsauce and frost oil (#34458) 2025-02-01 09:20:01 -06:00
Velken
c360a97e3b Juice that makes you go boom (#34730)
* Juice that makes you go boom

* moved explosive juice to fun yml - fixed ExplosionReactionEffect.cs not having TileBreakScale parameter - made Drazil plushie major contraband (they are evil!!!!!)

* removed JASON!!!! JASOOON!!! JASON!!!

* don't do commits at 1am

* Update fun.yml

fix ident

* no more bullying the server (only 1 explosion)
2025-01-30 12:34:32 +01:00
Alpaccalypse
f4e60ff96e Renamed "Irish Car Bomb" drink to "Irish Slammer" (#34107)
* Renamed "Irish Car Bomb" drink to "Irish Slammer", due to concerns over insensitivity.

* Fixing some missed references

* Added prototype id changes to migration.yml. Removed any reference to the troubles (and corrected ale to stout for flavour text).

* Corrected description back to "Irish Cream"

* Removed non-entities from migration.yml
2025-01-02 10:46:30 +01:00
Hannah Giovanna Dawson
c33d3350bd [Christmas] Y'all want a Smite Cranberry? (#33922)
* Add a festive lemon-lime soda variant: cranberry!

* Gave lemon-lime a brand name

* Make the CrateFoodSoftdrinksLarge slightly larger to accomodate the extra drinks.

* Extend the Christmas anomaly with extra jolliness

* Minor spelling mistake. Jollyness will not be denied.

* Removed redundant delay from meta file
2024-12-19 01:11:59 +01:00
ArtisticRoomba
345adcd5d0 New Drazil plushie (inverse lizard plushie) (#33776)
* Hew

* properly attribute hew.ogg

* add to maints locker plushie pool with low chance, clear up grammar

* shhhh nobody saw that linter failure

* adds localization support for Weh and Hew emotes

* fix capitalization error present since circa 2/25/2024

* resolve conflicts, fix sprite, add reversed inhands

* clear up cursed formatting
2024-12-18 17:31:55 +01:00
SlamBamActionman
95328dab68 Add Holy damage (#32755)
* Initial commit

* hoili moili

* now to add sherlock and doctor who

* funny stick

* Oops it was meant to be called metaphysical

* Attribution

* Even BETTER attribution
2024-12-16 16:33:32 +01:00
dragonryan06
1e80dd2891 Add the Zombie, a new cocktail (#32802) 2024-12-16 16:25:06 +01:00
joshepvodka
9cb46d9343 Bar related tweaks (#33505)
* does everything

* beer flavor revert and linter fix

* Update Resources/Locale/en-US/flavors/flavor-profiles.ftl

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* fix misspelling

* fix yet another misspelling

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* english has weird spellings huh

* im starting to feel ashamed of myself

* this is shameful

---------

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
2024-12-09 18:12:57 +01:00
SlamBamActionman
fe69de942f Updated values 2024-11-01 12:52:12 +01:00
Stomf
0b8d6a1bd5 Mutetoxin buff (#32915)
* Fixes smile's ghost role to not need a raffle, very nice

* a simplier solution

* Mute toxin buffed to be more like glue

* buffed the toxin even more

* Update Resources/Prototypes/Entities/Mobs/NPCs/pets.yml

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

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-10-20 22:43:14 -05:00
BramvanZijp
548973bc1f Fix Doctors Delight metabolism Rate (#32297)
* Fix Doctors Delight metabolism Rate

* Combine Drink and Medicine instead of halving their motabolism rate.

* Removed unintentional newline.

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

* Remove metabolismRate since it is setting it to the default.

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

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-09-25 19:39:49 +02:00
deltanedas
2c9a3020ab make epinephrine adrenaline (#32076)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-09-19 01:00:48 +02:00
MissKay1994
4abb6a7dd1 Lizards now metabolize chocolate (#32147)
* Eat the chocolate

* Update toxins.yml

* fully delete threshold lines

* Update snacks.yml

* Fix tags

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

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-09-16 14:45:15 +02:00
SlamBamActionman
5794ecd28f Initial commit 2024-09-16 11:05:57 +02:00
Alpha-Two
f04de87ec4 Fix that space (#32149)
Fixed the GODDAMN SPACE

Co-authored-by: Alpha-Two <alpha2.5232@gmail.com>
2024-09-14 14:28:35 +03:00
Nemanja
e510504596 Hivelord mob (#31322)
* Hivelord

* make it longah
2024-09-11 09:52:27 -04:00
RumiTiger
d9b1369dae Cherry (#28962)
* Add files via upload

* Update produce.yml

* Update produce.yml

* Update seeds.yml

* Update flavor-profiles.ftl

* Update flavors.yml

* Update meal_recipes.yml

* Update food_produce.yml

* Update meta.json

* Update seeds.yml

* Update botany.yml

* Delete Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json

* Create meta.json

* Delete Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json

* Create meta.json

* Update produce.yml

* Update produce.yml

* Update produce.yml

* Update food_produce.yml

* Update food_produce.yml

* Update produce.yml

* Apply suggestions from code review

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Update seeds.yml

* Update juice.yml

* Update juice.ftl

* Update seeds.ftl

* Update seeds.yml

* Update cargo_botany.yml

* Update cargo_botany.yml

* Update cargo_botany.yml

* Update cargo_vending.yml

* Update cargo_vending.yml

* Update seeds.yml

* Update seeds.yml

* Update meta.json

* Update produce.yml

* Cherry Tree

* Alphabetical order

* Update food_produce.yml

* Update food-sequence.ftl

* Update food-sequence.ftl

* Update produce.yml

* Update produce.yml

* Update food-sequence.ftl

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2024-08-29 11:30:58 +10:00