Commit Graph

368 Commits

Author SHA1 Message Date
Errant 3838aef210
vox oxygen toxicity, respiration changes (#26705)
* vox oxygen toxicity and related stuff

* Review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit a62e8701cb30cc0c96cbac5a33b57728efe596b5)
2024-05-03 00:31:02 +02:00
IlyaElDunaev 4da059a948
Treatment of blood loss in the Rat King (#26887)
Bloodloss-RatKing

(cherry picked from commit 3847a298c13192ba97364b06b8b55b4fe60deaa7)
2024-05-03 00:12:40 +02:00
potato1234_x 9ad13b8200
Psicodine, Mannitol, Lipolicide and Happiness (#27134)
* reagents

* Update Resources/Locale/en-US/reagents/meta/narcotics.ftl

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
(cherry picked from commit e2b260d894812194f444e209dfc1d1d2ea0ab645)
2024-05-02 23:53:00 +02:00
Tayrtahn e2d3ab4226
Make YAML Linter validate server/client-only components (#26809)
* YAML Linter now validates invalid fields in server-only and client-only components

* Update to change in engine PR

* Use reflection manager to get the lists of client/server assemblies.

Also made it use a hashset on type instead of the previous code.

* I'm dumb my bad.

* Fix 2 errors that snuck through, showing why we need this.

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
(cherry picked from commit 299da35c8758c408f2333d825a3e3c1243a87b6f)
2024-04-21 23:19:52 +02:00
Tayrtahn 794302839d
Add ability to shake fizzy drinks so they spray in peoples' faces (#25574)
* Implemented Shakeable

* Prevent shaking open Openables

* Prevent shaking empty drinks. Moved part of DrinkSystem to Shared.

* DrinkSystem can have a little more prediction, as a treat

* Cleanup

* Overhauled PressurizedDrink

* Make soda cans/bottles and champagne shakeable. The drink shaker too, for fun.

* We do a little refactoring.
PressurizedDrink is now PressurizedSolution, and fizziness now only works on solutions containing a reagent marked as fizzy.

* Documentation, cleanup, and tweaks.

* Changed fizziness calculation to use a cubic-out easing curve.

* Removed broken YAML that has avoid the linter's wrath for far too long

* Changed reagent fizzy bool to fizziness float.
Solution fizzability now scales with reagent proportion.

* Rename file to match changed class name

* DoAfter improvements. Cancel if the user moves away; block if no hands.

* Match these filenames too

* And this one

* guh

* Updated to use Shared puddle methods

* Various fixes and improvements.

* Made AttemptShakeEvent a struct

* AttemptAddFizzinessEvent too

(cherry picked from commit cfa94be4c2044146298d07c703f3b71bc377ca63)
2024-04-21 22:08:21 +02:00
Vasilis f3eea4409b
Uncooked animal proteins is safe for animal stomachs only (#26906)
Uncooked animal proteins is safe for animal stomachs

(cherry picked from commit a49a576b031d2f90b7e127fd2b639a20bb31aaf4)
2024-04-21 21:54:33 +02:00
Tayrtahn 8dad1ab006
Server-only component YAML cleanup (#26836)
* First pass cleaning up server-only YAML errors.

* Second pass

(cherry picked from commit a0de0ab1f807be5ad69fcc04136755239d75ce8a)
2024-04-21 21:45:03 +02:00
Alzore 9f8885dc48
Dionae now bleed sap, and this can be used to make syrup. (#25748)
* SapAndSyrup

* centrifug

* morewatervapor

* whyisitnotpushing

* nymphs

* lessrealmorefun

(cherry picked from commit 5523e016f4af4f4574c3e26757e7dbbb09de457f)
2024-04-07 14:35:55 +02:00
Firewatch 08adf15afb
Bartender "Essentials" (#25367)
* drinks round 1

saving my progress before my hard drive explodes

* test 2

please work

* name fixes

whoops

* Update drinks.yml

* various fixes

am dumb

* add sol dry to vends

more fixes and changes, yippee!

* more fixes & ingame testing

shrimple tests

* last fixes :trollface:

should be ready for pr now

* Update soda.yml

sate thirst

(cherry picked from commit ea3e98e1208f21aa2a52b0a9938ee22e07b74ccd)
2024-04-07 14:27:22 +02:00
takemysoult a2e3e0bc06
up stimulants (no sleep) (#25886)
* up stimulants (no sleep)

* Update SharedSleepingSystem.cs

(cherry picked from commit 97b390d35f503dd9bda35e0b3a6192b2a502d120)
2024-04-07 14:14:42 +02:00
EdenTheLiznerd 01016a44a2
Rebalance amatoxin so it is a slower killer (#25830)
* Balancing? Balancing!!!

* Additional changes

(cherry picked from commit 431c3ad3b893b01b80e18ce0c00daffd2f77b046)
2024-04-07 14:14:29 +02:00
Tayrtahn cbd2b5e8c3
Fix some invalid damage types (#26295)
Fixed some invalid damage types

(cherry picked from commit b34777177ca2b379c67fb5d0d117f95b8809f43e)
2024-03-24 00:07:56 +01:00
Mr. 27 b2564e7a3b
make romerol work on the dead (#26222)
* a

* review

* g

(cherry picked from commit 87386ca0baa9fc3006b726d26723b345b737943d)
2024-03-23 23:52:03 +01:00
Mr. 27 d7c48b4028
Pipebombs and IED rework (#25705)
* inital

* 2-9

* add crafting function, rename ied to fire bomb

* add firebomb ignition

* fikss

* change damage values

* add note

* fix tests i think

* ok

* good

* Review

* warning

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

(cherry picked from commit 3cb1c585c53f694f5ceb9720057bb765673970ec)
2024-03-17 15:06:54 +01:00
FungiFellow 32a979433d
Grey Matter Addition and Slime Organ Tweak (#25464)
* Added Grey Matter

* Update diona.yml

* Update human.yml

* Update slime.yml

* Update flavors.yml

* Update biological.yml

* Update physical-desc.ftl

* Update biological.ftl

* Make Slime Brain Grindable

* Slime Organs Grind into Slime

* Update flavor-profiles.ftl

* Added Brain to Blacklist

(cherry picked from commit 471dfed44531f3d2541c0b1050dd425e5ec6c4b1)
2024-03-17 14:56:10 +01:00
Nim d65a35bcb4
Slimes can drink fourteenloko (#25889)
* fourteenloko

* inverse

(cherry picked from commit a846966515e3051c131f00dc56743c360a91766e)
2024-03-17 14:41:55 +01:00
MACMAN2003 bbc0f1e15f
Clockwork structures and furniture (#24673)
* sprites

something something strength and certainty of steel (except this is brass)

* test1

* commas it was commas

* commas and brackets

* LET THERE BE BRASS

* brass-glass-etc-windows-thindows-floors-lattice

* ALL THE STRUCTURES!!

"Which structures did you add?"
"all."

* buyable brass

and on the first day the quartermaster said "let there be brass" and all the cargo techs stopped inve$ting in awe

* Update windoor.yml

i forgor 💀

* Update tiles.ftl

* i hate random capital letters

* linter fix 1

whew, thank god for linters

* fix 2

* maybe this

shot in the dark, idk what the hell i'm doing hopefully this fixes it?

* fix attempt 1

weather to true, maybe the thingy got confused?

* remove clockwork lattice

it's fixed the test fail... but at what cost?

* changes 1

* fix clockwork windoor

* FLOORS

HAHAHA LET THERE BE FLOORS

* try linter fix 1

i love linters they find things i'd never catch myself

* tweaks fixes 1

fixes merge conflict and does more stuff part two later because i'm tired

* tweaks fixes 2

i should probably do this stuff during the day when i have more energy but eh

* Update assembly.yml

* Update chairs.yml

* fix door sprites

somehow the deny_unlit was broken for all the clockwork doors

* fix glass.yml

(cherry picked from commit f0e8695a91b787c8107ebf198309d92159463dc0)
2024-03-07 01:26:19 +01:00
Errant 63e45f9532
Alerts for breathing plasma/tritium (#24484)
* Alert autoremove v0

* Code cleanup and timing

* comment

* Tritium, code compression

* not resolving manually

* reduced lookups, new comp

* fix-fix yes

* use RemCompDeferred, handle OnUnpaused

* missed a todo

* entitysystem resolve

* remove unnecessary component updates

* remove AlertState from comp, move EntityUnpausedEvent actions to AlertStateComponent's Timespan

* Code cleanup

* comments

* combines AutoRemove input into Clear

* minor logic adjustment that does not really change anything but is less ambiguous

(cherry picked from commit ecd2d5a644540c6ad28903ee4fb2af87876e3030)
2024-03-07 01:17:31 +01:00
Whisper 887bd1fe7e
Fix iron/copper being overtuned (infinite blood exploit!) (#25678)
* Fix iron being overtuned due to oversight

* fix copper too

(cherry picked from commit b720871d0bf442ea445f7c436d9113526458d124)
2024-03-07 01:05:09 +01:00
Zadeon a48c9cc1e2
Adds minable salt "ore" (#25324)
* Added salt to ore.yml
Added salt to ores.yml
Added salt walls to asteroid.yml
Added salt to BaseAsteroidDebris' list of ores to generate in asteroids.yml
Added OreSalt to biome_ore_templates.yml
Added salt to guaranteed salvageLoot in salvage_loot.yml
Added salt entry under salvage-magnet-resources in salvage-magnet.ftl
Added WIP sprites for salt.

* Renamed salt's id to SaltOre inside Entities/Objects/Materials/ore.yml
Fixed salt not being grindable due to using an incorrect reagent name
Added salt to ore.rsi/meta.json and rock.rsi/meta.json

* Added chlorine to the list of solutions salt gives when used in the grinder.

* Gave salt ore and salt rock overlay unique sprites.

* Added raw salt to materials/materials.ftl
Updated SaltOre definition in ore.yml to have RawSalt under materialComposition

* Updated saltore definition to give 10 units of tablesalt and 5 units of iodine when ground.

(cherry picked from commit 133bd0353a16a3b2260555318a1389b1c2c0f0e9)
2024-03-07 00:59:54 +01:00
Whisper 2539a9bcab
Juice that makes you Weh! (but real!) (#25132)
* Juice that makes you Weh!

* Remove dupe

* updated the localization files

* try to fix error

(cherry picked from commit 1de102d08e93c8e5de0bfedf05d4dc02dfbee8a6)
2024-03-07 00:52:37 +01:00
Whisper 3ee725e2ba
Fix xeno and dragon blood levels (#25442)
(cherry picked from commit 26417b76dbcdf83813241e9a4051057eb9817cfa)
2024-03-05 09:46:22 +01:00
potato1234_x 5f19fc3bb6
Spaceman's Trumpet and Lily (#25090)
* trumpet + lily +polypy

* trumbet

(cherry picked from commit 33153aaa2e387a221ee26fccbabdceca2fe25672)
2024-03-05 09:43:30 +01:00
Tayrtahn ae6b5434fd
Add fill level sprites for all the drinks (#25319)
* Fill levels for cuba libre

* Absinthe glass

* Acid Spit

* Ale glass

* Devil's kiss

* Doctor's delight (ugghh)

* Blue Curacao and Emerald Liquor glasses

* Allies cocktail, Martini, Vodka martini, Driest martini, Gildlager glass, Manhattan, Manhattan Project, Patron glass

* Aloe, Amasec, Andalusia, Antifreeze, Atomic Bomb

* Barefoot, B-52, Bahama Mama, Banana Honk, Beepsky Smash, Beer glass, Berry juice, Blood glass, Bloody Mary, Booger, Brave Bull, White Russian

* Whiskey Soda, Whiskey glass, Whiskey Cola, Vermouth glass, Tequila glass

* Cognac glass, Demon's Blood, Erika Surprise, Gargle Blaster, Gin Fizz, Gin & Tonic

* Grog glass, Hippies' Delight, Iced Beer, Irish Car Bomb, Irish Cream glass, Irish coffee

* Long Island Iced Tea, Manly Dorf, Margarita, Mead

* Merge beer steins

* More merging

* Tintable Demon's Blood, Absinthe, Barefoot, Bahama Mama, Beer, Bloody Mary, Booger, Devil's Kiss, Patron

* Sbiten, Coffee Liqueur, Cogchamp, Screwdriver, Rewriter

* Vodka glass, Gin Vodka glass, Wine glass, NT Cahors glass, Poison Wine glass, Rum glass, Dead Rum, Champagne

* Black Russian, Mojito, Neurotoxin, Silencer, Sui Dream, Snow White, Syndicate Bomb, Tequila Sunrise, The Martinez, Three Mile Island

* Green tea, Iced green tea, Iced tea, Grenadine, Iced coffee, Lemonade, Kira Special

* Cafe latte, Soy latte, Nuclear Cola, Singulo, Toxins Special, Vodka Tonic, Ice cream, Rootbeer, Rootbeer float

* Removed rogue pixel in Manhattan fill sprite.

(cherry picked from commit 29cdb9cf4e0c842675c45d5e102020b5e25b493d)
2024-03-05 09:31:25 +01:00
Errant bf08589ec6
Food poisoning changes (#25418)
* Food poisoning

* description

(cherry picked from commit 7e9bca98912378e593c2961b9eaecfffe76d8433)
2024-03-05 09:31:11 +01:00
ArchPigeon da32d06584
Add Flammable Touch Reaction for liquid tritium (#25281)
(cherry picked from commit d72254d17fb730381fc19e70d2d2d1374b7f79b1)
2024-02-21 04:03:34 +01:00
Sybil aea748df17
add icons for drinks in Solar's (#25301)
* add icons for drinks in Solar's

fixed colors of tea

* consistently use capitals for color codes

* don't add extra whitespace

(cherry picked from commit 64cecdde8421b29938e4304c3de42cc481102aa5)
2024-02-21 03:56:42 +01:00
Daxxi3 5169d9137a
Change copper blood from ferrous to metallic (#25217)
changed copper blood from ferrous to metallic

(cherry picked from commit 4c1e03fd705d0b526099a66a0a72b1770cbc59ed)
2024-02-18 23:17:48 +01:00
Errant 61ad8108af
Vox names, species prototype cleanup, some cosmetic changes (#24994)
* voxnames

* New generator parameters, names are more readable

* bunch of missing vox stuff

* more names

* sad

(cherry picked from commit 5a9ab3b315c90ddd054f2e2524af023d909e2a9e)
2024-02-18 23:08:43 +01:00
potato1234_x 321df5db54
Laughin' Peas (#25089)
* laughter

* make clownmobs bleed laughter

* laughin syrup and laughter recipe

* add laughin peas

(cherry picked from commit 667cebef52ae656760f806edbd4c550996d3dd6d)
2024-02-18 22:39:46 +01:00
Tayrtahn 378e29e1af
Adjust drink reagent colors (#24968)
(cherry picked from commit a1fa82fdb41bb615abc898b8f90ea1ac41b4e335)
2024-02-08 12:37:59 +01:00
lzk aded2ef145
Remove soapy water (#24301)
* localize shuttle timer eta etd

* remove soapy water for real

(cherry picked from commit c4e7f1ebe80b3a347d98784b8b0ec77e047b63d5)
2024-02-08 12:31:59 +01:00
themias 90824ea0cf
Fix dylovene OD damage (#24826)
fix dylovene OD damage

(cherry picked from commit eed7ca1ddc4bd76e7b02cbbb9205d974970878b6)
2024-02-08 12:24:28 +01:00
Arendian b98e16ff53
Spacelube slide (#24801)
* Space lube now makes you slide

* review

* oh lord he slippin

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 4f3b8d740cecfb736b018fd78a2be71f5397644d)
2024-02-08 12:17:49 +01:00
Hanz c6d3377853
Drink tastes touchup (#24700)
* Actual tastebuds

yup

* Grape Soda, can't forget them too

Grape Soda, my beloved

(cherry picked from commit 61516e82537877248a033c6988eda7e963cc0992)
2024-02-08 11:57:01 +01:00
themias 1c79bc7b4b
Add sticky footstep sound to space glue (#24710)
(cherry picked from commit e27a3e0d3e5827cc06a91a11d4b295e6d9d95b7e)
2024-02-08 11:56:41 +01:00
EdenTheLiznerd 20055cfb97
Reduce synaptizine damage (#24676)
(cherry picked from commit cf1d3eae155cb9a7ea277a58130e9c292a103d13)
2024-02-08 11:56:16 +01:00
Nemanja 47d5240304
Revert "Cigarettes now do very minor cellular damage" (#24568)
(cherry picked from commit 26422e16418bf959ca93ee27ffdde4727ab9c033)
2024-01-28 00:28:39 +01:00
Alzore 59e6156205
Cigarettes now do very minor cellular damage (#24546)
smokingisbadforyou

(cherry picked from commit dd3881d75c1a4f9b0c9b0a4caef06914eaabe433)
2024-01-28 00:27:15 +01:00
themias 87108e5822
Add reagent specific footstep sounds (#24406)
* Add sticky footsteps

* Update Resources/Audio/Effects/Footsteps/attributions.yml

Co-authored-by: ike709 <ike709@users.noreply.github.com>

---------

Co-authored-by: ike709 <ike709@users.noreply.github.com>
(cherry picked from commit 557e5eb476235398c3cf95aad793f36ab4b48f55)
2024-01-27 23:48:14 +01:00
Ubaser d511f31243
Mustard, ketchup and mayonnaise now tastes distinct (#24297)
add

(cherry picked from commit a6e16d99610120d086105de867d7e82712964109)
2024-01-26 23:11:15 +01:00
Ubaser 17cd8a16cd
Carrots now properly contain Oculine (#24228)
* carrot

* add

* quantity

(cherry picked from commit 882e27795567623a3b942ab354b16bf5e71a2aa2)
2024-01-26 23:05:29 +01:00
Skye be33bad257
Cryo Burn Chem - Aloxadone (#23980)
Aloxadone (accidentally exploded first pr oops)

(cherry picked from commit 9c277bd0e23fb805522f0943cf880c5028eb4f61)
2024-01-26 22:51:19 +01:00
Nemanja 4a073a98c7
fix coal ejection (#23993)
(cherry picked from commit bee200da6df03c033ace7a3019f6b6f9f61ddc65)
2024-01-26 22:34:29 +01:00
icekot8 0d269d0954
new chemical-Necrosol (#23850)
* rollback

* dumb fix

(cherry picked from commit 6820cff4f54cacc5aa10c61ebc4e2396b62aea70)
2024-01-26 22:33:11 +01:00
deltanedas cf50b5a8b3
dedicated burn and shock meds (#23941)
* pyrazine and insuzine

* add recipes

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

(cherry picked from commit 581c95ed728c181fa4fe4f8e497804f7340b446d)
2024-01-26 22:28:40 +01:00
Ubaser d48303bd19
Moths get insect blood (#23671)
* ya

* mothroach

* update

* fix

* fixe

* add

(cherry picked from commit e91e746dd388299ac2bc711f887aa1ba555203bc)
2024-01-26 22:24:21 +01:00
Boaz1111 477f5fdb97
More pirate weapon content(two new cannon ammo types, a musket and flintlock resprite and rebalance) (#23408)
* tally ho

* yarg

* forgot some shit

* Update projectiles.yml

* fucl

* glass ball

* Update snipers.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
(cherry picked from commit 5fd3d4552c8cf783fe8fe03dc0cfa472958e6282)
2024-01-26 22:19:19 +01:00
Nemanja ddfdfd13d9
Revert "Cryoxadone and doxarubixadone now work on the dead" (#23763)
Revert "Cryoxadone and doxarubixadone now work on the dead (#23558)"

This reverts commit 00ee48e4bc16eec3b3888b23b8f77687d94065d5.

(cherry picked from commit fd024cf131c07d02ed6afe4efe561557a6908a1a)
2024-01-26 22:15:58 +01:00
cool dolphin 81fa7c6443
Add delicious mopwata (#23740)
* added delicious mopwata

* added mopwata, the reagent

* fixed issues, changed color, added more possible fills

(cherry picked from commit a34ee7c300414a9a28b583d12b293a5e010e9deb)
2024-01-26 22:15:01 +01:00