Commit Graph

361 Commits

Author SHA1 Message Date
Vasilis
a49a576b03 Uncooked animal proteins is safe for animal stomachs only (#26906)
Uncooked animal proteins is safe for animal stomachs
2024-04-13 12:36:28 +10:00
Tayrtahn
a0de0ab1f8 Server-only component YAML cleanup (#26836)
* First pass cleaning up server-only YAML errors.

* Second pass
2024-04-09 00:20:49 -04:00
Alzore
5523e016f4 Dionae now bleed sap, and this can be used to make syrup. (#25748)
* SapAndSyrup

* centrifug

* morewatervapor

* whyisitnotpushing

* nymphs

* lessrealmorefun
2024-04-05 14:06:12 -07:00
Firewatch
ea3e98e120 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
2024-04-01 17:41:14 +11:00
takemysoult
97b390d35f up stimulants (no sleep) (#25886)
* up stimulants (no sleep)

* Update SharedSleepingSystem.cs
2024-03-30 00:52:27 -06:00
EdenTheLiznerd
431c3ad3b8 Rebalance amatoxin so it is a slower killer (#25830)
* Balancing? Balancing!!!

* Additional changes
2024-03-30 15:00:21 +11:00
Tayrtahn
b34777177c Fix some invalid damage types (#26295)
Fixed some invalid damage types
2024-03-21 12:58:21 +11:00
Mr. 27
87386ca0ba make romerol work on the dead (#26222)
* a

* review

* g
2024-03-18 17:25:36 +11:00
Mr. 27
3cb1c585c5 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>
2024-03-14 15:27:08 +11:00
FungiFellow
471dfed445 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
2024-03-13 20:06:03 +11:00
Nim
a846966515 Slimes can drink fourteenloko (#25889)
* fourteenloko

* inverse
2024-03-07 15:50:10 -05:00
MACMAN2003
f0e8695a91 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
2024-03-06 03:25:59 +03:00
Errant
ecd2d5a644 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
2024-03-03 01:07:05 +11:00
Whisper
b720871d0b Fix iron/copper being overtuned (infinite blood exploit!) (#25678)
* Fix iron being overtuned due to oversight

* fix copper too
2024-02-28 16:56:22 -05:00
Zadeon
133bd0353a 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.
2024-02-26 16:34:15 -07:00
Whisper
1de102d08e Juice that makes you Weh! (but real!) (#25132)
* Juice that makes you Weh!

* Remove dupe

* updated the localization files

* try to fix error
2024-02-26 00:54:07 +11:00
Whisper
26417b76db Fix xeno and dragon blood levels (#25442) 2024-02-21 21:54:15 -05:00
potato1234_x
33153aaa2e Spaceman's Trumpet and Lily (#25090)
* trumpet + lily +polypy

* trumbet
2024-02-20 23:49:39 -07:00
Tayrtahn
29cdb9cf4e 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.
2024-02-20 23:17:56 -07:00
Errant
7e9bca9891 Food poisoning changes (#25418)
* Food poisoning

* description
2024-02-20 23:12:59 -07:00
ArchPigeon
d72254d17f Add Flammable Touch Reaction for liquid tritium (#25281) 2024-02-19 15:37:44 -07:00
Sybil
64cecdde84 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
2024-02-19 10:40:43 -05:00
Daxxi3
4c1e03fd70 Change copper blood from ferrous to metallic (#25217)
changed copper blood from ferrous to metallic
2024-02-15 19:38:18 -06:00
Errant
5a9ab3b315 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
2024-02-14 14:08:45 +11:00
potato1234_x
667cebef52 Laughin' Peas (#25089)
* laughter

* make clownmobs bleed laughter

* laughin syrup and laughter recipe

* add laughin peas
2024-02-10 00:21:44 -08:00
Tayrtahn
a1fa82fdb4 Adjust drink reagent colors (#24968) 2024-02-05 15:58:36 -07:00
lzk
c4e7f1ebe8 Remove soapy water (#24301)
* localize shuttle timer eta etd

* remove soapy water for real
2024-02-03 15:23:34 +11:00
themias
eed7ca1ddc Fix dylovene OD damage (#24826)
fix dylovene OD damage
2024-02-01 15:21:04 -07:00
Arendian
4f3b8d740c Spacelube slide (#24801)
* Space lube now makes you slide

* review

* oh lord he slippin

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-02-01 21:39:10 +11:00
Hanz
61516e8253 Drink tastes touchup (#24700)
* Actual tastebuds

yup

* Grape Soda, can't forget them too

Grape Soda, my beloved
2024-01-29 16:21:28 -07:00
themias
e27a3e0d3e Add sticky footstep sound to space glue (#24710) 2024-01-30 09:35:27 +11:00
EdenTheLiznerd
cf1d3eae15 Reduce synaptizine damage (#24676) 2024-01-28 23:55:52 -08:00
Nemanja
26422e1641 Revert "Cigarettes now do very minor cellular damage" (#24568) 2024-01-26 01:50:03 -08:00
Alzore
dd3881d75c Cigarettes now do very minor cellular damage (#24546)
smokingisbadforyou
2024-01-25 01:51:26 -08:00
themias
557e5eb476 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>
2024-01-22 23:18:33 -05:00
Ubaser
a6e16d9961 Mustard, ketchup and mayonnaise now tastes distinct (#24297)
add
2024-01-19 11:42:47 -05:00
Ubaser
882e277955 Carrots now properly contain Oculine (#24228)
* carrot

* add

* quantity
2024-01-18 10:28:01 -05:00
Skye
9c277bd0e2 Cryo Burn Chem - Aloxadone (#23980)
Aloxadone (accidentally exploded first pr oops)
2024-01-14 20:57:30 -07:00
Nemanja
bee200da6d fix coal ejection (#23993) 2024-01-13 15:52:53 +11:00
icekot8
6820cff4f5 new chemical-Necrosol (#23850)
* rollback

* dumb fix
2024-01-12 00:59:21 -07:00
deltanedas
581c95ed72 dedicated burn and shock meds (#23941)
* pyrazine and insuzine

* add recipes

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-01-11 16:17:23 -07:00
Ubaser
e91e746dd3 Moths get insect blood (#23671)
* ya

* mothroach

* update

* fix

* fixe

* add
2024-01-10 03:42:20 -08:00
Boaz1111
5fd3d4552c 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>
2024-01-09 15:23:11 +03:00
Nemanja
fd024cf131 Revert "Cryoxadone and doxarubixadone now work on the dead" (#23763)
Revert "Cryoxadone and doxarubixadone now work on the dead (#23558)"

This reverts commit 00ee48e4bc.
2024-01-08 22:43:46 -07:00
cool dolphin
a34ee7c300 Add delicious mopwata (#23740)
* added delicious mopwata

* added mopwata, the reagent

* fixed issues, changed color, added more possible fills
2024-01-08 19:24:32 -07:00
Scribbles0
00ee48e4bc Cryoxadone and doxarubixadone now work on the dead (#23558)
cryox variable add
2024-01-07 23:31:26 -07:00
Ubaser
172fcaf2d4 Rename Goldschläger to Gildlager (#23223)
* add

* fix

* catalog

* migration

* conflicts..

* uh

* test

* m

* fix fr

* line?

* beg

* suffering

* um

* fix

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-01-07 02:34:15 +11:00
Nemanja
86c1e36cd5 Fix iron naming, add specific materials for ores (#23590)
add materials for ores, fix iron naming
2024-01-06 13:52:40 +11:00
Ubaser
7f0c9c59c6 Fix epinephrine yaml (#23579)
fix
2024-01-05 18:26:54 -05:00
Warentan
fd5a1b293a Nerfed bloodsuckers- They can no longer tank some incoming damage types by chugging blood (#22880)
Nerfed bloodsuckers- Can no longer tank some damage types by chugging blood

Co-authored-by: Warentan <StogIsAGamer@proton.me>
2023-12-24 14:59:44 -05:00