Commit Graph

334 Commits

Author SHA1 Message Date
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
Scribbles0
7af0b4c25f Cryoxadone and doxarubixadone now work on the dead (#23558)
cryox variable add

(cherry picked from commit 00ee48e4bc16eec3b3888b23b8f77687d94065d5)
2024-01-26 22:12:00 +01:00
Ubaser
5a76c4f135 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>
(cherry picked from commit 172fcaf2d42db4cda25ce7a40df493692a8e4e98)
2024-01-26 22:03:21 +01:00
Nemanja
3d4fa26e22 Fix iron naming, add specific materials for ores (#23590)
add materials for ores, fix iron naming

(cherry picked from commit 86c1e36cd54c474f87a9873e34f78a517b6410bd)
2024-01-26 21:47:38 +01:00
Ubaser
157cc51876 Fix epinephrine yaml (#23579)
fix

(cherry picked from commit 7f0c9c59c67c9dee070960035bb57048d179f872)
2024-01-26 21:47:03 +01:00
Warentan
76141474de 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>
(cherry picked from commit fd5a1b293a14ae53387eda20167a350fc8e61198)
2024-01-22 18:34:00 +01:00
Boaz1111
593fed7c68 Adding intermediate industrial chems (#22614)
* added hydroxide, benzene, and changed the phenol recipe

* I forgot to commit a bunch of changes, whoopsie doopsie

* Update chemicals.yml

made an error while resolving conflicts

* Update chemicals.yml

same here

* Update flavor-profiles.ftl

* Update chemicals.yml

* Update chemicals.ftl

* Update chemicals.ftl

* Update chemicals.yml

* Update medicine.yml

* Update chemicals.yml

* Update medicine.yml

* guh

* Revert "guh"

This reverts commit a0e5dfd4182d1a407bffd21d0eaa36355023993c.

* final touches and fixes

* fixed all the issues, for realsies

* thefuck

* Revert " thefuck"

This reverts commit 22068cb73d9902ccf81d065d92d078f423c67aea.

* maybe this fix?

* Revert " maybe this fix?"

This reverts commit 4bfd534f73a956e595c809ce77e52819ed142f2b.

* Update chemicals.yml

* Update chemicals.yml

* Update chemicals.yml

Trying to figure out my issue

* Update chemicals.yml

* Update chemicals.yml

* Update chemicals.yml

* Disabled the ethanol breakdown, fixing the issue

* Revert "Update chemicals.yml"

This reverts commit 1239512c0b7df5eab106bf64ec2af38185f2f016.

* Revert "Disabled the ethanol breakdown, fixing the issue"

This reverts commit 96190c967d22b1422d144e4211579f5af7bf9a09.

* Emo suggested I'd do this

* Update chemicals.yml

* made temps needed for the uhh hydroxide and benzene

* Update chemicals.yml

* removed SugarBreakdown

(cherry picked from commit 446b47a4b75bfa0ee95879349031407c8e2874e8)
2024-01-22 18:33:05 +01:00
Debug
18f0af1f68 Implement gridinv, proper (#703)
* Implement gridinv, 1500 squashed commits :elp:

* Me when

* Linter errors

* Fix katana belts
2024-01-21 19:58:28 +01:00
Kevin Zheng
0de9550ae3 Raise cryo metabolism min temperature (#22785)
Many people have been running into issues cooling bodies to the current
temperature. Make it a bit easier by raising the max temperature.

This is the temperature that the body has to change to in order to
metabolize the drug, so in practice cryo has to cool lower than this in
order to actually get the body to this temperature.
2023-12-22 23:13:19 +01:00
CrigCrag
4d98a7db2c add Fresium, a chillingly complex chemical to prank your friends with (#22527)
* everything

* tweakeroo

* maintspill

* some balancing and tweaking

* adds ice tags and gives it to ice crust

* fix code because im smart im the smart guy yeah that's me

* yeah

* oops

* do you wanna try that again

* conserve matter

* im rather smart
2023-12-22 23:13:19 +01:00
Kara
a23dce4702 Rename Miasma to Ammonia (#22791)
* Rename Miasma to Ammonia

* Namespace changes

* Map change????? why
2023-12-22 23:12:06 +01:00
Veritius
85222ca0f2 Make ethylredoxrazine effective at curing drunkness (#22763) 2023-12-22 23:04:48 +01:00
Velcroboy
4f7d00f295 Adds coal (#22559)
* Adds coal

* Fix stack splitting spawn

* Convert size

* Ahhh, it's a reagent tooo....

* ore.rsi

* Adjust recipes, add reagent extraction

* solution name

* Adjust reagents to prevent reactions

* Adjust reagents for standard of 10u

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-12-22 22:56:04 +01:00
Ubaser
c8bfabbdf8 Chemical Synthesis Kit (#22631)
* add

* locale

* probably fix

* fix stuffs

* oversight

* uh yea

* i beg

* tag

* i pray to god this fixes it

* update

* fix

* vestine

* fix note

* balancing

* fix

* toxin wipe
2023-12-22 22:51:37 +01:00
Nemanja
d4ef5bec6c mild reagent prototype cleanup + other misc garbage (#22630) 2023-12-22 22:45:36 +01:00
deltanedas
713627f71b smoke grenades (#20996)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-16 20:32:27 +01:00
Flareguy
a05ed1c1b1 Makes MORE raw materials grindable (#22550)
* makes MORE raw materials grindable (and adds cellulose fibers)

* meat sheets + cable coil + idk + dode

* uhhh uhhh um

* i have a disease and its called DODE
2023-12-16 20:31:47 +01:00
Ubaser
9ceb47ae6f add (#22525) 2023-12-16 20:24:33 +01:00
qwerltaz
7e01537f2c Fix frezon intoxication (#22453) 2023-12-16 20:16:24 +01:00
Whisper
eb76e3d300 Rat king fixes + buffs (#22247)
* fix minor typo

* add doafter range

* increase miasma release
2023-12-16 19:33:20 +01:00
CrigCrag
53df261ab5 3 New Brute Chemicals (And Razorium) (#22103)
* guidebook

* like everything else

* increase razorium damage

* nerf a lil bit
2023-12-16 19:27:09 +01:00
Whisper
0b46bae2cc lower chloral hydrate effect minimum to 10u (requires 11u to sleep) (#22148) 2023-12-16 19:18:42 +01:00
Moomoobeef
1dfeb053a3 added new chemical called Sodium Polyacrylate (#21833)
* added Sodium Polyacrylate chemical/recipe

* added new lines to appease the linter

* Update Resources/Prototypes/Reagents/chemicals.yml

Co-authored-by: Vasilis <vascreeper@yahoo.com>

---------

Co-authored-by: Vasilis <vascreeper@yahoo.com>
2023-12-02 20:35:39 +01:00
Ubaser
bc4135c5ba Add metamorphic "Blood" sprite (#21596)
* add

* forgot to remove

* maybe fix
2023-12-02 20:25:43 +01:00
Velcroboy
dc5f63edb0 Food/Bev updates and fixes (#21824)
* Food/Bev updates and fixes

* Remove some unnessesary

* Indentation oops

* No forensics on null item

* Missing whole ass file :)

* Oh, found it

* Remove redundant -type: drink

* Adds more hot cocoa

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-12-02 20:22:05 +01:00
Feluk6174
549c91f5ab Added Bananadine (#21759)
* added bananadine and its functionallity (and backed banana peel)

* added baked banana peals sprites

* fixed typos and changed the sprite used by backed banan peel to the right one

* Changed the cooktime and now grinded baked banana leaves have carbon

* Updated bananadine description

* Ficed typo in ragent-desc-bananadine

* Reverted actidental change to nocturine
2023-12-02 19:00:04 +01:00
Nim
0147b39a71 Space Sharkminnow (#20658)
* sharkminnow

* fix

* salvage
2023-11-19 22:03:30 +01:00
deltanedas
7a6e93270b egg rework (#21606)
* egg and raw egg

* add DamageEntity

* boiling and exploding eggs

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-11-19 21:59:51 +01:00
Whisper
dd1c48c66e (Reagent) Minor blood and uncooked protein rework (#20891)
* Blood makes non-animals take poison damage, and sates animal hunger at a very low rate

* Only affects humans, animal restrictions also removed

* ignore the other commits, blood and uncooked protein rework!

* Humans recieve a popup when they consume these reagents

* lower the original damage of uncooked proteins

* Change metablizing organs, make blood digest into uncooked protein instead of it having it's own effect
2023-11-12 20:45:19 +01:00
themias
27487bd4be Bicaridine metabolism bandaid (#21443) 2023-11-12 20:41:04 +01:00
IProduceWidgets
8b539c74fa Significantly nerf chemvomit and give it a reasonable default. (#21453) 2023-11-12 20:40:21 +01:00
RiceMar1244
c55026781c Adds more sources for sheet paper material (#21364)
* Moves sheetifier research unlock from civilian services to industrial

* Makes wood insertable into the sheetifier and makes paper a lathable material

* Adds a paper crate to the cargo catalog

* Adds localizations
2023-11-12 20:40:20 +01:00
TheEmber
3285d65df8 Soap dont have 100% vomit chance (#21428)
People using soap spears and darts too often as weapon. It shouldnt have better vomit chance than ipecac
2023-11-12 20:35:52 +01:00
brainfood1183
4c1c1e43c9 blue blood now requires copper instead of iron to cure bloodloss (#20863)
* blue blood now requires copper instead of iron to cure bloodloss

* arachnid species now needs copper to cure bloodloss and copper pills added to medkits.

* fix puddlesystem proto

* remove the cool

* no longer uses hastag, instead uses custom heart organ and hasorgan.

* fix
2023-11-12 20:29:10 +01:00
Psychpsyo
3fc496001a Soapy Water & Edible Soap (#20364)
* soap reagent and soapy water

* make soapy water recognizable

* Fix tile cleaning bug

CleanDecalsReaction was able to take more than the reactVolume it was given.

* make soapy water an evaporating reagent

* Tile reactions when mopping

* Fix indescribably soap flavor

* Adjust soap flavours

Soap and soapy water now taste clean and syndie soap tastes like punishment.

* Better soap numbers & DeleteOnSolutionEmpty

* Changed TrashOnEmpty to TrashOnSolutionEmpty

* Last TrashOnSolutionEmpty change

* Fix merged code not compiling

* Requested changes.
2023-11-12 20:26:09 +01:00