Commit Graph

312 Commits

Author SHA1 Message Date
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
Boaz1111
446b47a4b7 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
2023-12-24 14:12:36 -05:00
Kevin Zheng
4c1e71e84a 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-20 22:02:32 -08:00
CrigCrag
e9516fc43e 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-20 22:35:22 -07:00
Kara
ad97580727 Rename Miasma to Ammonia (#22791)
* Rename Miasma to Ammonia

* Namespace changes

* Map change????? why
2023-12-20 21:19:50 -07:00
Veritius
bc2925de3e Make ethylredoxrazine effective at curing drunkness (#22763) 2023-12-19 18:20:04 -08:00
Velcroboy
27308915f1 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-18 14:38:11 -05:00
Ubaser
d172988a8d 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-17 19:40:28 -07:00
Ubaser
488355d9ea Mindbreaker hallucinogen (#22639)
* add

* note
2023-12-17 00:44:54 -07:00
Nemanja
0a81038a17 mild reagent prototype cleanup + other misc garbage (#22630) 2023-12-16 19:34:13 -08:00
deltanedas
7dd472c934 smoke grenades (#20996)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-15 17:49:30 -08:00
Flareguy
90bcbc160b 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-15 15:37:07 -05:00
Ubaser
0349c53d0c Holy water (#22524)
* add

* flavour

* id

* reaction id fix

* maybe fix error

* yay

* notes

* below 50
2023-12-15 02:52:21 -07:00
Ubaser
c1bc32de14 add (#22525) 2023-12-15 02:28:12 -07:00
qwerltaz
cd58be1034 Fix frezon intoxication (#22453) 2023-12-13 12:17:48 -08:00
Whisper
8fa47b87fb Rat king fixes + buffs (#22247)
* fix minor typo

* add doafter range

* increase miasma release
2023-12-08 12:46:28 -06:00
CrigCrag
fe41e20439 3 New Brute Chemicals (And Razorium) (#22103)
* guidebook

* like everything else

* increase razorium damage

* nerf a lil bit
2023-12-06 22:05:29 -05:00
Whisper
50201e47f5 lower chloral hydrate effect minimum to 10u (requires 11u to sleep) (#22148) 2023-12-05 01:52:47 -07:00
Moomoobeef
7cd0abc37b 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 11:58:34 -05:00
Ubaser
de601208ea Add metamorphic "Blood" sprite (#21596)
* add

* forgot to remove

* maybe fix
2023-11-28 00:09:55 -07:00
Velcroboy
e0dd5e1b52 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-11-27 15:19:17 -07:00
Feluk6174
0da68ddc6c 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-11-21 20:08:53 -05:00
Nim
9bbdbb9212 Space Sharkminnow (#20658)
* sharkminnow

* fix

* salvage
2023-11-12 17:42:48 -07:00
deltanedas
60c19853cd egg rework (#21606)
* egg and raw egg

* add DamageEntity

* boiling and exploding eggs

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-11-12 16:18:48 -07:00
Whisper
e0a11f9659 (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-05 20:51:32 -07:00
themias
95a651e8b6 Bicaridine metabolism bandaid (#21443) 2023-11-05 19:18:20 -07:00
IProduceWidgets
79cd2a7d56 Significantly nerf chemvomit and give it a reasonable default. (#21453) 2023-11-05 19:16:56 -07:00
RiceMar1244
196be3cba1 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-05 19:14:02 -07:00
TheEmber
7d0070d99e 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-04 11:19:29 -04:00
brainfood1183
15fc7b1e92 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-10-31 13:41:25 -07:00
Psychpsyo
6a18bdc023 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-10-31 13:39:12 -07:00
LankLTE
1a9f3bc86b Fix the organtype (#21347) 2023-10-31 06:57:26 -06:00
Doru991
e1440cb493 Pumpkins, jack o' lanterns and pumpkin hat resprite (#21176)
* Pumpkin textures

* Pumpkin prototypes

* Jack o lantern prototypes and pumpkin cake

* Finishing touches

* Arbitrageloose

* Restore old pumpkin helmet sprites (God I hope it works)
2023-10-30 23:12:23 -04:00
kerisargit
f2bc0ff128 Atomic bomb add uranium (#21143)
* fix: Incendiary bullets no longer deal cold, acid, or shock damage that ignores all armor.

* Atomic bomb
2023-10-28 23:24:46 -07:00
Ed
82627cab15 Orewall and cobblestone wall pack (#21034)
* start work

* remove crafting things

* remove

* fix yml

* remove all pebbles
add sand stone
add sand cobblestone wall
add asteroid cobblestone wall
resprite basaltand snow walls

* add new walls

* :trollface:
2023-10-20 17:00:24 -04:00
Kevin Zheng
99f777ca9d Increase carbon dioxide poisoning damage (#20939)
* Increase CO2 poisoning damage

* Fix
2023-10-12 10:35:31 +03:00
brainfood1183
b7d96c6538 Honk reagent now makes you Honk. (#20838) 2023-10-11 19:43:54 +03:00
deltanedas
d2665b6bba glue only mutes if drank (#20627)
* glue only mutes if drunk

* glue mutes and fixes bleeding on touch

* no mute on touch

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-10 23:17:44 -04:00
Tunguso4ka
ee54022832 Ash Walker`s spear and uniform (#20292)
* bones, gladiators, milk, spear and tears

* :trollface: my copy/paste python script did the funny

* forgor

* fixed

* mat.yml fixed

* bones

* bone armor

* gladiator uniform now in clothesmate like ss13

* bone armor craft

* pieces

* i was dumb in the past, now im dumb too

* that was dumb...

* fixing stuff

* i hate git

* Revert "i hate git"

This reverts commit 17ef4e5a07a3ebad7d4f487f15721d1df16d757f.

* Revert "fixing stuff"

This reverts commit 4fc5d6b2dc1fc6ebb3945bdf5663b8e432ca7aa3.

* this will work?

* i fucking merged it
2023-09-24 15:57:10 -04:00
Waylon Cude
9cbcf67b1a Metabolism fixes (#20402)
* In-progress commit for fixing metabolism system

* Commit with all debugging in there

In case I have to revert or something

* Cleanup debug commands
2023-09-22 15:01:42 -05:00
Nemanja
f16ff3a2d9 Rat King Milsim + Buffs (#20190)
* rat king update

* rummaging

* buuuuunnnnncccchhh of shit

* the last of it

* make rat servants not ghost roles

* pissma buff and cooldown
2023-09-22 15:01:05 -05:00
Waylon Cude
a8018dd575 Tweak mixed drink ratios (#20301)
The drinks in SS14 were made quite boozy, usually there should be more
mixer than alcohol in a drink. This commit tweaks all the standard
alcohol + mixer drinks to have twice the amount of mixer vs alcohol
2023-09-20 16:58:56 -08:00
Doru991
fcfe75a308 New crops: Berries and Bungo (#19800)
* Add berries

* Berry recipes

* Add bungo fruit

* yml tweaks

* yummy poisonous pits

* Technically it's a seed

* Revert "Technically it's a seed"

This reverts commit be892cf119c1e733ac2922b878aaa476f435152a.

Slapping the seed component onto it led to unforeseen consequences, and I don't want to mess with the seed system for a mostly useless gimmick.

* Revert 2 Electric Boogaloo

This reverts commit 2c4fb34250e9369085d49e730de3dab0e077b687.

* Small rewording

* Cocoa balancing

* Oops
2023-09-18 23:29:27 -04:00
deltanedas
db2a4478b0 show non-sheet material units in lathe (#19896)
* locale for material units

* use material units in lathe ui

* give units to non-sheet materials

* :trollface:

* use volume properly

* :trollface:

* review

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-07 22:11:10 -04:00
Velcroboy
1de23dc4d0 Adds Ganja Brownies (#19222) 2023-09-06 21:21:14 -04:00
Doru991
c6869c89d0 Add plant phalanximine, fix slippery fruits (#19820) 2023-09-04 12:11:40 -08:00
Nemanja
445ed9e9d5 argocytes (#19801) 2023-09-03 22:02:00 -04:00
Sailor
5fefd5b718 Turn dionas into trees if they overdose on robust too hard (#19451)
* Add polymorph reactioneffect, make dionas polymorph into trees

* Actually they'll probably die before they get to 60 so there's that.

* Generalize effect loc

* Huh so that works

* Wow

* oh god the tabulation

* what

how

* Review

* Why did it happen again?!?!?!

* Parent adminhypo from an already existing one.

* Since were no longer checking protoname
2023-08-30 22:01:56 -04:00
OctoRocket
39ef05d47a [Tweak] Changed the nutriment color from a brown to a leafy green. (#18722) 2023-08-25 13:11:24 +10:00
Vladislav Kadira
229df7c5ec Add cocoa cultivation (#18366)
* Add cocoa cultivation

* fix

* Fix 2

* fix 3

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-08-13 10:35:58 -04:00