cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 11:05:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

some moire

Browse Source
This commit is contained in:
Kashargul
2024-12-06 21:54:05 +01:00
parent 80edcd2c3d
commit 429398bdd7
231 changed files with 2484 additions and 1945 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/blob2/overmind/types/classic.dm
+2 -2
View File
@@ -22,7 +22,7 @@
spawn()
var/obj/effect/effect/water/splash = new(T)
splash.create_reagents(15)
splash.reagents.add_reagent("blood", 10,list("blood_colour" = color))
splash.reagents.add_reagent(REAGENT_ID_BLOOD, 10,list("blood_colour" = color))
splash.set_color()
splash.set_up(F, 2, 3)
@@ -30,7 +30,7 @@
var/obj/effect/decal/cleanable/chemcoating/blood = locate() in T
if(!istype(blood))
blood = new(T)
blood.reagents.add_reagent("blood", 10,list("blood_colour" = color))
blood.reagents.add_reagent(REAGENT_ID_BLOOD, 10,list("blood_colour" = color))
blood.reagents.add_reagent("tricorlidaze", 5)
blood.update_icon()
code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm
+4 -4
View File
@@ -20,7 +20,7 @@
list("antitoxins", "anti_toxin", 0, 80),
list("nutrients", "glucose", 0, 80),
list("hyronalin", "hyronalin", 0, 80),
list("radium", "radium", 0, 80)
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80)
)
var/max_reagent_volume = 80 //Used when refilling.
@@ -40,7 +40,7 @@
list("clotting agent", "myelamine", 0, 30),
list("peridaxon", "peridaxon", 0, 30),
list("hyronalin", "hyronalin", 0, 30),
list("radium", "radium", 0, 30)
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 30)
)
/obj/item/rig_module/chem_dispenser/accepts_item(var/obj/item/input_item, var/mob/living/user)
@@ -156,7 +156,7 @@
list("antitoxins", "anti_toxin", 0, 80),
list("nutrients", "glucose", 0, 80),
list("hyronalin", "hyronalin", 0, 80),
list("radium", "radium", 0, 80),
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80),
list("clotting agent", "myelamine", 0, 80)
)
@@ -169,6 +169,6 @@
list("antitoxins", "anti_toxin", 0, 0),
list("nutrients", "glucose", 0, 0),
list("hyronalin", "hyronalin", 0, 0),
list("radium", "radium", 0, 0),
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 0),
list("clotting agent", "myelamine", 0, 0)
)
code/modules/clothing/spacesuits/rig/modules/utility.dm
+3 -3
View File
@@ -150,7 +150,7 @@
list("antitoxins", "anti_toxin", 0, 80),
list("nutrients", "glucose", 0, 80),
list("hyronalin", "hyronalin", 0, 80),
list("radium", "radium", 0, 80)
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80)
)
var/max_reagent_volume = 80 //Used when refilling.
@@ -170,7 +170,7 @@
list("clotting agent", "myelamine", 0, 30),
list("peridaxon", "peridaxon", 0, 30),
list("hyronalin", "hyronalin", 0, 30),
list("radium", "radium", 0, 30)
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 30)
)
/obj/item/rig_module/chem_dispenser/accepts_item(var/obj/item/input_item, var/mob/living/user)
@@ -286,7 +286,7 @@
list("antitoxins", "anti_toxin", 0, 80),
list("nutrients", "glucose", 0, 80),
list("hyronalin", "hyronalin", 0, 80),
list("radium", "radium", 0, 80),
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80),
list("clotting agent", "myelamine", 0, 80)
)
code/modules/detectivework/tools/rag.dm
+3 -3
View File
@@ -168,8 +168,8 @@
//rag must have a minimum of 2 units welder fuel or ehtanol based reagents and at least 80% of the reagents must so.
/obj/item/reagent_containers/glass/rag/proc/can_ignite()
var/fuel
if(reagents.get_reagent_amount("fuel"))
fuel += reagents.get_reagent_amount("fuel")
if(reagents.get_reagent_amount(REAGENT_ID_FUEL))
fuel += reagents.get_reagent_amount(REAGENT_ID_FUEL)
else
for(var/datum/reagent/ethanol/R in reagents.reagent_list)
@@ -231,7 +231,7 @@
qdel(src)
return
reagents.remove_reagent("fuel", reagents.maximum_volume/25)
reagents.remove_reagent(REAGENT_ID_FUEL, reagents.maximum_volume/25)
for(var/datum/reagent/ethanol/R in reagents.reagent_list)
if(istype(R, /datum/reagent/ethanol))
reagents.remove_reagent(R.id, reagents.maximum_volume/25)
code/modules/fishing/fishing_rod.dm
+1 -1
View File
@@ -87,7 +87,7 @@
if(istype(Bait, bait_type))
var/foodvolume
for(var/datum/reagent/re in Bait.reagents.reagent_list)
if(re.id == "nutriment" || re.id == "protein" || re.id == "glucose" || re.id == "fishbait")
if(re.id == REAGENT_ID_NUTRIMENT || re.id == "protein" || re.id == "glucose" || re.id == "fishbait")
foodvolume += re.volume
toolspeed = initial(toolspeed) * 10*(0.01/(0.2*(foodvolume/Bait.reagents.maximum_volume + 0.5))) //VOREStation edit: gives fishing a universal formula because Polaris' doesn't work here. Min value of 1, max value of 1/3, 0.5 at 1/2 filled with bait reagents.
code/modules/food/drinkingglass/extras.dm
+2 -2
View File
@@ -86,11 +86,11 @@
sipp_mob(target, user, "liquid_protean")
return
if(SPECIES_PROMETHEAN)
sipp_mob(target, user, "nutriment")
sipp_mob(target, user, REAGENT_ID_NUTRIMENT)
return
return ..()
/obj/item/glass_extra/straw/proc/sipp_mob(mob/living/victim, mob/user, reagent_type = "nutriment")
/obj/item/glass_extra/straw/proc/sipp_mob(mob/living/victim, mob/user, reagent_type = REAGENT_ID_NUTRIMENT)
if(victim.health <= 0)
to_chat(user, span_warning("There's not enough of [victim] left to sip on!"))
return
code/modules/food/drinkingglass/metaglass_vr.dm
+1 -1
View File
@@ -241,5 +241,5 @@
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/manager_summoner
glass_icon_state = "manager_summoner"
glass_icon_state = REAGENT_ID_MANAGERSUMMONER
glass_icon_file = 'icons/obj/drinks_vr.dmi'
code/modules/food/drinkingglass/shaker.dm
+4 -4
View File
@@ -32,10 +32,10 @@
/obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake/Initialize()
. = ..()
cut_overlays()
reagents.add_reagent("nutriment", 30)
reagents.add_reagent("iron", 10)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 30)
reagents.add_reagent(REAGENT_ID_IRON, 10)
reagents.add_reagent("protein", 35)
reagents.add_reagent("water", 25)
reagents.add_reagent(REAGENT_ID_WATER, 25)
/obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake/update_icon()
return
return
code/modules/food/drinkingglass/shaker_vr.dm
+2 -2
View File
@@ -9,7 +9,7 @@
. = ..()
cut_overlays()
reagents.add_reagent("liquid_protean", 50)
reagents.add_reagent("nutriment", 50)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 50)
/obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteanshake/update_icon()
return
return
code/modules/food/food/cans.dm
+25 -25
View File
@@ -41,7 +41,7 @@
/obj/item/reagent_containers/food/drinks/cans/waterbottle/Initialize()
. = ..()
reagents.add_reagent("water", 30)
reagents.add_reagent(REAGENT_ID_WATER, 30)
/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind
name = "\improper Space Mountain Wind"
@@ -278,8 +278,8 @@
/obj/item/reagent_containers/food/drinks/cans/terra_cola/Initialize()
. = ..()
reagents.add_reagent("water", 25)
reagents.add_reagent("iron", 5)
reagents.add_reagent(REAGENT_ID_WATER, 25)
reagents.add_reagent(REAGENT_ID_IRON, 5)
/////////////////////////MISC VENDOR DRINKS/////////////////////////
@@ -365,7 +365,7 @@
/obj/item/reagent_containers/food/drinks/cans/bepis/Initialize()
. = ..()
reagents.add_reagent("bepis", 30)
reagents.add_reagent(REAGENT_ID_BEPIS, 30)
/obj/item/reagent_containers/food/drinks/cans/astrodew
name = "\improper Astro Dew Spring Water"
@@ -376,7 +376,7 @@
/obj/item/reagent_containers/food/drinks/cans/astrodew/Initialize()
. = ..()
reagents.add_reagent("water", 30)
reagents.add_reagent(REAGENT_ID_WATER, 30)
/obj/item/reagent_containers/food/drinks/cans/icecoffee
name = "\improper Café Del Consumir"
@@ -403,7 +403,7 @@
/obj/item/reagent_containers/food/drinks/cans/buzz/Initialize()
. = ..()
reagents.add_reagent("buzz_fuzz", 30)
reagents.add_reagent(REAGENT_ID_BUZZFUZZ, 30)
/obj/item/reagent_containers/food/drinks/cans/shambler
name = "\improper Shambler's Juice"
@@ -414,7 +414,7 @@
/obj/item/reagent_containers/food/drinks/cans/shambler/Initialize()
. = ..()
reagents.add_reagent("shamblers", 30)
reagents.add_reagent(REAGENT_ID_SHAMBLERS, 30)
/obj/item/reagent_containers/food/drinks/cans/cranberry
name = "\improper Sprited Cranberry"
@@ -425,7 +425,7 @@
/obj/item/reagent_containers/food/drinks/cans/cranberry/Initialize()
. = ..()
reagents.add_reagent("sprited_cranberry", 30)
reagents.add_reagent(REAGENT_ID_SPRITEDCRANBERRY, 30)
/////////////////////////CANNED BOOZE DRINKS/////////////////////////
@@ -460,7 +460,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_peach/Initialize()
. = ..()
reagents.add_reagent("nukie_peach", 60)
reagents.add_reagent(REAGENT_ID_NUKIEPEACH, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_pear
name = "\improper Nukies - Great Pear"
@@ -471,7 +471,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_pear/Initialize()
. = ..()
reagents.add_reagent("nukie_pear", 60)
reagents.add_reagent(REAGENT_ID_NUKIEPEAR, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_cherry
name = "\improper Nukies - Popping Cherry"
@@ -482,7 +482,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_cherry/Initialize()
. = ..()
reagents.add_reagent("nukie_cherry", 60)
reagents.add_reagent(REAGENT_ID_NUKIECHERRY, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_melon
name = "\improper Nukies - Melon Squirter"
@@ -493,7 +493,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_melon/Initialize()
. = ..()
reagents.add_reagent("nukie_melon", 60)
reagents.add_reagent(REAGENT_ID_NUKIEMELON, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_banana
name = "\improper Nukies - Bursting Banana"
@@ -504,7 +504,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_banana/Initialize()
. = ..()
reagents.add_reagent("nukie_banana", 60)
reagents.add_reagent(REAGENT_ID_NUKIEBANANA, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_rose
name = "\improper Nukies - Insatiable Rose"
@@ -515,7 +515,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_rose/Initialize()
. = ..()
reagents.add_reagent("nukie_rose", 60)
reagents.add_reagent(REAGENT_ID_NUKIEROSE, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_lemon
name = "\improper Nukies - Citrus Got Real"
@@ -526,7 +526,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_lemon/Initialize()
. = ..()
reagents.add_reagent("nukie_lemon", 60)
reagents.add_reagent(REAGENT_ID_NUKIELEMON, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_fruit
name = "\improper Nukies - Swelling Fruit"
@@ -537,7 +537,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_fruit/Initialize()
. = ..()
reagents.add_reagent("nukie_fruit", 60)
reagents.add_reagent(REAGENT_ID_NUKIEFRUIT, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_special
name = "\improper Nukies - Limited Edition"
@@ -548,7 +548,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_special/Initialize()
. = ..()
reagents.add_reagent("nukie_special", 60)
reagents.add_reagent(REAGENT_ID_NUKIESPECIAL, 60)
/////////////////////////MEGA NUKIES/////////////////////////
//Rare loot energy drinks with special properties, for the funnies.
@@ -562,7 +562,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_sight/Initialize()
. = ..()
reagents.add_reagent("nukie_mega_sight", 60)
reagents.add_reagent(REAGENT_ID_NUKIEMEGASIGHT, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_heart
name = "\improper Nukies Mega - Juice Pumper"
@@ -573,7 +573,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_heart/Initialize()
. = ..()
reagents.add_reagent("nukie_mega_heart", 60)
reagents.add_reagent(REAGENT_ID_NUKIEMEGAHEART, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_sleep
name = "\improper Nukies Nega - Vibrating Nights"
@@ -584,7 +584,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_sleep/Initialize()
. = ..()
reagents.add_reagent("nukie_mega_sleep", 60)
reagents.add_reagent(REAGENT_ID_NUKIEMEGASLEEP, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_shock
name = "\improper Nukies Mega - Jolt Railer"
@@ -595,7 +595,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_shock/Initialize()
. = ..()
reagents.add_reagent("nukie_mega_shock", 60)
reagents.add_reagent(REAGENT_ID_NUKIEMEGASHOCK, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_fast
name = "\improper Nukies Mega - Rapid Rager"
@@ -606,7 +606,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_fast/Initialize()
. = ..()
reagents.add_reagent("nukie_mega_fast", 60)
reagents.add_reagent(REAGENT_ID_NUKIEMEGAFAST, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_high
name = "\improper Nukies Mega - Diamond Sky"
@@ -617,7 +617,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_high/Initialize()
. = ..()
reagents.add_reagent("nukie_mega_high", 60)
reagents.add_reagent(REAGENT_ID_NUKIEMEGAHIGH, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_shrink
name = "\improper Nukies Mega - Shrinking Flower"
@@ -628,7 +628,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_shrink/Initialize()
. = ..()
reagents.add_reagent("nukie_mega_shrink", 60)
reagents.add_reagent(REAGENT_ID_NUKIEMEGASHRINK, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_grow
name = "\improper Nukies Mega - Growing Geyser"
@@ -639,4 +639,4 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_grow/Initialize()
. = ..()
reagents.add_reagent("nukie_mega_growth", 60)
reagents.add_reagent(REAGENT_ID_NUKIEMEGAGROWTH, 60)
code/modules/food/food/condiment.dm
+15 -15
View File
@@ -91,7 +91,7 @@
desc = "Leaves the tongue numb in its passage."
icon_state = "coldsauce"
center_of_mass = list("x"=16, "y"=6)
if("sodiumchloride")
if(REAGENT_ID_SODIUMCHLORIDE)
name = "Salt Shaker"
desc = "Salt. From space oceans, presumably."
icon_state = "saltshaker"
@@ -106,7 +106,7 @@
desc = "A delicious oil used in cooking. General purpose."
icon_state = "oliveoil"
center_of_mass = list("x"=16, "y"=6)
if("sugar")
if(REAGENT_ID_SUGAR)
name = "Sugar"
desc = "Tastey space sugar!"
center_of_mass = list("x"=16, "y"=6)
@@ -166,7 +166,7 @@
/obj/item/reagent_containers/food/condiment/sugar/Initialize()
. = ..()
reagents.add_reagent("sugar", 50)
reagents.add_reagent(REAGENT_ID_SUGAR, 50)
/obj/item/reagent_containers/food/condiment/ketchup/Initialize()
. = ..()
@@ -237,7 +237,7 @@
/obj/item/reagent_containers/food/condiment/small/saltshaker/Initialize()
. = ..()
reagents.add_reagent("sodiumchloride", 20)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 20)
/obj/item/reagent_containers/food/condiment/small/peppermill //Keeping name here to save map based headaches
name = "pepper shaker"
@@ -260,13 +260,13 @@
reagents.add_reagent("blackpepper", 30)
/obj/item/reagent_containers/food/condiment/small/sugar
name = "sugar"
name = REAGENT_ID_SUGAR
desc = "Sweetness in a bottle"
icon_state = "sugarsmall"
/obj/item/reagent_containers/food/condiment/small/sugar/Initialize()
. = ..()
reagents.add_reagent("sugar", 20)
reagents.add_reagent(REAGENT_ID_SUGAR, 20)
//MRE condiments and drinks.
@@ -284,7 +284,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/salt/Initialize()
. = ..()
reagents.add_reagent("sodiumchloride", 5)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 5)
/obj/item/reagent_containers/food/condiment/small/packet/pepper
name = "pepper packet"
@@ -302,7 +302,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/sugar/Initialize()
. = ..()
reagents.add_reagent("sugar", 5)
reagents.add_reagent(REAGENT_ID_SUGAR, 5)
/obj/item/reagent_containers/food/condiment/small/packet/jelly
name = "jelly packet"
@@ -495,7 +495,7 @@
/obj/item/reagent_containers/food/condiment/carton/sugar
name = "sugar carton"
desc = "A big carton of sugar. Sweet!"
icon_state = "sugar"
icon_state = REAGENT_ID_SUGAR
volume = 120
center_of_mass = list("x"=16, "y"=8)
@@ -505,7 +505,7 @@
/obj/item/reagent_containers/food/condiment/carton/sugar/Initialize()
. = ..()
reagents.add_reagent("sugar", 100)
reagents.add_reagent(REAGENT_ID_SUGAR, 100)
/obj/item/reagent_containers/food/condiment/carton/sugar/rustic
name = "sugar sack"
@@ -534,7 +534,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/Initialize()
. = ..()
reagents.add_reagent("protein_powder", 5)
reagents.add_reagent(REAGENT_ID_PROTEINPOWDER, 5)
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/vanilla
name = "vanilla protein powder packet"
@@ -543,7 +543,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/vanilla/Initialize()
. = ..()
reagents.add_reagent("vanilla_protein_powder", 5)
reagents.add_reagent(REAGENT_ID_VANILLAPROTEINPOWDER, 5)
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/banana
name = "banana protein powder packet"
@@ -552,7 +552,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/banana/Initialize()
. = ..()
reagents.add_reagent("banana_protein_powder", 5)
reagents.add_reagent(REAGENT_ID_BANANAPROTEINPOWDER, 5)
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/chocolate
name = "chocolate protein powder packet"
@@ -561,7 +561,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/chocolate/Initialize()
. = ..()
reagents.add_reagent("chocolate_protein_powder", 5)
reagents.add_reagent(REAGENT_ID_CHOCOLATEPROTEINPOWDER, 5)
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/strawberry
name = "strawberry protein powder packet"
@@ -570,4 +570,4 @@
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/strawberry/Initialize()
. = ..()
reagents.add_reagent("strawberry_protein_powder", 5)
reagents.add_reagent(REAGENT_ID_STRAWBERRYPROTEINPOWDER, 5)
code/modules/food/food/drinks/drinkingglass.dm
+3 -3
View File
@@ -157,7 +157,7 @@
/obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/proteinshake/Initialize()
. = ..()
reagents.add_reagent("nutriment", 30)
reagents.add_reagent("iron", 10)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 30)
reagents.add_reagent(REAGENT_ID_IRON, 10)
reagents.add_reagent("protein", 15)
reagents.add_reagent("water", 45)
reagents.add_reagent(REAGENT_ID_WATER, 45)
code/modules/food/food/snacks.dm
+125 -125
View File
@@ -53,7 +53,7 @@
/obj/item/reagent_containers/food/snacks/Initialize()
. = ..()
if(nutriment_amt)
reagents.add_reagent("nutriment",(nutriment_amt*2),nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT,(nutriment_amt*2),nutriment_desc)
//Placeholder for effect that trigger on eating that aren't tied to reagents.
/obj/item/reagent_containers/food/snacks/proc/On_Consume(var/mob/living/M)
@@ -116,7 +116,7 @@
var/swallow_whole = FALSE
var/obj/belly/belly_target // These are surprise tools that will help us later
var/fullness = M.nutrition + (M.reagents.get_reagent_amount("nutriment") * 25)
var/fullness = M.nutrition + (M.reagents.get_reagent_amount(REAGENT_ID_NUTRIMENT) * 25)
if(M == user) //If you're eating it yourself
if(istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M
@@ -460,7 +460,7 @@
/obj/item/reagent_containers/food/snacks/candy/donor/Initialize()
. = ..()
reagents.add_reagent("sugar", 3)
reagents.add_reagent(REAGENT_ID_SUGAR, 3)
/obj/item/reagent_containers/food/snacks/candy_corn
name = "candy corn"
@@ -475,7 +475,7 @@
/obj/item/reagent_containers/food/snacks/candy_corn/Initialize()
. = ..()
reagents.add_reagent("sugar", 2)
reagents.add_reagent(REAGENT_ID_SUGAR, 2)
/obj/item/reagent_containers/food/snacks/chocolatebar //not a vending item
name = "Chocolate Bar"
@@ -489,7 +489,7 @@
/obj/item/reagent_containers/food/snacks/chocolatebar/Initialize()
. = ..()
reagents.add_reagent("sugar", 2)
reagents.add_reagent(REAGENT_ID_SUGAR, 2)
reagents.add_reagent("coco", 2)
/obj/item/reagent_containers/food/snacks/chocolatepiece
@@ -527,7 +527,7 @@
/obj/item/reagent_containers/food/snacks/chocolateegg/Initialize()
. = ..()
reagents.add_reagent("sugar", 2)
reagents.add_reagent(REAGENT_ID_SUGAR, 2)
reagents.add_reagent("coco", 2)
/obj/item/reagent_containers/food/snacks/donut
@@ -548,7 +548,7 @@
desc = "A plain ol' donut."
/obj/item/reagent_containers/food/snacks/donut/plain/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/plain/jelly
name = "plain jelly donut"
@@ -556,7 +556,7 @@
desc = "At least this one has jelly!"
/obj/item/reagent_containers/food/snacks/donut/plain/jelly/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
/obj/item/reagent_containers/food/snacks/donut/pink
@@ -566,7 +566,7 @@
overlay_state = "donut_pink_inbox"
/obj/item/reagent_containers/food/snacks/donut/pink/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/pink/jelly
name = "pink frosted jelly donut"
@@ -574,7 +574,7 @@
desc = "This one has pink frosting and a jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/pink/jelly/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
/obj/item/reagent_containers/food/snacks/donut/purple
@@ -584,7 +584,7 @@
overlay_state = "donut_purple_inbox"
/obj/item/reagent_containers/food/snacks/donut/purple/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/purple/jelly
name = "purple frosted jelly donut"
@@ -592,7 +592,7 @@
desc = "This one has purple frosting and a jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/purple/jelly/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
/obj/item/reagent_containers/food/snacks/donut/green
@@ -602,7 +602,7 @@
overlay_state = "donut_green_inbox"
/obj/item/reagent_containers/food/snacks/donut/green/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/green/jelly
name = "green frosted jelly donut"
@@ -610,7 +610,7 @@
desc = "This one has green frosting and a jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/green/jelly/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
/obj/item/reagent_containers/food/snacks/donut/beige
@@ -620,7 +620,7 @@
overlay_state = "donut_beige_inbox"
/obj/item/reagent_containers/food/snacks/donut/beige/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/beige/jelly
name = "beige frosted jelly donut"
@@ -628,7 +628,7 @@
desc = "This one has beige frosting and a jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/beige/jelly/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
/obj/item/reagent_containers/food/snacks/donut/choc
@@ -638,7 +638,7 @@
overlay_state = "donut_choc_inbox"
/obj/item/reagent_containers/food/snacks/donut/choc/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("chocolate", 5)
/obj/item/reagent_containers/food/snacks/donut/choc/jelly
@@ -647,7 +647,7 @@
desc = "This one has chocolate frosting and a jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/choc/jelly/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
reagents.add_reagent("chocolate", 5)
@@ -658,7 +658,7 @@
overlay_state = "donut_blue_inbox"
/obj/item/reagent_containers/food/snacks/donut/blue/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/blue/jelly
name = "blue frosted jelly donut"
@@ -666,7 +666,7 @@
desc = "This one has blue frosting and a jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/blue/jelly/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
/obj/item/reagent_containers/food/snacks/donut/yellow
@@ -676,7 +676,7 @@
overlay_state = "donut_yellow_inbox"
/obj/item/reagent_containers/food/snacks/donut/yellow/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/yellow/jelly
name = "yellow frosted jelly donut"
@@ -684,7 +684,7 @@
desc = "This one has yellow frosting and a jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/yellow/jelly/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
/obj/item/reagent_containers/food/snacks/donut/olive
@@ -694,7 +694,7 @@
overlay_state = "donut_olive_inbox"
/obj/item/reagent_containers/food/snacks/donut/olive/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/olive/jelly
name = "olive frosted jelly donut"
@@ -702,7 +702,7 @@
desc = "This one has olive frosting and a jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/olive/jelly/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
/obj/item/reagent_containers/food/snacks/donut/homer
@@ -712,7 +712,7 @@
overlay_state = "donut_homer_inbox"
/obj/item/reagent_containers/food/snacks/donut/homer/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("sprinkles", 1)
/obj/item/reagent_containers/food/snacks/donut/homer/jelly
@@ -721,7 +721,7 @@
desc = "It's a d'ohnut with jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/homer/jelly/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("sprinkles", 1)
reagents.add_reagent("berryjuice", 5)
@@ -732,7 +732,7 @@
overlay_state = "donut_choc_sprinkles_inbox"
/obj/item/reagent_containers/food/snacks/donut/choc_sprinkles/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("sprinkles", 1)
reagents.add_reagent("chocolate", 1)
@@ -742,7 +742,7 @@
desc = "Pretty sure this is the most sugar you can pack into a donut."
/obj/item/reagent_containers/food/snacks/donut/choc_sprinkles/jelly/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("sprinkles", 1)
reagents.add_reagent("berryjuice", 5)
reagents.add_reagent("chocolate", 1)
@@ -763,7 +763,7 @@
overlay_state = "donut_laugh_inbox"
/obj/item/reagent_containers/food/snacks/donut/laugh/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/laugh/jelly
name = "laugh jelly donut"
@@ -771,7 +771,7 @@
desc = "Try not to be jelly."
/obj/item/reagent_containers/food/snacks/donut/laugh/jelly/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
@@ -789,7 +789,7 @@
reagents.add_reagent("sprinkles", 1)
switch(rand(1,10))
if(1)
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
if(2)
reagents.add_reagent("capsaicin", 3)
if(3)
@@ -909,7 +909,7 @@
/obj/item/reagent_containers/food/snacks/friedegg/Initialize()
. = ..()
reagents.add_reagent("protein", 3)
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
reagents.add_reagent("blackpepper", 1)
/obj/item/reagent_containers/food/snacks/boiledegg
@@ -1016,7 +1016,7 @@
/obj/item/reagent_containers/food/snacks/crab_legs/Initialize()
. = ..()
reagents.add_reagent("seafood", 6)
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
/obj/item/reagent_containers/food/snacks/fishfingers
name = "Fish Fingers"
@@ -1054,7 +1054,7 @@
/obj/item/reagent_containers/food/snacks/mushroomslice/Initialize()
. = ..()
reagents.add_reagent("psilocybin", 3)
reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 3)
/obj/item/reagent_containers/food/snacks/tomatomeat
name = "tomato slice"
@@ -1090,7 +1090,7 @@
/obj/item/reagent_containers/food/snacks/xenomeat/Initialize()
. = ..()
reagents.add_reagent("protein", 6)
reagents.add_reagent("pacid",6)
reagents.add_reagent(REAGENT_ID_PACID,6)
/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat // Substitute for recipes requiring xeno meat.
name = "spider meat"
@@ -1102,8 +1102,8 @@
/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat/Initialize()
. = ..()
reagents.add_reagent("spidertoxin",6)
reagents.remove_reagent("pacid",6)
reagents.add_reagent(REAGENT_ID_SPIDERTOXIN,6)
reagents.remove_reagent(REAGENT_ID_PACID,6)
/obj/item/reagent_containers/food/snacks/meatball
name = "meatball"
@@ -1212,7 +1212,7 @@
icon_state = "dankpocket"
nutriment_amt = 2
nutriment_desc = list("heartiness" = 1, "dough" = 2)
heated_reagents = list("bliss" = 5)
heated_reagents = list(REAGENT_ID_BLISS = 5)
/obj/item/reagent_containers/food/snacks/donkpocket/sinpocket
name = "\improper Sin-pocket"
@@ -1518,7 +1518,7 @@
/obj/item/reagent_containers/food/snacks/amanita_pie/Initialize()
. = ..()
reagents.add_reagent("amatoxin", 3)
reagents.add_reagent("psilocybin", 1)
reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 1)
/obj/item/reagent_containers/food/snacks/plump_pie
name = "plump pie"
@@ -1535,7 +1535,7 @@
if(prob(10))
name = "exceptional plump pie"
desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!"
reagents.add_reagent("nutriment", 8, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 8, nutriment_desc)
reagents.add_reagent("tricordrazine", 5)
/obj/item/reagent_containers/food/snacks/xemeatpie
@@ -1752,7 +1752,7 @@
/obj/item/reagent_containers/food/snacks/blackpudding/Initialize()
. = ..()
reagents.add_reagent("protein", 2)
reagents.add_reagent("blood", 5)
reagents.add_reagent(REAGENT_ID_BLOOD, 5)
/obj/item/reagent_containers/food/snacks/soydope
name = "Soy Dope"
@@ -1786,7 +1786,7 @@
/obj/item/reagent_containers/food/snacks/badrecipe/Initialize()
. = ..()
reagents.add_reagent("toxin", 1)
reagents.add_reagent("carbon", 3)
reagents.add_reagent(REAGENT_ID_CARBON, 3)
/obj/item/reagent_containers/food/snacks/meatsteak
name = "Meat steak"
@@ -1800,7 +1800,7 @@
/obj/item/reagent_containers/food/snacks/meatsteak/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
reagents.add_reagent("blackpepper", 1)
/obj/item/reagent_containers/food/snacks/spacylibertyduff
@@ -1816,7 +1816,7 @@
/obj/item/reagent_containers/food/snacks/spacylibertyduff/Initialize()
. = ..()
reagents.add_reagent("psilocybin", 6)
reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 6)
/obj/item/reagent_containers/food/snacks/amanitajelly
name = "Amanita Jelly"
@@ -1832,7 +1832,7 @@
/obj/item/reagent_containers/food/snacks/amanitajelly/Initialize()
. = ..()
reagents.add_reagent("amatoxin", 6)
reagents.add_reagent("psilocybin", 3)
reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 3)
/obj/item/reagent_containers/food/snacks/poppypretzel
name = "Poppy pretzel"
@@ -1895,7 +1895,7 @@
Expand()
/obj/item/reagent_containers/food/snacks/monkeycube/on_reagent_change()
if(reagents.has_reagent("water"))
if(reagents.has_reagent(REAGENT_ID_WATER))
Expand()
/obj/item/reagent_containers/food/snacks/monkeycube/wrapped
@@ -1981,7 +1981,7 @@
reagents.add_reagent("protein", 10)
reagents.add_reagent("banana", 5)
reagents.add_reagent("blackpepper", 1)
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
/obj/item/reagent_containers/food/snacks/baguette
name = "Baguette"
@@ -1996,7 +1996,7 @@
/obj/item/reagent_containers/food/snacks/baguette/Initialize()
. = ..()
reagents.add_reagent("blackpepper", 1)
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
/obj/item/reagent_containers/food/snacks/fishandchips
name = "Fish and Chips"
@@ -2025,7 +2025,7 @@
/obj/item/reagent_containers/food/snacks/rofflewaffles/Initialize()
. = ..()
reagents.add_reagent("psilocybin", 8)
reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 8)
/obj/item/reagent_containers/food/snacks/jelliedtoast
name = "Jellied Toast"
@@ -2290,7 +2290,7 @@
/obj/item/reagent_containers/food/snacks/toastedsandwich/Initialize()
. = ..()
reagents.add_reagent("protein", 3)
reagents.add_reagent("carbon", 2)
reagents.add_reagent(REAGENT_ID_CARBON, 2)
/obj/item/reagent_containers/food/snacks/grilledcheese
name = "Grilled Cheese Sandwich"
@@ -2358,7 +2358,7 @@
if(prob(10))
name = "exceptional plump helmet biscuit"
desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!"
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/chawanmushi
name = "chawanmushi"
@@ -2431,7 +2431,7 @@
/obj/item/reagent_containers/food/snacks/meatballsoup/Initialize()
. = ..()
reagents.add_reagent("protein", 8)
reagents.add_reagent("water", 5)
reagents.add_reagent(REAGENT_ID_WATER, 5)
/obj/item/reagent_containers/food/snacks/slimesoup
name = "slime soup"
@@ -2444,7 +2444,7 @@
/obj/item/reagent_containers/food/snacks/slimesoup/Initialize()
. = ..()
reagents.add_reagent("slimejelly", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent(REAGENT_ID_WATER, 10)
/obj/item/reagent_containers/food/snacks/bloodsoup
name = "Tomato soup"
@@ -2458,8 +2458,8 @@
/obj/item/reagent_containers/food/snacks/bloodsoup/Initialize()
. = ..()
reagents.add_reagent("protein", 2)
reagents.add_reagent("blood", 10)
reagents.add_reagent("water", 5)
reagents.add_reagent(REAGENT_ID_BLOOD, 10)
reagents.add_reagent(REAGENT_ID_WATER, 5)
/obj/item/reagent_containers/food/snacks/clownstears
name = JOB_CLOWN + "'s Tears"
@@ -2475,7 +2475,7 @@
/obj/item/reagent_containers/food/snacks/clownstears/Initialize()
. = ..()
reagents.add_reagent("banana", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent(REAGENT_ID_WATER, 10)
/obj/item/reagent_containers/food/snacks/vegetablesoup
name = "Vegetable soup"
@@ -2490,7 +2490,7 @@
/obj/item/reagent_containers/food/snacks/vegetablesoup/Initialize()
. = ..()
reagents.add_reagent("vegetable_soup", 10)
reagents.add_reagent(REAGENT_ID_VEGETABLESOUP, 10)
/obj/item/reagent_containers/food/snacks/nettlesoup
name = "Nettle soup"
@@ -2506,7 +2506,7 @@
/obj/item/reagent_containers/food/snacks/nettlesoup/Initialize()
. = ..()
reagents.add_reagent("water", 5)
reagents.add_reagent(REAGENT_ID_WATER, 5)
reagents.add_reagent("tricordrazine", 5)
/obj/item/reagent_containers/food/snacks/mysterysoup
@@ -2526,37 +2526,37 @@
var/mysteryselect = pick(1,2,3,4,5,6,7,8,9,10)
switch(mysteryselect)
if(1)
reagents.add_reagent("nutriment", 6, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc)
reagents.add_reagent("capsaicin", 3)
reagents.add_reagent("tomatojuice", 2)
if(2)
reagents.add_reagent("nutriment", 6, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc)
reagents.add_reagent("frostoil", 3)
reagents.add_reagent("tomatojuice", 2)
if(3)
reagents.add_reagent("nutriment", 5, nutriment_desc)
reagents.add_reagent("water", 5)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5, nutriment_desc)
reagents.add_reagent(REAGENT_ID_WATER, 5)
reagents.add_reagent("tricordrazine", 5)
if(4)
reagents.add_reagent("nutriment", 5, nutriment_desc)
reagents.add_reagent("water", 10)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5, nutriment_desc)
reagents.add_reagent(REAGENT_ID_WATER, 10)
if(5)
reagents.add_reagent("nutriment", 2, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 2, nutriment_desc)
reagents.add_reagent("banana", 10)
if(6)
reagents.add_reagent("nutriment", 6, nutriment_desc)
reagents.add_reagent("blood", 10)
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("water", 10)
reagents.add_reagent(REAGENT_ID_WATER, 10)
if(8)
reagents.add_reagent("carbon", 10)
reagents.add_reagent(REAGENT_ID_CARBON, 10)
reagents.add_reagent("toxin", 10)
if(9)
reagents.add_reagent("nutriment", 5, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5, nutriment_desc)
reagents.add_reagent("tomatojuice", 10)
if(10)
reagents.add_reagent("nutriment", 6, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc)
reagents.add_reagent("tomatojuice", 5)
reagents.add_reagent("imidazoline", 5)
@@ -2572,10 +2572,10 @@
/obj/item/reagent_containers/food/snacks/wishsoup/Initialize()
. = ..()
reagents.add_reagent("water", 10)
reagents.add_reagent(REAGENT_ID_WATER, 10)
if(prob(25))
src.desc = "A wish come true!"
reagents.add_reagent("nutriment", 8, list("something good" = 8))
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 8, list("something good" = 8))
/obj/item/reagent_containers/food/snacks/tomatosoup
name = "Tomato Soup"
@@ -2589,7 +2589,7 @@
/obj/item/reagent_containers/food/snacks/tomatosoup/Initialize()
. = ..()
reagents.add_reagent("tomato_soup", 10)
reagents.add_reagent(REAGENT_ID_TOMATOSOUP, 10)
/obj/item/reagent_containers/food/snacks/mushroomsoup
name = "chantrelle soup"
@@ -2603,7 +2603,7 @@
/obj/item/reagent_containers/food/snacks/mushroomsoup/Initialize()
. = ..()
reagents.add_reagent("mushroom_soup", 10)
reagents.add_reagent(REAGENT_ID_MUSHROOMSOUP, 10)
/obj/item/reagent_containers/food/snacks/beetsoup
name = "beet soup"
@@ -2618,7 +2618,7 @@
/obj/item/reagent_containers/food/snacks/beetsoup/Initialize()
. = ..()
name = pick(list("borsch","bortsch","borstch","borsh","borshch","borscht"))
reagents.add_reagent("beet_soup", 10)
reagents.add_reagent(REAGENT_ID_BEETSOUP, 10)
/obj/item/reagent_containers/food/snacks/soup/onion
name = "onion soup"
@@ -2632,7 +2632,7 @@
/obj/item/reagent_containers/food/snacks/soup/onion/Initialize()
. = ..()
reagents.add_reagent("onion_soup", 10)
reagents.add_reagent(REAGENT_ID_ONIONSOUP, 10)
/obj/item/reagent_containers/food/snacks/chickennoodlesoup
name = "chicken noodle soup"
@@ -2644,7 +2644,7 @@
/obj/item/reagent_containers/food/snacks/chickennoodlesoup/Initialize()
. = ..()
reagents.add_reagent("chicken_noodle_soup", 10)
reagents.add_reagent(REAGENT_ID_CHICKENNOODLESOUP, 10)
/obj/item/reagent_containers/food/snacks/stew
name = "Stew"
@@ -2664,7 +2664,7 @@
reagents.add_reagent("protein", 4)
reagents.add_reagent("tomatojuice", 5)
reagents.add_reagent("imidazoline", 5)
reagents.add_reagent("water", 5)
reagents.add_reagent(REAGENT_ID_WATER, 5)
/obj/item/reagent_containers/food/snacks/bearstew
name = "bear stew"
@@ -2684,7 +2684,7 @@
reagents.add_reagent("hyperzine", 5)
reagents.add_reagent("tomatojuice", 5)
reagents.add_reagent("imidazoline", 5)
reagents.add_reagent("water", 5)
reagents.add_reagent(REAGENT_ID_WATER, 5)
/obj/item/reagent_containers/food/snacks/hotchili
@@ -3435,7 +3435,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/cosmicbrownies/Initialize()
. = ..()
reagents.add_reagent("protein", 2)
reagents.add_reagent("ambrosia_extract", 2)
reagents.add_reagent(REAGENT_ID_AMBROSIAEXTRACT, 2)
reagents.add_reagent("bicaridine", 1)
reagents.add_reagent("kelotane", 1)
reagents.add_reagent("toxin", 1)
@@ -3503,7 +3503,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/buchedenoel/Initialize()
. = ..()
reagents.add_reagent("sugar", 9)
reagents.add_reagent(REAGENT_ID_SUGAR, 9)
reagents.add_reagent("coco", 5)
/obj/item/reagent_containers/food/snacks/bucheslice
@@ -3531,7 +3531,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/turkey/Initialize()
. = ..()
reagents.add_reagent("blackpepper", 1)
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
reagents.add_reagent("cookingoil", 1)
/obj/item/reagent_containers/food/snacks/turkeyslice
@@ -3561,7 +3561,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/turkey/Initialize()
. = ..()
reagents.add_reagent("blackpepper", 1)
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
reagents.add_reagent("cookingoil", 1)
/obj/item/reagent_containers/food/snacks/sliceable/turkey/on_slice_extra()
@@ -4039,7 +4039,7 @@
/obj/item/reagent_containers/food/snacks/dionaroast/Initialize()
. = ..()
reagents.add_reagent("radium", 2)
reagents.add_reagent(REAGENT_ID_RADIUM, 2)
/obj/item/reagent_containers/food/snacks/dough
name = "dough"
@@ -4281,7 +4281,7 @@
reagents.add_reagent("oxycodone", 1)
reagents.add_reagent("sifsap", 5)
reagents.add_reagent("bliss", 5)
reagents.add_reagent(REAGENT_ID_BLISS, 5)
/obj/item/reagent_containers/food/snacks/bellefritter
name = "frostbelle fritters"
@@ -4295,7 +4295,7 @@
/obj/item/reagent_containers/food/snacks/bellefritter/Initialize()
. = ..()
reagents.add_reagent("batter", 10)
reagents.add_reagent("sugar", 5)
reagents.add_reagent(REAGENT_ID_SUGAR, 5)
/obj/item/reagent_containers/food/snacks/roastedsunflower
name = "sunflower seeds"
@@ -4333,7 +4333,7 @@
/obj/item/reagent_containers/food/snacks/liquidfood/Initialize()
. = ..()
reagents.add_reagent("iron", 3)
reagents.add_reagent(REAGENT_ID_IRON, 3)
/obj/item/reagent_containers/food/snacks/liquidprotein
name = "\improper LiquidProtein Ration"
@@ -4349,7 +4349,7 @@
/obj/item/reagent_containers/food/snacks/liquidprotein/Initialize()
. = ..()
reagents.add_reagent("protein", 30)
reagents.add_reagent("iron", 3)
reagents.add_reagent(REAGENT_ID_IRON, 3)
/obj/item/reagent_containers/food/snacks/liquidvitamin
name = "\improper VitaPaste Ration"
@@ -4368,7 +4368,7 @@
reagents.add_reagent("tricordrazine", 5)
reagents.add_reagent("paracetamol", 5)
reagents.add_reagent("enzyme", 1)
reagents.add_reagent("iron", 3)
reagents.add_reagent(REAGENT_ID_IRON, 3)
/obj/item/reagent_containers/food/snacks/meatcube
name = "cubed meat"
@@ -4564,7 +4564,7 @@
icon_state = "rosesalad"
filling_color = "#FF3867"
nutriment_amt = 10
nutriment_desc = list("bittersweet" = 10, "iron" = 5)
nutriment_desc = list("bittersweet" = 10, REAGENT_ID_IRON = 5)
bitesize = 4
/obj/item/reagent_containers/food/snacks/rosesalad/Initialize()
@@ -4919,7 +4919,7 @@
// composition_reagent = "slimejelly"
/mob/living/carbon/alien/diona
composition_reagent = "nutriment"//Dionae are plants, so eating them doesn't give animal protein
composition_reagent = REAGENT_ID_NUTRIMENT//Dionae are plants, so eating them doesn't give animal protein
/mob/living/simple_mob/slime
composition_reagent = "slimejelly"
@@ -5009,7 +5009,7 @@
/obj/item/reagent_containers/food/snacks/funnelcake/Initialize()
. = ..()
reagents.add_reagent("batter", 10)
reagents.add_reagent("sugar", 5)
reagents.add_reagent(REAGENT_ID_SUGAR, 5)
/obj/item/reagent_containers/food/snacks/spreads
name = "nutri-spread"
@@ -5031,7 +5031,7 @@
/obj/item/reagent_containers/food/snacks/spreads/Initialize()
. = ..()
reagents.add_reagent("triglyceride", 20)
reagents.add_reagent("sodiumchloride",1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE,1)
/obj/item/reagent_containers/food/snacks/rawcutlet/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W,/obj/item/material/knife))
@@ -6190,7 +6190,7 @@
/obj/item/reagent_containers/food/snacks/candy/Initialize()
. = ..()
reagents.add_reagent("sugar", 3)
reagents.add_reagent(REAGENT_ID_SUGAR, 3)
/obj/item/reagent_containers/food/snacks/namagashi
name = "\improper Ryo-kucha Namagashi"
@@ -6206,7 +6206,7 @@
/obj/item/reagent_containers/food/snacks/namagashi/Initialize()
. = ..()
reagents.add_reagent("sugar", 2)
reagents.add_reagent(REAGENT_ID_SUGAR, 2)
/obj/item/reagent_containers/food/snacks/candy/proteinbar
name = "\improper SwoleMAX protein bar"
@@ -6222,7 +6222,7 @@
/obj/item/reagent_containers/food/snacks/candy/proteinbar/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
reagents.add_reagent("sugar", 4)
reagents.add_reagent(REAGENT_ID_SUGAR, 4)
/obj/item/reagent_containers/food/snacks/candy/gummy
name = "\improper AlliCo Gummies"
@@ -6237,7 +6237,7 @@
/obj/item/reagent_containers/food/snacks/candy/gummy/Initialize()
. = ..()
reagents.add_reagent("sugar", 5)
reagents.add_reagent(REAGENT_ID_SUGAR, 5)
/obj/item/reagent_containers/food/snacks/cookiesnack
name = "Carps Ahoy! miniature cookies"
@@ -6259,12 +6259,12 @@
icon_state = "fruitbar"
trash = /obj/item/trash/candy/fruitbar
nutriment_amt = 13
nutriment_desc = list("apricot" = 2, "sugar" = 2, "dates" = 2, "cranberry" = 2, "apple" = 2)
nutriment_desc = list("apricot" = 2, REAGENT_ID_SUGAR = 2, "dates" = 2, "cranberry" = 2, "apple" = 2)
bitesize = 6
/obj/item/reagent_containers/food/snacks/fruitbar/Initialize()
. = ..()
reagents.add_reagent("sugar", 4)
reagents.add_reagent(REAGENT_ID_SUGAR, 4)
/////////////////////////////////////////////////////////////////////////////
//////////////////////////////Candy Bars (1-10)//////////////////////////////
@@ -6285,7 +6285,7 @@
/obj/item/reagent_containers/food/snacks/cb01/Initialize()
. = ..()
reagents.add_reagent("sugar", 1)
reagents.add_reagent(REAGENT_ID_SUGAR, 1)
/obj/item/reagent_containers/food/snacks/cb02
name = "\improper Hundred-Thousand Thaler Bar"
@@ -6302,7 +6302,7 @@
/obj/item/reagent_containers/food/snacks/cb02/Initialize()
. = ..()
reagents.add_reagent("sugar", 1)
reagents.add_reagent(REAGENT_ID_SUGAR, 1)
/obj/item/reagent_containers/food/snacks/cb03
name = "\improper Aerostat Bar"
@@ -6319,7 +6319,7 @@
/obj/item/reagent_containers/food/snacks/cb03/Initialize()
. = ..()
reagents.add_reagent("sugar", 1)
reagents.add_reagent(REAGENT_ID_SUGAR, 1)
/obj/item/reagent_containers/food/snacks/cb04
name = "\improper Lars' Saltlakris"
@@ -6336,7 +6336,7 @@
/obj/item/reagent_containers/food/snacks/cb04/Initialize()
. = ..()
reagents.add_reagent("sugar", 1)
reagents.add_reagent(REAGENT_ID_SUGAR, 1)
/obj/item/reagent_containers/food/snacks/cb05
name = "\improper Andromeda Bar"
@@ -6353,7 +6353,7 @@
/obj/item/reagent_containers/food/snacks/cb05/Initialize()
. = ..()
reagents.add_reagent("sugar", 3)
reagents.add_reagent(REAGENT_ID_SUGAR, 3)
/obj/item/reagent_containers/food/snacks/cb06
name = "\improper Mocha Crunch"
@@ -6370,7 +6370,7 @@
/obj/item/reagent_containers/food/snacks/cb06/Initialize()
. = ..()
reagents.add_reagent("sugar", 1)
reagents.add_reagent(REAGENT_ID_SUGAR, 1)
reagents.add_reagent("coffee", 1)
/obj/item/reagent_containers/food/snacks/cb07
@@ -6388,7 +6388,7 @@
/obj/item/reagent_containers/food/snacks/cb07/Initialize()
. = ..()
reagents.add_reagent("sugar", 1)
reagents.add_reagent(REAGENT_ID_SUGAR, 1)
/obj/item/reagent_containers/food/snacks/cb08
name = "\improper Cronk Bar"
@@ -6405,7 +6405,7 @@
/obj/item/reagent_containers/food/snacks/cb08/Initialize()
. = ..()
reagents.add_reagent("sugar", 2)
reagents.add_reagent(REAGENT_ID_SUGAR, 2)
/obj/item/reagent_containers/food/snacks/cb09
name = "\improper Kaju Mamma! Bar"
@@ -6422,7 +6422,7 @@
/obj/item/reagent_containers/food/snacks/cb09/Initialize()
. = ..()
reagents.add_reagent("sugar", 1)
reagents.add_reagent(REAGENT_ID_SUGAR, 1)
reagents.add_reagent("milk", 1)
reagents.add_reagent("peanutoil", 1)
@@ -6441,7 +6441,7 @@
/obj/item/reagent_containers/food/snacks/cb10/Initialize()
. = ..()
reagents.add_reagent("sugar", 1)
reagents.add_reagent(REAGENT_ID_SUGAR, 1)
reagents.add_reagent("protein", 1)
reagents.add_reagent("peanutoil", 1)
@@ -6664,7 +6664,7 @@
//
///obj/item/reagent_containers/food/snacks/spacetwinkie/Initialize()
// . = ..()
// reagents.add_reagent("sugar", 4)
// reagents.add_reagent(REAGENT_ID_SUGAR, 4)
/obj/item/reagent_containers/food/snacks/cheesiehonkers
name = "Cheesie Honkers"
@@ -6936,12 +6936,12 @@
/obj/item/reagent_containers/food/snacks/old/Initialize()
.=..()
reagents.add_reagent(pick(list(
"fuel",
REAGENT_ID_FUEL,
"amatoxin",
"carpotoxin",
"zombiepowder",
"cryptobiolin",
"psilocybin")), 5)
REAGENT_ID_PSILOCYBIN)), 5)
reagents.add_reagent("salmonella", 5)
/obj/item/reagent_containers/food/snacks/old/pizza
@@ -6997,7 +6997,7 @@
/obj/item/reagent_containers/food/snacks/canned/beef/Initialize()
.=..()
reagents.add_reagent("protein", 4)
reagents.add_reagent("sodiumchloride", 2)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 2)
/obj/item/reagent_containers/food/snacks/canned/beans
name = "baked beans"
@@ -7027,7 +7027,7 @@
/obj/item/reagent_containers/food/snacks/canned/tomato/Initialize()
.=..()
reagents.add_reagent("tomato_soup", 12)
reagents.add_reagent(REAGENT_ID_TOMATOSOUP, 12)
/obj/item/reagent_containers/food/snacks/canned/spinach
name = "spinach"
@@ -7044,7 +7044,7 @@
.=..()
reagents.add_reagent("adrenaline", 4)
reagents.add_reagent("hyperzine", 4)
reagents.add_reagent("iron", 4)
reagents.add_reagent(REAGENT_ID_IRON, 4)
//////////////////////////////Advanced Canned Food//////////////////////////////
@@ -7092,7 +7092,7 @@
/obj/item/reagent_containers/food/snacks/canned/maps/Initialize()
. = ..()
reagents.add_reagent("protein", 6)
reagents.add_reagent("sodiumchloride", 2)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 2)
/obj/item/reagent_containers/food/snacks/canned/appleberry
name = "\improper Appleberry Bits"
@@ -7108,7 +7108,7 @@
/obj/item/reagent_containers/food/snacks/canned/appleberry/Initialize()
. = ..()
reagents.add_reagent("milk", 8)
reagents.add_reagent("sugar", 5)
reagents.add_reagent(REAGENT_ID_SUGAR, 5)
/obj/item/reagent_containers/food/snacks/canned/ntbeans
name = "baked beans"
@@ -7137,7 +7137,7 @@
filling_color = "#caa3c9"
center_of_mass = list("x"=15, "y"=9)
bitesize = 2
var/brainmeat = "brain_protein"
var/brainmeat = REAGENT_ID_BRAINPROTEIN
/obj/item/reagent_containers/food/snacks/canned/brainzsnax/Initialize()
. = ..()
@@ -7155,7 +7155,7 @@
filling_color = "#a6898d"
center_of_mass = list("x"=15, "y"=9)
bitesize = 2
brainmeat = "red_brain_protein"
brainmeat = REAGENT_ID_REDBRAINPROTEIN
//////////////Packaged Food - break open and eat//////////////
@@ -7221,7 +7221,7 @@
/obj/item/reagent_containers/food/snacks/packaged/spacetwinkie/Initialize()
. = ..()
reagents.add_reagent("sugar", 4)
reagents.add_reagent(REAGENT_ID_SUGAR, 4)
/obj/item/reagent_containers/food/snacks/packaged/genration
name = "generic ration"
@@ -7277,7 +7277,7 @@
/obj/item/reagent_containers/food/snacks/packaged/sweetration/Initialize()
. = ..()
reagents.add_reagent("sugar", 6)
reagents.add_reagent(REAGENT_ID_SUGAR, 6)
/obj/item/reagent_containers/food/snacks/packaged/vendburger
name = "packaged burger"
@@ -7290,7 +7290,7 @@
/obj/item/reagent_containers/food/snacks/packaged/vendburger/Initialize()
. = ..()
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
/obj/item/reagent_containers/food/snacks/packaged/vendhotdog
name = "packaged hotdog"
@@ -7303,7 +7303,7 @@
/obj/item/reagent_containers/food/snacks/packaged/vendhotdog/Initialize()
. = ..()
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
/obj/item/reagent_containers/food/snacks/packaged/vendburrito
name = "packaged burrito"
@@ -7316,4 +7316,4 @@
/obj/item/reagent_containers/food/snacks/packaged/vendburrito/Initialize()
. = ..()
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
code/modules/food/food/snacks/meat.dm
+4 -4
View File
@@ -80,7 +80,7 @@
/obj/item/reagent_containers/food/snacks/hugemushroomslice/Initialize()
. = ..()
reagents.add_reagent("psilocybin", 3)
reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 3)
/obj/item/reagent_containers/food/snacks/tomatomeat
name = "tomato slice"
@@ -116,7 +116,7 @@
/obj/item/reagent_containers/food/snacks/xenomeat/Initialize()
. = ..()
reagents.add_reagent("protein", 6)
reagents.add_reagent("pacid",6)
reagents.add_reagent(REAGENT_ID_PACID,6)
/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat // Substitute for recipes requiring xeno meat.
name = "insect meat"
@@ -128,8 +128,8 @@
/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat/Initialize()
. = ..()
reagents.add_reagent("spidertoxin",6)
reagents.remove_reagent("pacid",6)
reagents.add_reagent(REAGENT_ID_SPIDERTOXIN,6)
reagents.remove_reagent(REAGENT_ID_PACID,6)
/obj/item/reagent_containers/food/snacks/rawturkey
name = "raw turkey"
code/modules/food/food/snacks_vr.dm
+26 -26
View File
@@ -38,7 +38,7 @@
/obj/item/reagent_containers/food/snacks/goulash/Initialize()
. = ..()
reagents.add_reagent("protein", 3) //For meaty things.
reagents.add_reagent("water", 5)
reagents.add_reagent(REAGENT_ID_WATER, 5)
/obj/item/reagent_containers/food/snacks/donerkebab
@@ -79,7 +79,7 @@
/obj/item/reagent_containers/food/snacks/reishicup/Initialize()
. = ..()
reagents.add_reagent("psilocybin", 3)
reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 3)
bitesize = 6
/obj/item/storage/box/wings //This is kinda like the donut box.
@@ -134,7 +134,7 @@
/obj/item/reagent_containers/food/snacks/hotandsoursoup/Initialize()
. = ..()
bitesize = 2
reagents.add_reagent("hot_n_sour_soup", 10)
reagents.add_reagent(REAGENT_ID_HOTNSOURSOUP, 10)
/obj/item/reagent_containers/food/snacks/kitsuneudon
name = "kitsune udon"
@@ -178,7 +178,7 @@
/obj/item/reagent_containers/food/snacks/bugball/Initialize()
. = ..()
reagents.add_reagent("protein", 1)
reagents.add_reagent("carbon", 5)
reagents.add_reagent(REAGENT_ID_CARBON, 5)
bitesize = 7
/obj/item/reagent_containers/food/snacks/pillbug
@@ -207,7 +207,7 @@
/obj/item/reagent_containers/food/snacks/pillbug/Initialize()
. = ..()
reagents.add_reagent("protein", 1)
reagents.add_reagent("carbon", 5)
reagents.add_reagent(REAGENT_ID_CARBON, 5)
bitesize = 3
/obj/item/reagent_containers/food/snacks/mammi
@@ -263,7 +263,7 @@
bitesize = 5
reagents.add_reagent("protein", 20)
reagents.add_reagent("tricordrazine", 5)
reagents.add_reagent("iron", 5)
reagents.add_reagent(REAGENT_ID_IRON, 5)
/obj/item/reagent_containers/food/snacks/cuttlefish
name = "raw cuttlefish"
@@ -343,7 +343,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/monkfishremains/Initialize()
. = ..()
bitesize = 0.01 //impossible to eat
reagents.add_reagent("carbon", 5)
reagents.add_reagent(REAGENT_ID_CARBON, 5)
/obj/item/reagent_containers/food/snacks/sliceable/sharkchunk
name = "chunk of shark meat"
@@ -472,14 +472,14 @@
qdel(src)
/obj/item/reagent_containers/food/snacks/cube/on_reagent_change()
if(reagents.has_reagent("water"))
if(reagents.has_reagent(REAGENT_ID_WATER))
Expand()
/obj/item/reagent_containers/food/snacks/cube/protein
/obj/item/reagent_containers/food/snacks/cube/protein/Initialize()
. = ..()
reagents.add_reagent("meatcolony", 5)
reagents.add_reagent(REAGENT_ID_MEATCOLONY, 5)
/obj/item/reagent_containers/food/snacks/proteinslab
name = "Protein slab"
@@ -502,7 +502,7 @@
/obj/item/reagent_containers/food/snacks/cube/nutriment/Initialize()
. = ..()
reagents.add_reagent("plantcolony", 5)
reagents.add_reagent(REAGENT_ID_PLANTCOLONY, 5)
/obj/item/reagent_containers/food/snacks/nutrimentslab
name = "Nutriment slab"
@@ -561,7 +561,7 @@
/obj/item/reagent_containers/food/snacks/nachos/Initialize()
. = ..()
reagents.add_reagent("nutriment", 1)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 1)
bitesize = 1
/obj/item/reagent_containers/food/snacks/cheesenachos
@@ -573,7 +573,7 @@
/obj/item/reagent_containers/food/snacks/cheesenachos/Initialize()
. = ..()
reagents.add_reagent("nutriment", 5)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5)
reagents.add_reagent("protein", 2)
bitesize = 2
@@ -590,7 +590,7 @@
/obj/item/reagent_containers/food/snacks/milosoup/Initialize()
. = ..()
reagents.add_reagent("water", 5)
reagents.add_reagent(REAGENT_ID_WATER, 5)
/obj/item/reagent_containers/food/snacks/onionsoup
name = "Onion Soup"
@@ -604,7 +604,7 @@
/obj/item/reagent_containers/food/snacks/onionsoup/Initialize()
. = ..()
reagents.add_reagent("onion_soup", 10)
reagents.add_reagent(REAGENT_ID_ONIONSOUP, 10)
//Fennec foods
/obj/item/storage/box/wings/bucket
@@ -691,7 +691,7 @@
/obj/item/reagent_containers/food/snacks/scorpion_cooked/Initialize()
. = ..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 2)
reagents.add_reagent("protein", 4)
bitesize = 4
@@ -736,7 +736,7 @@
/obj/item/reagent_containers/food/snacks/honey_candy/Initialize()
. = ..()
reagents.add_reagent("sugar", 2)
reagents.add_reagent(REAGENT_ID_SUGAR, 2)
bitesize = 2
/obj/item/reagent_containers/food/snacks/locust
@@ -981,28 +981,28 @@
w_class = ITEMSIZE_TINY
nutriment_amt = 1
bitesize = 2
nutriment_desc = list("sugar" = 5, "berry" = 2)
nutriment_desc = list(REAGENT_ID_SUGAR = 5, "berry" = 2)
/obj/item/reagent_containers/food/snacks/winegum/orange
icon_state = "winegum_orange"
nutriment_desc = list("sugar" = 5, "orange" = 2)
nutriment_desc = list(REAGENT_ID_SUGAR = 5, "orange" = 2)
/obj/item/reagent_containers/food/snacks/winegum/black
icon_state = "winegum_black"
nutriment_desc = list("sugar" = 5, "berry" = 2)
nutriment_desc = list(REAGENT_ID_SUGAR = 5, "berry" = 2)
/obj/item/reagent_containers/food/snacks/winegum/green
icon_state = "winegum_green"
nutriment_desc = list("sugar" = 5, "lime" = 2)
nutriment_desc = list(REAGENT_ID_SUGAR = 5, "lime" = 2)
/obj/item/reagent_containers/food/snacks/winegum/yellow
icon_state = "winegum_yellow"
nutriment_desc = list("sugar" = 5, "lemon" = 2)
nutriment_desc = list(REAGENT_ID_SUGAR = 5, "lemon" = 2)
/obj/item/reagent_containers/food/snacks/winegum/white
icon_state = "winegum_white"
nutriment_desc = list("sugar" = 5, "pineapplejuice" = 2)
nutriment_desc = list(REAGENT_ID_SUGAR = 5, "pineapplejuice" = 2)
/obj/item/storage/box/winegum //This is kinda like the donut box.
name = "Desatti Wine Gums"
@@ -1044,7 +1044,7 @@
w_class = ITEMSIZE_TINY
nutriment_amt = 1
bitesize = 2
nutriment_desc = list("sugar" = 5)
nutriment_desc = list(REAGENT_ID_SUGAR = 5)
var/list/color_options = list("saucer_pink","saucer_blue","saucer_orange","saucer_green","saucer_yellow")
/obj/item/reagent_containers/food/snacks/saucer/Initialize()
@@ -1149,7 +1149,7 @@
w_class = ITEMSIZE_TINY
nutriment_amt = 1
bitesize = 2
nutriment_desc = list("sugar" = 5, "banana" = 3)
nutriment_desc = list(REAGENT_ID_SUGAR = 5, "banana" = 3)
/obj/item/reagent_containers/food/snacks/foam_shrimp
name = "Foam Shrimp"
@@ -1159,7 +1159,7 @@
w_class = ITEMSIZE_TINY
nutriment_amt = 1
bitesize = 2
nutriment_desc = list("sugar" = 5, "strawberry" = 3)
nutriment_desc = list(REAGENT_ID_SUGAR = 5, "strawberry" = 3)
/obj/item/storage/box/shrimpsandbananas //This is kinda like the donut box.
name = "Shrimps and Bananas"
@@ -1184,7 +1184,7 @@
w_class = ITEMSIZE_TINY
nutriment_amt = 1
bitesize = 2
nutriment_desc = list("sugar" = 5, "rhubarb" = 2, "custard" = 2)
nutriment_desc = list(REAGENT_ID_SUGAR = 5, "rhubarb" = 2, "custard" = 2)
var/list/color_options = list("rhubarbcustard_1","rhubarbcustard_2")
/obj/item/reagent_containers/food/snacks/rhubarbcustard/Initialize()
code/modules/food/food/superfoods.dm
+13 -13
View File
@@ -1,7 +1,7 @@
// Chaos cake
/datum/recipe/chaoscake_layerone
reagents = list("flour" = 30,"milk" = 20, "sugar" = 10, "egg" = 9)
reagents = list("flour" = 30,"milk" = 20, REAGENT_ID_SUGAR = 10, "egg" = 9)
fruit = list("poisonberries" = 2, "cherries" = 2)
items = list(
/obj/item/reagent_containers/food/snacks/meat/,
@@ -12,7 +12,7 @@
result = /obj/structure/chaoscake
/datum/recipe/chaoscake_layertwo
reagents = list("flour" = 30, "milk" = 20, "sugar" = 10, "egg" = 9, )
reagents = list("flour" = 30, "milk" = 20, REAGENT_ID_SUGAR = 10, "egg" = 9, )
fruit = list("vanilla" = 2, "banana" = 2)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -23,7 +23,7 @@
result = /obj/item/chaoscake_layer
/datum/recipe/chaoscake_layerthree
reagents = list("flour" = 25, "milk" = 15, "sugar" = 10, "egg" = 6, "deathbell" = 10)
reagents = list("flour" = 25, "milk" = 15, REAGENT_ID_SUGAR = 10, "egg" = 6, "deathbell" = 10)
fruit = list("grapes" = 3)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -33,7 +33,7 @@
result = /obj/item/chaoscake_layer/three
/datum/recipe/chaoscake_layerfour
reagents = list("flour" = 25, "milk" = 15, "sugar" = 10, "egg" = 6, "milkshake" = 30)
reagents = list("flour" = 25, "milk" = 15, REAGENT_ID_SUGAR = 10, "egg" = 6, "milkshake" = 30)
fruit = list("rice" = 3)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -43,13 +43,13 @@
result = /obj/item/chaoscake_layer/four
/datum/recipe/chaoscake_layerfive
reagents = list("flour" = 20, "milk" = 10, "sugar" = 10, "egg" = 6, "blood" = 30)
reagents = list("flour" = 20, "milk" = 10, REAGENT_ID_SUGAR = 10, "egg" = 6, REAGENT_ID_BLOOD = 30)
fruit = list("tomato" = 2)
items = list() //supposed to be made with lobster, still has to be ported.
result = /obj/item/chaoscake_layer/five
/datum/recipe/chaoscake_layersix
reagents = list("flour" = 20, "milk" = 10, "sugar" = 10, "egg" = 6, "sprinkles" = 5)
reagents = list("flour" = 20, "milk" = 10, REAGENT_ID_SUGAR = 10, "egg" = 6, "sprinkles" = 5)
fruit = list("apple" = 2)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -62,7 +62,7 @@
result = /obj/item/chaoscake_layer/six
/datum/recipe/chaoscake_layerseven
reagents = list("flour" = 15, "milk" = 10, "sugar" = 5, "egg" = 3, "devilskiss" = 20)
reagents = list("flour" = 15, "milk" = 10, REAGENT_ID_SUGAR = 5, "egg" = 3, "devilskiss" = 20)
fruit = list("potato" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -72,7 +72,7 @@
result = /obj/item/chaoscake_layer/seven
/datum/recipe/chaoscake_layereight
reagents = list("flour" = 15, "milk" = 10, "sugar" = 5, "egg" = 3, "cream" = 20)
reagents = list("flour" = 15, "milk" = 10, REAGENT_ID_SUGAR = 5, "egg" = 3, "cream" = 20)
fruit = list("lemon" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -82,7 +82,7 @@
result = /obj/item/chaoscake_layer/eight
/datum/recipe/chaoscake_layernine
reagents = list("water" = 10, "blood" = 10)
reagents = list(REAGENT_ID_WATER = 10, REAGENT_ID_BLOOD = 10)
fruit = list("goldapple" = 1)
items = list()
result = /obj/item/chaoscake_layer/nine
@@ -194,24 +194,24 @@
reagents.add_reagent("shockchem", 2)
reagents.add_reagent("amatoxin", 2)
reagents.add_reagent("carpotoxin", 2)
reagents.add_reagent("spidertoxin", 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("bliss", 10)
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("psilocybin", 10)
reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 10)
bitesize = 30 //even a single bite won't make you escape fate.
if(3)
name = "Slice Of Evil" //acidic
desc = "A menacing slice, smelling clearly of copper, blood clots float on top."
nutriment_desc = list("Infernal Rage" = 10)
reagents.add_reagent("blood", 20)
reagents.add_reagent(REAGENT_ID_BLOOD, 20)
reagents.add_reagent("stomacid", 10)
reagents.add_reagent("mutagen", 4)
reagents.add_reagent("thirteenloko", 20)
code/modules/food/food/z_custom_food_vr.dm
+1 -1
View File
@@ -22,7 +22,7 @@ var/global/ingredientLimit = 20
. = ..()
topping = image(icon,,"[initial(icon_state)]_top")
filling = image(icon,,"[initial(icon_state)]_filling")
src.reagents.add_reagent("nutriment",3)
src.reagents.add_reagent(REAGENT_ID_NUTRIMENT,3)
src.updateName()
return
code/modules/food/glass/bottle.dm
+2 -2
View File
@@ -147,7 +147,7 @@
desc = "A small bottle. Contains a small amount of Polytrinic Acid"
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
prefill = list("pacid" = 60)
prefill = list(REAGENT_ID_PACID = 60)
/obj/item/reagent_containers/glass/bottle/adminordrazine
name = "adminordrazine bottle"
@@ -175,4 +175,4 @@
desc = "A bottle of raw biomass! Gross!"
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
prefill = list("biomass" = 60)
prefill = list("biomass" = 60)
code/modules/food/glass/bottle_potion.dm
+10 -10
View File
@@ -45,7 +45,7 @@
/obj/item/reagent_containers/glass/bottle/potion/lightness
name = "feather weight potion"
desc = "A small green bottle containing some mysterious liquid that claims to make you feel lighter."
prefill = list("ickypak" = 30)
prefill = list(REAGENT_ID_ICKYPAK = 30)
/obj/item/reagent_containers/glass/bottle/potion/SOP
name = "standard operating potion"
@@ -55,12 +55,12 @@
/obj/item/reagent_containers/glass/bottle/potion/shrink
name = "diminution potion"
desc = "A small green bottle containing some swirling cyan liquid that claims to reduce the drinkers stature."
prefill = list("microcillin" = 1)
prefill = list(REAGENT_ID_MICROCILLIN = 1)
/obj/item/reagent_containers/glass/bottle/potion/growth
name = "fire giant potion"
desc = "A small green bottle containing some bubbling yellow liquid that claims to turn the drinker into a fire giant."
prefill = list("macrocillin" = 1, "capsaicin" = 5)
prefill = list(REAGENT_ID_MACROCILLIN = 1, "capsaicin" = 5)
/obj/item/reagent_containers/glass/bottle/potion/pain
name = "grit potion"
@@ -70,12 +70,12 @@
/obj/item/reagent_containers/glass/bottle/potion/faerie
name = "faerie dance potion"
desc = "A small green bottle containing some swishing pink liquid that claims to help you open your mind."
prefill = list("psilocybin" = 30)
prefill = list(REAGENT_ID_PSILOCYBIN = 30)
/obj/item/reagent_containers/glass/bottle/potion/relaxation
name = "relaxation potion"
desc = "A small green bottle containing some still green liquid that claims to make everything feel just fine, really."
prefill = list("ambrosia_extract" = 30)
prefill = list(REAGENT_ID_AMBROSIAEXTRACT = 30)
/obj/item/reagent_containers/glass/bottle/potion/speed
name = "blinding speed potion"
@@ -90,12 +90,12 @@
/obj/item/reagent_containers/glass/bottle/potion/girljuice
name = "girl transformation potion"
desc = "A small green bottle containing some pretty pink liquid that claims to turn the drinker into a woman."
prefill = list("gynorovir" = 1)
prefill = list(REAGENT_ID_GYNOROVIR = 1)
/obj/item/reagent_containers/glass/bottle/potion/boyjuice
name = "boy transformation potion"
desc = "A small green bottle containing some strong blue liquid that claims to turn the drinker into a man."
prefill = list("androrovir" = 1)
prefill = list(REAGENT_ID_ANDROROVIR = 1)
/obj/item/reagent_containers/glass/bottle/potion/badpolymorph
name = "unstable polymorph potion"
@@ -122,17 +122,17 @@
/obj/item/reagent_containers/glass/bottle/potion/plain
name = "plain potion"
desc = "A small green bottle containing some plain transparent liquid."
prefill = list("water" = 30)
prefill = list(REAGENT_ID_WATER = 30)
/obj/item/reagent_containers/glass/bottle/potion/ethanol
name = "thin potion"
desc = "A small green bottle containing some thin transparent liquid with a solvent scent."
prefill = list("ethanol" = 30)
prefill = list(REAGENT_ID_ETHANOL = 30)
/obj/item/reagent_containers/glass/bottle/potion/sugar
name = "sweet potion"
desc = "A small green bottle containing some white translucent liquid with a sweet scent."
prefill = list("sugar" = 30)
prefill = list(REAGENT_ID_SUGAR = 30)
/obj/item/reagent_containers/glass/bottle/potion/capsaicin
name = "warm potion"
code/modules/food/glass/bottle_vr.dm
+2 -2
View File
@@ -136,14 +136,14 @@
desc = "A small bottle of ickypak. The smell alone makes you gag."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
prefill = list("ickypak" = 60)
prefill = list(REAGENT_ID_ICKYPAK = 60)
/obj/item/reagent_containers/glass/bottle/unsorbitol
name = "unsorbitol bottle"
desc = "A small bottle of unsorbitol. Sickeningly sweet."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
prefill = list("unsorbitol" = 60)
prefill = list(REAGENT_ID_UNSORBITOL = 60)
/obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose
name = "glucose container"
code/modules/food/kitchen/cooking_machines/_appliance.dm
+3 -3
View File
@@ -716,16 +716,16 @@
/mob/living/proc/calculate_composition() // moved from devour.dm on aurora's side
if (!composition_reagent)//if no reagent has been set, then we'll set one
if (isSynthetic())
src.composition_reagent = "iron"
src.composition_reagent = REAGENT_ID_IRON
else
if(istype(src, /mob/living/carbon/human/diona) || istype(src, /mob/living/carbon/alien/diona))
src.composition_reagent = "nutriment" // diona are plants, not meat
src.composition_reagent = REAGENT_ID_NUTRIMENT // diona are plants, not meat
else
src.composition_reagent = "protein"
if(istype(src, /mob/living/carbon/human))
var/mob/living/carbon/human/H = src
if(istype(H.species, /datum/species/diona))
src.composition_reagent = "nutriment"
src.composition_reagent = REAGENT_ID_NUTRIMENT
//if the mob is a simple animal - MOB NOT ANIMAL - with a defined meat quantity
if (istype(src, /mob/living/simple_mob))
code/modules/food/kitchen/gibber.dm
+1 -1
View File
@@ -209,7 +209,7 @@
var/obj/item/reagent_containers/food/snacks/meat/new_meat = new slab_type(src, rand(3,8))
if(istype(new_meat))
new_meat.name = "[slab_name] [new_meat.name]"
new_meat.reagents.add_reagent("nutriment",slab_nutrition)
new_meat.reagents.add_reagent(REAGENT_ID_NUTRIMENT,slab_nutrition)
if(src.occupant.reagents)
src.occupant.reagents.trans_to_obj(new_meat, round(occupant.reagents.total_volume/(2 + occupant.meat_amount),1))
code/modules/food/kitchen/icecream.dm
+5 -5
View File
@@ -30,9 +30,9 @@
if(ICECREAM_BLUE)
return list("milk", "ice", "singulo")
if(CONE_WAFFLE)
return list("flour", "sugar")
return list("flour", REAGENT_ID_SUGAR)
if(CONE_CHOC)
return list("flour", "sugar", "coco")
return list("flour", REAGENT_ID_SUGAR, "coco")
else
return list("milk", "ice")
@@ -58,7 +58,7 @@
product_types.Add(5)
reagents.add_reagent("milk", 5)
reagents.add_reagent("flour", 5)
reagents.add_reagent("sugar", 5)
reagents.add_reagent(REAGENT_ID_SUGAR, 5)
reagents.add_reagent("ice", 5)
/obj/machinery/icecream_vat/attack_hand(mob/user as mob)
@@ -98,7 +98,7 @@
// if(beaker)
// beaker.reagents.trans_to(I, 10)
if(I.reagents.total_volume < 10)
I.reagents.add_reagent("sugar", 10 - I.reagents.total_volume)
I.reagents.add_reagent(REAGENT_ID_SUGAR, 10 - I.reagents.total_volume)
else
to_chat(user, span_warning("There is not enough icecream left!"))
else
@@ -179,7 +179,7 @@
/obj/item/reagent_containers/food/snacks/icecream/New()
create_reagents(20)
reagents.add_reagent("nutriment", 5)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5)
/obj/item/reagent_containers/food/snacks/icecream/proc/add_ice_cream(var/flavour_name)
name = "[flavour_name] icecream"
code/modules/food/kitchen/microwave.dm
+1 -1
View File
@@ -552,7 +552,7 @@
qdel(H.held_mob)
qdel(O)
src.reagents.clear_reagents()
ffuu.reagents.add_reagent("carbon", amount)
ffuu.reagents.add_reagent(REAGENT_ID_CARBON, amount)
ffuu.reagents.add_reagent("toxin", amount/10)
return ffuu
code/modules/food/recipes_fryer.dm
+10 -10
View File
@@ -22,7 +22,7 @@
/datum/recipe/risottoballs
appliance = FRYER
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
items = list(/obj/item/reagent_containers/food/snacks/risotto)
coating = /datum/reagent/nutriment/coating/batter
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
@@ -32,7 +32,7 @@
/datum/recipe/bellefritter
appliance = FRYER
coating = /datum/reagent/nutriment/coating/batter
reagents = list("sugar" = 5)
reagents = list(REAGENT_ID_SUGAR = 5)
items = list(/obj/item/reagent_containers/food/snacks/frostbelle)
result = /obj/item/reagent_containers/food/snacks/bellefritter
result_quantity = 2
@@ -128,7 +128,7 @@
// All donuts were given reagents of 5 to equal old recipes and make for faster cook times.
/datum/recipe/jellydonut
appliance = FRYER
reagents = list("berryjuice" = 5, "sugar" = 5)
reagents = list("berryjuice" = 5, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice
)
@@ -136,23 +136,23 @@
result_quantity = 2
/datum/recipe/jellydonut/poisonberry
reagents = list("poisonberryjuice" = 5, "sugar" = 5)
reagents = list("poisonberryjuice" = 5, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/dough
)
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, "sugar" = 5)
reagents = list("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.
reagents = list("cherryjelly" = 5, "sugar" = 5)
reagents = list("cherryjelly" = 5, REAGENT_ID_SUGAR = 5)
result = /obj/item/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly
/datum/recipe/donut
appliance = FRYER
reagents = list("sugar" = 5)
reagents = list(REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice
)
@@ -161,7 +161,7 @@
/datum/recipe/chaosdonut
appliance = FRYER
reagents = list("frostoil" = 10, "capsaicin" = 10, "sugar" = 10)
reagents = list("frostoil" = 10, "capsaicin" = 10, REAGENT_ID_SUGAR = 10)
reagent_mix = RECIPE_REAGENT_REPLACE //This creates its own reagents
items = list(
/obj/item/reagent_containers/food/snacks/doughslice
@@ -171,7 +171,7 @@
/datum/recipe/funnelcake
appliance = FRYER
reagents = list("sugar" = 5, "batter" = 10)
reagents = list(REAGENT_ID_SUGAR = 5, "batter" = 10)
result = /obj/item/reagent_containers/food/snacks/funnelcake
result_quantity = 2
@@ -185,7 +185,7 @@
//VOREStation Add Start
/datum/recipe/generalschicken
appliance = FRYER
reagents = list("capsaicin" = 2, "sugar" = 2, "batter" = 10)
reagents = list("capsaicin" = 2, REAGENT_ID_SUGAR = 2, "batter" = 10)
items = list(
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat
code/modules/food/recipes_fryer_vr.dm
+3 -3
View File
@@ -1,6 +1,6 @@
/datum/recipe/generalschicken
appliance = FRYER
reagents = list("capsaicin" = 2, "sugar" = 2, "batter" = 10)
reagents = list("capsaicin" = 2, REAGENT_ID_SUGAR = 2, "batter" = 10)
items = list(
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat
@@ -30,8 +30,8 @@
/datum/recipe/locust
appliance = FRYER
reagents = list("sodiumchloride" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/locust
)
result = /obj/item/reagent_containers/food/snacks/locust_cooked
result = /obj/item/reagent_containers/food/snacks/locust_cooked
code/modules/food/recipes_grill.dm
+4 -4
View File
@@ -186,7 +186,7 @@
/datum/recipe/superbiteburger
appliance = GRILL
fruit = list("tomato" = 1)
reagents = list("sodiumchloride" = 5, "blackpepper" = 5)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 5, "blackpepper" = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bigbiteburger,
/obj/item/reagent_containers/food/snacks/dough,
@@ -247,17 +247,17 @@
/datum/recipe/omurice/heart
appliance = GRILL
reagents = list("rice" = 5, "ketchup" = 5, "sugar" = 5, "egg" = 3)
reagents = list("rice" = 5, "ketchup" = 5, REAGENT_ID_SUGAR = 5, "egg" = 3)
result = /obj/item/reagent_containers/food/snacks/omurice/heart
/datum/recipe/omurice/face
appliance = GRILL
reagents = list("rice" = 5, "ketchup" = 5, "sodiumchloride" = 1, "egg" = 3)
reagents = list("rice" = 5, "ketchup" = 5, REAGENT_ID_SODIUMCHLORIDE = 1, "egg" = 3)
result = /obj/item/reagent_containers/food/snacks/omurice/face
/datum/recipe/meatsteak
appliance = GRILL
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
items = list(/obj/item/reagent_containers/food/snacks/meat)
result = /obj/item/reagent_containers/food/snacks/meatsteak
code/modules/food/recipes_microwave.dm
+68 -68
View File
@@ -20,14 +20,14 @@ I said no!
*/
/datum/recipe/friedegg
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/egg
)
result = /obj/item/reagent_containers/food/snacks/friedegg
/datum/recipe/boiledegg
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
reagent_mix = RECIPE_REAGENT_REPLACE
items = list(
/obj/item/reagent_containers/food/snacks/egg
@@ -36,7 +36,7 @@ I said no!
/datum/recipe/devilledegg
fruit = list("chili" = 1)
reagents = list("sodiumchloride" = 2, "mayo" = 5)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "mayo" = 5)
items = list(
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg
@@ -67,7 +67,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/donkpocket //SPECIAL
/datum/recipe/muffin
reagents = list("milk" = 5, "sugar" = 5)
reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5)
reagent_mix = RECIPE_REAGENT_REPLACE
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -146,7 +146,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/cheesymash
/datum/recipe/blackpudding
reagents = list("blood" = 5)
reagents = list(REAGENT_ID_BLOOD = 5)
items = list(
/obj/item/reagent_containers/food/snacks/sausage,
)
@@ -157,7 +157,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/popcorn
/datum/recipe/fortunecookie
reagents = list("sugar" = 5)
reagents = list(REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice,
/obj/item/paper,
@@ -165,16 +165,16 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/fortunecookie
/datum/recipe/syntisteak
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
items = list(/obj/item/reagent_containers/food/snacks/meat/syntiflesh)
result = /obj/item/reagent_containers/food/snacks/meatsteak
/datum/recipe/spacylibertyduff
reagents = list("water" = 5, "vodka" = 5, "psilocybin" = 5)
reagents = list(REAGENT_ID_WATER = 5, "vodka" = 5, REAGENT_ID_PSILOCYBIN = 5)
result = /obj/item/reagent_containers/food/snacks/spacylibertyduff
/datum/recipe/amanitajelly
reagents = list("water" = 5, "vodka" = 5, "amatoxin" = 5)
reagents = list(REAGENT_ID_WATER = 5, "vodka" = 5, "amatoxin" = 5)
result = /obj/item/reagent_containers/food/snacks/amanitajelly
/datum/recipe/amanitajelly/make_food(var/obj/container as obj)
@@ -184,22 +184,22 @@ I said no!
/datum/recipe/meatballsoup
fruit = list("carrot" = 1, "potato" = 1)
reagents = list("water" = 10)
reagents = list(REAGENT_ID_WATER = 10)
items = list(/obj/item/reagent_containers/food/snacks/meatball)
result = /obj/item/reagent_containers/food/snacks/meatballsoup
/datum/recipe/vegetablesoup
fruit = list("carrot" = 1, "potato" = 1, "corn" = 1, "eggplant" = 1)
reagents = list("water" = 10)
reagents = list(REAGENT_ID_WATER = 10)
result = /obj/item/reagent_containers/food/snacks/vegetablesoup
/datum/recipe/nettlesoup
fruit = list("nettle" = 1, "potato" = 1)
reagents = list("water" = 10, "egg" = 3)
reagents = list(REAGENT_ID_WATER = 10, "egg" = 3)
result = /obj/item/reagent_containers/food/snacks/nettlesoup
/datum/recipe/wishsoup
reagents = list("water" = 20)
reagents = list(REAGENT_ID_WATER = 20)
result= /obj/item/reagent_containers/food/snacks/wishsoup
/datum/recipe/hotchili
@@ -250,11 +250,11 @@ I said no!
/datum/recipe/tomatosoup
fruit = list("tomato" = 2)
reagents = list("water" = 10)
reagents = list(REAGENT_ID_WATER = 10)
result = /obj/item/reagent_containers/food/snacks/tomatosoup
/datum/recipe/rofflewaffles
reagents = list("psilocybin" = 5, "sugar" = 10)
reagents = list(REAGENT_ID_PSILOCYBIN = 5, REAGENT_ID_SUGAR = 10)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough,
@@ -264,7 +264,7 @@ I said no!
/datum/recipe/stew
fruit = list("potato" = 1, "tomato" = 1, "carrot" = 1, "eggplant" = 1, "mushroom" = 1)
reagents = list("water" = 10)
reagents = list(REAGENT_ID_WATER = 10)
items = list(/obj/item/reagent_containers/food/snacks/meat)
result = /obj/item/reagent_containers/food/snacks/stew
@@ -283,7 +283,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry
/datum/recipe/milosoup
reagents = list("water" = 10)
reagents = list(REAGENT_ID_WATER = 10)
items = list(
/obj/item/reagent_containers/food/snacks/soydope,
/obj/item/reagent_containers/food/snacks/soydope,
@@ -301,14 +301,14 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/stewedsoymeat
/datum/recipe/boiledspagetti
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/spagetti,
)
result = /obj/item/reagent_containers/food/snacks/boiledspagetti
/datum/recipe/boiledrice
reagents = list("water" = 5, "rice" = 10)
reagents = list(REAGENT_ID_WATER = 5, "rice" = 10)
result = /obj/item/reagent_containers/food/snacks/boiledrice
/datum/recipe/ricepudding
@@ -317,12 +317,12 @@ I said no!
/datum/recipe/pastatomato
fruit = list("tomato" = 2)
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(/obj/item/reagent_containers/food/snacks/spagetti)
result = /obj/item/reagent_containers/food/snacks/pastatomato
/datum/recipe/meatballspagetti
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/spagetti,
/obj/item/reagent_containers/food/snacks/meatball,
@@ -331,7 +331,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/meatballspagetti
/datum/recipe/spesslaw
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/spagetti,
/obj/item/reagent_containers/food/snacks/meatball,
@@ -343,12 +343,12 @@ I said no!
/datum/recipe/candiedapple
fruit = list("apple" = 1)
reagents = list("water" = 5, "sugar" = 5) //Makes sense seeing as how it's just syrup on the exterior
reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_SUGAR = 5) //Makes sense seeing as how it's just syrup on the exterior
result = /obj/item/reagent_containers/food/snacks/candiedapple
/datum/recipe/caramelapple
fruit = list("apple" = 1)
reagents = list("milk" = 5, "sugar" = 5) //Since caramel can be made with milk I thought this was appropriate
reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5) //Since caramel can be made with milk I thought this was appropriate
result = /obj/item/reagent_containers/food/snacks/caramelapple
/datum/recipe/twobread
@@ -376,16 +376,16 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/jellysandwich/cherry
/datum/recipe/bloodsoup
reagents = list("blood" = 30)
reagents = list(REAGENT_ID_BLOOD = 30)
result = /obj/item/reagent_containers/food/snacks/bloodsoup
/datum/recipe/slimesoup
reagents = list("water" = 10, "slimejelly" = 5)
reagents = list(REAGENT_ID_WATER = 10, "slimejelly" = 5)
items = list()
result = /obj/item/reagent_containers/food/snacks/slimesoup
/datum/recipe/boiledslimeextract
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/slime_extract,
)
@@ -415,7 +415,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/kudzudonburi
/datum/recipe/mysterysoup
reagents = list("water" = 10, "egg" = 3)
reagents = list(REAGENT_ID_WATER = 10, "egg" = 3)
items = list(
/obj/item/reagent_containers/food/snacks/badrecipe,
/obj/item/reagent_containers/food/snacks/tofu,
@@ -426,24 +426,24 @@ I said no!
/datum/recipe/plumphelmetbiscuit
fruit = list("plumphelmet" = 1)
reagents = list("water" = 5, "flour" = 5)
reagents = list(REAGENT_ID_WATER = 5, "flour" = 5)
result = /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit
result_quantity = 2
/datum/recipe/mushroomsoup
fruit = list("mushroom" = 1)
reagents = list("water" = 5, "milk" = 5)
reagents = list(REAGENT_ID_WATER = 5, "milk" = 5)
reagent_mix = RECIPE_REAGENT_REPLACE
result = /obj/item/reagent_containers/food/snacks/mushroomsoup
/datum/recipe/chawanmushi
fruit = list("mushroom" = 1)
reagents = list("water" = 5, "soysauce" = 5, "egg" = 6)
reagents = list(REAGENT_ID_WATER = 5, "soysauce" = 5, "egg" = 6)
result = /obj/item/reagent_containers/food/snacks/chawanmushi
/datum/recipe/beetsoup
fruit = list("whitebeet" = 1, "cabbage" = 1)
reagents = list("water" = 10)
reagents = list(REAGENT_ID_WATER = 10)
result = /obj/item/reagent_containers/food/snacks/beetsoup
/datum/recipe/tossedsalad
@@ -487,7 +487,7 @@ I said no!
being_cooked.reagents.del_reagent("toxin")
/datum/recipe/stuffing
reagents = list("water" = 5, "sodiumchloride" = 1, "blackpepper" = 1)
reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/bread,
)
@@ -510,7 +510,7 @@ I said no!
/datum/recipe/onionsoup
fruit = list("onion" = 1)
reagents = list("water" = 10)
reagents = list(REAGENT_ID_WATER = 10)
result = /obj/item/reagent_containers/food/snacks/soup/onion
/datum/recipe/microwavebun
@@ -539,7 +539,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/cutlet
/datum/recipe/roastedcornsunflowerseeds
reagents = list("sodiumchloride" = 1, "cornoil" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "cornoil" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/rawsunflower
)
@@ -547,7 +547,7 @@ I said no!
result_quantity = 2
/datum/recipe/roastedsunflowerseeds
reagents = list("sodiumchloride" = 1, "cookingoil" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "cookingoil" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/rawsunflower
)
@@ -555,7 +555,7 @@ I said no!
result_quantity = 2
/datum/recipe/roastedpeanutsunflowerseeds
reagents = list("sodiumchloride" = 1, "peanutoil" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "peanutoil" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/rawsunflower
)
@@ -564,24 +564,24 @@ I said no!
/datum/recipe/roastedpeanuts
fruit = list("peanut" = 2)
reagents = list("sodiumchloride" = 2, "cookingoil" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "cookingoil" = 1)
result = /obj/item/reagent_containers/food/snacks/roastedpeanuts
result_quantity = 2
/datum/recipe/roastedpeanutscorn
fruit = list("peanut" = 2)
reagents = list("sodiumchloride" = 2, "cornoil" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "cornoil" = 1)
result = /obj/item/reagent_containers/food/snacks/roastedpeanuts
result_quantity = 2
/datum/recipe/roastedpeanutspeanut
fruit = list("peanut" = 2)
reagents = list("sodiumchloride" = 2, "peanutoil" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "peanutoil" = 1)
result = /obj/item/reagent_containers/food/snacks/roastedpeanuts
result_quantity = 2
/datum/recipe/mint
reagents = list("sugar" = 5, "frostoil" = 5)
reagents = list(REAGENT_ID_SUGAR = 5, "frostoil" = 5)
result = /obj/item/reagent_containers/food/snacks/mint
/datum/recipe/sashimi
@@ -608,12 +608,12 @@ I said no!
items = list(
/obj/item/reagent_containers/food/snacks/dough
)
reagents = list("sugar" = 5, "egg" = 3)
reagents = list(REAGENT_ID_SUGAR = 5, "egg" = 3)
result = /obj/item/reagent_containers/food/snacks/sugarcookie
result_quantity = 4
/datum/recipe/berrymuffin
reagents = list("milk" = 5, "sugar" = 5)
reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/dough
)
@@ -622,7 +622,7 @@ I said no!
result_quantity = 2
/datum/recipe/poisonberrymuffin
reagents = list("milk" = 5, "sugar" = 5)
reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/dough
)
@@ -631,7 +631,7 @@ I said no!
result_quantity = 2
/datum/recipe/ghostmuffin
reagents = list("milk" = 5, "sugar" = 5)
reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/ectoplasm
@@ -641,7 +641,7 @@ I said no!
result_quantity = 2
/datum/recipe/poisonghostmuffin
reagents = list("milk" = 5, "sugar" = 5)
reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/ectoplasm
@@ -663,11 +663,11 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/fruitsalad
/datum/recipe/eggbowl
reagents = list("water" = 5, "rice" = 10, "egg" = 3)
reagents = list(REAGENT_ID_WATER = 5, "rice" = 10, "egg" = 3)
result = /obj/item/reagent_containers/food/snacks/eggbowl
/datum/recipe/porkbowl
reagents = list("water" = 5, "rice" = 10)
reagents = list(REAGENT_ID_WATER = 5, "rice" = 10)
items = list(
/obj/item/reagent_containers/food/snacks/cutlet
)
@@ -694,14 +694,14 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/piginblanket
/datum/recipe/bagelplain
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bun
)
result = /obj/item/reagent_containers/food/snacks/bagelplain
/datum/recipe/bagelsunflower
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bun,
/obj/item/reagent_containers/food/snacks/rawsunflower
@@ -709,7 +709,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/bagelsunflower
/datum/recipe/bagelcheese
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bun,
/obj/item/reagent_containers/food/snacks/cheesewedge
@@ -717,7 +717,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/bagelcheese
/datum/recipe/bagelraisin
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bun,
/obj/item/reagent_containers/food/snacks/no_raisin
@@ -726,14 +726,14 @@ I said no!
/datum/recipe/bagelpoppy
fruit = list("poppy" = 1)
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bun
)
result = /obj/item/reagent_containers/food/snacks/bagelpoppy
/datum/recipe/bageleverything
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bun,
/obj/item/fuel_assembly/supermatter
@@ -741,7 +741,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/bageleverything
/datum/recipe/bageltwo
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bun,
/obj/item/soulstone
@@ -786,7 +786,7 @@ I said no!
/datum/recipe/bearstew
fruit = list("potato" = 1, "tomato" = 1, "carrot" = 1, "eggplant" = 1, "mushroom" = 1)
reagents = list("water" = 10)
reagents = list(REAGENT_ID_WATER = 10)
items = list(/obj/item/reagent_containers/food/snacks/bearmeat)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/bearstew
@@ -802,13 +802,13 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/bibimbap
/datum/recipe/friedrice
reagents = list("water" = 5, "rice" = 10, "soysauce" = 5)
reagents = list(REAGENT_ID_WATER = 5, "rice" = 10, "soysauce" = 5)
fruit = list("carrot" = 1, "cabbage" = 1)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/friedrice
/datum/recipe/lomein
reagents = list("water" = 5, "soysauce" = 5)
reagents = list(REAGENT_ID_WATER = 5, "soysauce" = 5)
fruit = list("carrot" = 1, "cabbage" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/spagetti
@@ -818,7 +818,7 @@ I said no!
/datum/recipe/chickennoodlesoup
fruit = list("carrot" = 1)
reagents = list("water" = 10)
reagents = list(REAGENT_ID_WATER = 10)
items = list( /obj/item/reagent_containers/food/snacks/spagetti, /obj/item/reagent_containers/food/snacks/rawcutlet)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/chickennoodlesoup
@@ -839,7 +839,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/risotto
/datum/recipe/poachedegg
reagents = list("spacespice" = 1, "sodiumchloride" = 1, "blackpepper" = 1, "water" = 5)
reagents = list("spacespice" = 1, REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1, REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/egg
)
@@ -857,7 +857,7 @@ I said no!
// Chip update
/datum/recipe/microwavetortilla
reagents = list("flour" = 5, "water" = 5)
reagents = list("flour" = 5, REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough
)
@@ -874,7 +874,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/taco
/datum/recipe/chips
reagents = list("sodiumchloride" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/tortilla
)
@@ -889,13 +889,13 @@ I said no!
/datum/recipe/salsa
fruit = list("chili" = 1, "tomato" = 1, "lime" = 1)
reagents = list("spacespice" = 1, "blackpepper" = 1,"sodiumchloride" = 1)
reagents = list("spacespice" = 1, "blackpepper" = 1,REAGENT_ID_SODIUMCHLORIDE = 1)
result = /obj/item/reagent_containers/food/snacks/dip/salsa
reagent_mix = RECIPE_REAGENT_REPLACE //Ingredients are mixed together.
/datum/recipe/guac
fruit = list("chili" = 1, "lime" = 1)
reagents = list("spacespice" = 1, "blackpepper" = 1,"sodiumchloride" = 1)
reagents = list("spacespice" = 1, "blackpepper" = 1,REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/tofu
)
@@ -904,7 +904,7 @@ I said no!
/datum/recipe/cheesesauce
fruit = list("chili" = 1, "tomato" = 1)
reagents = list("spacespice" = 1, "blackpepper" = 1,"sodiumchloride" = 1)
reagents = list("spacespice" = 1, "blackpepper" = 1,REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/cheesewedge
)
@@ -1037,7 +1037,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg
)
reagents = list("blood" = 15)
reagents = list(REAGENT_ID_BLOOD = 15)
result = /obj/item/reagent_containers/food/snacks/riztizkzi_sea
/datum/recipe/father_breakfast
@@ -1116,7 +1116,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/gigapuddi
/datum/recipe/gigapuddi/happy
reagents = list("milk" = 15, "sugar" = 5)
reagents = list("milk" = 15, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg
@@ -1124,7 +1124,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/gigapuddi/happy
/datum/recipe/gigapuddi/anger
reagents = list("milk" = 15, "sodiumchloride" = 5)
reagents = list("milk" = 15, REAGENT_ID_SODIUMCHLORIDE = 5)
items = list(
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg
code/modules/food/recipes_microwave_vr.dm
+10 -10
View File
@@ -30,7 +30,7 @@
/datum/recipe/donerkebab
fruit = list("tomato" = 1, "cabbage" = 1)
reagents = list("sodiumchloride" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/meatsteak,
/obj/item/reagent_containers/food/snacks/sliceable/flatdough
@@ -46,7 +46,7 @@
result = /obj/item/reagent_containers/food/snacks/roastbeef
/datum/recipe/reishicup
reagents = list("psilocybin" = 3, "sugar" = 3)
reagents = list(REAGENT_ID_PSILOCYBIN = 3, REAGENT_ID_SUGAR = 3)
items = list(
/obj/item/reagent_containers/food/snacks/chocolatebar
)
@@ -54,7 +54,7 @@
/datum/recipe/hotandsoursoup
fruit = list("cabbage" = 1, "mushroom" = 1)
reagents = list("sodiumchloride" = 2, "blackpepper" = 2, "water" = 10)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "blackpepper" = 2, REAGENT_ID_WATER = 10)
items = list(
/obj/item/reagent_containers/food/snacks/tofu
)
@@ -69,7 +69,7 @@
result = /obj/item/reagent_containers/food/snacks/kitsuneudon
/datum/recipe/pillbugball
reagents = list("carbon" = 5)
reagents = list(REAGENT_ID_CARBON = 5)
items = list(
/obj/item/reagent_containers/food/snacks/meat/grubmeat
)
@@ -77,7 +77,7 @@
/datum/recipe/mammi
fruit = list("orange" = 1)
reagents = list("water" = 10, "flour" = 10, "milk" = 5, "sodiumchloride" = 1)
reagents = list(REAGENT_ID_WATER = 10, "flour" = 10, "milk" = 5, REAGENT_ID_SODIUMCHLORIDE = 1)
result = /obj/item/reagent_containers/food/snacks/mammi
/datum/recipe/makaroni
@@ -121,14 +121,14 @@
result = /obj/item/reagent_containers/food/snacks/monkfishcooked
/datum/recipe/sharksteak
reagents = list("blackpepper"= 1, "sodiumchloride" = 1)
reagents = list("blackpepper"= 1, REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat
)
result = /obj/item/reagent_containers/food/snacks/sharkmeatcooked
/datum/recipe/sharkdip
reagents = list("sodiumchloride" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1)
fruit = list("chili" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat
@@ -136,7 +136,7 @@
result = /obj/item/reagent_containers/food/snacks/sharkmeatdip
/datum/recipe/sharkcubes
reagents = list("soysauce" = 5, "sodiumchloride" = 1)
reagents = list("soysauce" = 5, REAGENT_ID_SODIUMCHLORIDE = 1)
fruit = list("potato" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat
@@ -146,7 +146,7 @@
//// food cubes
/datum/recipe/foodcubes
reagents = list("enzyme" = 20, "virusfood" = 5, "nutriment" = 15, "protein" = 15) // labor intensive
reagents = list("enzyme" = 20, "virusfood" = 5, REAGENT_ID_NUTRIMENT = 15, "protein" = 15) // labor intensive
items = list()
result = /obj/item/storage/box/wings/tray
@@ -182,7 +182,7 @@
result = /obj/item/reagent_containers/food/snacks/grub_purple
/datum/recipe/honey_candy
reagents = list("sugar" = 5, "nutriment" = 5)
reagents = list(REAGENT_ID_SUGAR = 5, REAGENT_ID_NUTRIMENT = 5)
items = list()
result = /obj/item/reagent_containers/food/snacks/honey_candy
code/modules/food/recipes_oven.dm
+32 -32
View File
@@ -11,7 +11,7 @@
/datum/recipe/dionaroast
appliance = OVEN
fruit = list("apple" = 1)
reagents = list("pacid" = 5) //It dissolves the carapace. Still poisonous, though.
reagents = list(REAGENT_ID_PACID = 5) //It dissolves the carapace. Still poisonous, though.
items = list(/obj/item/holder/diona)
result = /obj/item/reagent_containers/food/snacks/dionaroast
reagent_mix = RECIPE_REAGENT_REPLACE //No eating polyacid
@@ -19,7 +19,7 @@
/datum/recipe/monkeysdelight
appliance = OVEN
fruit = list("banana" = 1)
reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "flour" = 10)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1, "flour" = 10)
items = list(
/obj/item/reagent_containers/food/snacks/monkeycube
)
@@ -36,7 +36,7 @@
/* OLD RECIPE
/datum/recipe/turkey
appliance = OVEN
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/meat/chicken,
/obj/item/reagent_containers/food/snacks/stuffing
@@ -47,7 +47,7 @@
/datum/recipe/turkey
appliance = OVEN
fruit = list("potato" = 1)
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/rawturkey,
/obj/item/reagent_containers/food/snacks/stuffing
@@ -56,7 +56,7 @@
/datum/recipe/tofurkey
appliance = OVEN
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/tofu,
/obj/item/reagent_containers/food/snacks/tofu,
@@ -67,7 +67,7 @@
/datum/recipe/zestfish
appliance = OVEN
fruit = list("lemon" = 1)
reagents = list("sodiumchloride" = 3)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 3)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat
)
@@ -76,7 +76,7 @@
/datum/recipe/limezestfish
appliance = OVEN
fruit = list("lime" = 1)
reagents = list("sodiumchloride" = 3)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 3)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat
)
@@ -91,12 +91,12 @@
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough
)
reagents = list("sodiumchloride" = 1, "yeast" = 5)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "yeast" = 5)
result = /obj/item/reagent_containers/food/snacks/sliceable/bread
/datum/recipe/baguette
appliance = OVEN
reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "yeast" = 5)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1, "yeast" = 5)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough
@@ -182,7 +182,7 @@
/datum/recipe/bananabread
appliance = OVEN
fruit = list("banana" = 1)
reagents = list("milk" = 5, "sugar" = 15)
reagents = list("milk" = 5, REAGENT_ID_SUGAR = 15)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough
@@ -228,14 +228,14 @@
/datum/recipe/pie
appliance = OVEN
fruit = list("banana" = 1)
reagents = list("sugar" = 5)
reagents = list(REAGENT_ID_SUGAR = 5)
items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough)
result = /obj/item/reagent_containers/food/snacks/pie
/datum/recipe/cherrypie
appliance = OVEN
fruit = list("cherries" = 1)
reagents = list("sugar" = 10)
reagents = list(REAGENT_ID_SUGAR = 10)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough
)
@@ -262,14 +262,14 @@
/datum/recipe/pumpkinpie
appliance = OVEN
fruit = list("pumpkin" = 1)
reagents = list("sugar" = 5)
reagents = list(REAGENT_ID_SUGAR = 5)
items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough)
result = /obj/item/reagent_containers/food/snacks/sliceable/pumpkinpie
/datum/recipe/appletart
appliance = OVEN
fruit = list("goldapple" = 1)
reagents = list("sugar" = 10)
reagents = list(REAGENT_ID_SUGAR = 10)
items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough)
result = /obj/item/reagent_containers/food/snacks/appletart
result_quantity = 2
@@ -278,7 +278,7 @@
/datum/recipe/keylimepie
appliance = OVEN
fruit = list("lime" = 2)
reagents = list("milk" = 5, "sugar" = 5, "egg" = 3, "flour" = 10)
reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5, "egg" = 3, "flour" = 10)
result = /obj/item/reagent_containers/food/snacks/sliceable/keylimepie
reagent_mix = RECIPE_REAGENT_REPLACE //No raw egg in finished product, protein after cooking causes magic meatballs otherwise
@@ -294,7 +294,7 @@
/datum/recipe/cookie
appliance = OVEN
reagents = list("milk" = 10, "sugar" = 10)
reagents = list("milk" = 10, REAGENT_ID_SUGAR = 10)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/chocolatebar
@@ -305,7 +305,7 @@
/datum/recipe/ovenfortunecookie
appliance = OVEN
reagents = list("sugar" = 5)
reagents = list(REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice,
/obj/item/paper
@@ -321,7 +321,7 @@
/datum/recipe/cracker
appliance = OVEN
reagents = list("sodiumchloride" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice
)
@@ -348,7 +348,7 @@
/datum/recipe/cinnamonbun
appliance = OVEN
reagents = list("sugar" = 15, "cream" = 10)
reagents = list(REAGENT_ID_SUGAR = 15, "cream" = 10)
items = list(
/obj/item/reagent_containers/food/snacks/dough
)
@@ -515,7 +515,7 @@
/datum/recipe/pancakes
appliance = OVEN
reagents = list("milk" = 5, "sugar" = 15)
reagents = list("milk" = 5, REAGENT_ID_SUGAR = 15)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/sliceable/flatdough
@@ -526,7 +526,7 @@
/datum/recipe/pancakes/berry
appliance = OVEN
fruit = list("berries" = 2)
reagents = list("milk" = 5, "sugar" = 15)
reagents = list("milk" = 5, REAGENT_ID_SUGAR = 15)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/sliceable/flatdough
@@ -595,7 +595,7 @@
/datum/recipe/truffle
appliance = OVEN
reagents = list("sugar" = 5, "cream" = 5)
reagents = list(REAGENT_ID_SUGAR = 5, "cream" = 5)
items = list(
/obj/item/reagent_containers/food/snacks/chocolatebar
)
@@ -605,7 +605,7 @@
/datum/recipe/croissant
appliance = OVEN
reagents = list("sodiumchloride" = 1, "water" = 5, "milk" = 5, "yeast" = 5)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_WATER = 5, "milk" = 5, "yeast" = 5)
reagent_mix = RECIPE_REAGENT_REPLACE
items = list(/obj/item/reagent_containers/food/snacks/dough)
result = /obj/item/reagent_containers/food/snacks/croissant
@@ -623,7 +623,7 @@
/datum/recipe/suppermatter
appliance = OVEN
reagents = list("radium" = 5, "milk" = 5)
reagents = list(REAGENT_ID_RADIUM = 5, "milk" = 5)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/cheesecake
)
@@ -632,7 +632,7 @@
/datum/recipe/excitingsuppermatter
appliance = OVEN
reagents = list("radium" = 5, "spacespice" = 5)
reagents = list(REAGENT_ID_RADIUM = 5, "spacespice" = 5)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/cheesecake
)
@@ -641,7 +641,7 @@
/datum/recipe/waffles
appliance = OVEN
reagents = list("sugar" = 10)
reagents = list(REAGENT_ID_SUGAR = 10)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough
@@ -658,7 +658,7 @@
/datum/recipe/meatbun
appliance = OVEN
fruit = list("cabbage" = 1)
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/meatball,
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
@@ -669,7 +669,7 @@
/datum/recipe/spicedmeatbun
appliance = OVEN
reagents = list("spacespice" = 2, "water" = 5)
reagents = list("spacespice" = 2, REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice,
/obj/item/reagent_containers/food/snacks/rawcutlet
@@ -680,7 +680,7 @@
/datum/recipe/custardbun
appliance = OVEN
reagents = list("spacespice" = 1, "water" = 5, "egg" = 3)
reagents = list("spacespice" = 1, REAGENT_ID_WATER = 5, "egg" = 3)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice
)
@@ -689,7 +689,7 @@
/datum/recipe/chickenmomo
appliance = OVEN
reagents = list("spacespice" = 2, "water" = 5)
reagents = list("spacespice" = 2, REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice,
/obj/item/reagent_containers/food/snacks/doughslice,
@@ -702,7 +702,7 @@
/datum/recipe/veggiemomo
appliance = OVEN
reagents = list("spacespice" = 2, "water" = 5)
reagents = list("spacespice" = 2, REAGENT_ID_WATER = 5)
fruit = list("carrot" = 1, "cabbage" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice,
@@ -711,4 +711,4 @@
)
reagent_mix = RECIPE_REAGENT_REPLACE //Get that water outta here
result = /obj/item/reagent_containers/food/snacks/veggiemomo
result_quantity = 2
result_quantity = 2
code/modules/food/recipes_oven_vr.dm
+2 -2
View File
@@ -1,7 +1,7 @@
/datum/recipe/scorpion
appliance = OVEN
reagents = list("sodiumchloride" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/scorpion
)
result = /obj/item/reagent_containers/food/snacks/scorpion_cooked
result = /obj/item/reagent_containers/food/snacks/scorpion_cooked
code/modules/hydroponics/backtank.dm
+2 -2
View File
@@ -233,7 +233,7 @@
/obj/item/watertank/op/Initialize()
. = ..()
reagents.add_reagent("fuel", 500)
reagents.add_reagent(REAGENT_ID_FUEL, 500)
reagents.add_reagent("cryptobiolin", 500)
reagents.add_reagent(REAGENT_ID_PHORON, 500)
reagents.add_reagent("condensedcapsaicin", 500)
@@ -266,7 +266,7 @@
/obj/item/watertank/atmos/Initialize()
. = ..()
reagents.add_reagent("water", 200)
reagents.add_reagent(REAGENT_ID_WATER, 200)
/obj/item/watertank/atmos/make_noz()
return new /obj/item/reagent_containers/spray/mister/atmos(src)
code/modules/hydroponics/grown.dm
+6 -6
View File
@@ -52,7 +52,7 @@
var/list/data = list()
if(reagent_data.len > 1 && potency > 0)
rtotal += round(potency/reagent_data[2])
if(rid == "nutriment")
if(rid == REAGENT_ID_NUTRIMENT)
data[seed.seed_name] = max(1,rtotal)
reagents.add_reagent(rid,max(1,rtotal),data)
@@ -70,13 +70,13 @@
desc = SSplants.product_descs["[seed.uid]"]
else
var/list/descriptors = list()
if(reagents.has_reagent("sugar") || reagents.has_reagent("cherryjelly") || reagents.has_reagent("honey") || reagents.has_reagent("berryjuice"))
if(reagents.has_reagent(REAGENT_ID_SUGAR) || reagents.has_reagent("cherryjelly") || reagents.has_reagent("honey") || reagents.has_reagent("berryjuice"))
descriptors |= "sweet"
if(reagents.has_reagent("anti_toxin"))
descriptors |= "astringent"
if(reagents.has_reagent("frostoil"))
descriptors |= "numbing"
if(reagents.has_reagent("nutriment"))
if(reagents.has_reagent(REAGENT_ID_NUTRIMENT))
descriptors |= "nutritious"
if(reagents.has_reagent("condensedcapsaicin") || reagents.has_reagent("capsaicin"))
descriptors |= "spicy"
@@ -84,11 +84,11 @@
descriptors |= "bitter"
if(reagents.has_reagent("orangejuice") || reagents.has_reagent("lemonjuice") || reagents.has_reagent("limejuice"))
descriptors |= "sweet-sour"
if(reagents.has_reagent("radium") || reagents.has_reagent("uranium"))
if(reagents.has_reagent(REAGENT_ID_RADIUM) || reagents.has_reagent("uranium"))
descriptors |= "radioactive"
if(reagents.has_reagent("amatoxin") || reagents.has_reagent("toxin"))
descriptors |= "poisonous"
if(reagents.has_reagent("psilocybin") || reagents.has_reagent("bliss") || reagents.has_reagent("earthsblood"))
if(reagents.has_reagent(REAGENT_ID_PSILOCYBIN) || reagents.has_reagent(REAGENT_ID_BLISS) || reagents.has_reagent("earthsblood"))
descriptors |= "hallucinogenic"
if(reagents.has_reagent("bicaridine") || reagents.has_reagent("earthsblood"))
descriptors |= "medicinal"
@@ -96,7 +96,7 @@
descriptors |= "shiny"
if(reagents.has_reagent("lube"))
descriptors |= "slippery"
if(reagents.has_reagent("pacid") || reagents.has_reagent("sacid"))
if(reagents.has_reagent(REAGENT_ID_PACID) || reagents.has_reagent(REAGENT_ID_SACID))
descriptors |= "acidic"
if(seed.get_trait(TRAIT_JUICY))
descriptors |= "juicy"
code/modules/hydroponics/seed.dm
+6 -6
View File
@@ -390,7 +390,7 @@
"calvatia", "gigantea", "clitopilis", "prumulus", "entoloma", "abortivum",
"suillus", "tuber", "aestivum", "volvacea", "delica", "russula", "rozites")
possible_prefixes |= list("butter", "shad", "sugar", "june", "wild", "rigus", "curry", "hard", "soft", "dark", "brick", "stone", "red", "brown",
possible_prefixes |= list("butter", "shad", REAGENT_ID_SUGAR, "june", "wild", "rigus", "curry", "hard", "soft", "dark", "brick", "stone", "red", "brown",
"black", "white", "paper", "slippery", "honey", "bitter")
prefix = pick(possible_prefixes)
@@ -455,7 +455,7 @@
chems = list()
if(prob(80))
chems["nutriment"] = list(rand(1,10),rand(10,20))
chems[REAGENT_ID_NUTRIMENT] = list(rand(1,10),rand(10,20))
var/additional_chems = rand(0,5)
@@ -463,10 +463,10 @@
// VOREStation Edit Start: Modified exclusion list
var/list/banned_chems = list(
"adminordrazine",
"nutriment",
"macrocillin",
"microcillin",
"normalcillin",
REAGENT_ID_NUTRIMENT,
REAGENT_ID_MACROCILLIN,
REAGENT_ID_MICROCILLIN,
REAGENT_ID_NORMALCILLIN,
"magicdust"
)
// VOREStation Edit End: Modified exclusion list
code/modules/hydroponics/seed_datums_vr.dm
+3 -3
View File
@@ -7,7 +7,7 @@
display_name = "Shrinking mushroom trees"
mutants = list("megam")
kitchen_tag = "microm"
chems = list("microcillin" = list(1,20))
chems = list(REAGENT_ID_MICROCILLIN = list(1,20))
/datum/seed/size/New()
..()
@@ -27,7 +27,7 @@
display_name = "Mega mushroom trees"
mutants = list("microm")
kitchen_tag = "megam"
chems = list("macrocillin" = list(1,20))
chems = list(REAGENT_ID_MACROCILLIN = list(1,20))
/datum/seed/size/megam/New()
..()
@@ -41,4 +41,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#DADA00")
/datum/seed/gnomes
harvest_sound = 'sound/items/hooh.ogg'
harvest_sound = 'sound/items/hooh.ogg'
code/modules/hydroponics/seedtypes/amauri.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "amauri"
display_name = "amauri plant"
kitchen_tag = "amauri"
chems = list("zombiepowder" = list(1,10),"condensedcapsaicin" = list(1,5),"nutriment" = list(1,5))
chems = list("zombiepowder" = list(1,10),"condensedcapsaicin" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/amauri/New()
..()
@@ -12,4 +12,4 @@
set_trait(TRAIT_MATURATION,8)
set_trait(TRAIT_PRODUCTION,9)
set_trait(TRAIT_YIELD,4)
set_trait(TRAIT_POTENCY,10)
set_trait(TRAIT_POTENCY,10)
code/modules/hydroponics/seedtypes/ambrosia.dm
+5 -5
View File
@@ -5,7 +5,7 @@
display_name = "ambrosia vulgaris"
kitchen_tag = "ambrosia"
mutants = list("ambrosiadeus")
chems = list("nutriment" = list(1), "ambrosia_extract" = list(1,8), "kelotane" = list(1,8,1), "bicaridine" = list(1,10,1))
chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_AMBROSIAEXTRACT = list(1,8), "kelotane" = list(1,8,1), "bicaridine" = list(1,10,1))
/datum/seed/ambrosia/New()
..()
@@ -25,7 +25,7 @@
display_name = "ambrosia deus"
kitchen_tag = "ambrosiadeus"
mutants = list("ambrosiainfernus", "ambrosiagaia")
chems = list("nutriment" = list(1), "bicaridine" = list(1,8), "synaptizine" = list(1,8,1), "hyperzine" = list(1,10,1), "ambrosia_extract" = list(1,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1), "bicaridine" = list(1,8), "synaptizine" = list(1,8,1), "hyperzine" = list(1,10,1), REAGENT_ID_AMBROSIAEXTRACT = list(1,10))
/datum/seed/ambrosia/deus/New()
..()
@@ -38,7 +38,7 @@
display_name = "ambrosia infernus"
kitchen_tag = "ambrosiainfernus"
mutants = null
chems = list("nutriment" = list(1,3), "oxycodone" = list(1,8), "impedrezene" = list(1,10), "mindbreaker" = list(1,10), "ambrosia_extract" = list(1,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,3), "oxycodone" = list(1,8), "impedrezene" = list(1,10), "mindbreaker" = list(1,10), REAGENT_ID_AMBROSIAEXTRACT = list(1,10))
/datum/seed/ambrosia/infernus/New()
..()
@@ -51,7 +51,7 @@
display_name = "ambrosia gaia"
kitchen_tag = "ambrosiagaia"
mutants = null
chems = list ("earthsblood" = list(3,5), "nutriment" = list(1,3))
chems = list ("earthsblood" = list(3,5), REAGENT_ID_NUTRIMENT = list(1,3))
/datum/seed/ambrosia/gaia/New()
..()
@@ -65,4 +65,4 @@
set_trait(TRAIT_BIOLUM,1)
set_trait(TRAIT_BIOLUM_COLOUR,"#ffb500")
set_trait(TRAIT_PRODUCT_COLOUR, "#ffee00")
set_trait(TRAIT_PLANT_COLOUR,"#f3ba2b")
set_trait(TRAIT_PLANT_COLOUR,"#f3ba2b")
code/modules/hydroponics/seedtypes/apples.dm
+4 -4
View File
@@ -5,7 +5,7 @@
display_name = "apple tree"
kitchen_tag = "apple"
mutants = list("poisonapple","goldapple")
chems = list("nutriment" = list(1,10),"applejuice" = list(10,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10),"applejuice" = list(10,20))
/datum/seed/apple/New()
..()
@@ -31,7 +31,7 @@
display_name = "gold apple tree"
kitchen_tag = "goldapple"
mutants = null
chems = list("nutriment" = list(1,10), "gold" = list(1,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "gold" = list(1,5))
/datum/seed/apple/gold/New()
..()
@@ -46,7 +46,7 @@
seed_name = "sivian pod"
display_name = "sivian pod"
kitchen_tag = "apple"
chems = list("nutriment" = list(1,5),"sifsap" = list(10,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,5),"sifsap" = list(10,20))
/datum/seed/apple/sif/New()
..()
@@ -59,4 +59,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#0720c3")
set_trait(TRAIT_PLANT_ICON,"tree5")
set_trait(TRAIT_FLESH_COLOUR,"#05157d")
set_trait(TRAIT_IDEAL_LIGHT, 1)
set_trait(TRAIT_IDEAL_LIGHT, 1)
code/modules/hydroponics/seedtypes/berries.dm
+5 -5
View File
@@ -5,7 +5,7 @@
display_name = "berry bush"
kitchen_tag = "berries"
mutants = list("glowberries","poisonberries")
chems = list("nutriment" = list(1,10), "berryjuice" = list(10,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "berryjuice" = list(10,10))
/datum/seed/berry/New()
..()
@@ -26,7 +26,7 @@
seed_name = "glowberry"
display_name = "glowberry bush"
mutants = null
chems = list("nutriment" = list(1,10), "uranium" = list(3,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "uranium" = list(3,5))
/datum/seed/berry/glow/New()
..()
@@ -47,7 +47,7 @@
kitchen_tag = "poisonberries"
display_name = "poison berry bush"
mutants = list("deathberries")
chems = list("nutriment" = list(1), "toxin" = list(3,5), "poisonberryjuice" = list(10,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1), "toxin" = list(3,5), "poisonberryjuice" = list(10,5))
/datum/seed/berry/poison/New()
..()
@@ -60,7 +60,7 @@
seed_name = "death berry"
display_name = "death berry bush"
mutants = null
chems = list("nutriment" = list(1), "toxin" = list(3,3), "lexorin" = list(1,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1), "toxin" = list(3,3), "lexorin" = list(1,5))
/datum/seed/berry/poison/death/New()
..()
@@ -79,4 +79,4 @@
/datum/seed/berry/peppercorn/New()
..()
set_trait(TRAIT_PRODUCT_COLOUR,"#303030")
set_trait(TRAIT_WATER_CONSUMPTION, 2)
set_trait(TRAIT_WATER_CONSUMPTION, 2)
code/modules/hydroponics/seedtypes/cabbage.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "cabbage"
display_name = "cabbages"
kitchen_tag = "cabbage"
chems = list("nutriment" = list(1,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10))
/datum/seed/cabbage/New()
..()
@@ -18,4 +18,4 @@
set_trait(TRAIT_PLANT_ICON,"vine2")
set_trait(TRAIT_IDEAL_LIGHT, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
code/modules/hydroponics/seedtypes/carrots.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "carrot"
display_name = "carrots"
kitchen_tag = "carrot"
chems = list("nutriment" = list(1,20), "imidazoline" = list(3,5), "carrotjuice" = list(10,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "imidazoline" = list(3,5), "carrotjuice" = list(10,20))
/datum/seed/carrots/New()
..()
@@ -14,4 +14,4 @@
set_trait(TRAIT_PRODUCT_ICON,"carrot")
set_trait(TRAIT_PRODUCT_COLOUR,"#FFDB4A")
set_trait(TRAIT_PLANT_ICON,"carrot")
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
code/modules/hydroponics/seedtypes/celery.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "celery"
display_name = "celery"
kitchen_tag = "celery"
chems = list("nutriment" = list(5,20))
chems = list(REAGENT_ID_NUTRIMENT = list(5,20))
/datum/seed/celery/New()
..()
@@ -14,4 +14,4 @@
set_trait(TRAIT_POTENCY,8)
set_trait(TRAIT_PRODUCT_ICON,"stalk")
set_trait(TRAIT_PRODUCT_COLOUR,"#56FD56")
set_trait(TRAIT_PLANT_ICON,"stalk3")
set_trait(TRAIT_PLANT_ICON,"stalk3")
code/modules/hydroponics/seedtypes/cherries.dm
+2 -2
View File
@@ -4,7 +4,7 @@
seed_noun = "pits"
display_name = "cherry tree"
kitchen_tag = "cherries"
chems = list("nutriment" = list(1,15), "sugar" = list(1,15), "cherryjelly" = list(10,15))
chems = list(REAGENT_ID_NUTRIMENT = list(1,15), REAGENT_ID_SUGAR = list(1,15), "cherryjelly" = list(10,15))
/datum/seed/cherries/New()
..()
@@ -17,4 +17,4 @@
set_trait(TRAIT_PRODUCT_ICON,"cherry")
set_trait(TRAIT_PRODUCT_COLOUR,"#A80000")
set_trait(TRAIT_PLANT_ICON,"tree2")
set_trait(TRAIT_PLANT_COLOUR,"#2F7D2D")
set_trait(TRAIT_PLANT_COLOUR,"#2F7D2D")
code/modules/hydroponics/seedtypes/chili.dm
+5 -5
View File
@@ -4,7 +4,7 @@
seed_name = "chili"
display_name = "chili plants"
kitchen_tag = "chili"
chems = list("capsaicin" = list(3,5), "nutriment" = list(1,25))
chems = list("capsaicin" = list(3,5), REAGENT_ID_NUTRIMENT = list(1,25))
mutants = list("icechili", "ghostchili")
/datum/seed/chili/New()
@@ -26,7 +26,7 @@
display_name = "ice-pepper plants"
kitchen_tag = "icechili"
mutants = null
chems = list("frostoil" = list(3,5), "nutriment" = list(1,50))
chems = list("frostoil" = list(3,5), REAGENT_ID_NUTRIMENT = list(1,50))
/datum/seed/chili/ice/New()
..()
@@ -40,10 +40,10 @@
display_name = "ghost chili plants"
kitchen_tag = "ghostchili"
mutants = null
chems = list("condensedcapsaicin" = list (3,10), "nutriment" = list (1,25))
chems = list("condensedcapsaicin" = list (3,10), REAGENT_ID_NUTRIMENT = list (1,25))
/datum/seed/chili/ghost/New()
..()
set_trait(TRAIT_MATURATION,6)
set_trait(TRAIT_PRODUCTION,3)
set_trait(TRAIT_PRODUCT_COLOUR,"#eaecec")
set_trait(TRAIT_PRODUCT_COLOUR,"#eaecec")
code/modules/hydroponics/seedtypes/citrus.dm
+4 -4
View File
@@ -3,7 +3,7 @@
seed_name = "lime"
display_name = "lime trees"
kitchen_tag = "lime"
chems = list("nutriment" = list(1,20), "limejuice" = list(10,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "limejuice" = list(10,20))
/datum/seed/citrus/New()
..()
@@ -23,7 +23,7 @@
seed_name = "lemon"
display_name = "lemon trees"
kitchen_tag = "lemon"
chems = list("nutriment" = list(1,20), "lemonjuice" = list(10,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "lemonjuice" = list(10,20))
/datum/seed/citrus/lemon/New()
..()
@@ -38,9 +38,9 @@
seed_name = "orange"
display_name = "orange trees"
kitchen_tag = "orange"
chems = list("nutriment" = list(1,20), "orangejuice" = list(10,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "orangejuice" = list(10,20))
/datum/seed/citrus/orange/New()
..()
set_trait(TRAIT_PRODUCT_COLOUR,"#FFC20A")
set_trait(TRAIT_FLESH_COLOUR,"#FFC20A")
set_trait(TRAIT_FLESH_COLOUR,"#FFC20A")
code/modules/hydroponics/seedtypes/cocoa.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "cacao"
display_name = "cacao tree"
kitchen_tag = "cocoa"
chems = list("nutriment" = list(1,10), "coco" = list(4,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "coco" = list(4,5))
/datum/seed/cocoa/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#CCA935")
set_trait(TRAIT_PLANT_ICON,"tree2")
set_trait(TRAIT_IDEAL_HEAT, 298)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
code/modules/hydroponics/seedtypes/corn.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "corn"
display_name = "ears of corn"
kitchen_tag = "corn"
chems = list("nutriment" = list(1,10), "cornoil" = list(3,15))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "cornoil" = list(3,15))
trash_type = /obj/item/corncob
/datum/seed/corn/New()
@@ -18,4 +18,4 @@
set_trait(TRAIT_PLANT_ICON,"corn")
set_trait(TRAIT_IDEAL_HEAT, 298)
set_trait(TRAIT_IDEAL_LIGHT, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
code/modules/hydroponics/seedtypes/durian.dm
+2 -2
View File
@@ -4,7 +4,7 @@
seed_noun = "pits"
display_name = "durian"
kitchen_tag = "durian"
chems = list("nutriment" = list(1,5), "durianpaste" = list(1, 20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "durianpaste" = list(1, 20))
/datum/seed/durian/New()
..()
@@ -18,4 +18,4 @@
set_trait(TRAIT_PLANT_COLOUR,"#87C969")
set_trait(TRAIT_PLANT_ICON,"tree")
set_trait(TRAIT_IDEAL_LIGHT, 8)
set_trait(TRAIT_WATER_CONSUMPTION, 8)
set_trait(TRAIT_WATER_CONSUMPTION, 8)
code/modules/hydroponics/seedtypes/eggplant.dm
+2 -2
View File
@@ -5,7 +5,7 @@
display_name = "eggplants"
kitchen_tag = "eggplant"
mutants = list("egg-plant")
chems = list("nutriment" = list(1,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10))
/datum/seed/eggplant/New()
..()
@@ -27,5 +27,5 @@
display_name = "egg-plants"
kitchen_tag = "egg-plant"
mutants = null
chems = list("nutriment" = list(1,5), "egg" = list(3,12))
chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "egg" = list(3,12))
has_item_product = /obj/item/reagent_containers/food/snacks/egg/purple
code/modules/hydroponics/seedtypes/flowers.dm
+5 -5
View File
@@ -4,7 +4,7 @@
seed_name = "harebell"
display_name = "harebells"
kitchen_tag = "harebell"
chems = list("nutriment" = list(1,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20))
/datum/seed/flower/New()
..()
@@ -22,7 +22,7 @@
seed_name = "poppy"
display_name = "poppies"
kitchen_tag = "poppy"
chems = list("nutriment" = list(1,20), "bicaridine" = list(1,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "bicaridine" = list(1,10))
/datum/seed/flower/poppy/New()
..()
@@ -58,7 +58,7 @@
seed_name = "lavender"
display_name = "lavender"
kitchen_tag = "lavender"
chems = list("nutriment" = list(1,20), "bicaridine" = list(1,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "bicaridine" = list(1,10))
/datum/seed/flower/lavender/New()
..()
@@ -79,7 +79,7 @@
display_name = "rose"
kitchen_tag = "rose"
mutants = list("bloodrose")
chems = list("nutriment" = list(1,5), "stoxin" = list(0,2))
chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "stoxin" = list(0,2))
/datum/seed/flower/rose/New()
..()
@@ -99,7 +99,7 @@
name = "bloodrose"
display_name = "bleeding rose"
mutants = null
chems = list("nutriment" = list(1,5), "stoxin" = list(1,5), "blood" = list(0,2))
chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "stoxin" = list(1,5), REAGENT_ID_BLOOD = list(0,2))
/datum/seed/flower/rose/blood/New()
..()
code/modules/hydroponics/seedtypes/gelthi.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "gelthi"
display_name = "gelthi plant"
kitchen_tag = "gelthi"
chems = list("stoxin" = list(1,5),"capsaicin" = list(1,5),"nutriment" = list(1,5))
chems = list("stoxin" = list(1,5),"capsaicin" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/gelthi/New()
..()
@@ -12,4 +12,4 @@
set_trait(TRAIT_MATURATION,6)
set_trait(TRAIT_PRODUCTION,6)
set_trait(TRAIT_YIELD,2)
set_trait(TRAIT_POTENCY,1)
set_trait(TRAIT_POTENCY,1)
code/modules/hydroponics/seedtypes/grapes.dm
+3 -3
View File
@@ -5,7 +5,7 @@
display_name = "grapevines"
kitchen_tag = "grapes"
mutants = list("greengrapes")
chems = list("nutriment" = list(1,10), "sugar" = list(1,5), "grapejuice" = list(10,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_SUGAR = list(1,5), "grapejuice" = list(10,10))
/datum/seed/grapes/New()
..()
@@ -26,8 +26,8 @@
seed_name = "green grape"
display_name = "green grapevines"
mutants = null
chems = list("nutriment" = list(1,10), "kelotane" = list(3,5), "grapejuice" = list(10,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "kelotane" = list(3,5), "grapejuice" = list(10,10))
/datum/seed/grapes/green/New()
..()
set_trait(TRAIT_PRODUCT_COLOUR,"42ed2f")
set_trait(TRAIT_PRODUCT_COLOUR,"42ed2f")
code/modules/hydroponics/seedtypes/grass.dm
+2 -2
View File
@@ -4,7 +4,7 @@
display_name = "grass"
kitchen_tag = "grass"
mutants = list("carpet")
chems = list("nutriment" = list(1,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20))
/datum/seed/grass/New()
..()
@@ -33,4 +33,4 @@
set_trait(TRAIT_PRODUCT_ICON,"grass")
set_trait(TRAIT_PRODUCT_COLOUR,"#9e2500")
set_trait(TRAIT_PLANT_COLOUR,"#ee4401")
set_trait(TRAIT_PLANT_ICON,"grass")
set_trait(TRAIT_PLANT_ICON,"grass")
code/modules/hydroponics/seedtypes/jurlmah.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "jurl'mah"
display_name = "jurl'mah reeds"
kitchen_tag = "jurlmah"
chems = list("serotrotium" = list(1,5),"nutriment" = list(1,5))
chems = list("serotrotium" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/jurlmah/New()
..()
@@ -12,4 +12,4 @@
set_trait(TRAIT_MATURATION,8)
set_trait(TRAIT_PRODUCTION,9)
set_trait(TRAIT_YIELD,3)
set_trait(TRAIT_POTENCY,10)
set_trait(TRAIT_POTENCY,10)
code/modules/hydroponics/seedtypes/kudzu.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "kudzu"
display_name = "kudzu vines"
kitchen_tag = "kudzu"
chems = list("nutriment" = list(1,50), "anti_toxin" = list(1,25))
chems = list(REAGENT_ID_NUTRIMENT = list(1,50), "anti_toxin" = list(1,25))
/datum/seed/kudzu/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#96D278")
set_trait(TRAIT_PLANT_COLOUR,"#6F7A63")
set_trait(TRAIT_PLANT_ICON,"vine2")
set_trait(TRAIT_WATER_CONSUMPTION, 0.5)
set_trait(TRAIT_WATER_CONSUMPTION, 0.5)
code/modules/hydroponics/seedtypes/lettuce.dm
+3 -3
View File
@@ -4,7 +4,7 @@
seed_name = "lettuce"
display_name = "lettuce"
kitchen_tag = "lettuce"
chems = list("nutriment" = list(1,15))
chems = list(REAGENT_ID_NUTRIMENT = list(1,15))
/datum/seed/lettuce/New()
..()
@@ -26,9 +26,9 @@
seed_name = "glacial lettuce"
display_name = "glacial lettuce"
kitchen_tag = "icelettuce"
chems = list("nutriment" = list(1,5), "paracetamol" = list(0,2))
chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "paracetamol" = list(0,2))
/datum/seed/lettuce/ice/New()
..()
set_trait(TRAIT_ALTER_TEMP, -5)
set_trait(TRAIT_PRODUCT_COLOUR,"#9ABCC9")
set_trait(TRAIT_PRODUCT_COLOUR,"#9ABCC9")
code/modules/hydroponics/seedtypes/mushrooms.dm
+8 -8
View File
@@ -5,7 +5,7 @@
seed_noun = "spores"
display_name = "chanterelle mushrooms"
mutants = list("reishi","amanita","plumphelmet")
chems = list("nutriment" = list(1,25))
chems = list(REAGENT_ID_NUTRIMENT = list(1,25))
splat_type = /obj/effect/plant
kitchen_tag = "mushroom"
@@ -44,7 +44,7 @@
seed_name = "plump helmet"
display_name = "plump helmet mushrooms"
mutants = list("walkingmushroom","towercap")
chems = list("nutriment" = list(2,10))
chems = list(REAGENT_ID_NUTRIMENT = list(2,10))
kitchen_tag = "plumphelmet"
/datum/seed/mushroom/plump/New()
@@ -62,7 +62,7 @@
seed_name = "reishi"
display_name = "reishi"
mutants = list("libertycap","glowshroom")
chems = list("nutriment" = list(1,50), "psilocybin" = list(3,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1,50), REAGENT_ID_PSILOCYBIN = list(3,5))
/datum/seed/mushroom/hallucinogenic/New()
..()
@@ -80,7 +80,7 @@
seed_name = "liberty cap"
display_name = "liberty cap mushrooms"
mutants = null
chems = list("nutriment" = list(1), "stoxin" = list(3,3), "bliss" = list(1,25))
chems = list(REAGENT_ID_NUTRIMENT = list(1), "stoxin" = list(3,3), REAGENT_ID_BLISS = list(1,25))
/datum/seed/mushroom/hallucinogenic/strong/New()
..()
@@ -96,7 +96,7 @@
seed_name = "fly amanita"
display_name = "fly amanita mushrooms"
mutants = list("destroyingangel","plastic")
chems = list("nutriment" = list(1), "amatoxin" = list(3,3), "psilocybin" = list(1,25))
chems = list(REAGENT_ID_NUTRIMENT = list(1), "amatoxin" = list(3,3), REAGENT_ID_PSILOCYBIN = list(1,25))
/datum/seed/mushroom/poison/New()
..()
@@ -114,7 +114,7 @@
seed_name = "destroying angel"
display_name = "destroying angel mushrooms"
mutants = null
chems = list("nutriment" = list(1,50), "amatoxin" = list(13,3), "psilocybin" = list(1,25))
chems = list(REAGENT_ID_NUTRIMENT = list(1,50), "amatoxin" = list(13,3), REAGENT_ID_PSILOCYBIN = list(1,25))
/datum/seed/mushroom/poison/death/New()
..()
@@ -159,7 +159,7 @@
seed_name = "glowshroom"
display_name = "glowshrooms"
mutants = null
chems = list("radium" = list(1,20))
chems = list(REAGENT_ID_RADIUM = list(1,20))
/datum/seed/mushroom/glowshroom/New()
..()
@@ -209,4 +209,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#e29cd2")
set_trait(TRAIT_PLANT_COLOUR,"#f8e6f4")
set_trait(TRAIT_PLANT_ICON,"mushroom9")
set_trait(TRAIT_SPORING, TRUE)
set_trait(TRAIT_SPORING, TRUE)
code/modules/hydroponics/seedtypes/nettles.dm
+2 -2
View File
@@ -4,7 +4,7 @@
seed_name = "nettle"
display_name = "nettles"
mutants = list("deathnettle")
chems = list("nutriment" = list(1,50), "sacid" = list(0,1))
chems = list(REAGENT_ID_NUTRIMENT = list(1,50), REAGENT_ID_SACID = list(0,1))
kitchen_tag = "nettle"
/datum/seed/nettle/New()
@@ -25,7 +25,7 @@
display_name = "death nettles"
kitchen_tag = "deathnettle"
mutants = null
chems = list("nutriment" = list(1,50), "pacid" = list(0,1))
chems = list(REAGENT_ID_NUTRIMENT = list(1,50), REAGENT_ID_PACID = list(0,1))
/datum/seed/nettle/death/New()
..()
code/modules/hydroponics/seedtypes/onion.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "onion"
display_name = "onions"
kitchen_tag = "onion"
chems = list("nutriment" = list(1,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10))
/datum/seed/onion/New()
..()
@@ -14,4 +14,4 @@
set_trait(TRAIT_PRODUCT_ICON,"onion")
set_trait(TRAIT_PRODUCT_COLOUR,"#E0C367")
set_trait(TRAIT_PLANT_ICON,"carrot")
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
code/modules/hydroponics/seedtypes/peanuts.dm
+2 -2
View File
@@ -4,7 +4,7 @@
seed_name = "peanut"
display_name = "peanut vines"
kitchen_tag = "peanut"
chems = list("nutriment" = list(1,10), "peanutoil" = list(3,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "peanutoil" = list(3,10))
/datum/seed/peanuts/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PRODUCT_ICON,"nuts")
set_trait(TRAIT_PRODUCT_COLOUR,"#C4AE7A")
set_trait(TRAIT_PLANT_ICON,"bush2")
set_trait(TRAIT_IDEAL_LIGHT, 6)
set_trait(TRAIT_IDEAL_LIGHT, 6)
code/modules/hydroponics/seedtypes/pineapple.dm
+3 -3
View File
@@ -6,7 +6,7 @@
display_name = "pineapple"
kitchen_tag = "pineapple"
mutants = list("spineapple")
chems = list("nutriment" = list(1,5), "pineapplejuice" = list(1, 20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "pineapplejuice" = list(1, 20))
/datum/seed/pineapple/New()
..()
@@ -30,7 +30,7 @@
seed_name = "spineapple"
display_name = "spineapple"
kitchen_tag = "spineapple"
chems = list("nutriment" = list(1,5), "enzyme" = list(1,5), "pineapplejuice" = list(1, 20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "enzyme" = list(1,5), "pineapplejuice" = list(1, 20))
/datum/seed/spineapple/New()
..()
@@ -46,4 +46,4 @@
set_trait(TRAIT_IDEAL_HEAT, 298)
set_trait(TRAIT_IDEAL_LIGHT, 4)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_STINGS,1)
set_trait(TRAIT_STINGS,1)
code/modules/hydroponics/seedtypes/potato.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "potato"
display_name = "potatoes"
kitchen_tag = "potato"
chems = list("nutriment" = list(1,10), "potatojuice" = list(10,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "potatojuice" = list(10,10))
/datum/seed/potato/New()
..()
@@ -15,4 +15,4 @@
set_trait(TRAIT_PRODUCT_ICON,"potato")
set_trait(TRAIT_PRODUCT_COLOUR,"#D4CAB4")
set_trait(TRAIT_PLANT_ICON,"bush2")
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
code/modules/hydroponics/seedtypes/pumpkin.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "pumpkin"
display_name = "pumpkin vine"
kitchen_tag = "pumpkin"
chems = list("nutriment" = list(1,6))
chems = list(REAGENT_ID_NUTRIMENT = list(1,6))
/datum/seed/pumpkin/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#DBAC02")
set_trait(TRAIT_PLANT_COLOUR,"#21661E")
set_trait(TRAIT_PLANT_ICON,"vine2")
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
code/modules/hydroponics/seedtypes/rhubarb.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "rhubarb"
display_name = "rhubarb"
kitchen_tag = "rhubarb"
chems = list("nutriment" = list(1,15))
chems = list(REAGENT_ID_NUTRIMENT = list(1,15))
/datum/seed/rhubarb/New()
..()
@@ -14,4 +14,4 @@
set_trait(TRAIT_POTENCY,6)
set_trait(TRAIT_PRODUCT_ICON,"stalk")
set_trait(TRAIT_PRODUCT_COLOUR,"#FD5656")
set_trait(TRAIT_PLANT_ICON,"stalk3")
set_trait(TRAIT_PLANT_ICON,"stalk3")
code/modules/hydroponics/seedtypes/rice.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "rice"
display_name = "rice stalks"
kitchen_tag = "rice"
chems = list("nutriment" = list(1,25), "rice" = list(10,15))
chems = list(REAGENT_ID_NUTRIMENT = list(1,25), "rice" = list(10,15))
/datum/seed/rice/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PLANT_COLOUR,"#8ED17D")
set_trait(TRAIT_PLANT_ICON,"stalk2")
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
code/modules/hydroponics/seedtypes/soybean.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "soybean"
display_name = "soybeans"
kitchen_tag = "soybeans"
chems = list("nutriment" = list(1,20), "soymilk" = list(10,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "soymilk" = list(10,20))
/datum/seed/soybean/New()
..()
@@ -14,4 +14,4 @@
set_trait(TRAIT_POTENCY,5)
set_trait(TRAIT_PRODUCT_ICON,"bean")
set_trait(TRAIT_PRODUCT_COLOUR,"#EBE7C0")
set_trait(TRAIT_PLANT_ICON,"stalk")
set_trait(TRAIT_PLANT_ICON,"stalk")
code/modules/hydroponics/seedtypes/sugarcane.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "sugarcane"
display_name = "sugarcanes"
kitchen_tag = "sugarcanes"
chems = list("sugar" = list(4,5))
chems = list(REAGENT_ID_SUGAR = list(4,5))
/datum/seed/sugarcane/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#B4D6BD")
set_trait(TRAIT_PLANT_COLOUR,"#6BBD68")
set_trait(TRAIT_PLANT_ICON,"stalk3")
set_trait(TRAIT_IDEAL_HEAT, 298)
set_trait(TRAIT_IDEAL_HEAT, 298)
code/modules/hydroponics/seedtypes/surik.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "surik"
display_name = "surik vine"
kitchen_tag = "surik"
chems = list("impedrezene" = list(1,3),"synaptizine" = list(1,2),"nutriment" = list(1,5))
chems = list("impedrezene" = list(1,3),"synaptizine" = list(1,2),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/surik/New()
..()
@@ -12,4 +12,4 @@
set_trait(TRAIT_MATURATION,7)
set_trait(TRAIT_PRODUCTION,7)
set_trait(TRAIT_YIELD,3)
set_trait(TRAIT_POTENCY,3)
set_trait(TRAIT_POTENCY,3)
code/modules/hydroponics/seedtypes/telriis.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "telriis"
display_name = "telriis grass"
kitchen_tag = "telriis"
chems = list("pwine" = list(1,5), "nutriment" = list(1,6))
chems = list("pwine" = list(1,5), REAGENT_ID_NUTRIMENT = list(1,6))
/datum/seed/telriis/New()
..()
@@ -13,4 +13,4 @@
set_trait(TRAIT_MATURATION,5)
set_trait(TRAIT_PRODUCTION,5)
set_trait(TRAIT_YIELD,4)
set_trait(TRAIT_POTENCY,5)
set_trait(TRAIT_POTENCY,5)
code/modules/hydroponics/seedtypes/thaadra.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "thaa'dra"
display_name = "thaa'dra lichen"
kitchen_tag = "thaadra"
chems = list("frostoil" = list(1,5),"nutriment" = list(1,5))
chems = list("frostoil" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/thaadra/New()
..()
@@ -13,4 +13,4 @@
set_trait(TRAIT_MATURATION,5)
set_trait(TRAIT_PRODUCTION,9)
set_trait(TRAIT_YIELD,2)
set_trait(TRAIT_POTENCY,5)
set_trait(TRAIT_POTENCY,5)
code/modules/hydroponics/seedtypes/tobacco.dm
+2 -2
View File
@@ -5,7 +5,7 @@
display_name = "tobacco"
kitchen_tag = "tobacco"
mutants = list("stimbush")
chems = list("nutriment" = list(1,15), "nicotine" = list(1,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,15), REAGENT_ID_NICOTINE = list(1,20))
/datum/seed/tobacco/New()
..()
@@ -23,7 +23,7 @@
name = "stimbush"
seed_name = "stim-bush"
display_name = "stim-bush"
chems = list("nutriment" = list(1,10), "hyperzine" = list(1,10), "synaptizine" = list(1,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "hyperzine" = list(1,10), "synaptizine" = list(1,5))
/datum/seed/tobacco/stimbush/New()
..()
code/modules/hydroponics/seedtypes/tomatoes.dm
+5 -5
View File
@@ -4,7 +4,7 @@
seed_name = "tomato"
display_name = "tomato plant"
mutants = list("bluetomato","bloodtomato")
chems = list("nutriment" = list(1,10), "tomatojuice" = list(10,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "tomatojuice" = list(10,10))
kitchen_tag = "tomato"
/datum/seed/tomato/New()
@@ -27,7 +27,7 @@
seed_name = "blood tomato"
display_name = "blood tomato plant"
mutants = list("killertomato")
chems = list("nutriment" = list(1,10), "blood" = list(1,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_BLOOD = list(1,5))
splat_type = /obj/effect/decal/cleanable/blood/splatter
/datum/seed/tomato/blood/New()
@@ -53,7 +53,7 @@
seed_name = "blue tomato"
display_name = "blue tomato plant"
mutants = list("bluespacetomato")
chems = list("nutriment" = list(1,20), "lube" = list(1,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "lube" = list(1,5))
/datum/seed/tomato/blue/New()
..()
@@ -65,11 +65,11 @@
seed_name = "bluespace tomato"
display_name = "bluespace tomato plant"
mutants = null
chems = list("nutriment" = list(1,20), "singulo" = list(10,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "singulo" = list(10,5))
/datum/seed/tomato/blue/teleport/New()
..()
set_trait(TRAIT_TELEPORTING,1)
set_trait(TRAIT_PRODUCT_COLOUR,"#00E5FF")
set_trait(TRAIT_BIOLUM,1)
set_trait(TRAIT_BIOLUM_COLOUR,"#4DA4A8")
set_trait(TRAIT_BIOLUM_COLOUR,"#4DA4A8")
code/modules/hydroponics/seedtypes/vale.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "vale"
display_name = "vale bush"
kitchen_tag = "vale"
chems = list("paracetamol" = list(1,5),"dexalin" = list(1,2),"nutriment"= list(1,5))
chems = list("paracetamol" = list(1,5),"dexalin" = list(1,2),REAGENT_ID_NUTRIMENT= list(1,5))
/datum/seed/vale/New()
..()
@@ -12,4 +12,4 @@
set_trait(TRAIT_MATURATION,8)
set_trait(TRAIT_PRODUCTION,10)
set_trait(TRAIT_YIELD,3)
set_trait(TRAIT_POTENCY,3)
set_trait(TRAIT_POTENCY,3)
code/modules/hydroponics/seedtypes/vanilla.dm
+1 -1
View File
@@ -3,7 +3,7 @@
seed_name = "vanilla"
display_name = "vanilla"
kitchen_tag = "vanilla"
chems = list("nutriment" = list(1,10), "vanilla" = list(2,8), "sugar" = list(1, 4))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "vanilla" = list(2,8), REAGENT_ID_SUGAR = list(1, 4))
/datum/seed/vanilla/New()
..()
code/modules/hydroponics/seedtypes/wabback.dm
+4 -4
View File
@@ -4,7 +4,7 @@
seed_name = "white wabback"
seed_noun = "nodes"
display_name = "white wabback"
chems = list("nutriment" = list(1,10), "protein" = list(1,5), "enzyme" = list(0,3))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "protein" = list(1,5), "enzyme" = list(0,3))
kitchen_tag = "wabback"
mutants = list("blackwabback","wildwabback")
has_item_product = /obj/item/stack/material/cloth
@@ -31,7 +31,7 @@
seed_name = "black wabback"
display_name = "black wabback"
mutants = null
chems = list("nutriment" = list(1,3), "protein" = list(1,10), "serotrotium_v" = list(0,1))
chems = list(REAGENT_ID_NUTRIMENT = list(1,3), "protein" = list(1,10), "serotrotium_v" = list(0,1))
/datum/seed/wabback/vine/New()
..()
@@ -44,11 +44,11 @@
display_name = "wild wabback"
mutants = list("whitewabback")
has_item_product = null
chems = list("nutriment" = list(1,15), "protein" = list(0,2), "enzyme" = list(0,1))
chems = list(REAGENT_ID_NUTRIMENT = list(1,15), "protein" = list(0,2), "enzyme" = list(0,1))
/datum/seed/wabback/wild/New()
..()
set_trait(TRAIT_IDEAL_LIGHT, 3)
set_trait(TRAIT_WATER_CONSUMPTION, 7)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.1)
set_trait(TRAIT_YIELD,5)
set_trait(TRAIT_YIELD,5)
code/modules/hydroponics/seedtypes/watermelon.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "watermelon"
display_name = "watermelon vine"
kitchen_tag = "watermelon"
chems = list("nutriment" = list(1,6), "watermelonjuice" = list(10,6))
chems = list(REAGENT_ID_NUTRIMENT = list(1,6), "watermelonjuice" = list(10,6))
/datum/seed/watermelon/New()
..()
@@ -20,4 +20,4 @@
set_trait(TRAIT_FLESH_COLOUR,"#F22C2C")
set_trait(TRAIT_IDEAL_HEAT, 298)
set_trait(TRAIT_IDEAL_LIGHT, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
code/modules/hydroponics/seedtypes/wheat.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "wheat"
display_name = "wheat stalks"
kitchen_tag = "wheat"
chems = list("nutriment" = list(1,25), "flour" = list(10,30))
chems = list(REAGENT_ID_NUTRIMENT = list(1,25), "flour" = list(10,30))
/datum/seed/wheat/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PLANT_COLOUR,"#BFAF82")
set_trait(TRAIT_PLANT_ICON,"stalk2")
set_trait(TRAIT_IDEAL_LIGHT, 6)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
code/modules/hydroponics/seedtypes/whitebeets.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "white-beet"
display_name = "white-beets"
kitchen_tag = "whitebeet"
chems = list("nutriment" = list(0,20), "sugar" = list(1,5))
chems = list(REAGENT_ID_NUTRIMENT = list(0,20), REAGENT_ID_SUGAR = list(1,5))
/datum/seed/whitebeets/New()
..()
@@ -15,4 +15,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#EEF5B0")
set_trait(TRAIT_PLANT_COLOUR,"#4D8F53")
set_trait(TRAIT_PLANT_ICON,"carrot2")
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
code/modules/hydroponics/seedtypes/wurmwoad.dm
+1 -1
View File
@@ -4,7 +4,7 @@
name = "wurmwoad"
seed_name = "wurmwoad"
display_name = "wurmwoad growth"
chems = list("nutriment" = list(1,10), "spacespice" = list(5,15))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "spacespice" = list(5,15))
kitchen_tag = "wurmwoad"
/datum/seed/wurmwoad/New()
code/modules/hydroponics/spreading/spreading.dm
+1 -1
View File
@@ -135,7 +135,7 @@
update_icon()
SSplants.add_plant(src)
//Some plants eat through plating.
if(islist(seed.chems) && !isnull(seed.chems["pacid"]))
if(islist(seed.chems) && !isnull(seed.chems[REAGENT_ID_PACID]))
var/turf/T = get_turf(src)
T.ex_act(prob(80) ? 3 : 2)
code/modules/hydroponics/spreading/spreading_growth.dm
+1 -1
View File
@@ -26,7 +26,7 @@
continue
if(floor.density)
if(!isnull(seed.chems["pacid"]))
if(!isnull(seed.chems[REAGENT_ID_PACID]))
spawn(rand(5,25)) floor.ex_act(3)
continue
code/modules/hydroponics/trays/tray.dm
+28 -28
View File
@@ -57,70 +57,70 @@
var/static/list/toxic_reagents = list(
"anti_toxin" = -2,
"toxin" = 2,
"fluorine" = 2.5,
"chlorine" = 1.5,
"sacid" = 1.5,
"pacid" = 3,
REAGENT_ID_FLUORINE = 2.5,
REAGENT_ID_CHLORINE = 1.5,
REAGENT_ID_SACID = 1.5,
REAGENT_ID_PACID = 3,
"plantbgone" = 3,
"cryoxadone" = -3,
"radium" = 2
REAGENT_ID_RADIUM = 2
)
var/static/list/nutrient_reagents = list(
"milk" = 0.1,
"beer" = 0.25,
"phosphorus" = 0.1,
"sugar" = 0.1,
REAGENT_ID_PHOSPHORUS = 0.1,
REAGENT_ID_SUGAR = 0.1,
"sodawater" = 0.1,
"ammonia" = 1,
"diethylamine" = 2,
"nutriment" = 1,
REAGENT_ID_NUTRIMENT = 1,
"adminordrazine" = 1,
"eznutrient" = 1,
"robustharvest" = 1,
"left4zed" = 1
)
var/static/list/weedkiller_reagents = list(
"fluorine" = -4,
"chlorine" = -3,
"phosphorus" = -2,
"sugar" = 2,
"sacid" = -2,
"pacid" = -4,
REAGENT_ID_FLUORINE = -4,
REAGENT_ID_CHLORINE = -3,
REAGENT_ID_PHOSPHORUS = -2,
REAGENT_ID_SUGAR = 2,
REAGENT_ID_SACID = -2,
REAGENT_ID_PACID = -4,
"plantbgone" = -8,
"adminordrazine" = -5
)
var/static/list/pestkiller_reagents = list(
"sugar" = 2,
REAGENT_ID_SUGAR = 2,
"diethylamine" = -2,
"adminordrazine" = -5
)
var/static/list/water_reagents = list(
"water" = 1,
REAGENT_ID_WATER = 1,
"adminordrazine" = 1,
"milk" = 0.9,
"beer" = 0.7,
"fluorine" = -0.5,
"chlorine" = -0.5,
"phosphorus" = -0.5,
"water" = 1,
REAGENT_ID_FLUORINE = -0.5,
REAGENT_ID_CHLORINE = -0.5,
REAGENT_ID_PHOSPHORUS = -0.5,
REAGENT_ID_WATER = 1,
"sodawater" = 1,
)
// Beneficial reagents also have values for modifying health, yield_mod and mut_mod (in that order).
var/static/list/beneficial_reagents = list(
"beer" = list( -0.05, 0, 0 ),
"fluorine" = list( -2, 0, 0 ),
"chlorine" = list( -1, 0, 0 ),
"phosphorus" = list( -0.75, 0, 0 ),
REAGENT_ID_FLUORINE = list( -2, 0, 0 ),
REAGENT_ID_CHLORINE = list( -1, 0, 0 ),
REAGENT_ID_PHOSPHORUS = list( -0.75, 0, 0 ),
"sodawater" = list( 0.1, 0, 0 ),
"sacid" = list( -1, 0, 0 ),
"pacid" = list( -2, 0, 0 ),
REAGENT_ID_SACID = list( -1, 0, 0 ),
REAGENT_ID_PACID = list( -2, 0, 0 ),
"plantbgone" = list( -2, 0, 0.2),
"cryoxadone" = list( 3, 0, 0 ),
"ammonia" = list( 0.5, 0, 0 ),
"diethylamine" = list( 1, 0, 0 ),
"nutriment" = list( 0.5, 0.1, 0 ),
"radium" = list( -1.5, 0, 0.2),
REAGENT_ID_NUTRIMENT = list( 0.5, 0.1, 0 ),
REAGENT_ID_RADIUM = list( -1.5, 0, 0.2),
"adminordrazine" = list( 1, 1, 1 ),
"robustharvest" = list( 0, 0.2, 0 ),
"left4zed" = list( 0, 0, 0.2)
@@ -129,7 +129,7 @@
// Mutagen list specifies minimum value for the mutation to take place, rather
// than a bound as the lists above specify.
var/static/list/mutagenic_reagents = list(
"radium" = 8,
REAGENT_ID_RADIUM = 8,
"mutagen" = 15
)
code/modules/integrated_electronics/passive/power.dm
+1 -1
View File
@@ -118,7 +118,7 @@
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_BIO = 2)
var/volume = 60
var/list/fuel = list(REAGENT_ID_PHORON = 50000, REAGENT_ID_SLIMEJELLY = 25000, "fuel" = 15000, "carbon" = 10000, "ethanol"= 10000, "nutriment" = 8000, "blood" = 5000)
var/list/fuel = list(REAGENT_ID_PHORON = 50000, REAGENT_ID_SLIMEJELLY = 25000, REAGENT_ID_FUEL = 15000, REAGENT_ID_CARBON = 10000, REAGENT_ID_ETHANOL= 10000, REAGENT_ID_NUTRIMENT = 8000, REAGENT_ID_BLOOD = 5000)
/obj/item/integrated_circuit/passive/power/chemical_cell/New()
..()
code/modules/materials/materials/metals/metals.dm
+21 -21
View File
@@ -4,7 +4,7 @@
// Very rare alloy that is reflective, should be used sparingly.
/datum/material/durasteel
name = "durasteel"
name = MAT_DURASTEEL
stack_type = /obj/item/stack/material/durasteel
integrity = 600
melting_point = 7000
@@ -41,7 +41,7 @@
)
/datum/material/iron
name = "iron"
name = MAT_IRON
stack_type = /obj/item/stack/material/iron
icon_colour = "#5C5454"
weight = 22
@@ -61,7 +61,7 @@
supply_conversion_value = 2
/datum/material/gold
name = "gold"
name = MAT_GOLD
stack_type = /obj/item/stack/material/gold
icon_colour = "#EDD12F"
weight = 24
@@ -73,7 +73,7 @@
supply_conversion_value = 2
/datum/material/silver
name = "silver"
name = MAT_SILVER
stack_type = /obj/item/stack/material/silver
icon_colour = "#D1E6E3"
weight = 22
@@ -85,7 +85,7 @@
supply_conversion_value = 2
/datum/material/platinum
name = "platinum"
name = MAT_PLATINUM
stack_type = /obj/item/stack/material/platinum
icon_colour = "#9999FF"
weight = 27
@@ -96,7 +96,7 @@
supply_conversion_value = 5
/datum/material/uranium
name = "uranium"
name = MAT_URANIUM
stack_type = /obj/item/stack/material/uranium
radioactivity = 12
icon_base = "stone"
@@ -108,7 +108,7 @@
supply_conversion_value = 2
/datum/material/mhydrogen
name = "mhydrogen"
name = MAT_METALHYDROGEN
stack_type = /obj/item/stack/material/mhydrogen
icon_colour = "#E6C5DE"
stack_origin_tech = list(TECH_MATERIAL = 6, TECH_POWER = 6, TECH_MAGNET = 5)
@@ -117,7 +117,7 @@
supply_conversion_value = 6
/datum/material/deuterium
name = "deuterium"
name = MAT_DEUTERIUM
stack_type = /obj/item/stack/material/deuterium
icon_colour = "#999999"
stack_origin_tech = list(TECH_MATERIAL = 3)
@@ -127,7 +127,7 @@
conductive = 0
/datum/material/tritium
name = "tritium"
name = MAT_TRITIUM
stack_type = /obj/item/stack/material/tritium
icon_colour = "#777777"
stack_origin_tech = list(TECH_MATERIAL = 5)
@@ -137,7 +137,7 @@
conductive = 0
/datum/material/osmium
name = "osmium"
name = MAT_OSMIUM
stack_type = /obj/item/stack/material/osmium
icon_colour = "#9999FF"
stack_origin_tech = list(TECH_MATERIAL = 5)
@@ -164,7 +164,7 @@
stack_origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 2)
/datum/material/bronze
name = "bronze"
name = MAT_BRONZE
stack_type = /obj/item/stack/material/bronze
icon_colour = "#EDD12F"
icon_base = "solid"
@@ -174,9 +174,9 @@
protectiveness = 9 // 33%
/datum/material/tin
name = "tin"
display_name = "tin"
use_name = "tin"
name = MAT_TIN
display_name = MAT_TIN
use_name = MAT_TIN
stack_type = /obj/item/stack/material/tin
icon_colour = "#b2afaf"
sheet_singular_name = "ingot"
@@ -186,9 +186,9 @@
weight = 13
/datum/material/copper
name = "copper"
display_name = "copper"
use_name = "copper"
name = MAT_COPPER
display_name = MAT_COPPER
use_name = MAT_COPPER
stack_type = /obj/item/stack/material/copper
conductivity = 52
icon_colour = "#af633e"
@@ -199,12 +199,12 @@
hardness = 50
/datum/material/aluminium
name = "aluminium"
display_name = "aluminium"
use_name = "aluminium"
name = MAT_ALUMINIUM
display_name = MAT_ALUMINIUM
use_name = MAT_ALUMINIUM
icon_colour = "#e5e2d0"
stack_type = /obj/item/stack/material/aluminium
sheet_singular_name = "ingot"
sheet_plural_name = "ingots"
supply_conversion_value = 2
weight = 10
weight = 10
code/modules/materials/sheets/metals/metal.dm
+32 -32
View File
@@ -6,9 +6,9 @@
apply_colour = TRUE
/obj/item/stack/material/plasteel
name = "plasteel"
name = MAT_PLASTEEL
icon_state = "sheet-reinforced"
default_type = "plasteel"
default_type = MAT_PLASTEEL
no_variants = FALSE
apply_colour = TRUE
@@ -26,10 +26,10 @@
icon_state = "rods"
/obj/item/stack/material/durasteel
name = "durasteel"
name = MAT_DURASTEEL
icon_state = "sheet-reinforced"
item_state = "sheet-metal"
default_type = "durasteel"
default_type = MAT_DURASTEEL
no_variants = FALSE
apply_colour = TRUE
@@ -42,112 +42,112 @@
no_variants = FALSE
/obj/item/stack/material/iron
name = "iron"
name = MAT_IRON
icon_state = "sheet-ingot"
default_type = "iron"
default_type = MAT_IRON
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/lead
name = "lead"
name = MAT_LEAD
icon_state = "sheet-ingot"
default_type = "lead"
default_type = MAT_LEAD
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/gold
name = "gold"
name = MAT_GOLD
icon_state = "sheet-ingot"
default_type = "gold"
default_type = MAT_GOLD
no_variants = FALSE
apply_colour = TRUE
/obj/item/stack/material/silver
name = "silver"
name = MAT_SILVER
icon_state = "sheet-ingot"
default_type = "silver"
default_type = MAT_SILVER
no_variants = FALSE
apply_colour = TRUE
//Valuable resource, cargo can sell it.
/obj/item/stack/material/platinum
name = "platinum"
name = MAT_PLATINUM
icon_state = "sheet-adamantine"
default_type = "platinum"
default_type = MAT_PLATINUM
no_variants = FALSE
apply_colour = TRUE
/obj/item/stack/material/uranium
name = "uranium"
name = MAT_URANIUM
icon_state = "sheet-uranium"
default_type = "uranium"
default_type = MAT_URANIUM
no_variants = FALSE
//Extremely valuable to Research.
/obj/item/stack/material/mhydrogen
name = "metallic hydrogen"
icon_state = "sheet-mythril"
default_type = "mhydrogen"
default_type = MAT_METALHYDROGEN
no_variants = FALSE
// Fusion fuel.
/obj/item/stack/material/deuterium
name = "deuterium"
name = MAT_DEUTERIUM
icon_state = "sheet-puck"
default_type = "deuterium"
default_type = MAT_DEUTERIUM
apply_colour = 1
no_variants = FALSE
//Fuel for MRSPACMAN generator.
/obj/item/stack/material/tritium
name = "tritium"
name = MAT_TRITIUM
icon_state = "sheet-puck"
default_type = "tritium"
default_type = MAT_TRITIUM
apply_colour = TRUE
no_variants = FALSE
/obj/item/stack/material/osmium
name = "osmium"
name = MAT_OSMIUM
icon_state = "sheet-ingot"
default_type = "osmium"
default_type = MAT_OSMIUM
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/graphite
name = "graphite"
name = MAT_GRAPHITE
icon_state = "sheet-puck"
default_type = MAT_GRAPHITE
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/bronze
name = "bronze"
name = MAT_BRONZE
icon_state = "sheet-ingot"
singular_name = "bronze ingot"
default_type = "bronze"
default_type = MAT_BRONZE
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/tin
name = "tin"
name = MAT_TIN
icon_state = "sheet-ingot"
singular_name = "tin ingot"
default_type = "tin"
default_type = MAT_TIN
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/copper
name = "copper"
name = MAT_COPPER
icon_state = "sheet-ingot"
singular_name = "copper ingot"
default_type = "copper"
default_type = MAT_COPPER
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/aluminium
name = "aluminium"
name = MAT_ALUMINIUM
icon_state = "sheet-ingot"
singular_name = "aluminium ingot"
default_type = "aluminium"
default_type = MAT_ALUMINIUM
apply_colour = 1
no_variants = FALSE
code/modules/mining/alloys.dm
+18 -18
View File
@@ -9,22 +9,22 @@
var/metaltag
/datum/alloy/durasteel
metaltag = "durasteel"
metaltag = MAT_DURASTEEL
requires = list(
"diamond" = 1,
"platinum" = 1,
"carbon" = 2,
"hematite" = 2
ORE_DIAMOND = 1,
ORE_PLATINUM = 1,
ORE_CARBON = 2,
ORE_HEMATITE = 2
)
product_mod = 0.3
product = /obj/item/stack/material/durasteel
/datum/alloy/plasteel
metaltag = "plasteel"
metaltag = MAT_PLASTEEL
requires = list(
"platinum" = 1,
"carbon" = 2,
"hematite" = 2
ORE_PLATINUM = 1,
ORE_CARBON = 2,
ORE_HEMATITE = 2
)
product_mod = 0.3
product = /obj/item/stack/material/plasteel
@@ -32,24 +32,24 @@
/datum/alloy/steel
metaltag = MAT_STEEL
requires = list(
"carbon" = 1,
"hematite" = 1
ORE_CARBON = 1,
ORE_HEMATITE = 1
)
product = /obj/item/stack/material/steel
/datum/alloy/borosilicate
metaltag = "borosilicate glass"
metaltag = MAT_PGLASS
requires = list(
"platinum" = 1,
"sand" = 2
ORE_PLATINUM = 1,
ORE_SAND = 2
)
product = /obj/item/stack/material/glass/phoronglass
/*
/datum/alloy/bronze
metaltag = "bronze"
metaltag = MAT_BRONZE
requires = list(
"copper" = 2,
"tin" = 1
ORE_COPPER = 2,
ORE_TIN = 1
)
product = /obj/item/stack/material/bronze
*/
*/
code/modules/mining/alloys_vr.dm
+3 -3
View File
@@ -3,7 +3,7 @@
requires = list(
"rutile" = 1,
"platinum" = 1,
"carbon" = 2,
REAGENT_ID_CARBON = 2,
)
product_mod = 0.3
product = /obj/item/stack/material/plastitanium
@@ -23,7 +23,7 @@
"rutile" = 1,
"sand" = 2,
"platinum" = 1,
"carbon" = 2,
REAGENT_ID_CARBON = 2,
)
product_mod = 1
product = /obj/item/stack/material/glass/plastitanium
product = /obj/item/stack/material/glass/plastitanium
code/modules/mining/ore_datum.dm
+7 -7
View File
@@ -39,7 +39,7 @@
/ore/hematite
name = ORE_HEMATITE
display_name = "hematite"
display_name = ORE_HEMATITE
smelts_to = MAT_IRON
alloy = 1
result_amount = 5
@@ -62,7 +62,7 @@
/ore/glass
name = ORE_SAND
display_name = "sand"
display_name = ORE_SAND
smelts_to = MAT_GLASS
alloy = 1
compresses_to = "sandstone"
@@ -113,7 +113,7 @@
/ore/diamond
name = ORE_DIAMOND
display_name = "diamond"
display_name = ORE_DIAMOND
alloy = 1
compresses_to = MAT_DIAMOND
result_amount = 5
@@ -178,7 +178,7 @@
/*
/ore/copper
name = ORE_COPPER
display_name = "copper"
display_name = ORE_COPPER
smelts_to = MAT_COPPER
alloy = 1
result_amount = 5
@@ -189,7 +189,7 @@
/ore/tin
name = ORE_TIN
display_name = "tin"
display_name = ORE_TIN
smelts_to = MAT_TIN
alloy = 1
result_amount = 5
@@ -208,7 +208,7 @@
/ore/bauxite
name = ORE_BAUXITE
display_name = "bauxite"
display_name = ORE_BAUXITE
smelts_to = MAT_ALUMINIUM
result_amount = 5
spread_chance = 25
@@ -218,7 +218,7 @@
*/
/ore/rutile
name = ORE_RUTILE
display_name = "rutile"
display_name = ORE_RUTILE
smelts_to = MAT_TITANIUM
result_amount = 5
spread_chance = 12
code/modules/mob/living/carbon/human/MedicalSideEffects.dm
+1 -1
View File
@@ -134,7 +134,7 @@
// ====
/datum/medical_effect/itch
name = "Itch"
triggers = list("bliss" = 10)
triggers = list(REAGENT_ID_BLISS = 10)
cures = list("inaprovaline")
cure_message = "The itching stops..."
code/modules/mob/living/carbon/human/chem_side_effects.dm
+1 -1
View File
@@ -134,7 +134,7 @@
// ====
/datum/medical_effect/itch
name = "Itch"
triggers = list("bliss" = 10)
triggers = list(REAGENT_ID_BLISS = 10)
cures = list("inaprovaline")
cure_message = "The itching stops..."
code/modules/mob/living/carbon/human/human.dm
+4 -4
View File
@@ -1040,7 +1040,7 @@
/mob/living/carbon/human/revive()
if(should_have_organ(O_HEART))
vessel.add_reagent("blood",species.blood_volume-vessel.total_volume)
vessel.add_reagent(REAGENT_ID_BLOOD,species.blood_volume-vessel.total_volume)
fixblood()
species.create_organs(src) // Reset our organs/limbs.
@@ -1313,9 +1313,9 @@
make_blood()
if(vessel.total_volume < species.blood_volume)
vessel.maximum_volume = species.blood_volume
vessel.add_reagent("blood", species.blood_volume - vessel.total_volume)
vessel.add_reagent(REAGENT_ID_BLOOD, species.blood_volume - vessel.total_volume)
else if(vessel.total_volume > species.blood_volume)
vessel.remove_reagent("blood",vessel.total_volume - species.blood_volume) //This one should stay remove_reagent to work even lack of a O_heart
vessel.remove_reagent(REAGENT_ID_BLOOD,vessel.total_volume - species.blood_volume) //This one should stay remove_reagent to work even lack of a O_heart
vessel.maximum_volume = species.blood_volume
fixblood()
species.update_attack_types() //VOREStation Edit - Required for any trait that updates unarmed_types in setup.
@@ -1788,7 +1788,7 @@
if(species?.flags & NO_BLOOD)
bloodtrail = 0
else
var/blood_volume = vessel.get_reagent_amount("blood")
var/blood_volume = vessel.get_reagent_amount(REAGENT_ID_BLOOD)
if(blood_volume < species?.blood_volume*species?.blood_level_fatal)
bloodtrail = 0 //Most of it's gone already, just leave it be
else
code/modules/mob/living/carbon/human/human_damage.dm
+1 -1
View File
@@ -436,7 +436,7 @@ This function restores the subjects blood to max.
if(!should_have_organ(O_HEART))
return
if(vessel.total_volume < species.blood_volume)
vessel.add_reagent("blood", species.blood_volume - vessel.total_volume)
vessel.add_reagent(REAGENT_ID_BLOOD, species.blood_volume - vessel.total_volume)
/*
This function restores all organs.
code/modules/mob/living/carbon/human/life.dm
+1 -1
View File
@@ -1942,7 +1942,7 @@
if(Pump)
temp += Pump.standard_pulse_level - PULSE_NORM
if(round(vessel.get_reagent_amount("blood")) <= species.blood_volume*species.blood_level_danger) //how much blood do we have
if(round(vessel.get_reagent_amount(REAGENT_ID_BLOOD)) <= species.blood_volume*species.blood_level_danger) //how much blood do we have
temp = temp + 3 //not enough :(
if(status_flags & FAKEDEATH)
code/modules/mob/living/carbon/human/species/species.dm
+2 -2
View File
@@ -41,8 +41,8 @@
var/show_ssd = "fast asleep"
var/virus_immune
var/short_sighted // Permanent weldervision.
var/blood_name = "blood" // Name for the species' blood.
var/blood_reagents = "iron" // Reagent(s) that restore lost blood. goes by reagent IDs.
var/blood_name = REAGENT_ID_BLOOD // Name for the species' blood.
var/blood_reagents = REAGENT_ID_IRON // Reagent(s) that restore lost blood. goes by reagent IDs.
var/blood_volume = 560 // Initial blood volume.
var/bloodloss_rate = 1 // Multiplier for how fast a species bleeds out. Higher = Faster
var/blood_level_safe = 0.85 //"Safe" blood level; above this, you're OK
code/modules/mob/living/carbon/human/species/station/alraune.dm
+1 -1
View File
@@ -338,7 +338,7 @@
name = "fruit gland"
desc = "A bulbous gourd-like structure."
organ_tag = A_FRUIT
var/generated_reagents = list("sugar" = 2) //This actually allows them. This could be anything, but sugar seems most fitting.
var/generated_reagents = list(REAGENT_ID_SUGAR = 2) //This actually allows them. This could be anything, but sugar seems most fitting.
var/usable_volume = 250 //Five fruit.
var/transfer_amount = 50
var/empty_message = list("Your have no fruit on you.", "You have a distinct lack of fruit..")
code/modules/mob/living/carbon/human/species/station/station.dm
+1 -1
View File
@@ -318,7 +318,7 @@
flash_mod = 1.2
chemOD_mod = 0.9
blood_reagents = "copper"
blood_reagents = REAGENT_ID_COPPER
bloodloss_rate = 1.5
ambiguous_genders = TRUE
code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
+4 -4
View File
@@ -87,9 +87,9 @@
/mob/living/carbon/human/proc/hasnutriment()
if (bloodstr.has_reagent("nutriment", 30) || src.bloodstr.has_reagent("protein", 15)) //protein needs half as much. For reference, a steak contains 9u protein.
if (bloodstr.has_reagent(REAGENT_ID_NUTRIMENT, 30) || src.bloodstr.has_reagent("protein", 15)) //protein needs half as much. For reference, a steak contains 9u protein.
return TRUE
else if (ingested.has_reagent("nutriment", 60) || src.ingested.has_reagent("protein", 30)) //try forcefeeding them, why not. Less effective.
else if (ingested.has_reagent(REAGENT_ID_NUTRIMENT, 60) || src.ingested.has_reagent("protein", 30)) //try forcefeeding them, why not. Less effective.
return TRUE
else return FALSE
@@ -1621,9 +1621,9 @@
continue
if(L == src) //no getting high off your own supply, get a nif or something, nerd.
continue
if(!L.resizable && (trait_injection_selected == "macrocillin" || trait_injection_selected == "microcillin" || trait_injection_selected == "normalcillin")) // If you're using a size reagent, ignore those with pref conflicts.
if(!L.resizable && (trait_injection_selected == REAGENT_ID_MACROCILLIN || trait_injection_selected == REAGENT_ID_MICROCILLIN || trait_injection_selected == REAGENT_ID_NORMALCILLIN)) // If you're using a size reagent, ignore those with pref conflicts.
continue
if(!L.allow_spontaneous_tf && (trait_injection_selected == "androrovir" || trait_injection_selected == "gynorovir" || trait_injection_selected == "androgynorovir")) // If you're using a TF reagent, ignore those with pref conflicts.
if(!L.allow_spontaneous_tf && (trait_injection_selected == REAGENT_ID_ANDROROVIR || trait_injection_selected == REAGENT_ID_GYNOROVIR || trait_injection_selected == REAGENT_ID_ANDROGYNOROVIR)) // If you're using a TF reagent, ignore those with pref conflicts.
continue
targets += L
code/modules/mob/living/carbon/human/species/station/station_vr.dm
+1 -1
View File
@@ -206,7 +206,7 @@
flesh_color = "#AFA59E"
base_color = "#333333"
blood_color = "#240bc4"
blood_reagents = "copper"
blood_reagents = REAGENT_ID_COPPER
reagent_tag = IS_ZORREN
color_mult = 1
code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
+9 -9
View File
@@ -170,17 +170,17 @@
/datum/trait/neutral/venom_bite/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..()
add_verb(H, /mob/living/proc/injection)
H.trait_injection_reagents += "microcillin" // get small
H.trait_injection_reagents += "macrocillin" // get BIG
H.trait_injection_reagents += "normalcillin" // normal
H.trait_injection_reagents += REAGENT_ID_MICROCILLIN // get small
H.trait_injection_reagents += REAGENT_ID_MACROCILLIN // get BIG
H.trait_injection_reagents += REAGENT_ID_NORMALCILLIN // normal
H.trait_injection_reagents += "numbenzyme" // no feelings
H.trait_injection_reagents += "androrovir" // -> MALE
H.trait_injection_reagents += "gynorovir" // -> FEMALE
H.trait_injection_reagents += "androgynorovir" // -> PLURAL
H.trait_injection_reagents += REAGENT_ID_ANDROROVIR // -> MALE
H.trait_injection_reagents += REAGENT_ID_GYNOROVIR // -> FEMALE
H.trait_injection_reagents += REAGENT_ID_ANDROGYNOROVIR // -> PLURAL
H.trait_injection_reagents += "stoxin" // night night chem
H.trait_injection_reagents += "rainbowtoxin" // Funny flashing lights.
H.trait_injection_reagents += "paralysistoxin" // Paralysis!
H.trait_injection_reagents += "painenzyme" // Pain INCREASER
H.trait_injection_reagents += REAGENT_ID_RAINBOWTOXIN // Funny flashing lights.
H.trait_injection_reagents += REAGENT_ID_PARALYSISTOXIN // Paralysis!
H.trait_injection_reagents += REAGENT_ID_PAINENZYME // Pain INCREASER
/datum/trait/neutral/long_vore
name = "Long Predatorial Reach"
code/modules/mob/living/carbon/metroid/items.dm
+1 -1
View File
@@ -358,7 +358,7 @@
/obj/item/reagent_containers/food/snacks/egg/slime/Initialize()
. = ..()
reagents.add_reagent("nutriment", 4)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 4)
reagents.add_reagent("slimejelly", 1)
addtimer(CALLBACK(src, ./proc/Grow), rand(120 SECONDS, 150 SECONDS))

Some files were not shown because too many files have changed in this diff Show More