Commit Graph

277 Commits

Author SHA1 Message Date
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
PixelTK
f189b73fe5 Arachnid rework (#18631)
* Merge before I fuck up anything again

* craft whitelist

* Sericulture

* Spider

* gone

* quickly fixed

* and coders taketh away

* And we take more away

* sericulture improvements

* arachnid

* better webbed

* OH WAIT

* test fail
2023-08-13 01:38:05 -06:00
CrigCrag
ade5cace12 make acids hurt more (#18938)
* Update toxins.yml

* Update toxins.yml

rework how acids do damage. they now metabolize at a rate of 3.0, but deal a lot of damage.

* make polytrinic require plasma

polytrinic acid now requires plasma to make

* add comments to indicate acid design
2023-08-13 01:24:50 -06:00
CrigCrag
2c4ca381b6 chemical elements metabolism updates (#18949)
* Update elements.yml

* Update gases.yml

niteogen is an element

* Update elements.yml

just make chlorine 2u

* fix le dumb mistake

i added another metabolisms:

* copper, mercury, lithium changes 

copper: very budget lead, does poison damage very slowly over time, not good enough to kill effectively but drinking a lot of it will poison you slowly over time, just like real copper poisoning!

mercury: halved damage

lithium: now vaguely simulates brain damage by very weakly poisoning you slowly and making you laugh and scream randomly while metabolizing. slower metab rates
2023-08-13 01:24:11 -06:00
CrigCrag
88f7ba0b2a pyrotechnic metabolism updates (#18947)
* Update pyrotechnic.yml

* Update chemicals.yml

* Update cleaning.yml bleach

* bleach makes you SCREAM

* decrease phlogiston poison damage to 1
2023-08-13 01:22:07 -06:00
Doru991
3af1cc0dbd Botany tweaks vol. 2.5 (#19039)
* Buff nutriment on plants

* Super composting buff

* 1984 pt. 2

* Use standard function
2023-08-13 01:10:22 -06:00
LankLTE
6e192341f2 Removes Spaceacillin (#18979)
* Removes spaceacillin

* this game blows
2023-08-10 23:04:49 -04:00
Doru991
30f0ad2134 Botany tweaks vol. 2 (#18888)
* Even more consumption

* Revert "Even more consumption"

This reverts commit 94ae0eca0ba1b4a55913f92519e1354b77e70734.

Oops forgot a file

* Believe it or not, more nutrient consumption

* Buff ez nutrient and l4z

* Add left 4 zed to emagged nutrimax just because

* Change some thresholds
2023-08-09 19:43:06 -06:00
Interrobang01
3457729ba4 Added Mustard (#18930) 2023-08-09 19:38:36 -06:00
deltanedas
af8302445d stimulants increase stamina (#18754)
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-08-06 21:06:23 +10:00
Leon Friedrich
28a5e32f5e Add prototype serialization tests. (#18458)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-08-06 12:47:45 +10:00
Vordenburg
ad47cee7f4 Replace THC with THCOil (#18617)
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2023-08-03 22:49:56 -07:00
LankLTE
70545f4873 Moths. (#18593) 2023-08-04 15:21:28 +10:00
Interrobang01
14e6ad6635 Reverted some of the mechanical changes of #16157 (#18555)
* Reverted functional changes from PR 16157

* Unreverted Epinephrine recipe Diethylamine removal because really, Epinephrine is complicated enough.

* Unreverted that Phenol change because 1. Phenol isn't actually used except in Epinephrine so it literally does not matter and 2. having Phenol use these common ingredients causes git add .fungit add . reaction conflicts to happen which is good

* Reverted Diphesomethingsomething recipe change because Diphesomething is pretty useless and so doesn't need such an incredibly difficult recipe
2023-08-03 22:30:37 -04:00
PuceTint
75b1435c48 nitrous oxide causes laughing (#18575)
* n2o causes laughing

* lower threshold, sort usign threshold
2023-08-02 15:33:00 -06:00
Alekshhh
c7c56f4a81 Chemical Wiki Descriptions, Recipe Tweaks & Effect Tweaks (2) (#16157)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-07-31 16:03:49 +10:00
MilenVolf
9ff7fc14d5 clean champagne from cyrillic letter (#18412) 2023-07-29 07:30:23 +02:00
SpaceCat
fc4c964e61 adds champagne (#18344)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-07-28 17:54:36 +02:00
deltanedas
dec2446171 make salt white (#18238)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-07-23 13:17:46 -06:00
Emisse
440d01b487 Saline (#18097) 2023-07-17 20:02:41 +10:00
LankLTE
9e6bd30aa4 Ambuzol Plus (#17884)
* Added component and functionality.

* Fixed ZombieImmune.

* Zombies now have zombie blood.

* Ambuzol plus.

* Ambuzol plus spawns in bundle.

* Fine CBURN get one too.

* Reworked the reaction

* No more magic blood refilling.

* ok CE i fixed it

* Component change.
2023-07-09 16:01:35 -06:00
Nemanja
e78257419b Zombie chem tweaks (#17870)
* make romerol cause zombification, make zombrex the cure, nuke corpium

* fix descriptions

* zombrex -> ambuzol
2023-07-06 22:45:59 -06:00
LankLTE
89ca105e7c Fixes Romerol & Corpium, Small Zombie Tweaks (#17784)
* Fixed romerol and corpium.

* Tweaked zombie values.

* Change guidebook descriptions.

* Fixed corpium, added reagent requirements.

* Readded zombie bundle to uplink.

* Edited description
2023-07-06 20:55:00 -06:00
Nairod
3560249f1f Construction Price Adjustments (#17549) 2023-06-30 15:32:03 -04:00
LankLTE
d0a9cce717 Adds Lead & Zinc, nerfs Licoxide. (#17703)
* Added Lead & Zinc, Nerfed Licoxide.

* Updated physical descriptions.

* Fixed my stupid dumb error.
2023-06-28 12:53:56 -05:00
Arendian
7c26480b5f Turns 90% of vomit into actual vomit (#17697)
* Changes vomit reagent composition

* Formatting
2023-06-27 20:08:57 -06:00
Nemanja
489077868c Artifexium (#17604) 2023-06-24 22:00:42 +10:00
metalgearsloth
d4c87155f8 Nerf stims (#17485) 2023-06-19 19:23:10 -07:00
deltanedas
4359729387 robust harvest 1984 (#17331)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-06-14 20:13:05 -06:00
Dynexust
35c838c1cf Added a new cryogenics chemical - Doxarubixadone! (#16568) 2023-06-15 11:26:27 +10:00
Nemanja
9946bd1f61 Sheet-meister 2000 (#16686) 2023-06-15 10:49:23 +10:00
Veritius
d0b42aebeb Add the White Gilgamesh (#16378) 2023-06-12 03:09:41 +10:00
Kit0vras
9adf737854 Reagent "Fat" and reactions for soapification and meatification (#16058)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-06-07 23:04:36 +10:00
deltanedas
f5d2b0e284 only show flavor above 0.1u (#17169)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-06-07 14:29:23 +10:00
Nemanja
3129f950fc Give categories to some reagents (#17142) 2023-06-05 17:08:30 -04:00
Vordenburg
d8c05d013e Triple strength of THC (#16866) 2023-06-03 12:29:46 -07:00