Commit Graph

302 Commits

Author SHA1 Message Date
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
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