cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-27 06:00:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

toxins.dm

Browse Source
This commit is contained in:
Kashargul
2024-12-07 01:03:25 +01:00
parent 2bd0f9c14d
commit a12a4d2d5e
92 changed files with 592 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food/food/snacks.dm
+30 -30
View File
@@ -801,7 +801,7 @@
if(6)
reagents.add_reagent("coco", 3)
if(7)
reagents.add_reagent("slimejelly", 3)
reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 3)
if(8)
reagents.add_reagent("banana", 3)
if(9)
@@ -821,7 +821,7 @@
/obj/item/reagent_containers/food/snacks/donut/plain/jelly/slimejelly/Initialize()
. = ..()
reagents.add_reagent("slimejelly", 5)
reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 5)
/obj/item/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly
filling_color = "#ED1169"
@@ -934,7 +934,7 @@
/obj/item/reagent_containers/food/snacks/organ/Initialize()
. = ..()
reagents.add_reagent("protein", rand(3,5))
reagents.add_reagent("toxin", rand(1,3))
reagents.add_reagent(REAGENT_ID_TOXIN, rand(1,3))
/obj/item/reagent_containers/food/snacks/tofu
name = "Tofu"
@@ -974,7 +974,7 @@
center_of_mass = list("x"=17, "y"=13)
bitesize = 6
var/toxin_type = "carpotoxin"
var/toxin_type = REAGENT_ID_CARPOTOXIN
var/toxin_amount = 3
/obj/item/reagent_containers/food/snacks/carpmeat/Initialize()
@@ -994,7 +994,7 @@
/obj/item/reagent_containers/food/snacks/carpmeat/ray
desc = "A fillet of space ray meat."
toxin_type = "stoxin"
toxin_type = REAGENT_ID_STOXIN
/obj/item/reagent_containers/food/snacks/carpmeat/gnat
desc = "A paltry sample of space-gnat meat. It looks pretty stringy and unpleasant, honestly."
@@ -1517,7 +1517,7 @@
/obj/item/reagent_containers/food/snacks/amanita_pie/Initialize()
. = ..()
reagents.add_reagent("amatoxin", 3)
reagents.add_reagent(REAGENT_ID_AMATOXIN, 3)
reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 1)
/obj/item/reagent_containers/food/snacks/plump_pie
@@ -1785,7 +1785,7 @@
/obj/item/reagent_containers/food/snacks/badrecipe/Initialize()
. = ..()
reagents.add_reagent("toxin", 1)
reagents.add_reagent(REAGENT_ID_TOXIN, 1)
reagents.add_reagent(REAGENT_ID_CARBON, 3)
/obj/item/reagent_containers/food/snacks/meatsteak
@@ -1831,7 +1831,7 @@
/obj/item/reagent_containers/food/snacks/amanitajelly/Initialize()
. = ..()
reagents.add_reagent("amatoxin", 6)
reagents.add_reagent(REAGENT_ID_AMATOXIN, 6)
reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 3)
/obj/item/reagent_containers/food/snacks/poppypretzel
@@ -2043,7 +2043,7 @@
/obj/item/reagent_containers/food/snacks/jelliedtoast/slime/Initialize()
. = ..()
reagents.add_reagent("slimejelly", 5)
reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 5)
/obj/item/reagent_containers/food/snacks/honeytoast
name = "Honeyed Toast"
@@ -2077,7 +2077,7 @@
/obj/item/reagent_containers/food/snacks/jellyburger/slime/Initialize()
. = ..()
reagents.add_reagent("slimejelly", 5)
reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 5)
/obj/item/reagent_containers/food/snacks/jellyburger/cherry/Initialize()
. = ..()
@@ -2317,7 +2317,7 @@
/obj/item/reagent_containers/food/snacks/jellysandwich/slime/Initialize()
. = ..()
reagents.add_reagent("slimejelly", 5)
reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 5)
/obj/item/reagent_containers/food/snacks/jellysandwich/cherry/Initialize()
. = ..()
@@ -2341,7 +2341,7 @@
/obj/item/reagent_containers/food/snacks/boiledslimecore/Initialize()
. = ..()
reagents.add_reagent("slimejelly", 5)
reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 5)
/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit
name = "plump helmet biscuit"
@@ -2443,7 +2443,7 @@
/obj/item/reagent_containers/food/snacks/slimesoup/Initialize()
. = ..()
reagents.add_reagent("slimejelly", 5)
reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
/obj/item/reagent_containers/food/snacks/bloodsoup
@@ -2547,11 +2547,11 @@
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc)
reagents.add_reagent(REAGENT_ID_BLOOD, 10)
if(7)
reagents.add_reagent("slimejelly", 10)
reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 10)
reagents.add_reagent(REAGENT_ID_WATER, 10)
if(8)
reagents.add_reagent(REAGENT_ID_CARBON, 10)
reagents.add_reagent("toxin", 10)
reagents.add_reagent(REAGENT_ID_TOXIN, 10)
if(9)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5, nutriment_desc)
reagents.add_reagent("tomatojuice", 10)
@@ -3438,7 +3438,7 @@
reagents.add_reagent(REAGENT_ID_AMBROSIAEXTRACT, 2)
reagents.add_reagent("bicaridine", 1)
reagents.add_reagent("kelotane", 1)
reagents.add_reagent("toxin", 1)
reagents.add_reagent(REAGENT_ID_TOXIN, 1)
/obj/item/reagent_containers/food/snacks/cosmicbrowniesslice
name = "cosmic brownie"
@@ -3824,7 +3824,7 @@
. = ..()
reagents.add_reagent("protein", 5)
reagents.add_reagent("tomatojuice", 6)
reagents.add_reagent("mold", 8)
reagents.add_reagent(REAGENT_ID_MOLD, 8)
/obj/item/reagent_containers/food/snacks/slice/oldpizza
name = "moldy pizza slice"
@@ -4219,7 +4219,7 @@
//
///obj/item/reagent_containers/food/snacks/hotdog/old/Initialize()
// . = ..()
// reagents.add_reagent("mold", 6)
// reagents.add_reagent(REAGENT_ID_MOLD, 6)
/obj/item/reagent_containers/food/snacks/flatbread
name = "flatbread"
@@ -4280,7 +4280,7 @@
set_light(1, 1, "#5dadcf")
reagents.add_reagent("oxycodone", 1)
reagents.add_reagent("sifsap", 5)
reagents.add_reagent(REAGENT_ID_SIFSAP, 5)
reagents.add_reagent(REAGENT_ID_BLISS, 5)
/obj/item/reagent_containers/food/snacks/bellefritter
@@ -4569,7 +4569,7 @@
/obj/item/reagent_containers/food/snacks/rosesalad/Initialize()
. = ..()
reagents.add_reagent("stoxin", 2)
reagents.add_reagent(REAGENT_ID_STOXIN, 2)
/obj/item/reagent_containers/food/snacks/eggbowl
name = "egg bowl"
@@ -4682,7 +4682,7 @@
/obj/item/reagent_containers/food/snacks/siffruit/Initialize()
. = ..()
reagents.add_reagent("sifsap", 2)
reagents.add_reagent(REAGENT_ID_SIFSAP, 2)
/obj/item/reagent_containers/food/snacks/siffruit/afterattack(obj/O as obj, mob/user as mob, proximity)
if(istype(O,/obj/machinery/microwave))
@@ -4916,13 +4916,13 @@
var/composition_reagent_quantity
///mob/living/simple_mob/adultslime //The literal only thing in the game that uses this is commented out, so I comment out this too
// composition_reagent = "slimejelly"
// composition_reagent = REAGENT_ID_SLIMEJELLY
/mob/living/carbon/alien/diona
composition_reagent = REAGENT_ID_NUTRIMENT//Dionae are plants, so eating them doesn't give animal protein
/mob/living/simple_mob/slime
composition_reagent = "slimejelly"
composition_reagent = REAGENT_ID_SLIMEJELLY
allow_mind_transfer = TRUE
/mob/living/simple_mob
@@ -6929,7 +6929,7 @@
name = "master old-food"
desc = "they're all inedible and potentially dangerous items"
center_of_mass = list ("x"=15, "y"=9)
nutriment_desc = list("rot" = 5, "mold" = 5)
nutriment_desc = list("rot" = 5, REAGENT_ID_MOLD = 5)
nutriment_amt = 10
bitesize = 3
filling_color = "#336b42"
@@ -6937,12 +6937,12 @@
.=..()
reagents.add_reagent(pick(list(
REAGENT_ID_FUEL,
"amatoxin",
"carpotoxin",
"zombiepowder",
"cryptobiolin",
REAGENT_ID_AMATOXIN,
REAGENT_ID_CARPOTOXIN,
REAGENT_ID_ZOMBIEPOWDER,
REAGENT_ID_CRYPTOBIOLIN,
REAGENT_ID_PSILOCYBIN)), 5)
reagents.add_reagent("salmonella", 5)
reagents.add_reagent(REAGENT_ID_SALMONELLA, 5)
/obj/item/reagent_containers/food/snacks/old/pizza
name = "\improper Pizza!"
@@ -7077,7 +7077,7 @@
/obj/item/reagent_containers/food/snacks/canned/caviar/true/Initialize()
. = ..()
reagents.add_reagent("seafood", 4)
reagents.add_reagent("carpotoxin", 1)
reagents.add_reagent(REAGENT_ID_CARPOTOXIN, 1)
/obj/item/reagent_containers/food/snacks/canned/maps
name = "\improper MAPS"
code/modules/food/food/snacks_vr.dm
+1 -1
View File
@@ -777,7 +777,7 @@
/obj/item/reagent_containers/food/snacks/donkpocket/ascended/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_URANIUM, 3)
reagents.add_reagent("thermite_v", 3)
reagents.add_reagent(REAGENT_ID_THERMITEV, 3)
// Altevian Foobs
code/modules/food/food/superfoods.dm
+9 -9
View File
@@ -190,21 +190,21 @@
name = "Slice Of Evil" //Pretty damn poisonous, takes a lot of work to make safe for consumption, useful for medical.
desc = "An odd slice, despite the grease and cherries oozing off the top, it smells delicious."
nutriment_desc = list("The desire to consume" = 10) // You won't even taste the poison.
reagents.add_reagent("neurotoxic_protein", 2)
reagents.add_reagent(REAGENT_ID_NEUROTOXIC_PROTEIN, 2)
reagents.add_reagent(REAGENT_ID_SHOCKCHEM, 2)
reagents.add_reagent("amatoxin", 2)
reagents.add_reagent("carpotoxin", 2)
reagents.add_reagent(REAGENT_ID_AMATOXIN, 2)
reagents.add_reagent(REAGENT_ID_CARPOTOXIN, 2)
reagents.add_reagent(REAGENT_ID_SPIDERTOXIN, 2)
bitesize = 7
if(2)
name = "Slice Of Evil" //A bad trip
desc = "A mysterious slice, coated in purple frosting that smells like grapes."
nutriment_desc = list("The desire to show off an party" = 10)
reagents.add_reagent("stoxin", 2)
reagents.add_reagent(REAGENT_ID_STOXIN, 2)
reagents.add_reagent(REAGENT_ID_BLISS, 10)
reagents.add_reagent("serotrotium", 4)
reagents.add_reagent("cryptobiolin", 8)
reagents.add_reagent("mindbreaker", 10)
reagents.add_reagent(REAGENT_ID_SEROTROTIUM, 4)
reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, 8)
reagents.add_reagent(REAGENT_ID_MINDBREAKER, 10)
reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 10)
bitesize = 30 //even a single bite won't make you escape fate.
if(3)
@@ -212,8 +212,8 @@
desc = "A menacing slice, smelling clearly of copper, blood clots float on top."
nutriment_desc = list("Infernal Rage" = 10)
reagents.add_reagent(REAGENT_ID_BLOOD, 20)
reagents.add_reagent("stomacid", 10)
reagents.add_reagent("mutagen", 4)
reagents.add_reagent(REAGENT_ID_STOMACID, 10)
reagents.add_reagent(REAGENT_ID_MUTAGEN, 4)
reagents.add_reagent("thirteenloko", 20)
reagents.add_reagent("hyperzine", 10)
bitesize = 30
code/modules/food/glass/bottle.dm
+8 -8
View File
@@ -70,28 +70,28 @@
desc = "A small bottle of toxins. Do not drink, it is poisonous."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
prefill = list("toxin" = 60)
prefill = list(REAGENT_ID_TOXIN = 60)
/obj/item/reagent_containers/glass/bottle/cyanide
name = "cyanide bottle"
desc = "A small bottle of cyanide. Bitter almonds?"
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
prefill = list("cyanide" = 30) //volume changed to match chloral
prefill = list(REAGENT_ID_CYANIDE = 30) //volume changed to match chloral
/obj/item/reagent_containers/glass/bottle/stoxin
name = "soporific bottle"
desc = "A small bottle of soporific. Just the fumes make you sleepy."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
prefill = list("stoxin" = 60)
prefill = list(REAGENT_ID_STOXIN = 60)
/obj/item/reagent_containers/glass/bottle/chloralhydrate
name = "chloral hydrate bottle"
desc = "A small bottle of Choral Hydrate. Mickey's Favorite!"
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
prefill = list("chloralhydrate" = 30) //Intentionally low since it is so strong. Still enough to knock someone out.
prefill = list(REAGENT_ID_CHLORALHYDRATE = 30) //Intentionally low since it is so strong. Still enough to knock someone out.
/obj/item/reagent_containers/glass/bottle/antitoxin
name = "dylovene bottle"
@@ -105,7 +105,7 @@
desc = "A small bottle of unstable mutagen. Randomly changes the DNA structure of whoever comes in contact."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-1"
prefill = list("mutagen" = 60)
prefill = list(REAGENT_ID_MUTAGEN = 60)
/obj/item/reagent_containers/glass/bottle/ammonia
name = "ammonia bottle"
@@ -119,21 +119,21 @@
desc = "A small bottle."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
prefill = list("eznutrient" = 60)
prefill = list(REAGENT_ID_EZNUTRIENT = 60)
/obj/item/reagent_containers/glass/bottle/left4zed
name = "\improper Left-4-Zed bottle"
desc = "A small bottle."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
prefill = list("left4zed" = 60)
prefill = list(REAGENT_ID_LEFT4ZED = 60)
/obj/item/reagent_containers/glass/bottle/robustharvest
name = "\improper Robust Harvest"
desc = "A small bottle."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
prefill = list("robustharvest" = 60)
prefill = list(REAGENT_ID_ROBUSTHARVEST = 60)
/obj/item/reagent_containers/glass/bottle/diethylamine
name = "diethylamine bottle"
code/modules/food/glass/bottle_potion.dm
+2 -2
View File
@@ -100,7 +100,7 @@
/obj/item/reagent_containers/glass/bottle/potion/badpolymorph
name = "unstable polymorph potion"
desc = "A small green bottle containing some uncomfortably green liquid that claims to transform the drinker wildly."
prefill = list("mutagen" = 30)
prefill = list(REAGENT_ID_MUTAGEN = 30)
/obj/item/reagent_containers/glass/bottle/potion/bonerepair
name = "mending potion"
@@ -142,7 +142,7 @@
/obj/item/reagent_containers/glass/bottle/potion/soporific
name = "still potion"
desc = "A small green bottle containing some calm blue liquid."
prefill = list("stoxin" = 30)
prefill = list(REAGENT_ID_STOXIN = 30)
/obj/item/reagent_containers/glass/bottle/potion/lipostipo
name = "thick potion"
code/modules/food/kitchen/microwave.dm
+1 -1
View File
@@ -553,7 +553,7 @@
qdel(O)
src.reagents.clear_reagents()
ffuu.reagents.add_reagent(REAGENT_ID_CARBON, amount)
ffuu.reagents.add_reagent("toxin", amount/10)
ffuu.reagents.add_reagent(REAGENT_ID_TOXIN, amount/10)
return ffuu
/obj/machinery/microwave/verb/Eject()
code/modules/food/recipes_fryer.dm
+1 -1
View File
@@ -143,7 +143,7 @@
result = /obj/item/reagent_containers/food/snacks/donut/plain/jelly/poisonberry
/datum/recipe/jellydonut/slime // Subtypes of jellydonut, appliance inheritance applies.
reagents = list("slimejelly" = 5, REAGENT_ID_SUGAR = 5)
reagents = list(REAGENT_ID_SLIMEJELLY = 5, REAGENT_ID_SUGAR = 5)
result = /obj/item/reagent_containers/food/snacks/donut/plain/jelly/slimejelly
/datum/recipe/jellydonut/cherry // Subtypes of jellydonut, appliance inheritance applies.
code/modules/food/recipes_grill.dm
+1 -1
View File
@@ -198,7 +198,7 @@
/datum/recipe/slimeburger
appliance = GRILL
reagents = list("slimejelly" = 5)
reagents = list(REAGENT_ID_SLIMEJELLY = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bun
)
code/modules/food/recipes_microwave.dm
+6 -6
View File
@@ -174,13 +174,13 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/spacylibertyduff
/datum/recipe/amanitajelly
reagents = list(REAGENT_ID_WATER = 5, "vodka" = 5, "amatoxin" = 5)
reagents = list(REAGENT_ID_WATER = 5, "vodka" = 5, REAGENT_ID_AMATOXIN = 5)
result = /obj/item/reagent_containers/food/snacks/amanitajelly
/datum/recipe/amanitajelly/make_food(var/obj/container as obj)
. = ..(container)
for(var/obj/item/reagent_containers/food/snacks/amanitajelly/being_cooked in .)
being_cooked.reagents.del_reagent("amatoxin")
being_cooked.reagents.del_reagent(REAGENT_ID_AMATOXIN)
/datum/recipe/meatballsoup
fruit = list("carrot" = 1, "potato" = 1)
@@ -269,7 +269,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/stew
/datum/recipe/slimetoast
reagents = list("slimejelly" = 5)
reagents = list(REAGENT_ID_SLIMEJELLY = 5)
items = list(
/obj/item/reagent_containers/food/snacks/slice/bread,
)
@@ -360,7 +360,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/twobread
/datum/recipe/slimesandwich
reagents = list("slimejelly" = 5)
reagents = list(REAGENT_ID_SLIMEJELLY = 5)
items = list(
/obj/item/reagent_containers/food/snacks/slice/bread,
/obj/item/reagent_containers/food/snacks/slice/bread,
@@ -380,7 +380,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/bloodsoup
/datum/recipe/slimesoup
reagents = list(REAGENT_ID_WATER = 10, "slimejelly" = 5)
reagents = list(REAGENT_ID_WATER = 10, REAGENT_ID_SLIMEJELLY = 5)
items = list()
result = /obj/item/reagent_containers/food/snacks/slimesoup
@@ -484,7 +484,7 @@ I said no!
/datum/recipe/validsalad/make_food(var/obj/container as obj)
. = ..(container)
for (var/obj/item/reagent_containers/food/snacks/validsalad/being_cooked in .)
being_cooked.reagents.del_reagent("toxin")
being_cooked.reagents.del_reagent(REAGENT_ID_TOXIN)
/datum/recipe/stuffing
reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
code/modules/food/recipes_oven.dm
+1 -1
View File
@@ -243,7 +243,7 @@
/datum/recipe/amanita_pie
appliance = OVEN
reagents = list("amatoxin" = 5)
reagents = list(REAGENT_ID_AMATOXIN = 5)
items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough)
result = /obj/item/reagent_containers/food/snacks/amanita_pie