shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more work.

Browse Source
This commit is contained in:
Ghommie
2019-12-25 01:34:33 +01:00
parent d571bbd292
commit 53d142b4c0
87 changed files with 963 additions and 963 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/clothing.dm
+1 -1
View File
@@ -70,7 +70,7 @@
/obj/item/reagent_containers/food/snacks/clothing
name = "oops"
desc = "If you're reading this it means I messed up. This is related to moths eating clothes and I didn't know a better way to do it than making a new food object."
list_reagents = list("nutriment" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 1)
tastes = list("dust" = 1, "lint" = 1)
/obj/item/clothing/attack(mob/M, mob/user, def_zone)
code/modules/events/holiday/vday.dm
+1 -1
View File
@@ -157,7 +157,7 @@
icon = 'icons/obj/holiday_misc.dmi'
icon_state = "candyheart"
desc = "A heart-shaped candy that reads: "
list_reagents = list("sugar" = 2)
list_reagents = list(/datum/reagent/consumable/sugar = 2)
junkiness = 5
/obj/item/reagent_containers/food/snacks/candyheart/New()
code/modules/food_and_drinks/drinks/drinks.dm
+1 -1
View File
@@ -236,7 +236,7 @@
/obj/item/reagent_containers/food/drinks/mug/coco
name = "Dutch hot coco"
desc = "Made in Space South America."
list_reagents = list("hot_coco" = 30, "sugar" = 5)
list_reagents = list("hot_coco" = 30, /datum/reagent/consumable/sugar = 5)
foodtype = SUGAR
resistance_flags = FREEZE_PROOF
code/modules/food_and_drinks/food/condiment.dm
+18 -18
View File
@@ -15,19 +15,19 @@
volume = 50
//Possible_states has the reagent id as key and a list of, in order, the icon_state, the name and the desc as values. Used in the on_reagent_change(changetype) to change names, descs and sprites.
var/list/possible_states = list(
"ketchup" = list("ketchup", "ketchup bottle", "You feel more American already."),
"mustard" = list("mustard", "mustard bottle", "A spice mixed with enzymes and water."),
"capsaicin" = list("hotsauce", "hotsauce bottle", "You can almost TASTE the stomach ulcers now!"),
"enzyme" = list("enzyme", "universal enzyme bottle", "Used in cooking various dishes"),
"soysauce" = list("soysauce", "soy sauce bottle", "A salty soy-based flavoring"),
"frostoil" = list("coldsauce", "coldsauce bottle", "Leaves the tongue numb in its passage"),
"sodiumchloride" = list("saltshakersmall", "salt shaker", "Salt. From space oceans, presumably"),
"blackpepper" = list("peppermillsmall", "pepper mill", "Often used to flavor food or make people sneeze"),
"cornoil" = list("oliveoil", "corn oil bottle", "A delicious oil used in cooking. Made from corn"),
"sugar" = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!"),
"mayonnaise" = list("mayonnaise", "mayonnaise jar", "An oily condiment made from egg yolks."),
"bbqsauce" = list("condi_bbq", "BBQ sauce", "Hand wipes not included."),
"peanut_butter" = list("peanutbutter", "peanut butter jar", "A deliciously and sticky spread made from peanuts."))
/datum/reagent/consumable/ketchup = list("ketchup", "ketchup bottle", "You feel more American already."),
/datum/reagent/consumable/mustard = list("mustard", "mustard bottle", "A spice mixed with enzymes and water."),
/datum/reagent/consumable/capsaicin = list("hotsauce", "hotsauce bottle", "You can almost TASTE the stomach ulcers now!"),
/datum/reagent/consumable/enzyme = list("enzyme", "universal enzyme bottle", "Used in cooking various dishes"),
/datum/reagent/consumable/soysauce = list("soysauce", "soy sauce bottle", "A salty soy-based flavoring"),
/datum/reagent/consumable/frostoil = list("coldsauce", "coldsauce bottle", "Leaves the tongue numb in its passage"),
/datum/reagent/consumable/sodiumchloride = list("saltshakersmall", "salt shaker", "Salt. From space oceans, presumably"),
/datum/reagent/consumable/blackpepper = list("peppermillsmall", "pepper mill", "Often used to flavor food or make people sneeze"),
/datum/reagent/consumable/cornoil = list("oliveoil", "corn oil bottle", "A delicious oil used in cooking. Made from corn"),
/datum/reagent/consumable/sugar = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!"),
/datum/reagent/consumable/mayonnaise = list("mayonnaise", "mayonnaise jar", "An oily condiment made from egg yolks."),
/datum/reagent/consumable/bbqsauce = list("condi_bbq", "BBQ sauce", "Hand wipes not included."),
/datum/reagent/consumable/peanut_butter = list("peanutbutter", "peanut butter jar", "A deliciously and sticky spread made from peanuts."))
var/originalname = "condiment" //Can't use initial(name) for this. This stores the name set by condimasters.
/obj/item/reagent_containers/food/condiment/suicide_act(mob/living/carbon/user)
@@ -117,12 +117,12 @@
name = "universal enzyme"
desc = "Used in cooking various dishes."
icon_state = "enzyme"
list_reagents = list("enzyme" = 50)
list_reagents = list(/datum/reagent/consumable/enzyme = 50)
/obj/item/reagent_containers/food/condiment/sugar
name = "sugar bottle"
desc = "Tasty spacey sugar!"
list_reagents = list("sugar" = 50)
list_reagents = list(/datum/reagent/consumable/sugar = 50)
/obj/item/reagent_containers/food/condiment/saltshaker //Separate from above since it's a small shaker rather then
name = "salt shaker" // a large one.
@@ -131,7 +131,7 @@
possible_transfer_amounts = list(1,20) //for clown turning the lid off
amount_per_transfer_from_this = 1
volume = 20
list_reagents = list("sodiumchloride" = 20)
list_reagents = list(/datum/reagent/consumable/sodiumchloride = 20)
possible_states = list()
/obj/item/reagent_containers/food/condiment/saltshaker/on_reagent_change(changetype)
@@ -169,7 +169,7 @@
possible_transfer_amounts = list(1,20) //for clown turning the lid off
amount_per_transfer_from_this = 1
volume = 20
list_reagents = list("blackpepper" = 20)
list_reagents = list(/datum/reagent/consumable/blackpepper = 20)
possible_states = list()
/obj/item/reagent_containers/food/condiment/peppermill/on_reagent_change(changetype)
@@ -185,7 +185,7 @@
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
list_reagents = list("milk" = 50)
list_reagents = list(/datum/reagent/consumable/milk = 50)
possible_states = list()
/obj/item/reagent_containers/food/condiment/flour
code/modules/food_and_drinks/food/customizables.dm
+1 -1
View File
@@ -189,7 +189,7 @@
desc = "Delicious food on a stick."
ingredients_placement = INGREDIENTS_LINE
trash = /obj/item/stack/rods
list_reagents = list("nutriment" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 1)
ingMax = 6
icon_state = "rod"
code/modules/food_and_drinks/food/snacks/dough.dm
+8 -8
View File
@@ -8,7 +8,7 @@
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "dough"
cooked_type = /obj/item/reagent_containers/food/snacks/store/bread/plain
list_reagents = list("nutriment" = 6)
list_reagents = list(/datum/reagent/consumable/nutriment = 6)
w_class = WEIGHT_CLASS_NORMAL
tastes = list("dough" = 1)
foodtype = GRAIN
@@ -36,7 +36,7 @@
slice_path = /obj/item/reagent_containers/food/snacks/doughslice
slices_num = 3
cooked_type = /obj/item/reagent_containers/food/snacks/pizzabread
list_reagents = list("nutriment" = 6)
list_reagents = list(/datum/reagent/consumable/nutriment = 6)
w_class = WEIGHT_CLASS_NORMAL
tastes = list("dough" = 1)
foodtype = GRAIN
@@ -47,7 +47,7 @@
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "pizzabread"
custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/pizza
list_reagents = list("nutriment" = 7)
list_reagents = list(/datum/reagent/consumable/nutriment = 7)
w_class = WEIGHT_CLASS_NORMAL
tastes = list("bread" = 1)
foodtype = GRAIN
@@ -69,7 +69,7 @@
desc = "A base for any self-respecting burger."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "bun"
list_reagents = list("nutriment" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 1)
custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/burger
filling_color = "#CD853F"
tastes = list("bun" = 1) // the bun tastes of bun.
@@ -81,7 +81,7 @@
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "cakebatter"
cooked_type = /obj/item/reagent_containers/food/snacks/store/cake/plain
list_reagents = list("nutriment" = 9)
list_reagents = list(/datum/reagent/consumable/nutriment = 9)
w_class = WEIGHT_CLASS_NORMAL
tastes = list("batter" = 1)
foodtype = GRAIN | DAIRY
@@ -106,7 +106,7 @@
slice_path = /obj/item/reagent_containers/food/snacks/rawpastrybase
slices_num = 3
cooked_type = /obj/item/reagent_containers/food/snacks/pie/plain
list_reagents = list("nutriment" = 9)
list_reagents = list(/datum/reagent/consumable/nutriment = 9)
w_class = WEIGHT_CLASS_NORMAL
tastes = list("dough" = 1)
foodtype = GRAIN | DAIRY
@@ -118,7 +118,7 @@
icon_state = "rawpastrybase"
cooked_type = /obj/item/reagent_containers/food/snacks/pastrybase
filling_color = "#CD853F"
list_reagents = list("nutriment" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 1)
tastes = list("raw pastry" = 1)
foodtype = GRAIN | DAIRY
@@ -127,7 +127,7 @@
desc = "A base for any self-respecting pastry."
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "pastrybase"
list_reagents = list("nutriment" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 1)
filling_color = "#CD853F"
tastes = list("pastry" = 1)
foodtype = GRAIN | DAIRY
code/modules/food_and_drinks/food/snacks/meat.dm
+23 -23
View File
@@ -8,7 +8,7 @@
icon_state = "meat"
dried_type = /obj/item/reagent_containers/food/snacks/sosjerky/healthy
bitesize = 3
list_reagents = list("nutriment" = 3, "cooking_oil" = 2) //Meat has fats that a food processor can process into cooking oil
list_reagents = list(/datum/reagent/consumable/nutriment = 3, "cooking_oil" = 2) //Meat has fats that a food processor can process into cooking oil
cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/plain
slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain
slices_num = 3
@@ -63,7 +63,7 @@
icon_state = "crabmeatraw"
cooked_type = /obj/item/reagent_containers/food/snacks/meat/crab
bitesize = 3
list_reagents = list("nutriment" = 1, "cooking_oil" = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, "cooking_oil" = 3)
filling_color = "#EAD079"
tastes = list("raw crab" = 1)
foodtype = RAW | MEAT
@@ -72,8 +72,8 @@
name = "crab meat"
desc = "Some deliciously cooked crab meat."
icon_state = "crabmeat"
list_reagents = list("nutriment" = 2)
bonus_reagents = list("nutriment" = 3, "vitamin" = 2, "cooking_oil" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, "cooking_oil" = 2)
filling_color = "#DFB73A"
tastes = list("crab" = 1)
foodtype = MEAT
@@ -88,7 +88,7 @@
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime
icon_state = "slimemeat"
desc = "Because jello wasn't offensive enough to vegans."
list_reagents = list("nutriment" = 3, "slimejelly" = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, "slimejelly" = 3)
filling_color = "#00FFFF"
tastes = list("slime" = 1, "jelly" = 1)
foodtype = MEAT | RAW | TOXIC
@@ -96,7 +96,7 @@
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem
icon_state = "golemmeat"
desc = "Edible rocks, welcome to the future."
list_reagents = list("nutriment" = 3, "iron" = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/iron = 3)
filling_color = "#A9A9A9"
tastes = list("rock" = 1)
foodtype = MEAT | RAW | GROSS
@@ -131,7 +131,7 @@
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/fly
icon_state = "flymeat"
desc = "Nothing says tasty like maggot filled radioactive mutant flesh."
list_reagents = list("nutriment" = 3, "uranium" = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, "uranium" = 3)
tastes = list("maggots" = 1, "the inside of a reactor" = 1)
foodtype = MEAT | RAW | GROSS
@@ -214,7 +214,7 @@
name = "killer tomato meat"
desc = "A slice from a huge tomato."
icon_state = "tomatomeat"
list_reagents = list("nutriment" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 2)
filling_color = "#FF0000"
cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/killertomato
slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/killertomato
@@ -225,7 +225,7 @@
name = "bear meat"
desc = "A very manly slab of meat."
icon_state = "bearmeat"
list_reagents = list("nutriment" = 12, "morphine" = 5, "vitamin" = 2, "cooking_oil" = 6)
list_reagents = list(/datum/reagent/consumable/nutriment = 12, "morphine" = 5, /datum/reagent/consumable/nutriment/vitamin = 2, "cooking_oil" = 6)
filling_color = "#FFB6C1"
cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/bear
slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/bear
@@ -236,7 +236,7 @@
name = "xeno meat"
desc = "A slab of meat."
icon_state = "xenomeat"
list_reagents = list("nutriment" = 3, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
bitesize = 4
filling_color = "#32CD32"
cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/xeno
@@ -248,7 +248,7 @@
name = "spider meat"
desc = "A slab of spider meat."
icon_state = "spidermeat"
list_reagents = list("nutriment" = 3, "toxin" = 3, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/toxin = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#7CFC00"
cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/spider
slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/spider
@@ -258,7 +258,7 @@
/obj/item/reagent_containers/food/snacks/meat/slab/goliath
name = "goliath meat"
desc = "A slab of goliath meat. It's not very edible now, but it cooks great in lava."
list_reagents = list("nutriment" = 3, "toxin" = 5, "cooking_oil" = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/toxin = 5, "cooking_oil" = 3)
icon_state = "goliathmeat"
tastes = list("meat" = 1)
foodtype = RAW | MEAT | TOXIC
@@ -271,7 +271,7 @@
/obj/item/reagent_containers/food/snacks/meat/slab/meatwheat
name = "meatwheat clump"
desc = "This doesn't look like meat, but your standards aren't <i>that</i> high to begin with."
list_reagents = list("nutriment" = 3, "vitamin" = 2, "blood" = 5, "cooking_oil" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, "blood" = 5, "cooking_oil" = 1)
filling_color = rgb(150, 0, 0)
icon_state = "meatwheat_clump"
bitesize = 4
@@ -281,7 +281,7 @@
/obj/item/reagent_containers/food/snacks/meat/slab/gorilla
name = "gorilla meat"
desc = "Much meatier than monkey meat."
list_reagents = list("nutriment" = 5, "vitamin" = 1, "cooking_oil" = 5) //Plenty of fat!
list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1, "cooking_oil" = 5) //Plenty of fat!
/obj/item/reagent_containers/food/snacks/meat/rawbacon
name = "raw piece of bacon"
@@ -289,7 +289,7 @@
icon_state = "bacon"
cooked_type = /obj/item/reagent_containers/food/snacks/meat/bacon
bitesize = 2
list_reagents = list("nutriment" = 1, "cooking_oil" = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, "cooking_oil" = 3)
filling_color = "#B22222"
tastes = list("bacon" = 1)
foodtype = RAW | MEAT
@@ -298,8 +298,8 @@
name = "piece of bacon"
desc = "A delicious piece of bacon."
icon_state = "baconcooked"
list_reagents = list("nutriment" = 2)
bonus_reagents = list("nutriment" = 1, "vitamin" = 1, "cooking_oil" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1, "cooking_oil" = 2)
filling_color = "#854817"
tastes = list("bacon" = 1)
foodtype = MEAT | BREAKFAST
@@ -307,7 +307,7 @@
/obj/item/reagent_containers/food/snacks/meat/slab/gondola
name = "gondola meat"
desc = "According to legends of old, consuming raw gondola flesh grants one inner peace."
list_reagents = list("nutriment" = 3, "tranquility" = 5, "cooking_oil" = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, "tranquility" = 5, "cooking_oil" = 3)
tastes = list("meat" = 4, "tranquility" = 1)
filling_color = "#9A6750"
cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/gondola
@@ -321,8 +321,8 @@
name = "steak"
desc = "A piece of hot spicy meat."
icon_state = "meatsteak"
list_reagents = list("nutriment" = 5)
bonus_reagents = list("nutriment" = 2, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
trash = /obj/item/trash/plate
filling_color = "#B22222"
foodtype = MEAT
@@ -383,7 +383,7 @@
icon_state = "rawcutlet"
cooked_type = /obj/item/reagent_containers/food/snacks/meat/cutlet/plain
bitesize = 2
list_reagents = list("nutriment" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 1)
filling_color = "#B22222"
tastes = list("meat" = 1)
var/meat_type = "meat"
@@ -447,8 +447,8 @@
desc = "A cooked meat cutlet."
icon_state = "cutlet"
bitesize = 2
list_reagents = list("nutriment" = 2)
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#B22222"
tastes = list("meat" = 1)
foodtype = MEAT
code/modules/food_and_drinks/food/snacks_bread.dm
+31 -31
View File
@@ -12,7 +12,7 @@
bitesize = 2
custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/sandwich
filling_color = "#FFA500"
list_reagents = list("nutriment" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 2)
slot_flags = ITEM_SLOT_HEAD
customfoodfilling = 0 //to avoid infinite bread-ception
foodtype = GRAIN
@@ -22,8 +22,8 @@
name = "bread"
desc = "Some plain old earthen bread."
icon_state = "bread"
bonus_reagents = list("nutriment" = 7)
list_reagents = list("nutriment" = 10)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 7)
list_reagents = list(/datum/reagent/consumable/nutriment = 10)
custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/bread
slice_path = /obj/item/reagent_containers/food/snacks/breadslice/plain
tastes = list("bread" = 10)
@@ -41,8 +41,8 @@
desc = "The culinary base of every self-respecting eloquen/tg/entleman."
icon_state = "meatbread"
slice_path = /obj/item/reagent_containers/food/snacks/breadslice/meat
bonus_reagents = list("nutriment" = 5, "vitamin" = 10)
list_reagents = list("nutriment" = 30, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 10)
list_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("bread" = 10, "meat" = 10)
foodtype = GRAIN | MEAT
@@ -57,8 +57,8 @@
desc = "The culinary base of every self-respecting eloquen/tg/entleman. Extra Heretical."
icon_state = "xenomeatbread"
slice_path = /obj/item/reagent_containers/food/snacks/breadslice/xenomeat
bonus_reagents = list("nutriment" = 5, "vitamin" = 10)
list_reagents = list("nutriment" = 30, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 10)
list_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("bread" = 10, "acid" = 10)
foodtype = GRAIN | MEAT
@@ -67,7 +67,7 @@
desc = "A slice of delicious meatbread. Extra Heretical."
icon_state = "xenobreadslice"
filling_color = "#32CD32"
list_reagents = list("nutriment" = 6, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
foodtype = GRAIN | MEAT
/obj/item/reagent_containers/food/snacks/store/bread/spidermeat
@@ -75,8 +75,8 @@
desc = "Reassuringly green meatloaf made from spider meat."
icon_state = "spidermeatbread"
slice_path = /obj/item/reagent_containers/food/snacks/breadslice/spidermeat
bonus_reagents = list("nutriment" = 5, "vitamin" = 10)
list_reagents = list("nutriment" = 30, "toxin" = 15, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 10)
list_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/toxin = 15, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("bread" = 10, "cobwebs" = 5)
foodtype = GRAIN | MEAT | TOXIC
@@ -85,7 +85,7 @@
desc = "A slice of meatloaf made from an animal that most likely still wants you dead."
icon_state = "xenobreadslice"
filling_color = "#7CFC00"
list_reagents = list("nutriment" = 6, "toxin" = 3, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/toxin = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
foodtype = GRAIN | MEAT | TOXIC
/obj/item/reagent_containers/food/snacks/store/bread/banana
@@ -93,8 +93,8 @@
desc = "A heavenly and filling treat."
icon_state = "bananabread"
slice_path = /obj/item/reagent_containers/food/snacks/breadslice/banana
bonus_reagents = list("nutriment" = 5, "banana" = 20)
list_reagents = list("nutriment" = 20, "banana" = 20)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/banana = 20)
list_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/consumable/banana = 20)
tastes = list("bread" = 10) // bananjuice will also flavour
foodtype = GRAIN | FRUIT
@@ -104,7 +104,7 @@
desc = "A slice of delicious banana bread."
icon_state = "bananabreadslice"
filling_color = "#FFD700"
list_reagents = list("nutriment" = 4, "banana" = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/banana = 4)
foodtype = GRAIN | FRUIT
/obj/item/reagent_containers/food/snacks/store/bread/tofu
@@ -112,8 +112,8 @@
desc = "Like meatbread but for vegetarians. Not guaranteed to give superpowers."
icon_state = "tofubread"
slice_path = /obj/item/reagent_containers/food/snacks/breadslice/tofu
bonus_reagents = list("nutriment" = 5, "vitamin" = 10)
list_reagents = list("nutriment" = 20, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 10)
list_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("bread" = 10, "tofu" = 10)
foodtype = GRAIN | VEGETABLES
@@ -122,7 +122,7 @@
desc = "A slice of delicious tofubread."
icon_state = "tofubreadslice"
filling_color = "#FF8C00"
list_reagents = list("nutriment" = 4, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1)
foodtype = GRAIN | VEGETABLES
/obj/item/reagent_containers/food/snacks/store/bread/creamcheese
@@ -130,8 +130,8 @@
desc = "Yum yum yum!"
icon_state = "creamcheesebread"
slice_path = /obj/item/reagent_containers/food/snacks/breadslice/creamcheese
bonus_reagents = list("nutriment" = 5, "vitamin" = 5)
list_reagents = list("nutriment" = 20, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("bread" = 10, "cheese" = 10)
foodtype = GRAIN | DAIRY
@@ -140,7 +140,7 @@
desc = "A slice of yum!"
icon_state = "creamcheesebreadslice"
filling_color = "#FF8C00"
list_reagents = list("nutriment" = 4, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1)
foodtype = GRAIN | DAIRY
/obj/item/reagent_containers/food/snacks/store/bread/mimana
@@ -148,8 +148,8 @@
desc = "Best eaten in silence."
icon_state = "mimanabread"
slice_path = /obj/item/reagent_containers/food/snacks/breadslice/mimana
bonus_reagents = list("nutriment" = 5, "vitamin" = 5)
list_reagents = list("nutriment" = 20, "mutetoxin" = 5, "nothing" = 5, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 20, "mutetoxin" = 5, "nothing" = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("bread" = 10, "silence" = 10)
foodtype = GRAIN | FRUIT
@@ -158,7 +158,7 @@
desc = "A slice of silence!"
icon_state = "mimanabreadslice"
filling_color = "#C0C0C0"
list_reagents = list("nutriment" = 2, "mutetoxin" = 1, "nothing" = 1, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 2, "mutetoxin" = 1, "nothing" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
foodtype = GRAIN | FRUIT
/obj/item/reagent_containers/food/snacks/breadslice/custom
@@ -172,8 +172,8 @@
desc = "Bon appetit!"
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "baguette"
bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
list_reagents = list("nutriment" = 6, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
bitesize = 3
w_class = WEIGHT_CLASS_NORMAL
tastes = list("bread" = 1)
@@ -268,8 +268,8 @@ GLOBAL_LIST_INIT(frying_bad_chems, list(
icon_state = "butteredtoast"
bitesize = 3
filling_color = "#FFA500"
list_reagents = list("nutriment" = 4)
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("butter" = 1, "toast" = 1)
foodtype = GRAIN | BREAKFAST
@@ -279,8 +279,8 @@ GLOBAL_LIST_INIT(frying_bad_chems, list(
icon = 'icons/obj/food/food.dmi'
icon_state = "butterbiscuit"
filling_color = "#F0E68C"
list_reagents = list("nutriment" = 5)
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("butter" = 1, "biscuit" = 1)
foodtype = GRAIN | BREAKFAST
@@ -291,8 +291,8 @@ GLOBAL_LIST_INIT(frying_bad_chems, list(
icon_state = "butterdog"
bitesize = 1
filling_color = "#F1F49A"
list_reagents = list("nutriment" = 5)
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("butter", "exotic butter")
/obj/item/reagent_containers/food/snacks/butterdog/ComponentInitialize()
code/modules/food_and_drinks/food/snacks_burgers.dm
+45 -45
View File
@@ -3,14 +3,14 @@
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "hburger"
bitesize = 3
list_reagents = list("nutriment" = 6, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("bun" = 4)
foodtype = GRAIN | MEAT
/obj/item/reagent_containers/food/snacks/burger/plain
name = "burger"
desc = "The cornerstone of every nutritious breakfast."
bonus_reagents = list("vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 1)
foodtype = GRAIN | MEAT
/obj/item/reagent_containers/food/snacks/burger/plain/Initialize()
@@ -31,7 +31,7 @@
var/subjectjob = null
name = "human burger"
desc = "A bloody burger."
bonus_reagents = list("vitamin" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 4)
foodtype = MEAT | GRAIN | GROSS
/obj/item/reagent_containers/food/snacks/burger/human/CheckParts(list/parts_list)
@@ -50,13 +50,13 @@
/obj/item/reagent_containers/food/snacks/burger/corgi
name = "corgi burger"
desc = "You monster."
bonus_reagents = list("vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 1)
foodtype = GRAIN | MEAT | GROSS
/obj/item/reagent_containers/food/snacks/burger/appendix
name = "appendix burger"
desc = "Tastes like appendicitis."
bonus_reagents = list("nutriment" = 6, "vitamin" = 6)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 6)
icon_state = "appendixburger"
tastes = list("bun" = 4, "grass" = 2)
foodtype = GRAIN | MEAT | GROSS
@@ -65,7 +65,7 @@
name = "fillet -o- carp sandwich"
desc = "Almost like a carp is yelling somewhere... Give me back that fillet -o- carp, give me that carp."
icon_state = "fishburger"
bonus_reagents = list("nutriment" = 2, "vitamin" = 3)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 3)
tastes = list("bun" = 4, "fish" = 4)
foodtype = GRAIN | MEAT
@@ -73,7 +73,7 @@
name = "tofu burger"
desc = "What.. is that meat?"
icon_state = "tofuburger"
bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("bun" = 4, "tofu" = 4)
foodtype = GRAIN | VEGETABLES
@@ -81,8 +81,8 @@
name = "roburger"
desc = "The lettuce is the only organic component. Beep."
icon_state = "roburger"
bonus_reagents = list("nutriment" = 2, "nanomachines" = 2, "vitamin" = 5)
list_reagents = list("nutriment" = 6, "nanomachines" = 5, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, "nanomachines" = 2, /datum/reagent/consumable/nutriment/vitamin = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, "nanomachines" = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("bun" = 4, "lettuce" = 2, "sludge" = 1)
foodtype = GRAIN | TOXIC
@@ -91,8 +91,8 @@
desc = "This massive patty looks like poison. Beep."
icon_state = "roburger"
volume = 120
bonus_reagents = list("nutriment" = 5, "nanomachines" = 70, "vitamin" = 10)
list_reagents = list("nutriment" = 6, "nanomachines" = 70, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, "nanomachines" = 70, /datum/reagent/consumable/nutriment/vitamin = 10)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, "nanomachines" = 70, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("bun" = 4, "lettuce" = 2, "sludge" = 1)
foodtype = GRAIN | TOXIC
@@ -100,7 +100,7 @@
name = "xenoburger"
desc = "Smells caustic. Tastes like heresy."
icon_state = "xburger"
bonus_reagents = list("nutriment" = 2, "vitamin" = 6)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 6)
tastes = list("bun" = 4, "acid" = 4)
foodtype = GRAIN | MEAT
@@ -108,29 +108,29 @@
name = "bearger"
desc = "Best served rawr."
icon_state = "bearger"
bonus_reagents = list("nutriment" = 3, "vitamin" = 6)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 6)
foodtype = GRAIN | MEAT
/obj/item/reagent_containers/food/snacks/burger/clown
name = "clown burger"
desc = "This tastes funny..."
icon_state = "clownburger"
bonus_reagents = list("nutriment" = 4, "vitamin" = 6, "banana" = 6)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/consumable/banana = 6)
foodtype = GRAIN | FRUIT
/obj/item/reagent_containers/food/snacks/burger/mime
name = "mime burger"
desc = "Its taste defies language."
icon_state = "mimeburger"
bonus_reagents = list("nutriment" = 4, "vitamin" = 6, "nothing" = 6)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 6, "nothing" = 6)
foodtype = GRAIN
/obj/item/reagent_containers/food/snacks/burger/brain
name = "brainburger"
desc = "A strange looking burger. It looks almost sentient."
icon_state = "brainburger"
bonus_reagents = list("nutriment" = 6, "mannitol" = 6, "vitamin" = 5)
list_reagents = list("nutriment" = 6, "mannitol" = 5, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/medicine/mannitol = 6, /datum/reagent/consumable/nutriment/vitamin = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/medicine/mannitol = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("bun" = 4, "brains" = 2)
foodtype = GRAIN | MEAT | GROSS
@@ -139,7 +139,7 @@
name = "ghost burger"
desc = "Too Spooky!"
icon_state = "ghostburger"
bonus_reagents = list("nutriment" = 5, "vitamin" = 12)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 12)
tastes = list("bun" = 4, "ectoplasm" = 2)
foodtype = GRAIN
alpha = 170
@@ -188,7 +188,7 @@
desc = "Perfect for hiding the fact it's burnt to a crisp."
icon_state = "cburger"
color = "#DA0000FF"
bonus_reagents = list("redcrayonpowder" = 10, "vitamin" = 5)
bonus_reagents = list("redcrayonpowder" = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
foodtype = GRAIN | MEAT
/obj/item/reagent_containers/food/snacks/burger/orange
@@ -196,7 +196,7 @@
desc = "Contains 0% juice."
icon_state = "cburger"
color = "#FF9300FF"
bonus_reagents = list("orangecrayonpowder" = 10, "vitamin" = 5)
bonus_reagents = list("orangecrayonpowder" = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
foodtype = GRAIN | MEAT
/obj/item/reagent_containers/food/snacks/burger/yellow
@@ -204,7 +204,7 @@
desc = "Bright to the last bite."
icon_state = "cburger"
color = "#FFF200FF"
bonus_reagents = list("yellowcrayonpowder" = 10, "vitamin" = 5)
bonus_reagents = list("yellowcrayonpowder" = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
foodtype = GRAIN | MEAT
/obj/item/reagent_containers/food/snacks/burger/green
@@ -212,7 +212,7 @@
desc = "It's not tainted meat, it's painted meat!"
icon_state = "cburger"
color = "#A8E61DFF"
bonus_reagents = list("greencrayonpowder" = 10, "vitamin" = 5)
bonus_reagents = list("greencrayonpowder" = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
foodtype = GRAIN | MEAT
/obj/item/reagent_containers/food/snacks/burger/blue
@@ -220,7 +220,7 @@
desc = "Is this blue rare?"
icon_state = "cburger"
color = "#00B7EFFF"
bonus_reagents = list("bluecrayonpowder" = 10, "vitamin" = 5)
bonus_reagents = list("bluecrayonpowder" = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
foodtype = GRAIN | MEAT
/obj/item/reagent_containers/food/snacks/burger/purple
@@ -228,7 +228,7 @@
desc = "Regal and low class at the same time."
icon_state = "cburger"
color = "#DA00FFFF"
bonus_reagents = list("purplecrayonpowder" = 10, "vitamin" = 5)
bonus_reagents = list("purplecrayonpowder" = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
foodtype = GRAIN | MEAT
/obj/item/reagent_containers/food/snacks/burger/black
@@ -236,7 +236,7 @@
desc = "This is overcooked."
icon_state = "cburger"
color = "#1C1C1C"
bonus_reagents = list("blackcrayonpowder" = 10, "vitamin" = 5)
bonus_reagents = list("blackcrayonpowder" = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
foodtype = GRAIN | MEAT
/obj/item/reagent_containers/food/snacks/burger/white
@@ -244,14 +244,14 @@
desc = "Delicous Titanium!"
icon_state = "cburger"
color = "#FFFFFF"
bonus_reagents = list("whitecrayonpowder" = 10, "vitamin" = 5)
bonus_reagents = list("whitecrayonpowder" = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
foodtype = GRAIN | MEAT
/obj/item/reagent_containers/food/snacks/burger/spell
name = "spell burger"
desc = "This is absolutely Ei Nath."
icon_state = "spellburger"
bonus_reagents = list("nutriment" = 6, "vitamin" = 10)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 10)
tastes = list("bun" = 4, "magic" = 2)
foodtype = GRAIN | MEAT
@@ -259,8 +259,8 @@
name = "big bite burger"
desc = "Forget the Big Mac. THIS is the future!"
icon_state = "bigbiteburger"
bonus_reagents = list("vitamin" = 6)
list_reagents = list("nutriment" = 10, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 6)
list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2)
w_class = WEIGHT_CLASS_NORMAL
foodtype = GRAIN | MEAT
@@ -272,21 +272,21 @@
foodtype = GRAIN | MEAT
/obj/item/reagent_containers/food/snacks/burger/jelly/slime
bonus_reagents = list("slimejelly" = 5, "vitamin" = 5)
list_reagents = list("nutriment" = 6, "slimejelly" = 5, "vitamin" = 1)
bonus_reagents = list("slimejelly" = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, "slimejelly" = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
foodtype = GRAIN | TOXIC
/obj/item/reagent_containers/food/snacks/burger/jelly/cherry
bonus_reagents = list("cherryjelly" = 5, "vitamin" = 5)
list_reagents = list("nutriment" = 6, "cherryjelly" = 5, "vitamin" = 1)
bonus_reagents = list("cherryjelly" = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, "cherryjelly" = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
foodtype = GRAIN | FRUIT
/obj/item/reagent_containers/food/snacks/burger/superbite
name = "super bite burger"
desc = "This is a mountain of a burger. FOOD!"
icon_state = "superbiteburger"
bonus_reagents = list("vitamin" = 10)
list_reagents = list("nutriment" = 40, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 10)
list_reagents = list(/datum/reagent/consumable/nutriment = 40, /datum/reagent/consumable/nutriment/vitamin = 5)
w_class = WEIGHT_CLASS_NORMAL
bitesize = 7
volume = 100
@@ -297,29 +297,29 @@
name = "five alarm burger"
desc = "HOT! HOT!"
icon_state = "fivealarmburger"
bonus_reagents = list("nutriment" = 2, "vitamin" = 5)
list_reagents = list("nutriment" = 6, "capsaicin" = 5, "condensedcapsaicin" = 5, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, "capsaicin" = 5, "condensedcapsaicin" = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
foodtype = GRAIN | MEAT
/obj/item/reagent_containers/food/snacks/burger/rat
name = "rat burger"
desc = "Pretty much what you'd expect..."
icon_state = "ratburger"
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
foodtype = GRAIN | MEAT | GROSS
/obj/item/reagent_containers/food/snacks/burger/baseball
name = "home run baseball burger"
desc = "It's still warm. The steam coming off of it looks like baseball."
icon_state = "baseball"
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
foodtype = GRAIN | GROSS
/obj/item/reagent_containers/food/snacks/burger/baconburger
name = "bacon burger"
desc = "The perfect combination of all things American."
icon_state = "baconburger"
bonus_reagents = list("nutriment" = 8, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("bun" = 4, "bacon" = 2)
foodtype = GRAIN | MEAT
@@ -327,7 +327,7 @@
name = "soylent burger"
desc = "A eco-friendly burger made using upcycled low value biomass."
icon_state = "soylentburger"
bonus_reagents = list("nutriment" = 5, "vitamin" = 3)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 3)
tastes = list("bun" = 2, "assistant" = 4)
foodtype = GRAIN | MEAT | DAIRY
@@ -335,7 +335,7 @@
name = "mcrib"
desc = "An elusive rib shaped burger with limited availablity across the galaxy. Not as good as you remember it."
icon_state = "mcrib"
bonus_reagents = list("bbqsauce" = 5, "vitamin" = 3)
bonus_reagents = list("bbqsauce" = 5, /datum/reagent/consumable/nutriment/vitamin = 3)
tastes = list("bun" = 2, "pork patty" = 4)
foodtype = GRAIN | MEAT
@@ -344,7 +344,7 @@
desc = "A cheap and greasy imitation of an eggs benedict."
icon_state = "mcguffin"
tastes = list("muffin" = 2, "bacon" = 3)
bonus_reagents = list("eggyolk" = 3, "nutriment" = 1)
bonus_reagents = list("eggyolk" = 3, /datum/reagent/consumable/nutriment = 1)
foodtype = GRAIN | MEAT | BREAKFAST
/obj/item/reagent_containers/food/snacks/burger/chicken
@@ -352,7 +352,7 @@
desc = "A delicious chicken sandwich, it is said the proceeds from this treat helps criminalize homosexuality on the space frontier."
icon_state = "chickenburger"
tastes = list("bun" = 2, "chicken" = 4, "God's covenant" = 1)
bonus_reagents = list("mayonnaise" = 3, "cooking_oil" = 2, "nutriment" = 2)
bonus_reagents = list("mayonnaise" = 3, "cooking_oil" = 2, /datum/reagent/consumable/nutriment = 2)
foodtype = GRAIN | MEAT | FRIED
/obj/item/reagent_containers/food/snacks/burger/cheese
@@ -360,7 +360,7 @@
desc = "This noble burger stands proudly clad in golden cheese."
icon_state = "cheeseburger"
tastes = list("bun" = 2, "beef patty" = 4, "cheese" = 3)
bonus_reagents = list("nutriment" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1)
foodtype = GRAIN | MEAT | DAIRY
/obj/item/reagent_containers/food/snacks/burger/cheese/Initialize()
code/modules/food_and_drinks/food/snacks_cake.dm
+29 -29
View File
@@ -4,14 +4,14 @@
slices_num = 5
bitesize = 3
volume = 80
list_reagents = list("nutriment" = 20, "vitamin" = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("cake" = 1)
foodtype = GRAIN | DAIRY
/obj/item/reagent_containers/food/snacks/cakeslice
icon = 'icons/obj/food/piecake.dmi'
trash = /obj/item/trash/plate
list_reagents = list("nutriment" = 4, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1)
customfoodfilling = 0 //to avoid infinite cake-ception
tastes = list("cake" = 1)
foodtype = GRAIN | DAIRY
@@ -21,7 +21,7 @@
desc = "A plain cake, not a lie."
icon_state = "plaincake"
custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/cake
bonus_reagents = list("nutriment" = 10, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("sweetness" = 2,"cake" = 5)
foodtype = GRAIN | DAIRY | SUGAR
@@ -40,8 +40,8 @@
icon_state = "carrotcake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/carrot
slices_num = 5
bonus_reagents = list("nutriment" = 3, "oculine" = 5, "vitamin" = 10)
list_reagents = list("nutriment" = 20, "oculine" = 10, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, "oculine" = 5, /datum/reagent/consumable/nutriment/vitamin = 10)
list_reagents = list(/datum/reagent/consumable/nutriment = 20, "oculine" = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1)
foodtype = GRAIN | DAIRY | VEGETABLES | SUGAR
@@ -50,7 +50,7 @@
desc = "Carrotty slice of Carrot Cake, carrots are good for your eyes! Also not a lie."
icon_state = "carrotcake_slice"
filling_color = "#FFA500"
list_reagents = list("nutriment" = 4, "oculine" = 2, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 4, "oculine" = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1)
foodtype = GRAIN | DAIRY | VEGETABLES | SUGAR
@@ -60,8 +60,8 @@
icon_state = "braincake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/brain
slices_num = 5
bonus_reagents = list("nutriment" = 5, "mannitol" = 10, "vitamin" = 10)
list_reagents = list("nutriment" = 20, "mannitol" = 10, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/medicine/mannitol = 10, /datum/reagent/consumable/nutriment/vitamin = 10)
list_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/medicine/mannitol = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1)
foodtype = GRAIN | DAIRY | MEAT | GROSS | SUGAR
@@ -71,7 +71,7 @@
desc = "Lemme tell you something about prions. THEY'RE DELICIOUS."
icon_state = "braincakeslice"
filling_color = "#FF69B4"
list_reagents = list("nutriment" = 4, "mannitol" = 2, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/medicine/mannitol = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1)
foodtype = GRAIN | DAIRY | MEAT | GROSS | SUGAR
@@ -81,7 +81,7 @@
icon_state = "cheesecake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/cheese
slices_num = 5
bonus_reagents = list("vitamin" = 10)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 10)
tastes = list("cake" = 4, "cream cheese" = 3)
foodtype = GRAIN | DAIRY
@@ -99,7 +99,7 @@
icon_state = "orangecake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/orange
slices_num = 5
bonus_reagents = list("nutriment" = 3, "vitamin" = 10)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 10)
tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2)
foodtype = GRAIN | DAIRY | FRUIT | SUGAR
@@ -117,7 +117,7 @@
icon_state = "limecake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/lime
slices_num = 5
bonus_reagents = list("nutriment" = 3, "vitamin" = 10)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 10)
tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
foodtype = GRAIN | DAIRY | FRUIT | SUGAR
@@ -135,7 +135,7 @@
icon_state = "lemoncake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/lemon
slices_num = 5
bonus_reagents = list("nutriment" = 3, "vitamin" = 10)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 10)
tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2)
foodtype = GRAIN | DAIRY | FRUIT | SUGAR
@@ -153,7 +153,7 @@
icon_state = "chocolatecake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/chocolate
slices_num = 5
bonus_reagents = list("nutriment" = 3, "vitamin" = 10)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 10)
tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4)
foodtype = GRAIN | DAIRY | JUNKFOOD | SUGAR
@@ -171,8 +171,8 @@
icon_state = "birthdaycake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/birthday
slices_num = 5
bonus_reagents = list("nutriment" = 7, "sprinkles" = 10, "vitamin" = 5)
list_reagents = list("nutriment" = 20, "sprinkles" = 10, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 7, "sprinkles" = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 20, "sprinkles" = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("cake" = 5, "sweetness" = 1)
foodtype = GRAIN | DAIRY | JUNKFOOD | SUGAR
@@ -181,7 +181,7 @@
desc = "A slice of your birthday."
icon_state = "birthdaycakeslice"
filling_color = "#DC143C"
list_reagents = list("nutriment" = 4, "sprinkles" = 2, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 4, "sprinkles" = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("cake" = 5, "sweetness" = 1)
foodtype = GRAIN | DAIRY | JUNKFOOD | SUGAR
@@ -191,7 +191,7 @@
icon_state = "applecake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/apple
slices_num = 5
bonus_reagents = list("nutriment" = 3, "vitamin" = 10)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 10)
tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1)
foodtype = GRAIN | DAIRY | FRUIT | SUGAR
@@ -214,7 +214,7 @@
desc = "A cake made of slimes. Probably not electrified."
icon_state = "slimecake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/slimecake
bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
tastes = list("cake" = 5, "sweetness" = 1, "slime" = 1)
foodtype = GRAIN | DAIRY | SUGAR
@@ -231,7 +231,7 @@
desc = "A hollow cake with real pumpkin."
icon_state = "pumpkinspicecake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/pumpkinspice
bonus_reagents = list("nutriment" = 3, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1)
foodtype = GRAIN | DAIRY | VEGETABLES | SUGAR
@@ -248,7 +248,7 @@
desc = "A plain cake, filled with assortment of blackberries and strawberries!"
icon_state = "blackbarry_strawberries_cake_vanilla_cake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/bsvc
bonus_reagents = list("nutriment" = 14, "vitamin" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 14, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("blackbarry" = 2, "strawberries" = 2, "vanilla" = 2, "sweetness" = 2, "cake" = 3)
foodtype = GRAIN | DAIRY | FRUIT | SUGAR
@@ -265,7 +265,7 @@
desc = "A plain cake, filled with assortment of blackberries and strawberries!"
icon_state = "blackbarry_strawberries_cake_coco_cake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/bscc
bonus_reagents = list("nutriment" = 14, "vitamin" = 4, "cocoa" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 14, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/consumable/coco = 5)
tastes = list("blackberry" = 2, "strawberries" = 2, "chocolate" = 2, "sweetness" = 2,"cake" = 3)
foodtype = GRAIN | DAIRY | FRUIT | SUGAR
@@ -282,7 +282,7 @@
desc = "A cake made for angels and chaplains alike! Contains holy water."
icon_state = "holy_cake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/holy_cake_slice
bonus_reagents = list("nutriment" = 1, "vitamin" = 3, "holy_water" = 10)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3, "holy_water" = 10)
tastes = list("cake" = 5, "sweetness" = 1, "clouds" = 1)
foodtype = GRAIN | DAIRY | SUGAR
@@ -300,7 +300,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
icon_state = "pound_cake"
slices_num = 7 //Its ment to feed the party
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/pound_cake_slice
bonus_reagents = list("nutriment" = 60)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 60)
tastes = list("cake" = 5, "sweetness" = 1, "batter" = 1)
foodtype = GRAIN | DAIRY | SUGAR | JUNKFOOD
@@ -317,7 +317,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
desc = "A cake that is made with electronic boards and leaks acid..."
icon_state = "hardware_cake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/hardware_cake_slice
bonus_reagents = list("sacid" = 15, "oil" = 15)
bonus_reagents = list(/datum/reagent/toxin/acid = 15, /datum/reagent/oil = 15)
tastes = list("acid" = 1, "metal" = 1, "regret" = 10)
foodtype = GRAIN | GROSS
@@ -334,7 +334,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
desc = "A vanilla frosted cake."
icon_state = "vanillacake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/vanilla_slice
bonus_reagents = list("sugar" = 15, "vanilla" = 15)
bonus_reagents = list(/datum/reagent/consumable/sugar = 15, /datum/reagent/consumable/vanilla = 15)
tastes = list("cake" = 1, "sugar" = 1, "vanilla" = 10)
foodtype = GRAIN | SUGAR | DAIRY
@@ -351,7 +351,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
desc = "A funny cake with a clown face on it."
icon_state = "clowncake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/clown_slice
bonus_reagents = list("sugar" = 15, "laugher" = 15)
bonus_reagents = list(/datum/reagent/consumable/sugar = 15, "laugher" = 15)
tastes = list("cake" = 1, "sugar" = 1, "joy" = 10)
foodtype = GRAIN | SUGAR | DAIRY
@@ -368,7 +368,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
desc = "A peach filled cake."
icon_state = "peachcake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/peach_slice
bonus_reagents = list("sugar" = 5, "peachjuice" = 15)
bonus_reagents = list(/datum/reagent/consumable/sugar = 5, "peachjuice" = 15)
tastes = list("cake" = 1, "sugar" = 1, "peachjuice" = 10)
foodtype = GRAIN | SUGAR | DAIRY
@@ -385,7 +385,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
desc = "A spaceman's trumpet frosted cake."
icon_state = "trumpetcake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/trumpet
bonus_reagents = list("polypyr" = 15, "cream" = 5, "vitamin" = 5, "berryjuice" = 5)
bonus_reagents = list("polypyr" = 15, "cream" = 5, /datum/reagent/consumable/nutriment/vitamin = 5, "berryjuice" = 5)
filling_color = "#7A3D80"
tastes = list("cake" = 4, "violets" = 2, "jam" = 2)
foodtype = GRAIN | DAIRY | FRUIT | SUGAR
code/modules/food_and_drinks/food/snacks_egg.dm
+10 -10
View File
@@ -5,8 +5,8 @@
name = "chocolate egg"
desc = "Such, sweet, fattening food."
icon_state = "chocolateegg"
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list("nutriment" = 4, "sugar" = 2, "cocoa" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 2)
filling_color = "#A0522D"
tastes = list("chocolate" = 4, "sweetness" = 1)
foodtype = JUNKFOOD | SUGAR
@@ -89,10 +89,10 @@
name = "fried egg"
desc = "A fried egg, with a touch of salt and pepper."
icon_state = "friedegg"
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
bitesize = 1
filling_color = "#FFFFF0"
list_reagents = list("nutriment" = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 3)
tastes = list("egg" = 4, "salt" = 1, "pepper" = 1)
foodtype = MEAT | FRIED | BREAKFAST
@@ -100,9 +100,9 @@
name = "boiled egg"
desc = "A hard boiled egg."
icon_state = "egg"
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#FFFFF0"
list_reagents = list("nutriment" = 2, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("egg" = 1)
foodtype = MEAT | BREAKFAST
@@ -111,8 +111,8 @@
desc = "That's all you can say!"
icon_state = "omelette"
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
list_reagents = list("nutriment" = 8, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1)
bitesize = 1
w_class = WEIGHT_CLASS_NORMAL
tastes = list("egg" = 1, "cheese" = 1)
@@ -140,9 +140,9 @@
name = "eggs benedict"
desc = "There is only one egg on this, how rude."
icon_state = "benedict"
bonus_reagents = list("vitamin" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 4)
trash = /obj/item/trash/plate
w_class = WEIGHT_CLASS_NORMAL
list_reagents = list("nutriment" = 6, "vitamin" = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("egg" = 1, "bacon" = 1, "bun" = 1)
foodtype = MEAT | BREAKFAST
code/modules/food_and_drinks/food/snacks_frozen.dm
+38 -38
View File
@@ -3,8 +3,8 @@
desc = "Portable Ice-cream in its own packaging."
icon = 'icons/obj/food/food.dmi'
icon_state = "icecreamsandwich"
bonus_reagents = list("nutriment" = 1, "ice" = 2)
list_reagents = list("nutriment" = 2, "ice" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, "ice" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 2, "ice" = 2)
tastes = list("ice cream" = 1)
foodtype = GRAIN | DAIRY
@@ -12,8 +12,8 @@
name = "sundae"
desc = "A classic dessert."
icon_state = "sundae"
bonus_reagents = list("nutriment" = 2, "vitamin" = 1)
list_reagents = list("nutriment" = 6, "banana" = 5, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/banana = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
filling_color = "#FFFACD"
tastes = list("ice cream" = 1, "banana" = 1)
foodtype = FRUIT | DAIRY | SUGAR
@@ -22,8 +22,8 @@
name = "honkdae"
desc = "The clown's favorite dessert."
icon_state = "honkdae"
bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
list_reagents = list("nutriment" = 6, "banana" = 10, "vitamin" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/banana = 10, /datum/reagent/consumable/nutriment/vitamin = 4)
filling_color = "#FFFACD"
tastes = list("ice cream" = 1, "banana" = 1, "a bad joke" = 1)
foodtype = FRUIT | DAIRY | SUGAR
@@ -33,8 +33,8 @@
trash = /obj/item/reagent_containers/food/drinks/drinkingglass
desc = "A long glass dish filled with ice-cream, chocolate and a banana down the middle. A timeless classic by any standards."
icon_state = "banana_split"
bonus_reagents = list("nutriment" = 5, "vitamin" = 3)
list_reagents = list("nutriment" = 3, "banana" = 10, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/banana = 10, /datum/reagent/consumable/nutriment/vitamin = 2)
filling_color = "#FFFACD"
tastes = list("ice cream" = 1, "banana" = 1, "charries" = 1)
foodtype = FRUIT | DAIRY | SUGAR
@@ -44,8 +44,8 @@
trash = /obj/item/reagent_containers/food/drinks/drinkingglass
desc = "A glass filled with cream, soda and ice-cream with a cherry on top."
icon_state = "cola_float"
bonus_reagents = list("nutriment" = 3, "vitamin" = 1)
list_reagents = list("nutriment" = 3, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
filling_color = "#FFFACD"
tastes = list("ice cream" = 1, "space coal" = 1, "cherries" = 1)
foodtype = FRUIT | DAIRY | SUGAR
@@ -55,8 +55,8 @@
trash = /obj/item/reagent_containers/food/drinks/drinkingglass
desc = "Cherries mixed with ice-cream, known for its filling tastes"
icon_state = "cherryshake"
bonus_reagents = list("nutriment" = 3, "vitamin" = 1)
list_reagents = list("nutriment" = 3, "vitamin" = 2, "cherryshake" = 15)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, "cherryshake" = 15)
filling_color = "#FFFACD"
tastes = list("ice cream" = 1, "charries" = 1)
foodtype = FRUIT | DAIRY | SUGAR
@@ -66,8 +66,8 @@
trash = /obj/item/reagent_containers/food/drinks/drinkingglass
desc = "Cherries mixed with ice-cream, known for its filling tastes. This one is a exotic blue!"
icon_state = "bluecherryshake"
bonus_reagents = list("nutriment" = 3, "vitamin" = 1)
list_reagents = list("nutriment" = 3, "vitamin" = 2, "bluecherryshake" = 10)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, "bluecherryshake" = 10)
filling_color = "#FFFACD"
tastes = list("ice cream" = 1, "blue cherries" = 1)
foodtype = FRUIT | DAIRY | SUGAR
@@ -76,8 +76,8 @@
name = "space freezy"
desc = "The best icecream in space."
icon_state = "spacefreezy"
bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
list_reagents = list("nutriment" = 6, "bluecherryjelly" = 5, "vitamin" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, "bluecherryjelly" = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
filling_color = "#87CEFA"
tastes = list("blue cherries" = 2, "ice cream" = 2)
foodtype = FRUIT | DAIRY
@@ -91,8 +91,8 @@
icon = 'icons/obj/food/snowcones.dmi'
icon_state = "flavorless_sc"
trash = /obj/item/reagent_containers/food/drinks/sillycup //We dont eat paper cups
bonus_reagents = list("water" = 10) //Base line will allways give water
list_reagents = list("water" = 1) // We dont get food for water/juices
bonus_reagents = list(/datum/reagent/water = 10) //Base line will allways give water
list_reagents = list(/datum/reagent/water = 1) // We dont get food for water/juices
filling_color = "#FFFFFF" //Ice is white
tastes = list("ice" = 1, "water" = 1)
foodtype = SUGAR //We use SUGAR as a base line to act in as junkfood, other wise we use fruit
@@ -101,7 +101,7 @@
name = "lime snowcone"
desc = "Lime syrup drizzled over a snowball in a paper cup."
icon_state = "lime_sc"
list_reagents = list("nutriment" = 1, "limejuice" = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, "limejuice" = 5)
tastes = list("ice" = 1, "water" = 1, "limes" = 5)
foodtype = FRUIT
@@ -109,7 +109,7 @@
name = "lemon snowcone"
desc = "Lemon syrup drizzled over a snowball in a paper cup."
icon_state = "lemon_sc"
list_reagents = list("nutriment" = 1, "lemonjuice" = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, "lemonjuice" = 5)
tastes = list("ice" = 1, "water" = 1, "lemons" = 5)
foodtype = FRUIT
@@ -117,7 +117,7 @@
name = "apple snowcone"
desc = "Apple syrup drizzled over a snowball in a paper cup."
icon_state = "amber_sc"
list_reagents = list("nutriment" = 1, "applejuice" = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, "applejuice" = 5)
tastes = list("ice" = 1, "water" = 1, "apples" = 5)
foodtype = FRUIT
@@ -125,7 +125,7 @@
name = "grape snowcone"
desc = "Grape syrup drizzled over a snowball in a paper cup."
icon_state = "grape_sc"
list_reagents = list("nutriment" = 1, "grapejuice" = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, "grapejuice" = 5)
tastes = list("ice" = 1, "water" = 1, "grape" = 5)
foodtype = FRUIT
@@ -133,7 +133,7 @@
name = "orange snowcone"
desc = "Orange syrup drizzled over a snowball in a paper cup."
icon_state = "orange_sc"
list_reagents = list("nutriment" = 1, "orangejuice" = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, "orangejuice" = 5)
tastes = list("ice" = 1, "water" = 1, "orange" = 5)
foodtype = FRUIT
@@ -141,7 +141,7 @@
name = "bluecherry snowcone"
desc = "Bluecherry syrup drizzled over a snowball in a paper cup, how rare!"
icon_state = "blue_sc"
list_reagents = list("nutriment" = 1, "bluecherryjelly" = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, "bluecherryjelly" = 5)
tastes = list("ice" = 1, "water" = 1, "blue" = 5, "cherries" = 5)
foodtype = FRUIT
@@ -149,7 +149,7 @@
name = "cherry snowcone"
desc = "Cherry syrup drizzled over a snowball in a paper cup."
icon_state = "red_sc"
list_reagents = list("nutriment" = 1, "cherryjelly" = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, "cherryjelly" = 5)
tastes = list("ice" = 1, "water" = 1, "red" = 5, "cherries" = 5)
foodtype = FRUIT
@@ -157,7 +157,7 @@
name = "kiwi snowcone"
desc = "A kiwi snowball in a paper cup."
icon_state = "kiwi_sc"
list_reagents = list("nutriment" = 3, "vitamin" = 6)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 6)
tastes = list("ice" = 1, "space" = 3, "kiwi" = 5)
foodtype = FRUIT
@@ -165,7 +165,7 @@
name = "peach snowcone"
desc = "A peach snowball in a paper cup."
icon_state = "peach_sc"
list_reagents = list("nutriment" = 1, "peachjuice" = 10)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, "peachjuice" = 10)
tastes = list("ice" = 1, "water" = 1, " peach" = 5)
foodtype = FRUIT
@@ -173,7 +173,7 @@
name = "strawberry snowcone"
desc = "A strawberry snowball in a paper cup."
icon_state = "blue_sc"
list_reagents = list("nutriment" = 1, "berryjuice" = 10)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, "berryjuice" = 10)
tastes = list("ice" = 1, "water" = 1, " strawberry" = 5)
foodtype = FRUIT
@@ -181,7 +181,7 @@
name = "berry snowcone"
desc = "Berry syrup drizzled over a snowball in a paper cup."
icon_state = "berry_sc"
list_reagents = list("nutriment" = 1, "berryjuice" = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, "berryjuice" = 5)
tastes = list("ice" = 1, "water" = 1, "berries" = 5)
foodtype = FRUIT
@@ -189,7 +189,7 @@
name = "fruit salad snowcone"
desc = "A delightful mix of citrus syrups drizzled over a snowball in a paper cup."
icon_state = "fruitsalad_sc"
list_reagents = list("nutriment" = 1, "lemonjuice" = 5, "limejuice" = 5, "orangejuice" = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, "lemonjuice" = 5, "limejuice" = 5, "orangejuice" = 5)
tastes = list("ice" = 1, "water" = 1, "oranges" = 5, "limes" = 5, "lemons" = 5, "citrus" = 5, "salad" = 5)
foodtype = FRUIT
@@ -197,7 +197,7 @@
name = "pineapple snowcone"
desc = "Pineapple syrup drizzled over a snowball in a paper cup."
icon_state = "pineapple_sc"
list_reagents = list("nutriment" = 1, "water" = 10)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/water = 10)
tastes = list("ice" = 1, "water" = 1, "pineapples" = 5)
foodtype = PINEAPPLE //Pineapple to allow all that like pineapple to enjoy
@@ -205,47 +205,47 @@
name = "mime snowcone"
desc = "..."
icon_state = "mime_sc"
list_reagents = list("nutriment" = 1, "nothing" = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, "nothing" = 5)
tastes = list("ice" = 1, "water" = 1, "nothing" = 5)
/obj/item/reagent_containers/food/snacks/snowcones/clown
name = "clown snowcone"
desc = "Laughter drizzled over a snowball in a paper cup."
icon_state = "clown_sc"
list_reagents = list("nutriment" = 1, "laughter" = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, "laughter" = 5)
tastes = list("ice" = 1, "water" = 1, "jokes" = 5, "brainfreeze" = 5, "joy" = 5)
/obj/item/reagent_containers/food/snacks/snowcones/soda
name = "space cola snowcone"
desc = "Space Cola drizzled over a snowball in a paper cup."
icon_state = "soda_sc"
list_reagents = list("nutriment" = 1, "space_cola" = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, "space_cola" = 5)
tastes = list("ice" = 1, "water" = 1, "cola" = 5)
/obj/item/reagent_containers/food/snacks/snowcones/spacemountainwind
name = "Space Mountain Wind snowcone"
desc = "Space Mountain Wind drizzled over a snowball in a paper cup."
icon_state = "kiwi_sc"
list_reagents = list("nutriment" = 1, "spacemountainwind" = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, "spacemountainwind" = 5)
tastes = list("ice" = 1, "water" = 1, "mountain wind" = 5)
/obj/item/reagent_containers/food/snacks/snowcones/pwrgame
name = "pwrgame snowcone"
desc = "Pwrgame soda drizzled over a snowball in a paper cup."
icon_state = "pwrgame_sc"
list_reagents = list("nutriment" = 1, "pwr_game" = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, "pwr_game" = 5)
tastes = list("ice" = 1, "water" = 1, "valid" = 5, "salt" = 5, "wats" = 5)
/obj/item/reagent_containers/food/snacks/snowcones/honey
name = "honey snowcone"
desc = "Honey drizzled over a snowball in a paper cup."
icon_state = "amber_sc"
list_reagents = list("nutriment" = 1, "honey" = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, "honey" = 5)
tastes = list("ice" = 1, "water" = 1, "flowers" = 5, "sweetness" = 5, "wax" = 1)
/obj/item/reagent_containers/food/snacks/snowcones/rainbow
name = "rainbow snowcone"
desc = "A very colorful snowball in a paper cup."
icon_state = "rainbow_sc"
list_reagents = list("nutriment" = 5, "laughter" = 25)
list_reagents = list(/datum/reagent/consumable/nutriment = 5, "laughter" = 25)
tastes = list("ice" = 1, "water" = 1, "sunlight" = 5, "light" = 5, "slime" = 5, "paint" = 3, "clouds" = 3)
code/modules/food_and_drinks/food/snacks_meat.dm
+50 -50
View File
@@ -8,10 +8,10 @@
desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!"
icon_state = "cubancarp"
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
bitesize = 3
filling_color = "#CD853F"
list_reagents = list("nutriment" = 6, "capsaicin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, "capsaicin" = 1)
tastes = list("fish" = 4, "batter" = 1, "hot peppers" = 1)
foodtype = MEAT
@@ -19,7 +19,7 @@
name = "carp fillet"
desc = "A fillet of spess carp meat."
icon_state = "fishfillet"
list_reagents = list("nutriment" = 3, "carpotoxin" = 2, "vitamin" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, "carpotoxin" = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
bitesize = 6
filling_color = "#FA8072"
tastes = list("fish" = 1)
@@ -37,8 +37,8 @@
name = "fish fingers"
desc = "A finger of fish."
icon_state = "fishfingers"
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
list_reagents = list("nutriment" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 4)
bitesize = 1
filling_color = "#CD853F"
tastes = list("fish" = 1, "breadcrumbs" = 1)
@@ -48,8 +48,8 @@
name = "fish and chips"
desc = "I do say so myself chap."
icon_state = "fishandchips"
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
list_reagents = list("nutriment" = 6)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 6)
filling_color = "#FA8072"
tastes = list("fish" = 1, "chips" = 1)
foodtype = MEAT | VEGETABLES | FRIED
@@ -59,8 +59,8 @@
desc = "A small cylindrical kudzu skin, filled with rice and fish."
icon = 'modular_citadel/icons/obj/food/food.dmi'
icon_state = "sushie_basic"
bonus_reagents = list("vitamin" = 2)
list_reagents = list("nutriment" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 4)
bitesize = 10
filling_color = "#F2EEEA" //rgb(242, 238, 234)
tastes = list("fish" = 1, "rice" = 2, "salt" = 1)
@@ -71,8 +71,8 @@
desc = "A peace of carp lightly placed on some rice."
icon = 'modular_citadel/icons/obj/food/food.dmi'
icon_state = "sushie_adv"
bonus_reagents = list("vitamin" = 2)
list_reagents = list("nutriment" = 6)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 6)
bitesize = 10
filling_color = "#F2EEEA" //rgb(242, 238, 234)
tastes = list("fish" = 2, "rice" = 2, "salt" = 1)
@@ -83,8 +83,8 @@
desc = "A well prepared peace of the best of the carp fillet placed on rice. Looks fancy and fresh!"
icon = 'modular_citadel/icons/obj/food/food.dmi'
icon_state = "sushie_pro"
bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
list_reagents = list("nutriment" = 6, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
bitesize = 10
filling_color = "#F2EEEA" //rgb(242, 238, 234)
tastes = list("fish" = 3, "rice" = 2, "salt" = 1)
@@ -97,7 +97,7 @@
name = "tofu"
desc = "We all love tofu."
icon_state = "tofu"
list_reagents = list("nutriment" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 2)
filling_color = "#F0E68C"
tastes = list("tofu" = 1)
foodtype = VEGETABLES
@@ -106,7 +106,7 @@
name = "spider leg"
desc = "A still twitching leg of a giant spider... you don't really want to eat this, do you?"
icon_state = "spiderleg"
list_reagents = list("nutriment" = 2, "toxin" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin = 2)
cooked_type = /obj/item/reagent_containers/food/snacks/boiledspiderleg
filling_color = "#000000"
tastes = list("cobwebs" = 1)
@@ -117,8 +117,8 @@
desc = "Now you can feel like a real tourist vacationing in Ireland."
icon_state = "cornedbeef"
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
list_reagents = list("nutriment" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 5)
tastes = list("meat" = 1, "cabbage" = 1)
foodtype = MEAT | VEGETABLES
@@ -127,8 +127,8 @@
desc = "Because eating bear wasn't manly enough."
icon_state = "bearsteak"
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 2, "vitamin" = 6)
list_reagents = list("nutriment" = 2, "vitamin" = 5, "manlydorf" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 6)
list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 5, "manlydorf" = 5)
tastes = list("meat" = 1, "salmon" = 1)
foodtype = MEAT | ALCOHOL
@@ -136,7 +136,7 @@
name = "faggot"
desc = "A great meal all round. Not a cord of wood."
icon_state = "faggot"
list_reagents = list("nutriment" = 4, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#800000"
tastes = list("meat" = 1)
foodtype = MEAT
@@ -146,8 +146,8 @@
desc = "A piece of mixed, long meat."
icon_state = "sausage"
filling_color = "#CD5C5C"
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list("nutriment" = 6, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("meat" = 1)
foodtype = MEAT | BREAKFAST
var/roasted = FALSE
@@ -160,35 +160,35 @@
trash = /obj/item/stack/rods
icon_state = "kebab"
w_class = WEIGHT_CLASS_NORMAL
list_reagents = list("nutriment" = 8)
list_reagents = list(/datum/reagent/consumable/nutriment = 8)
tastes = list("meat" = 3, "metal" = 1)
foodtype = MEAT
/obj/item/reagent_containers/food/snacks/kebab/human
name = "human-kebab"
desc = "A human meat, on a stick."
bonus_reagents = list("nutriment" = 1, "vitamin" = 6)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 6)
tastes = list("tender meat" = 3, "metal" = 1)
foodtype = MEAT | GROSS
/obj/item/reagent_containers/food/snacks/kebab/monkey
name = "meat-kebab"
desc = "Delicious meat, on a stick."
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("meat" = 3, "metal" = 1)
foodtype = MEAT
/obj/item/reagent_containers/food/snacks/kebab/tofu
name = "tofu-kebab"
desc = "Vegan meat, on a stick."
bonus_reagents = list("nutriment" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1)
tastes = list("tofu" = 3, "metal" = 1)
foodtype = VEGETABLES
/obj/item/reagent_containers/food/snacks/kebab/tail
name = "lizard-tail kebab"
desc = "Severed lizard tail on a stick."
bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("meat" = 8, "metal" = 4, "scales" = 1)
foodtype = MEAT
@@ -196,7 +196,7 @@
name = "raw khinkali"
desc = "One hundred khinkalis? Do I look like a pig?"
icon_state = "khinkali"
list_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
cooked_type = /obj/item/reagent_containers/food/snacks/khinkali
tastes = list("meat" = 1, "onions" = 1, "garlic" = 1)
foodtype = MEAT
@@ -205,7 +205,7 @@
name = "khinkali"
desc = "One hundred khinkalis? Do I look like a pig?"
icon_state = "khinkali"
list_reagents = list("nutriment" = 4, "vitamin" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2)
bitesize = 3
filling_color = "#F0F0F0"
tastes = list("meat" = 1, "onions" = 1, "garlic" = 1)
@@ -216,7 +216,7 @@
desc = "Just add water!"
icon_state = "monkeycube"
bitesize = 12
list_reagents = list("nutriment" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 2)
filling_color = "#CD853F"
tastes = list("the jungle" = 1, "bananas" = 1)
foodtype = MEAT | SUGAR
@@ -244,10 +244,10 @@
name = "enchiladas"
desc = "Viva La Mexico!"
icon_state = "enchiladas"
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
bitesize = 4
filling_color = "#FFA07A"
list_reagents = list("nutriment" = 8, "capsaicin" = 6)
list_reagents = list(/datum/reagent/consumable/nutriment = 8, "capsaicin" = 6)
tastes = list("hot peppers" = 1, "meat" = 3, "cheese" = 1, "sour cream" = 1)
foodtype = MEAT
@@ -256,8 +256,8 @@
desc = "Even non-vegetarians will LOVE this!"
icon_state = "stewedsoymeat"
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 1)
list_reagents = list("nutriment" = 8)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 8)
filling_color = "#D2691E"
tastes = list("soy" = 1, "vegetables" = 1)
foodtype = VEGETABLES
@@ -271,8 +271,8 @@
desc = "A giant spider's leg that's still twitching after being cooked. Gross!"
icon_state = "spiderlegcooked"
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 1, "capsaicin" = 2, "vitamin" = 2)
list_reagents = list("nutriment" = 3, "capsaicin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, "capsaicin" = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, "capsaicin" = 2)
filling_color = "#000000"
tastes = list("hot peppers" = 1, "cobwebs" = 1)
foodtype = MEAT
@@ -282,8 +282,8 @@
desc = "Would you eat them on a train? Would you eat them on a plane? Would you eat them on a state of the art corporate deathtrap floating through space?"
icon_state = "spidereggsham"
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
list_reagents = list("nutriment" = 6)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 6)
bitesize = 4
filling_color = "#7FFF00"
tastes = list("meat" = 1, "the colour green" = 1)
@@ -293,8 +293,8 @@
name = "carp sashimi"
desc = "Celebrate surviving attack from hostile alien lifeforms by hospitalising yourself."
icon_state = "sashimi"
bonus_reagents = list("nutriment" = 1, "capsaicin" = 4, "vitamin" = 4)
list_reagents = list("nutriment" = 6, "capsaicin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, "capsaicin" = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, "capsaicin" = 5)
filling_color = "#FA8072"
tastes = list("fish" = 1, "hot peppers" = 1)
foodtype = MEAT | TOXIC
@@ -302,8 +302,8 @@
/obj/item/reagent_containers/food/snacks/nugget
name = "chicken nugget"
filling_color = "#B22222"
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list("nutriment" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 2)
tastes = list("\"chicken\"" = 1)
foodtype = MEAT
@@ -317,8 +317,8 @@
name = "pig in a blanket"
desc = "A tiny sausage wrapped in a flakey, buttery roll. Free this pig from its blanket prison by eating it."
icon_state = "pigblanket"
list_reagents = list("nutriment" = 6, "vitamin" = 1)
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#800000"
tastes = list("meat" = 1, "butter" = 1)
@@ -328,14 +328,14 @@
icon_state = "dorndog"
trash = /obj/item/trash/plate/alt
tastes = list("hotdog" = 2, "mustard and ketchup" = 1, "fryed bread" = 1)
bonus_reagents = list("nutriment" = 6, "vitamin" = 2, "mustard" = 5, "ketchup" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2, "mustard" = 5, "ketchup" = 5)
/obj/item/reagent_containers/food/snacks/kebab/rat
name = "rat-kebab"
desc = "Not so delicious rat meat, on a stick."
icon_state = "ratkebab"
w_class = WEIGHT_CLASS_NORMAL
list_reagents = list("nutriment" = 6, "vitamin" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("rat meat" = 1, "metal" = 1)
foodtype = MEAT | GROSS
@@ -343,20 +343,20 @@
name = "double rat-kebab"
icon_state = "doubleratkebab"
tastes = list("rat meat" = 2, "metal" = 1)
bonus_reagents = list("nutriment" = 6, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
/obj/item/reagent_containers/food/snacks/kebab/fiesta
name = "fiesta skewer"
icon_state = "fiestaskewer"
tastes = list("tex-mex" = 3, "cumin" = 2)
bonus_reagents = list("vitamin" = 5, "capsaicin" = 3)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 5, "capsaicin" = 3)
/obj/item/reagent_containers/food/snacks/bbqribs
name = "bbq ribs"
desc = "BBQ ribs, slathered in a healthy coating of BBQ sauce. The least vegan thing to ever exist."
icon_state = "ribs"
w_class = WEIGHT_CLASS_NORMAL
list_reagents = list("nutriment" = 8, "vitamin" = 2, "bbqsauce" = 5)
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 2, "bbqsauce" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("meat" = 3, "smokey sauce" = 1)
foodtype = MEAT
code/modules/food_and_drinks/food/snacks_other.dm
+75 -75
View File
@@ -7,7 +7,7 @@
icon_state = "cheesewheel"
slice_path = /obj/item/reagent_containers/food/snacks/cheesewedge
slices_num = 5
list_reagents = list("nutriment" = 15, "vitamin" = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 15, /datum/reagent/consumable/nutriment/vitamin = 5)
w_class = WEIGHT_CLASS_NORMAL
tastes = list("cheese" = 1)
foodtype = DAIRY
@@ -17,7 +17,7 @@
desc = "A wedge of delicious Cheddar. The cheese wheel it was cut from can't have gone far."
icon_state = "cheesewedge"
filling_color = "#FFD700"
list_reagents = list("nutriment" = 3, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("cheese" = 1)
foodtype = DAIRY
@@ -34,7 +34,7 @@
name = "candy corn"
desc = "It's a handful of candy corn. Can be stored in a detective's hat."
icon_state = "candy_corn"
list_reagents = list("nutriment" = 4, "sugar" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2)
filling_color = "#FF8C00"
tastes = list("candy corn" = 1)
foodtype = JUNKFOOD | SUGAR
@@ -43,7 +43,7 @@
name = "chocolate bar"
desc = "Such, sweet, fattening food."
icon_state = "chocolatebar"
list_reagents = list("nutriment" = 2, "sugar" = 2, "cocoa" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 2)
filling_color = "#A0522D"
tastes = list("chocolate" = 1)
foodtype = JUNKFOOD | SUGAR
@@ -53,7 +53,7 @@
name = "huge mushroom slice"
desc = "A slice from a huge mushroom."
icon_state = "hugemushroomslice"
list_reagents = list("nutriment" = 3, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("mushroom" = 1)
foodtype = VEGETABLES
@@ -62,7 +62,7 @@
desc = "Now let's find some cinema."
icon_state = "popcorn"
trash = /obj/item/trash/popcorn
list_reagents = list("nutriment" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 2)
bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0
filling_color = "#FFEFD5"
tastes = list("popcorn" = 3, "butter" = 1)
@@ -76,8 +76,8 @@
name = "loaded baked potato"
desc = "Totally baked."
icon_state = "loadedbakedpotato"
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
list_reagents = list("nutriment" = 6)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 6)
filling_color = "#D2B48C"
tastes = list("potato" = 1)
foodtype = VEGETABLES | DAIRY
@@ -87,7 +87,7 @@
desc = "AKA: French Fries, Freedom Fries, etc."
icon_state = "fries"
trash = /obj/item/trash/plate
list_reagents = list("nutriment" = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 4)
filling_color = "#FFD700"
tastes = list("fries" = 3, "salt" = 1)
foodtype = VEGETABLES | GRAIN | FRIED
@@ -97,7 +97,7 @@
name = "tator tot"
desc = "A large fried potato nugget that may or may not try to valid you."
icon_state = "tatortot"
list_reagents = list("nutriment" = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 4)
filling_color = "FFD700"
tastes = list("potato" = 3, "valids" = 1)
foodtype = FRIED | VEGETABLES
@@ -108,7 +108,7 @@
desc = "Dope from a soy."
icon_state = "soydope"
trash = /obj/item/trash/plate
list_reagents = list("nutriment" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 2)
filling_color = "#DEB887"
tastes = list("soy" = 1)
foodtype = VEGETABLES
@@ -119,8 +119,8 @@
desc = "Fries. Covered in cheese. Duh."
icon_state = "cheesyfries"
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
list_reagents = list("nutriment" = 6)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 6)
filling_color = "#FFD700"
tastes = list("fries" = 3, "cheese" = 1)
foodtype = VEGETABLES | GRAIN
@@ -139,7 +139,7 @@
desc = "Tasty fries from fresh Carrots."
icon_state = "carrotfries"
trash = /obj/item/trash/plate
list_reagents = list("nutriment" = 3, "oculine" = 3, "vitamin" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, "oculine" = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
filling_color = "#FFA500"
tastes = list("carrots" = 3, "salt" = 1)
foodtype = VEGETABLES
@@ -149,8 +149,8 @@
desc = "An apple coated in sugary sweetness."
icon_state = "candiedapple"
bitesize = 3
bonus_reagents = list("nutriment" = 2, "sugar" = 3)
list_reagents = list("nutriment" = 3, "sugar" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/sugar = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sugar = 2)
filling_color = "#FF4500"
tastes = list("apple" = 2, "sweetness" = 2)
foodtype = JUNKFOOD | FRUIT | SUGAR
@@ -169,8 +169,8 @@
name = "egg wrap"
desc = "The precursor to Pigs in a Blanket."
icon_state = "eggwrap"
bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
list_reagents = list("nutriment" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 5)
filling_color = "#F0E68C"
tastes = list("egg" = 1)
foodtype = MEAT | GRAIN
@@ -179,8 +179,8 @@
name = "tin of beans"
desc = "Musical fruit in a slightly less musical container."
icon_state = "beans"
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list("nutriment" = 10)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 10)
filling_color = "#B22222"
tastes = list("beans" = 1)
foodtype = VEGETABLES
@@ -189,7 +189,7 @@
name = "spider eggs"
desc = "A cluster of juicy spider eggs. A great side dish for when you care not for your health."
icon_state = "spidereggs"
list_reagents = list("nutriment" = 2, "toxin" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin = 2)
filling_color = "#008000"
tastes = list("cobwebs" = 1)
foodtype = MEAT | TOXIC
@@ -198,7 +198,7 @@
name = "spiderling"
desc = "It's slightly twitching in your hand. Ew..."
icon_state = "spiderling"
list_reagents = list("nutriment" = 1, "toxin" = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/toxin = 4)
filling_color = "#00800"
tastes = list("cobwebs" = 1, "guts" = 2)
foodtype = MEAT | TOXIC
@@ -207,7 +207,7 @@
name = "spider lollipop"
desc = "Still gross, but at least it has a mountain of sugar on it."
icon_state = "spiderlollipop"
list_reagents = list("nutriment" = 1, "toxin" = 1, "iron" = 10, "sugar" = 5, "omnizine" = 2) //lollipop, but vitamins = toxins
list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/toxin = 1, /datum/reagent/iron = 10, /datum/reagent/consumable/sugar = 5, "omnizine" = 2) //lollipop, but vitamins = toxins
filling_color = "#00800"
tastes = list("cobwebs" = 1, "sugar" = 2)
foodtype = JUNKFOOD | SUGAR
@@ -217,7 +217,7 @@
desc = "Spider eggs wrapped in a thin salted Kudzu pod"
icon = 'modular_citadel/icons/obj/food/food.dmi'
icon_state = "sushie_egg"
list_reagents = list("nutriment" = 6, "vitamin" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
filling_color = "#FF3333" // R225 G051 B051
tastes = list("seaweed" = 1, "cobwebs" = 1, "salty" = 2)
foodtype = MEAT | VEGETABLES
@@ -226,8 +226,8 @@
name = "chocolate coin"
desc = "A completely edible but nonflippable festive coin."
icon_state = "chococoin"
bonus_reagents = list("nutriment" = 1, "sugar" = 1)
list_reagents = list("nutriment" = 3, "cocoa" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/coco = 1)
filling_color = "#A0522D"
tastes = list("chocolate" = 1)
foodtype = JUNKFOOD | SUGAR
@@ -236,8 +236,8 @@
name = "fudge dice"
desc = "A little cube of chocolate that tends to have a less intense taste if you eat too many at once."
icon_state = "chocodice"
bonus_reagents = list("nutriment" = 1, "sugar" = 1)
list_reagents = list("nutriment" = 3, "cocoa" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/coco = 1)
filling_color = "#A0522D"
trash = /obj/item/dice/fudge
tastes = list("fudge" = 1)
@@ -247,8 +247,8 @@
name = "chocolate orange"
desc = "A festive chocolate orange."
icon_state = "chocoorange"
bonus_reagents = list("nutriment" = 1, "sugar" = 1)
list_reagents = list("nutriment" = 3, "sugar" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sugar = 1)
filling_color = "#A0522D"
tastes = list("chocolate" = 3, "oranges" = 1)
foodtype = JUNKFOOD | SUGAR
@@ -258,8 +258,8 @@
desc = "The only good recipe for eggplant."
icon_state = "eggplantparm"
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
list_reagents = list("nutriment" = 6, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
filling_color = "#BA55D3"
tastes = list("eggplant" = 3, "cheese" = 1)
foodtype = VEGETABLES | DAIRY
@@ -269,7 +269,7 @@
desc = "The base for all your burritos."
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "tortilla"
list_reagents = list("nutriment" = 3, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#FFEFD5"
tastes = list("tortilla" = 1)
foodtype = GRAIN
@@ -278,8 +278,8 @@
name = "burrito"
desc = "Tortilla wrapped goodness."
icon_state = "burrito"
bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
list_reagents = list("nutriment" = 4, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#FFEFD5"
tastes = list("torilla" = 2, "meat" = 3)
foodtype = GRAIN | MEAT
@@ -288,8 +288,8 @@
name = "cheesy burrito"
desc = "It's a burrito filled with cheese."
icon_state = "cheesyburrito"
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
list_reagents = list("nutriment" = 4, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2)
filling_color = "#FFD800"
tastes = list("torilla" = 2, "meat" = 3, "cheese" = 1)
foodtype = GRAIN | MEAT | DAIRY
@@ -298,8 +298,8 @@
name = "carne asada burrito"
desc = "The best burrito for meat lovers."
icon_state = "carneburrito"
bonus_reagents = list("nutriment" = 2, "vitamin" = 1)
list_reagents = list("nutriment" = 5, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#A0522D"
tastes = list("torilla" = 2, "meat" = 4)
foodtype = GRAIN | MEAT
@@ -308,8 +308,8 @@
name = "fuego plasma burrito"
desc = "A super spicy burrito."
icon_state = "fuegoburrito"
bonus_reagents = list("nutriment" = 2, "vitamin" = 3)
list_reagents = list("nutriment" = 4, "capsaicin" = 5, "vitamin" = 3)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 4, "capsaicin" = 5, /datum/reagent/consumable/nutriment/vitamin = 3)
filling_color = "#FF2000"
tastes = list("torilla" = 2, "meat" = 3, "hot peppers" = 1)
foodtype = GRAIN | MEAT
@@ -319,7 +319,7 @@
desc = "Made with roasted sweet potatoes!"
icon_state = "yakiimo"
trash = /obj/item/trash/plate
list_reagents = list("nutriment" = 5, "vitamin" = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
filling_color = "#8B1105"
tastes = list("sweet potato" = 1)
foodtype = GRAIN | VEGETABLES | SUGAR
@@ -329,7 +329,7 @@
desc = "Sweet and crunchy."
icon_state = "roastparsnip"
trash = /obj/item/trash/plate
list_reagents = list("nutriment" = 3, "vitamin" = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 4)
filling_color = "#FF5500"
tastes = list("parsnip" = 1)
foodtype = VEGETABLES
@@ -338,8 +338,8 @@
name = "melon fruit bowl"
desc = "For people who wants edible fruit bowls."
icon_state = "melonfruitbowl"
bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
list_reagents = list("nutriment" = 6, "vitamin" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 4)
filling_color = "#FF5500"
w_class = WEIGHT_CLASS_NORMAL
tastes = list("melon" = 1)
@@ -349,8 +349,8 @@
name = "nachos"
desc = "Chips from Space Mexico."
icon_state = "nachos"
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list("nutriment" = 6, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
filling_color = "#F4A460"
tastes = list("nachos" = 1)
foodtype = VEGETABLES | FRIED
@@ -359,8 +359,8 @@
name = "cheesy nachos"
desc = "The delicious combination of nachos and melting cheese."
icon_state = "cheesynachos"
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
list_reagents = list("nutriment" = 6, "vitamin" = 3)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 3)
filling_color = "#FFD700"
tastes = list("nachos" = 2, "cheese" = 1)
foodtype = VEGETABLES | FRIED | DAIRY
@@ -369,8 +369,8 @@
name = "Cuban nachos"
desc = "That's some dangerously spicy nachos."
icon_state = "cubannachos"
bonus_reagents = list("nutriment" = 2, "vitamin" = 3)
list_reagents = list("nutriment" = 7, "capsaicin" = 8, "vitamin" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 7, "capsaicin" = 8, /datum/reagent/consumable/nutriment/vitamin = 4)
filling_color = "#DC143C"
tastes = list("nachos" = 2, "hot pepper" = 1)
foodtype = VEGETABLES | FRIED | DAIRY
@@ -379,8 +379,8 @@
name = "melon keg"
desc = "Who knew vodka was a fruit?"
icon_state = "melonkeg"
bonus_reagents = list("nutriment" = 3, "vitamin" = 3)
list_reagents = list("nutriment" = 9, "vodka" = 15, "vitamin" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 9, "vodka" = 15, /datum/reagent/consumable/nutriment/vitamin = 4)
filling_color = "#FFD700"
volume = 80
bitesize = 5
@@ -391,8 +391,8 @@
name = "honey nut bar"
desc = "Oats and nuts compressed together into a bar, held together with a honey glaze."
icon_state = "honeybar"
bonus_reagents = list("nutriment" = 2, "honey" = 2, "vitamin" = 2)
list_reagents = list("nutriment" = 5, "honey" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, "honey" = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 5, "honey" = 5)
filling_color = "#F2CE91"
tastes = list("oats" = 3, "nuts" = 2, "honey" = 1)
foodtype = FRUIT | SUGAR
@@ -401,8 +401,8 @@
name = "stuffed legion"
desc = "The former skull of a damned human, filled with goliath meat. It has a decorative lava pool made of ketchup and hotsauce."
icon_state = "stuffed_legion"
bonus_reagents = list("vitamin" = 3, "capsaicin" = 1, "tricordrazine" = 5)
list_reagents = list("nutriment" = 5, "vitamin" = 5, "capsaicin" = 2, "tricordrazine" = 10)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 3, "capsaicin" = 1, "tricordrazine" = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5, "capsaicin" = 2, "tricordrazine" = 10)
tastes = list("death" = 2, "rock" = 1, "meat" = 1, "hot peppers" = 1)
foodtype = MEAT
@@ -410,8 +410,8 @@
name = "Powercrepe"
desc = "With great power, comes great crepes. It looks like a pancake filled with jelly but packs quite a punch."
icon_state = "powercrepe"
bonus_reagents = list("nutriment" = 5, "vitamin" = 3, "iron" = 10)
list_reagents = list("nutriment" = 10, "vitamin" = 5, "cherryjelly" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 3, /datum/reagent/iron = 10)
list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 5, "cherryjelly" = 5)
force = 20
throwforce = 10
block_chance = 50
@@ -426,7 +426,7 @@
desc = "A delicious lollipop. Makes for a great Valentine's present."
icon = 'icons/obj/lollipop.dmi'
icon_state = "lollipop_stick"
list_reagents = list("nutriment" = 1, "vitamin" = 1, "iron" = 10, "sugar" = 5, "omnizine" = 2) //Honk
list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/iron = 10, /datum/reagent/consumable/sugar = 5, "omnizine" = 2) //Honk
var/mutable_appearance/head
var/headcolor = rgb(0, 0, 0)
tastes = list("candy" = 1)
@@ -468,7 +468,7 @@
desc = "A colorful, sugary gumball."
icon = 'icons/obj/lollipop.dmi'
icon_state = "gumball"
list_reagents = list("sugar" = 5, "bicaridine" = 2, "kelotane" = 2) //Kek
list_reagents = list(/datum/reagent/consumable/sugar = 5, "bicaridine" = 2, "kelotane" = 2) //Kek
tastes = list("candy")
foodtype = JUNKFOOD
@@ -495,8 +495,8 @@
name = "taco"
desc = "A traditional taco with meat, cheese, and lettuce."
icon_state = "taco"
bonus_reagents = list("nutriment" = 3, "vitamin" = 2)
list_reagents = list("nutriment" = 4, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2)
filling_color = "F0D830"
tastes = list("taco" = 4, "meat" = 2, "cheese" = 2, "lettuce" = 1)
foodtype = MEAT | DAIRY | GRAIN | VEGETABLES
@@ -504,8 +504,8 @@
/obj/item/reagent_containers/food/snacks/taco/plain
desc = "A traditional taco with meat and cheese, minus the rabbit food."
icon_state = "taco_plain"
bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
list_reagents = list("nutriment" = 3, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("taco" = 4, "meat" = 2, "cheese" = 2)
foodtype = MEAT | DAIRY | GRAIN
@@ -513,8 +513,8 @@
name = "Bran Requests Cereal"
desc = "A dry cereal that satiates your requests for bran. Tastes uniquely like raisins and salt."
icon_state = "bran_requests"
list_reagents = list("nutriment" = 3, "vitamin" = 2, "sodiumchloride" = 5)
bonus_reagents = list("sodiumchloride" = 10)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/sodiumchloride = 5)
bonus_reagents = list(/datum/reagent/consumable/sodiumchloride = 10)
tastes = list("bran" = 4, "raisins" = 3, "salt" = 1)
foodtype = GRAIN | FRUIT
@@ -522,7 +522,7 @@
name = "stick of butter"
desc = "A stick of delicious, golden, fatty goodness."
icon_state = "butter"
list_reagents = list("nutriment" = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 5)
filling_color = "#FFD700"
tastes = list("butter" = 1)
foodtype = DAIRY
@@ -531,7 +531,7 @@
name = "onion rings"
desc = "Onion slices coated in batter."
icon_state = "onionrings"
list_reagents = list("nutriment" = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 3)
filling_color = "#C0C9A0"
gender = PLURAL
tastes = list("batter" = 3, "onion" = 1)
@@ -549,7 +549,7 @@
name = "chocolate"
desc = "A tiny and sweet chocolate. Has a 'strawberry' filling!"
icon_state = "tiny_chocolate"
list_reagents = list("nutriment" = 1, "sugar" = 1, "cocoa" = 1, "aphro" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/coco = 1, "aphro" = 1)
filling_color = "#A0522D"
tastes = list("chocolate" = 1)
foodtype = JUNKFOOD | SUGAR
@@ -559,7 +559,7 @@
desc = "A ball of rice with some light salt and a wrap of Kudzu skin."
icon = 'modular_citadel/icons/obj/food/food.dmi'
icon_state = "riceball"
list_reagents = list("nutriment" = 6, "sodiumchloride" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/sodiumchloride = 2)
tastes = list("rice" = 3, "salt" = 1)
foodtype = GRAIN
@@ -567,7 +567,7 @@
name = "Canned Peaches"
desc = "Just a nice can of ripe peaches swimming in their own juices."
icon_state = "peachcan"
list_reagents = list("peachjuice" = 20, "sugar" = 8, "nutriment" = 2)
list_reagents = list("peachjuice" = 20, /datum/reagent/consumable/sugar = 8, /datum/reagent/consumable/nutriment = 2)
filling_color = "#ffdf26"
w_class = WEIGHT_CLASS_NORMAL
tastes = list("peaches" = 7, "tin" = 1)
@@ -583,7 +583,7 @@
name = "Chocolate dipped strawberries"
desc = "A strawberry dipped in a bit of chocolate."
icon_state = "chocolatestrawberry"
list_reagents = list("sugar" = 5, "nutriment" = 2)
list_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/nutriment = 2)
filling_color = "#ffdf26"
tastes = list("strawberries" = 5, "chocolate" = 3)
foodtype = FRUIT | SUGAR
@@ -593,7 +593,7 @@
name = "Chocolate dipped banana"
desc = "A banana dipped in a bit of chocolate and held on a stick."
icon_state = "banana_coco"
list_reagents = list("sugar" = 5, "nutriment" = 3, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#ffdf26"
tastes = list("banana" = 5, "chocolate" = 3)
foodtype = FRUIT | SUGAR
@@ -605,7 +605,7 @@
icon_state = "boritos"
trash = /obj/item/trash/boritos
bitesize = 2
list_reagents = list("nutriment" = 3, "cooking_oil" = 2, "sodiumchloride" = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, "cooking_oil" = 2, /datum/reagent/consumable/sodiumchloride = 3)
filling_color = "#ECA735"
tastes = list("fried corn" = 1)
foodtype = JUNKFOOD | FRIED
code/modules/food_and_drinks/food/snacks_pastry.dm
+74 -74
View File
@@ -8,8 +8,8 @@
icon = 'icons/obj/food/donut.dmi'
icon_state = "donut"
bitesize = 5
bonus_reagents = list("sugar" = 1)
list_reagents = list("nutriment" = 3, "sprinkles" = 1, "sugar" = 2)
bonus_reagents = list(/datum/reagent/consumable/sugar = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, "sprinkles" = 1, /datum/reagent/consumable/sugar = 2)
filling_color = "#D2691E"
tastes = list("donut" = 1)
foodtype = JUNKFOOD | GRAIN | FRIED | SUGAR | BREAKFAST
@@ -69,7 +69,7 @@
desc = "Tastes as gross as it looks."
icon_state = "donut_meat"
bonus_reagents = list("ketchup" = 1)
list_reagents = list("nutriment" = 3, "ketchup" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, "ketchup" = 2)
tastes = list("meat" = 1)
foodtype = JUNKFOOD | MEAT | GROSS | FRIED | BREAKFAST
@@ -151,7 +151,7 @@
desc = "You jelly?"
icon_state = "jelly"
decorated_icon = "jelly_homer"
bonus_reagents = list("sugar" = 1, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
extra_reagent = "berryjuice"
tastes = list("jelly" = 1, "donut" = 3)
foodtype = JUNKFOOD | GRAIN | FRIED | FRUIT | SUGAR | BREAKFAST
@@ -167,7 +167,7 @@
name = "pink jelly donut"
desc = "Goes great with a soy latte."
icon_state = "jelly_pink"
bonus_reagents = list("berryjuice" = 3, "sprinkles" = 1, "vitamin" = 1) //Extra sprinkles to reward frosting.
bonus_reagents = list("berryjuice" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1) //Extra sprinkles to reward frosting.
filling_color = "#E57d9A"
decorated_icon = "jelly_homer"
@@ -175,7 +175,7 @@
name = "spaceman's jelly donut"
desc = "Goes great with a cold beaker of malk."
icon_state = "jelly_purple"
bonus_reagents = list("polypyr" = 3, "sprinkles" = 1, "vitamin" = 1)
bonus_reagents = list("polypyr" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("jelly" = 1, "donut" = 3, "violets" = 1)
is_decorated = TRUE
filling_color = "#8739BF"
@@ -184,7 +184,7 @@
name = "apple jelly donut"
desc = "Goes great with a shot of cinnamon schnapps."
icon_state = "jelly_green"
bonus_reagents = list("applejuice" = 3, "sprinkles" = 1, "vitamin" = 1)
bonus_reagents = list("applejuice" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("jelly" = 1, "donut" = 3, "green apples" = 1)
is_decorated = TRUE
filling_color = "#6ABE30"
@@ -193,7 +193,7 @@
name = "caramel jelly donut"
desc = "Goes great with a mug of hot coco."
icon_state = "jelly_beige"
bonus_reagents = list("caramel" = 3, "sprinkles" = 1, "vitamin" = 1)
bonus_reagents = list("caramel" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("jelly" = 1, "donut" = 3, "buttery sweetness" = 1)
is_decorated = TRUE
filling_color = "#D4AD5B"
@@ -202,7 +202,7 @@
name = "chocolate jelly donut"
desc = "Goes great with a glass of warm milk."
icon_state = "jelly_choc"
bonus_reagents = list("hot_coco" = 3, "sprinkles" = 1, "vitamin" = 1) //the coco reagent is just bitter.
bonus_reagents = list("hot_coco" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1) //the coco reagent is just bitter.
tastes = list("jelly" = 1, "donut" = 4, "bitterness" = 1)
decorated_icon = "jelly_choc_sprinkles"
filling_color = "#4F230D"
@@ -211,7 +211,7 @@
name = "blumpkin jelly donut"
desc = "Goes great with a mug of soothing drunken blumpkin."
icon_state = "jelly_blue"
bonus_reagents = list("blumpkinjuice" = 3, "sprinkles" = 1, "vitamin" = 1)
bonus_reagents = list("blumpkinjuice" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("jelly" = 1, "donut" = 2, "blumpkin" = 1)
is_decorated = TRUE
filling_color = "#2788C4"
@@ -220,7 +220,7 @@
name = "bungo jelly donut"
desc = "Goes great with a mason jar of hippie's delight."
icon_state = "jelly_yellow"
bonus_reagents = list("bungojuice" = 3, "sprinkles" = 1, "vitamin" = 1)
bonus_reagents = list("bungojuice" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("jelly" = 1, "donut" = 3, "tropical sweetness" = 1)
is_decorated = TRUE
filling_color = "#DEC128"
@@ -229,7 +229,7 @@
name = "matcha jelly donut"
desc = "Goes great with a cup of tea."
icon_state = "jelly_olive"
bonus_reagents = list("teapowder" = 3, "sprinkles" = 1, "vitamin" = 1)
bonus_reagents = list("teapowder" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("jelly" = 1, "donut" = 3, "matcha" = 1)
is_decorated = TRUE
filling_color = "#879630"
@@ -249,14 +249,14 @@
name = "pink jelly donut"
desc = "Goes great with a soy latte."
icon_state = "jelly_pink"
bonus_reagents = list("berryjuice" = 3, "sprinkles" = 1, "vitamin" = 1) //Extra sprinkles to reward frosting
bonus_reagents = list("berryjuice" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1) //Extra sprinkles to reward frosting
filling_color = "#E57d9A"
/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/trumpet
name = "spaceman's jelly donut"
desc = "Goes great with a cold beaker of malk."
icon_state = "jelly_purple"
bonus_reagents = list("polypyr" = 3, "sprinkles" = 1, "vitamin" = 1)
bonus_reagents = list("polypyr" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("jelly" = 1, "donut" = 3, "violets" = 1)
is_decorated = TRUE
filling_color = "#8739BF"
@@ -265,7 +265,7 @@
name = "apple jelly donut"
desc = "Goes great with a shot of cinnamon schnapps."
icon_state = "jelly_green"
bonus_reagents = list("applejuice" = 3, "sprinkles" = 1, "vitamin" = 1)
bonus_reagents = list("applejuice" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("jelly" = 1, "donut" = 3, "green apples" = 1)
is_decorated = TRUE
filling_color = "#6ABE30"
@@ -274,7 +274,7 @@
name = "caramel jelly donut"
desc = "Goes great with a mug of hot coco."
icon_state = "jelly_beige"
bonus_reagents = list("caramel" = 3, "sprinkles" = 1, "vitamin" = 1)
bonus_reagents = list("caramel" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("jelly" = 1, "donut" = 3, "buttery sweetness" = 1)
is_decorated = TRUE
filling_color = "#D4AD5B"
@@ -283,7 +283,7 @@
name = "chocolate jelly donut"
desc = "Goes great with a glass of warm milk."
icon_state = "jelly_choc"
bonus_reagents = list("hot_coco" = 3, "sprinkles" = 1, "vitamin" = 1) //the coco reagent is just bitter.
bonus_reagents = list("hot_coco" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1) //the coco reagent is just bitter.
tastes = list("jelly" = 1, "donut" = 4, "bitterness" = 1)
decorated_icon = "jelly_choc_sprinkles"
filling_color = "#4F230D"
@@ -292,7 +292,7 @@
name = "blumpkin jelly donut"
desc = "Goes great with a mug of soothing drunken blumpkin."
icon_state = "jelly_blue"
bonus_reagents = list("blumpkinjuice" = 3, "sprinkles" = 1, "vitamin" = 1)
bonus_reagents = list("blumpkinjuice" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("jelly" = 1, "donut" = 2, "blumpkin" = 1)
is_decorated = TRUE
filling_color = "#2788C4"
@@ -301,7 +301,7 @@
name = "bungo jelly donut"
desc = "Goes great with a mason jar of hippie's delight."
icon_state = "jelly_yellow"
bonus_reagents = list("bungojuice" = 3, "sprinkles" = 1, "vitamin" = 1)
bonus_reagents = list("bungojuice" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("jelly" = 1, "donut" = 3, "tropical sweetness" = 1)
is_decorated = TRUE
filling_color = "#DEC128"
@@ -310,7 +310,7 @@
name = "matcha jelly donut"
desc = "Goes great with a cup of tea."
icon_state = "jelly_olive"
bonus_reagents = list("teapowder" = 3, "sprinkles" = 1, "vitamin" = 1)
bonus_reagents = list("teapowder" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("jelly" = 1, "donut" = 3, "matcha" = 1)
is_decorated = TRUE
filling_color = "#879630"
@@ -320,8 +320,8 @@
desc = "A sugar glazed donut."
icon_state = "donut_glaze"
bitesize = 10
bonus_reagents = list("sugar" = 3)
list_reagents = list("nutriment" = 3, "sugar" = 8)
bonus_reagents = list(/datum/reagent/consumable/sugar = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sugar = 8)
filling_color = "#FFFFFF"
tastes = list("donut" = 1, "salt" = 3)
foodtype = JUNKFOOD | GRAIN | FRIED | SUGAR
@@ -332,8 +332,8 @@
name = "muffin"
desc = "A delicious and spongy little cake."
icon_state = "muffin"
bonus_reagents = list("vitamin" = 1)
list_reagents = list("nutriment" = 6)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 6)
filling_color = "#F4A460"
tastes = list("muffin" = 1)
foodtype = GRAIN | SUGAR | BREAKFAST
@@ -357,8 +357,8 @@
name = "chawanmushi"
desc = "A legendary egg custard that makes friends out of enemies. Probably too hot for a cat to eat."
icon_state = "chawanmushi"
bonus_reagents = list("vitamin" = 1)
list_reagents = list("nutriment" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 5)
filling_color = "#FFE4E1"
tastes = list("custard" = 1)
foodtype = GRAIN | MEAT | VEGETABLES
@@ -370,8 +370,8 @@
desc = "Mmm, waffles."
icon_state = "waffles"
trash = /obj/item/trash/waffles
bonus_reagents = list("vitamin" = 1)
list_reagents = list("nutriment" = 8, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#D2691E"
tastes = list("waffles" = 1)
foodtype = GRAIN | SUGAR | BREAKFAST
@@ -381,8 +381,8 @@
desc = "Not made of people. Honest." //Totally people.
icon_state = "soylent_green"
trash = /obj/item/trash/waffles
bonus_reagents = list("vitamin" = 1)
list_reagents = list("nutriment" = 10, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#9ACD32"
tastes = list("waffles" = 7, "people" = 1)
foodtype = GRAIN | MEAT
@@ -392,8 +392,8 @@
desc = "Not made of people. Honest." //Actually honest for once.
icon_state = "soylent_yellow"
trash = /obj/item/trash/waffles
bonus_reagents = list("vitamin" = 1)
list_reagents = list("nutriment" = 10, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#9ACD32"
tastes = list("waffles" = 7, "the colour green" = 1)
foodtype = GRAIN
@@ -404,8 +404,8 @@
icon_state = "rofflewaffles"
trash = /obj/item/trash/waffles
bitesize = 4
bonus_reagents = list("vitamin" = 2)
list_reagents = list("nutriment" = 8, "mushroomhallucinogen" = 2, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 8, "mushroomhallucinogen" = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
filling_color = "#00BFFF"
tastes = list("waffle" = 1, "mushrooms" = 1)
foodtype = GRAIN | VEGETABLES | SUGAR | BREAKFAST
@@ -417,8 +417,8 @@
desc = "COOKIE!!!"
icon_state = "COOKIE!!!"
bitesize = 1
bonus_reagents = list("nutriment" = 1)
list_reagents = list("nutriment" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 1)
filling_color = "#F0E68C"
tastes = list("cookie" = 1)
foodtype = GRAIN | SUGAR
@@ -428,7 +428,7 @@
name = "\improper Donk-pocket"
desc = "The food of choice for the seasoned traitor."
icon_state = "donkpocket"
list_reagents = list("nutriment" = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 4)
cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm
filling_color = "#CD853F"
tastes = list("meat" = 2, "dough" = 2, "laziness" = 1)
@@ -438,7 +438,7 @@
name = "warm Donk-pocket"
desc = "The heated food of choice for the seasoned traitor."
bonus_reagents = list("omnizine" = 3)
list_reagents = list("nutriment" = 4, "omnizine" = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 4, "omnizine" = 3)
cooked_type = null
tastes = list("meat" = 2, "dough" = 2, "laziness" = 1)
foodtype = GRAIN
@@ -447,7 +447,7 @@
name = "\improper Dank-pocket"
desc = "The food of choice for the seasoned botanist."
icon_state = "dankpocket"
list_reagents = list("lipolicide" = 3, "space_drugs" = 3, "nutriment" = 4)
list_reagents = list("lipolicide" = 3, /datum/reagent/drug/space_drugs = 3, /datum/reagent/consumable/nutriment = 4)
filling_color = "#00FF00"
tastes = list("meat" = 2, "dough" = 2)
foodtype = GRAIN | VEGETABLES
@@ -456,8 +456,8 @@
name = "fortune cookie"
desc = "A true prophecy in each cookie!"
icon_state = "fortune_cookie"
bonus_reagents = list("nutriment" = 2)
list_reagents = list("nutriment" = 3)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 3)
filling_color = "#F4A460"
tastes = list("cookie" = 1)
foodtype = GRAIN | SUGAR
@@ -466,8 +466,8 @@
name = "poppy pretzel"
desc = "It's all twisted up!"
icon_state = "poppypretzel"
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
list_reagents = list("nutriment" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 5)
filling_color = "#F0E68C"
tastes = list("pretzel" = 1)
foodtype = GRAIN | SUGAR
@@ -476,8 +476,8 @@
name = "plump helmet biscuit"
desc = "This is a finely-prepared plump helmet biscuit. The ingredients are exceptionally minced plump helmet, and well-minced dwarven wheat flour."
icon_state = "phelmbiscuit"
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list("nutriment" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 5)
filling_color = "#F0E68C"
tastes = list("mushroom" = 1, "biscuit" = 1)
foodtype = GRAIN | VEGETABLES
@@ -497,8 +497,8 @@
desc = "It's a salted cracker."
icon_state = "cracker"
bitesize = 1
bonus_reagents = list("nutriment" = 1)
list_reagents = list("nutriment" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 1)
filling_color = "#F0E68C"
tastes = list("cracker" = 1)
foodtype = GRAIN
@@ -508,8 +508,8 @@
desc = "Fresh footlong ready to go down on."
icon_state = "hotdog"
bitesize = 3
bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
list_reagents = list("nutriment" = 6, "ketchup" = 3, "vitamin" = 3)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, "ketchup" = 3, /datum/reagent/consumable/nutriment/vitamin = 3)
filling_color = "#8B0000"
tastes = list("bun" = 3, "meat" = 2)
foodtype = GRAIN | MEAT | VEGETABLES
@@ -518,8 +518,8 @@
name = "meat bun"
desc = "Has the potential to not be Dog."
icon_state = "meatbun"
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
list_reagents = list("nutriment" = 6, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
filling_color = "#8B0000"
tastes = list("bun" = 3, "meat" = 2)
foodtype = GRAIN | MEAT | VEGETABLES
@@ -528,7 +528,7 @@
name = "khachapuri"
desc = "Bread with egg and cheese?"
icon_state = "khachapuri"
list_reagents = list("nutriment" = 12, "vitamin" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 12, /datum/reagent/consumable/nutriment/vitamin = 2)
filling_color = "#FFFF4D"
tastes = list("bread" = 1, "egg" = 1, "cheese" = 1)
foodtype = GRAIN | MEAT | DAIRY
@@ -537,8 +537,8 @@
name = "sugar cookie"
desc = "Just like your little sister used to make."
icon_state = "sugarcookie"
bonus_reagents = list("nutriment" = 1, "sugar" = 3)
list_reagents = list("nutriment" = 3, "sugar" = 3)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sugar = 3)
filling_color = "#CD853F"
tastes = list("sweetness" = 1)
foodtype = GRAIN | JUNKFOOD | SUGAR
@@ -548,8 +548,8 @@
name = "chocolate cornet"
desc = "Which side's the head, the fat end or the thin end?"
icon_state = "chococornet"
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list("nutriment" = 5, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#FFE4C4"
tastes = list("biscuit" = 3, "chocolate" = 1)
foodtype = GRAIN | JUNKFOOD
@@ -558,8 +558,8 @@
name = "oatmeal cookie"
desc = "The best of both cookie and oat."
icon_state = "oatmealcookie"
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list("nutriment" = 5, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#D2691E"
tastes = list("cookie" = 2, "oat" = 1)
foodtype = GRAIN
@@ -569,8 +569,8 @@
name = "raisin cookie"
desc = "Why would you put raisins on a cookie?"
icon_state = "raisincookie"
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list("nutriment" = 5, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#F0E68C"
tastes = list("cookie" = 1, "raisins" = 1)
foodtype = GRAIN | FRUIT
@@ -580,8 +580,8 @@
name = "cherry cupcake"
desc = "A sweet cupcake with cherry bits."
icon_state = "cherrycupcake"
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list("nutriment" = 5, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#F0E68C"
tastes = list("cake" = 3, "cherry" = 1)
foodtype = GRAIN | FRUIT | SUGAR
@@ -590,8 +590,8 @@
name = "blue cherry cupcake"
desc = "Blue cherries inside a delicious cupcake."
icon_state = "bluecherrycupcake"
bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
list_reagents = list("nutriment" = 5, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#F0E68C"
tastes = list("cake" = 3, "blue cherry" = 1)
foodtype = GRAIN | FRUIT | SUGAR
@@ -600,8 +600,8 @@
name = "strawberry cupcake"
desc = "Strawberry inside a delicious cupcake."
icon_state = "strawberrycupcake"
bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
list_reagents = list("nutriment" = 5, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#F0E68C"
tastes = list("cake" = 2, "strawberry" = 1)
foodtype = GRAIN | FRUIT | SUGAR
@@ -610,8 +610,8 @@
name = "honey bun"
desc = "A sticky pastry bun glazed with honey."
icon_state = "honeybun"
bonus_reagents = list("nutriment" = 1, "honey" = 1)
list_reagents = list("nutriment" = 5, "honey" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, "honey" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 5, "honey" = 5)
filling_color = "#F2CE91"
tastes = list("pastry" = 1, "sweetness" = 1)
foodtype = GRAIN | SUGAR
@@ -623,8 +623,8 @@
desc = "A fluffy pancake. The softer, superior relative of the waffle."
icon_state = "pancakes_1"
item_state = "pancakes"
bonus_reagents = list("vitamin" = 1)
list_reagents = list("nutriment" = 4, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#D2691E"
tastes = list("pancakes" = 1)
foodtype = GRAIN | SUGAR | BREAKFAST
@@ -634,8 +634,8 @@
desc = "A fluffy and delicious blueberry pancake."
icon_state = "bbpancakes_1"
item_state = "bbpancakes"
bonus_reagents = list("vitamin" = 2)
list_reagents = list("nutriment" = 6, "vitamin" = 3)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 3)
tastes = list("pancakes" = 1, "blueberries" = 1)
/obj/item/reagent_containers/food/snacks/pancakes/chocolatechip
@@ -643,8 +643,8 @@
desc = "A fluffy and delicious chocolate chip pancake."
icon_state = "ccpancakes_1"
item_state = "ccpancakes"
bonus_reagents = list("vitamin" = 2)
list_reagents = list("nutriment" = 6, "vitamin" = 3)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 3)
tastes = list("pancakes" = 1, "chocolate" = 1)
/obj/item/reagent_containers/food/snacks/pancakes/Initialize()
code/modules/food_and_drinks/food/snacks_pie.dm
+37 -37
View File
@@ -5,7 +5,7 @@
bitesize = 3
w_class = WEIGHT_CLASS_NORMAL
volume = 80
list_reagents = list("nutriment" = 10, "vitamin" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("pie" = 1)
foodtype = GRAIN
@@ -14,7 +14,7 @@
desc = "A simple pie, still delicious."
icon_state = "pie"
custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/pie
bonus_reagents = list("nutriment" = 8, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("pie" = 1)
foodtype = GRAIN
@@ -23,8 +23,8 @@
desc = "Just like back home, on clown planet! HONK!"
icon_state = "pie"
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
list_reagents = list("nutriment" = 6, "banana" = 5, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/banana = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("pie" = 1)
foodtype = GRAIN | DAIRY | SUGAR
var/stunning = TRUE
@@ -90,8 +90,8 @@
name = "berry clafoutis"
desc = "No black birds, this is a good sign."
icon_state = "berryclafoutis"
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
list_reagents = list("nutriment" = 10, "berryjuice" = 5, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 10, "berryjuice" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("pie" = 1, "blackberries" = 1)
foodtype = GRAIN | FRUIT | SUGAR
@@ -99,8 +99,8 @@
name = "beary pie"
desc = "No brown bears, this is a good sign."
icon_state = "bearypie"
bonus_reagents = list("nutriment" = 2, "vitamin" = 3)
list_reagents = list("nutriment" = 2, "vitamin" = 3)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 3)
tastes = list("pie" = 1, "meat" = 1, "salmon" = 1)
foodtype = GRAIN | SUGAR
@@ -108,7 +108,7 @@
name = "meat-pie"
icon_state = "meatpie"
desc = "An old barber recipe, very delicious!"
bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("pie" = 1, "meat" = 1)
foodtype = GRAIN | MEAT
@@ -117,7 +117,7 @@
name = "tofu-pie"
icon_state = "meatpie"
desc = "A delicious tofu pie."
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("pie" = 1, "tofu" = 1)
foodtype = GRAIN
@@ -127,8 +127,8 @@
desc = "Sweet and tasty poison pie."
icon_state = "amanita_pie"
bitesize = 4
bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
list_reagents = list("nutriment" = 6, "amatoxin" = 3, "mushroomhallucinogen" = 1, "vitamin" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, "amatoxin" = 3, "mushroomhallucinogen" = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("pie" = 1, "mushroom" = 1)
foodtype = GRAIN | VEGETABLES | TOXIC | GROSS
@@ -137,7 +137,7 @@
name = "plump pie"
desc = "I bet you love stuff made out of plump helmets!"
icon_state = "plump_pie"
bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("pie" = 1, "mushroom" = 1)
foodtype = GRAIN | VEGETABLES
@@ -158,7 +158,7 @@
icon_state = "xenomeatpie"
desc = "A delicious meatpie. Probably heretical."
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("pie" = 1, "meat" = 1, "acid" = 1)
foodtype = GRAIN | MEAT
@@ -167,7 +167,7 @@
name = "apple pie"
desc = "A pie containing sweet sweet love...or apple."
icon_state = "applepie"
bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
tastes = list("pie" = 1, "apple" = 1)
foodtype = GRAIN | FRUIT | SUGAR
@@ -175,7 +175,7 @@
name = "cherry pie"
desc = "Taste so good, make a grown man cry."
icon_state = "cherrypie"
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("pie" = 7, "Nicole Paige Brooks" = 2)
foodtype = GRAIN | FRUIT | SUGAR
@@ -186,7 +186,7 @@
icon_state = "pumpkinpie"
slice_path = /obj/item/reagent_containers/food/snacks/pumpkinpieslice
slices_num = 5
bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("pie" = 1, "pumpkin" = 1)
foodtype = GRAIN | VEGETABLES
@@ -197,7 +197,7 @@
icon_state = "pumpkinpieslice"
trash = /obj/item/trash/plate
filling_color = "#FFA500"
list_reagents = list("nutriment" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 2)
tastes = list("pie" = 1, "pumpkin" = 1)
foodtype = GRAIN | VEGETABLES
@@ -205,8 +205,8 @@
name = "golden apple streusel tart"
desc = "A tasty dessert that won't make it through a metal detector."
icon_state = "gappletart"
bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
list_reagents = list("nutriment" = 8, "gold" = 5, "vitamin" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/gold = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("pie" = 1, "apple" = 1, "expensive metal" = 1)
foodtype = GRAIN | FRUIT | SUGAR
@@ -214,8 +214,8 @@
name = "grape tart"
desc = "A tasty dessert that reminds you of the wine you didn't make."
icon_state = "grapetart"
bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
list_reagents = list("nutriment" = 4, "vitamin" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("pie" = 1, "grape" = 1)
foodtype = GRAIN | FRUIT | SUGAR
@@ -223,8 +223,8 @@
name = "mime tart"
desc = "..."
icon_state = "mimetart"
bonus_reagents = list("nutriment" = 1, "vitamin" = 4, "nothing" = 10)
list_reagents = list("nutriment" = 5, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4, "nothing" = 10)
list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("pie" = 1, "nothing" = 1)
foodtype = GRAIN
@@ -232,8 +232,8 @@
name = "berry tart"
desc = "A tasty dessert of many different small barries on a thin pie crust."
icon_state = "berrytart"
bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
list_reagents = list("nutriment" = 3, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("pie" = 1, "berries" = 2)
foodtype = GRAIN | FRUIT
@@ -241,8 +241,8 @@
name = "chocolate lava tart"
desc = "A tasty dessert made of chocaloate, with a liquid core."
icon_state = "cocolavatart"
bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
list_reagents = list("nutriment" = 4, "vitamin" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("pie" = 1, "grape" = 1)
foodtype = GRAIN | SUGAR
@@ -252,7 +252,7 @@
icon_state = "blumpkinpie"
slice_path = /obj/item/reagent_containers/food/snacks/blumpkinpieslice
slices_num = 5
bonus_reagents = list("nutriment" = 3, "vitamin" = 6)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 6)
tastes = list("pie" = 1, "a mouthful of pool water" = 1)
foodtype = GRAIN | VEGETABLES
@@ -263,7 +263,7 @@
icon_state = "blumpkinpieslice"
trash = /obj/item/trash/plate
filling_color = "#1E90FF"
list_reagents = list("nutriment" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 2)
tastes = list("pie" = 1, "a mouthful of pool water" = 1)
foodtype = GRAIN | VEGETABLES
@@ -273,7 +273,7 @@
icon_state = "dulcedebatata"
slice_path = /obj/item/reagent_containers/food/snacks/dulcedebatataslice
slices_num = 5
bonus_reagents = list("nutriment" = 4, "vitamin" = 8)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 8)
tastes = list("jelly" = 1, "sweet potato" = 1)
foodtype = GRAIN | VEGETABLES | SUGAR
@@ -284,7 +284,7 @@
icon_state = "dulcedebatataslice"
trash = /obj/item/trash/plate
filling_color = "#8B4513"
list_reagents = list("nutriment" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 2)
tastes = list("jelly" = 1, "sweet potato" = 1)
foodtype = GRAIN | VEGETABLES | SUGAR
@@ -292,7 +292,7 @@
name = "frosty pie"
desc = "Tastes like blue and cold."
icon_state = "frostypie"
bonus_reagents = list("nutriment" = 4, "vitamin" = 6)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 6)
tastes = list("mint" = 1, "pie" = 1)
foodtype = GRAIN | FRUIT | SUGAR
@@ -302,7 +302,7 @@
icon_state = "baklava"
slice_path = /obj/item/reagent_containers/food/snacks/baklavaslice
slices_num = 6
bonus_reagents = list("nutriment" = 2, "vitamin" = 6)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 6)
tastes = list("nuts" = 1, "pie" = 1)
foodtype = GRAIN
@@ -313,7 +313,7 @@
icon_state = "baklavaslice"
trash = /obj/item/trash/plate
filling_color = "#1E90FF"
list_reagents = list("nutriment" = 2, "vitamin" = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("nuts" = 1, "pie" = 1)
foodtype = GRAIN
@@ -321,7 +321,7 @@
name = "strawberry pie"
desc = "A strawberry pie."
icon_state = "strawberrypie"
bonus_reagents = list("nutriment" = 6, "vitamin" = 6)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 6)
tastes = list("strawberry" = 1, "pie" = 1)
foodtype = GRAIN | FRUIT | SUGAR
@@ -329,6 +329,6 @@
name = "peach pie"
desc = "A pie with peach filling."
icon_state = "strawberrypie"
bonus_reagents = list("nutriment" = 5, "vitamin" = 6, "peachjuice" = 15)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 6, "peachjuice" = 15)
tastes = list("peach" = 1, "pie" = 1)
foodtype = GRAIN | FRUIT
code/modules/food_and_drinks/food/snacks_pizza.dm
+17 -17
View File
@@ -6,13 +6,13 @@
w_class = WEIGHT_CLASS_NORMAL
slices_num = 6
volume = 80
list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 30, "tomatojuice" = 6, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
foodtype = GRAIN | DAIRY | VEGETABLES
/obj/item/reagent_containers/food/snacks/pizzaslice
icon = 'icons/obj/food/pizzaspaghetti.dmi'
list_reagents = list("nutriment" = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 5)
foodtype = GRAIN | DAIRY | VEGETABLES
/obj/item/reagent_containers/food/snacks/pizza/margherita
@@ -20,7 +20,7 @@
desc = "The most cheezy pizza in galaxy."
icon_state = "pizzamargherita"
slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/margherita
bonus_reagents = list("nutriment" = 5, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
foodtype = GRAIN | VEGETABLES
@@ -41,8 +41,8 @@
desc = "Greasy pizza with delicious meat."
icon_state = "meatpizza"
slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/meat
bonus_reagents = list("nutriment" = 5, "vitamin" = 8)
list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 8)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 8)
list_reagents = list(/datum/reagent/consumable/nutriment = 30, "tomatojuice" = 6, /datum/reagent/consumable/nutriment/vitamin = 8)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
foodtype = GRAIN | VEGETABLES| DAIRY | MEAT
@@ -59,8 +59,8 @@
desc = "Very special pizza."
icon_state = "mushroompizza"
slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/mushroom
bonus_reagents = list("nutriment" = 5, "vitamin" = 5)
list_reagents = list("nutriment" = 30, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "mushroom" = 1)
foodtype = GRAIN | VEGETABLES | DAIRY
@@ -77,8 +77,8 @@
desc = "No one of Tomatos Sapiens were harmed during making this pizza."
icon_state = "vegetablepizza"
slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/vegetable
bonus_reagents = list("nutriment" = 5, "vitamin" = 5)
list_reagents = list("nutriment" = 25, "tomatojuice" = 6, "oculine" = 12, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 25, "tomatojuice" = 6, "oculine" = 12, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("crust" = 1, "tomato" = 2, "cheese" = 1, "carrot" = 1)
foodtype = GRAIN | VEGETABLES | DAIRY
@@ -95,8 +95,8 @@
desc = "Who thought this would be a good idea?"
icon_state = "donkpocketpizza"
slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/donkpocket
bonus_reagents = list("nutriment" = 5, "vitamin" = 5)
list_reagents = list("nutriment" = 25, "tomatojuice" = 6, "omnizine" = 10, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 25, "tomatojuice" = 6, "omnizine" = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "laziness" = 1)
foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD
@@ -113,8 +113,8 @@
desc = "The hippie's pizza of choice."
icon_state = "dankpizza"
slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/dank
bonus_reagents = list("nutriment" = 2, "vitamin" = 6)
list_reagents = list("nutriment" = 25, "doctorsdelight" = 5, "tomatojuice" = 6, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 6)
list_reagents = list(/datum/reagent/consumable/nutriment = 25, "doctorsdelight" = 5, "tomatojuice" = 6, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
foodtype = GRAIN | VEGETABLES | FRUIT | DAIRY
@@ -131,7 +131,7 @@
desc = "You can really smell the sassiness."
icon_state = "sassysagepizza"
slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/sassysage
bonus_reagents = list("nutriment" = 6, "vitamin" = 6)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 6)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
foodtype = GRAIN | VEGETABLES | DAIRY
@@ -148,7 +148,7 @@
desc = "The pizza equivalent of Einstein's riddle."
icon_state = "pineapplepizza"
slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/pineapple
bonus_reagents = list("nutriment" = 6, "vitamin" = 6)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 6)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 6, "ham" = 2)
foodtype = PINEAPPLE //Over powering tast of gods fruit
@@ -162,7 +162,7 @@
/obj/item/reagent_containers/food/snacks/pizza/pineapple/anomaly
desc = "A anomaly made pizza with pineapple..."
bonus_reagents = list("nutriment" = 16, "vitamin" = 16)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 16, /datum/reagent/consumable/nutriment/vitamin = 16)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 6, "ham" = 2, "good" = 10)
/obj/item/reagent_containers/food/snacks/pizzaslice/pineapple/anomaly
@@ -174,7 +174,7 @@
desc = "Hello, you've reached Arnold's pizza shop. I'm not here now, I'm out killing pepperoni."
icon_state = "arnoldpizza"
slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/arnold
bonus_reagents = list("nutriment" = 30, "vitamin" = 6, "iron" = 10, "omnizine" = 30)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/iron = 10, "omnizine" = 30)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pepperoni" = 2, "9 millimeter bullets" = 2)
/obj/item/reagent_containers/food/snacks/proc/try_break_off(mob/living/M, mob/living/user) //maybe i give you a pizza maybe i break off your arm
code/modules/food_and_drinks/food/snacks_salad.dm
+20 -20
View File
@@ -5,7 +5,7 @@
trash = /obj/item/reagent_containers/glass/bowl
bitesize = 3
w_class = WEIGHT_CLASS_NORMAL
list_reagents = list("nutriment" = 7, "vitamin" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("leaves" = 1)
foodtype = VEGETABLES
@@ -17,8 +17,8 @@
name = "\improper Aesir salad"
desc = "Probably too incredible for mortal men to fully enjoy."
icon_state = "aesirsalad"
bonus_reagents = list("omnizine" = 2, "vitamin" = 6)
list_reagents = list("nutriment" = 8, "omnizine" = 8, "vitamin" = 6)
bonus_reagents = list("omnizine" = 2, /datum/reagent/consumable/nutriment/vitamin = 6)
list_reagents = list(/datum/reagent/consumable/nutriment = 8, "omnizine" = 8, /datum/reagent/consumable/nutriment/vitamin = 6)
tastes = list("leaves" = 1)
foodtype = VEGETABLES
@@ -26,8 +26,8 @@
name = "herb salad"
desc = "A tasty salad with apples on top."
icon_state = "herbsalad"
bonus_reagents = list("vitamin" = 4)
list_reagents = list("nutriment" = 8, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("leaves" = 1, "apple" = 1)
foodtype = VEGETABLES | FRUIT
@@ -35,8 +35,8 @@
name = "valid salad"
desc = "It's just an herb salad with meatballs and fried potato slices. Nothing suspicious about it."
icon_state = "validsalad"
bonus_reagents = list("doctorsdelight" = 5, "vitamin" = 4)
list_reagents = list("nutriment" = 8, "doctorsdelight" = 5, "vitamin" = 2)
bonus_reagents = list("doctorsdelight" = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 8, "doctorsdelight" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("leaves" = 1, "potato" = 1, "meat" = 1, "valids" = 1)
foodtype = VEGETABLES | MEAT | FRIED | JUNKFOOD | FRUIT
@@ -44,8 +44,8 @@
name = "oatmeal"
desc = "A nice bowl of oatmeal."
icon_state = "oatmeal"
bonus_reagents = list("nutriment" = 4, "vitamin" = 4)
list_reagents = list("nutriment" = 7, "milk" = 10, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/milk = 10, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("oats" = 1, "milk" = 1)
foodtype = DAIRY | GRAIN | BREAKFAST
@@ -53,7 +53,7 @@
name = "fruit salad"
desc = "Your standard fruit salad."
icon_state = "fruitsalad"
bonus_reagents = list("nutriment" = 2, "vitamin" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("fruit" = 1)
foodtype = FRUIT | BREAKFAST
@@ -61,8 +61,8 @@
name = "jungle salad"
desc = "Exotic fruits in a bowl."
icon_state = "junglesalad"
bonus_reagents = list("nutriment" = 4, "vitamin" = 4)
list_reagents = list("nutriment" = 7, "banana" = 5, "vitamin" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/banana = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("fruit" = 1, "the jungle" = 1)
foodtype = FRUIT | BREAKFAST
@@ -70,8 +70,8 @@
name = "citrus delight"
desc = "Citrus overload!"
icon_state = "citrusdelight"
bonus_reagents = list("nutriment" = 4, "vitamin" = 4)
list_reagents = list("nutriment" = 7, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("sourness" = 1, "leaves" = 1)
foodtype = FRUIT | BREAKFAST
@@ -80,7 +80,7 @@
desc = "A bowl of raw rice."
icon_state = "ricebowl"
cooked_type = /obj/item/reagent_containers/food/snacks/salad/boiledrice
list_reagents = list("nutriment" = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 4)
tastes = list("rice" = 1)
foodtype = GRAIN | RAW
@@ -88,8 +88,8 @@
name = "boiled rice"
desc = "A warm bowl of rice."
icon_state = "boiledrice"
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list("nutriment" = 5, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("rice" = 1)
foodtype = GRAIN | BREAKFAST
@@ -97,7 +97,7 @@
name = "rice pudding"
desc = "Everybody loves rice pudding!"
icon_state = "ricepudding"
bonus_reagents = list("nutriment" = 4, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("rice" = 1, "sweetness" = 1)
foodtype = GRAIN | DAIRY
@@ -105,7 +105,7 @@
name = "rice and pork"
desc = "Well, it looks like pork..."
icon_state = "riceporkbowl"
bonus_reagents = list("nutriment" = 4, "vitamin" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("rice" = 1, "meat" = 1)
foodtype = GRAIN | MEAT
@@ -113,6 +113,6 @@
name = "egg bowl"
desc = "A bowl of rice with a fried egg."
icon_state = "eggbowl"
bonus_reagents = list("nutriment" = 4, "vitamin" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("rice" = 1, "egg" = 1)
foodtype = GRAIN | MEAT //EGG = MEAT -NinjaNomNom 2017
code/modules/food_and_drinks/food/snacks_sandwichtoast.dm
+27 -27
View File
@@ -4,8 +4,8 @@
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "sandwich"
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list("nutriment" = 6, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
cooked_type = /obj/item/reagent_containers/food/snacks/toastedsandwich
tastes = list("meat" = 2, "cheese" = 1, "bread" = 2, "lettuce" = 1)
foodtype = GRAIN | VEGETABLES
@@ -16,8 +16,8 @@
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "toastedsandwich"
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 1, "carbon" = 2)
list_reagents = list("nutriment" = 6, "carbon" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/carbon = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/carbon = 2)
tastes = list("toast" = 1)
foodtype = GRAIN
@@ -27,8 +27,8 @@
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "toastedsandwich"
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list("nutriment" = 7, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("toast" = 1, "cheese" = 1)
foodtype = GRAIN | DAIRY
@@ -43,13 +43,13 @@
foodtype = GRAIN
/obj/item/reagent_containers/food/snacks/jellysandwich/slime
bonus_reagents = list("slimejelly" = 5, "vitamin" = 2)
list_reagents = list("nutriment" = 2, "slimejelly" = 5, "vitamin" = 2)
bonus_reagents = list("slimejelly" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 2, "slimejelly" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
foodtype = GRAIN | TOXIC
/obj/item/reagent_containers/food/snacks/jellysandwich/cherry
bonus_reagents = list("cherryjelly" = 5, "vitamin" = 2)
list_reagents = list("nutriment" = 2, "cherryjelly" = 5, "vitamin" = 2)
bonus_reagents = list("cherryjelly" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 2, "cherryjelly" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
foodtype = GRAIN | FRUIT
/obj/item/reagent_containers/food/snacks/jellysandwich/pbj
@@ -59,13 +59,13 @@
tastes = list("bread" = 1, "jelly" = 1, "peanuts" = 1)
/obj/item/reagent_containers/food/snacks/jellysandwich/pbj/cherry
bonus_reagents = list("cherryjelly" = 5, "peanut_butter" = 5, "vitamin" = 2)
list_reagents = list("nutriment" = 2, "cherryjelly" = 5, "peanut_butter" = 5, "vitamin" = 2)
bonus_reagents = list("cherryjelly" = 5, "peanut_butter" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 2, "cherryjelly" = 5, "peanut_butter" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
foodtype = GRAIN | FRUIT
/obj/item/reagent_containers/food/snacks/jellysandwich/pbj/slime
bonus_reagents = list("slimejelly" = 5, "peanut_butter" = 5, "vitamin" = 2)
list_reagents = list("nutriment" = 2, "slimejelly" = 5, "peanut_butter" = 5, "vitamin" = 2)
bonus_reagents = list("slimejelly" = 5, "peanut_butter" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 2, "slimejelly" = 5, "peanut_butter" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
foodtype = GRAIN | TOXIC
/obj/item/reagent_containers/food/snacks/peanutbutter_sandwich
@@ -75,8 +75,8 @@
icon_state = "peanutbuttersandwich"
trash = /obj/item/trash/plate
bitesize = 3
bonus_reagents = list("peanut_butter" = 5, "vitamin" = 2)
list_reagents = list("nutriment" = 2, "peanut_butter" = 5, "vitamin" = 2)
bonus_reagents = list("peanut_butter" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 2, "peanut_butter" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
foodtype = GRAIN
/obj/item/reagent_containers/food/snacks/notasandwich
@@ -85,8 +85,8 @@
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "notasandwich"
trash = /obj/item/trash/plate
bonus_reagents = list("vitamin" = 6)
list_reagents = list("nutriment" = 6, "vitamin" = 6)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 6)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 6)
tastes = list("nothing suspicious" = 1)
foodtype = GRAIN | GROSS
@@ -101,13 +101,13 @@
foodtype = GRAIN
/obj/item/reagent_containers/food/snacks/jelliedtoast/cherry
bonus_reagents = list("cherryjelly" = 5, "vitamin" = 2)
list_reagents = list("nutriment" = 1, "cherryjelly" = 5, "vitamin" = 2)
bonus_reagents = list("cherryjelly" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, "cherryjelly" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
foodtype = GRAIN | FRUIT | SUGAR
/obj/item/reagent_containers/food/snacks/jelliedtoast/slime
bonus_reagents = list("slimejelly" = 5, "vitamin" = 2)
list_reagents = list("nutriment" = 1, "slimejelly" = 5, "vitamin" = 2)
bonus_reagents = list("slimejelly" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, "slimejelly" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
foodtype = GRAIN | TOXIC | SUGAR
/obj/item/reagent_containers/food/snacks/peanut_buttertoast
@@ -117,8 +117,8 @@
icon_state = "peanutbuttertoast"
trash = /obj/item/trash/plate
bitesize = 3
bonus_reagents = list("peanut_butter" = 5, "vitamin" = 2)
list_reagents = list("nutriment" = 1, "peanut_butter" = 5, "vitamin" = 2)
bonus_reagents = list("peanut_butter" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, "peanut_butter" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("toast" = 1, "peanuts" = 1)
foodtype = GRAIN
@@ -128,8 +128,8 @@
desc = "This seems awfully bitter."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "twobread"
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
list_reagents = list("nutriment" = 2, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("bread" = 2)
foodtype = GRAIN
@@ -139,6 +139,6 @@
icon = 'modular_citadel/icons/obj/food/food.dmi'
icon_state = "tunasandwich"
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
tastes = list("tuna" = 4, "mayonnaise" = 2, "bread" = 2)
foodtype = GRAIN | MEAT
code/modules/food_and_drinks/food/snacks_soup.dm
+39 -39
View File
@@ -4,7 +4,7 @@
trash = /obj/item/reagent_containers/glass/bowl
bitesize = 5
volume = 80
list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("tasteless soup" = 1)
foodtype = VEGETABLES
@@ -16,7 +16,7 @@
name = "wish soup"
desc = "I wish this was soup."
icon_state = "wishsoup"
list_reagents = list("water" = 10)
list_reagents = list(/datum/reagent/water = 10)
tastes = list("wishes" = 1)
/obj/item/reagent_containers/food/snacks/soup/wish/Initialize()
@@ -24,7 +24,7 @@
var/wish_true = prob(25)
if(wish_true)
desc = "A wish come true!"
bonus_reagents = list("nutriment" = 9, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 9, /datum/reagent/consumable/nutriment/vitamin = 1)
if(wish_true)
reagents.add_reagent(/datum/reagent/consumable/nutriment, 9)
reagents.add_reagent(/datum/reagent/consumable/nutriment/vitamin, 1)
@@ -34,7 +34,7 @@
name = "meatball soup"
desc = "You've got balls kid, BALLS!"
icon_state = "meatballsoup"
bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("meat" = 1)
foodtype = MEAT
@@ -42,8 +42,8 @@
name = "slime soup"
desc = "If no water is available, you may substitute tears."
icon_state = "slimesoup"
bonus_reagents = list("nutriment" = 1, "slimejelly" = 5, "vitamin" = 5)
list_reagents = list("nutriment" = 5, "slimejelly" = 5, "water" = 5, "vitamin" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, "slimejelly" = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 5, "slimejelly" = 5, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("slime" = 1)
foodtype = TOXIC | SUGAR
@@ -51,8 +51,8 @@
name = "tomato soup"
desc = "Smells like copper."
icon_state = "tomatosoup"
bonus_reagents = list("nutriment" = 1, "vitamin" = 6)
list_reagents = list("nutriment" = 2, "blood" = 10, "water" = 5, "vitamin" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 6)
list_reagents = list(/datum/reagent/consumable/nutriment = 2, "blood" = 10, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("iron" = 1)
foodtype = GROSS
@@ -61,8 +61,8 @@
desc = "A savory dish of alien wing wang in soy."
icon_state = "wingfangchu"
trash = /obj/item/reagent_containers/glass/bowl
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
list_reagents = list("nutriment" = 6, "soysauce" = 5, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, "soysauce" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("soy" = 1)
foodtype = MEAT
@@ -70,8 +70,8 @@
name = "clown's tears"
desc = "Not very funny."
icon_state = "clownstears"
bonus_reagents = list("nutriment" = 1, "banana" = 5, "vitamin" = 8, "clownstears" = 10)
list_reagents = list("nutriment" = 4, "banana" = 5, "water" = 5, "vitamin" = 8, "clownstears" = 10)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/banana = 5, /datum/reagent/consumable/nutriment/vitamin = 8, "clownstears" = 10)
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/banana = 5, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 8, "clownstears" = 10)
tastes = list("a bad joke" = 1)
foodtype = FRUIT | SUGAR
@@ -79,7 +79,7 @@
name = "vegetable soup"
desc = "A true vegan meal."
icon_state = "vegetablesoup"
bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("vegetables" = 1)
foodtype = VEGETABLES
@@ -87,7 +87,7 @@
name = "nettle soup"
desc = "To think, the botanist would've beat you to death with one of these."
icon_state = "nettlesoup"
bonus_reagents = list("nutriment" = 1, "omnizine" = 5, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, "omnizine" = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("nettles" = 1)
foodtype = VEGETABLES
@@ -96,7 +96,7 @@
desc = "The mystery is, why aren't you eating it?"
icon_state = "mysterysoup"
var/extra_reagent = null
list_reagents = list("nutriment" = 6)
list_reagents = list(/datum/reagent/consumable/nutriment = 6)
tastes = list("chaos" = 1)
/obj/item/reagent_containers/food/snacks/soup/mystery/Initialize()
@@ -111,8 +111,8 @@
name = "hot chili"
desc = "A five alarm Texan Chili!"
icon_state = "hotchili"
bonus_reagents = list("nutriment" = 1, "tomatojuice" = 2, "vitamin" = 2)
list_reagents = list("nutriment" = 5, "capsaicin" = 1, "tomatojuice" = 2, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, "tomatojuice" = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 5, "capsaicin" = 1, "tomatojuice" = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("hot peppers" = 1)
foodtype = VEGETABLES
@@ -120,8 +120,8 @@
name = "cold chili"
desc = "This slush is barely a liquid!"
icon_state = "coldchili"
bonus_reagents = list("nutriment" = 1, "tomatojuice" = 2, "vitamin" = 2)
list_reagents = list("nutriment" = 5, "frostoil" = 1, "tomatojuice" = 2, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, "tomatojuice" = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 5, "frostoil" = 1, "tomatojuice" = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("tomato" = 1, "mint" = 1)
foodtype = VEGETABLES
@@ -129,8 +129,8 @@
name = "monkey's delight"
desc = "A delicious soup with dumplings and hunks of monkey meat simmered to perfection, in a broth that tastes faintly of bananas."
icon_state = "monkeysdelight"
bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
list_reagents = list("nutriment" = 10, "banana" = 5, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/banana = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("the jungle" = 1, "banana" = 1)
foodtype = FRUIT
@@ -138,8 +138,8 @@
name = "tomato soup"
desc = "Drinking this feels like being a vampire! A tomato vampire..."
icon_state = "tomatosoup"
bonus_reagents = list("nutriment" = 1, "tomatojuice" = 10, "vitamin" = 3)
list_reagents = list("nutriment" = 5, "tomatojuice" = 10, "vitamin" = 3)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, "tomatojuice" = 10, /datum/reagent/consumable/nutriment/vitamin = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 5, "tomatojuice" = 10, /datum/reagent/consumable/nutriment/vitamin = 3)
tastes = list("tomato" = 1)
foodtype = VEGETABLES
@@ -147,7 +147,7 @@
name = "eyeball soup"
desc = "It looks back at you..."
icon_state = "eyeballsoup"
bonus_reagents = list("nutriment" = 1, "liquidgibs" = 3)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, "liquidgibs" = 3)
tastes = list("tomato" = 1, "squirming" = 1)
foodtype = MEAT | GROSS
@@ -155,7 +155,7 @@
name = "milosoup"
desc = "The universes best soup! Yum!!!"
icon_state = "milosoup"
bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
tastes = list("milo" = 1) // wtf is milo
foodtype = GROSS
@@ -163,8 +163,8 @@
name = "chantrelle soup"
desc = "A delicious and hearty mushroom soup."
icon_state = "mushroomsoup"
bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
list_reagents = list("nutriment" = 8, "vitamin" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("mushroom" = 1)
foodtype = VEGETABLES
@@ -172,7 +172,7 @@
name = "beet soup"
desc = "Wait, how do you spell it again..?"
icon_state = "beetsoup"
bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5)
foodtype = VEGETABLES
/obj/item/reagent_containers/food/snacks/soup/beet/Initialize()
@@ -186,8 +186,8 @@
desc = "Jello gelatin, from Alfred Hubbard's cookbook."
icon_state = "spacylibertyduff"
bitesize = 3
bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
list_reagents = list("nutriment" = 6, "mushroomhallucinogen" = 6)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, "mushroomhallucinogen" = 6)
tastes = list("jelly" = 1, "mushroom" = 1)
foodtype = VEGETABLES
@@ -196,8 +196,8 @@
desc = "Looks curiously toxic."
icon_state = "amanitajelly"
bitesize = 3
bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
list_reagents = list("nutriment" = 6, "mushroomhallucinogen" = 3, "amatoxin" = 6)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, "mushroomhallucinogen" = 3, "amatoxin" = 6)
tastes = list("jelly" = 1, "mushroom" = 1)
foodtype = VEGETABLES | TOXIC
@@ -205,8 +205,8 @@
name = "stew"
desc = "A nice and warm stew. Healthy and strong."
icon_state = "stew"
bonus_reagents = list("nutriment" = 1, "tomatojuice" = 5, "vitamin" = 5)
list_reagents = list("nutriment" = 10, "oculine" = 5, "tomatojuice" = 5, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, "tomatojuice" = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 10, "oculine" = 5, "tomatojuice" = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
bitesize = 7
volume = 100
tastes = list("tomato" = 1, "carrot" = 1)
@@ -216,7 +216,7 @@
name = "sweet potato soup"
desc = "Delicious sweet potato in soup form."
icon_state = "sweetpotatosoup"
bonus_reagents = list("nutriment" = 4, "vitamin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("sweet potato" = 1)
foodtype = VEGETABLES | SUGAR
@@ -224,7 +224,7 @@
name = "red beet soup"
desc = "Quite a delicacy."
icon_state = "redbeetsoup"
bonus_reagents = list("nutriment" = 4, "vitamin" = 6)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 6)
tastes = list("beet" = 1)
foodtype = VEGETABLES
@@ -232,7 +232,7 @@
name = "electron soup"
desc = "A gastronomic curiosity of ethereal origin. It is famed for the minature weather system formed over a properly prepared soup."
icon_state = "electronsoup"
list_reagents = list("nutriment" = 3, "liquidelectricity" = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, "liquidelectricity" = 5)
tastes = list("mushroom" = 1, "electrons" = 4, "shockingly good")
filling_color = "#CC2B52"
foodtype = VEGETABLES | TOXIC
@@ -241,8 +241,8 @@
name = "bungo curry"
desc = "A spicy vegetable curry made with the humble bungo fruit, Exotic!"
icon_state = "bungocurry"
bonus_reagents = list("vitamin" = 11)
list_reagents = list("nutriment" = 6, "capsaicin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 11)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, "capsaicin" = 5)
tastes = list("bungo" = 2, "hot curry" = 4, "tropical sweetness" = 1)
filling_color = "#E6A625"
foodtype = VEGETABLES | FRUIT | DAIRY
code/modules/food_and_drinks/food/snacks_spaghetti.dm
+15 -15
View File
@@ -4,7 +4,7 @@
desc = "Now that's a nic'e pasta!"
icon = 'icons/obj/food/pizzaspaghetti.dmi'
icon_state = "spaghetti"
list_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
cooked_type = /obj/item/reagent_containers/food/snacks/boiledspaghetti
filling_color = "#F0E68C"
tastes = list("pasta" = 1)
@@ -16,8 +16,8 @@
icon = 'icons/obj/food/pizzaspaghetti.dmi'
icon_state = "spaghettiboiled"
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 2)
list_reagents = list("nutriment" = 2, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/pasta
filling_color = "#F0E68C"
tastes = list("pasta" = 1)
@@ -30,8 +30,8 @@
icon_state = "pastatomato"
trash = /obj/item/trash/plate
bitesize = 4
bonus_reagents = list("nutriment" = 1, "tomatojuice" = 10, "vitamin" = 4)
list_reagents = list("nutriment" = 6, "tomatojuice" = 10, "vitamin" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, "tomatojuice" = 10, /datum/reagent/consumable/nutriment/vitamin = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, "tomatojuice" = 10, /datum/reagent/consumable/nutriment/vitamin = 4)
filling_color = "#DC143C"
tastes = list("pasta" = 1, "tomato" = 1)
foodtype = GRAIN | VEGETABLES
@@ -43,8 +43,8 @@
icon_state = "copypasta"
trash = /obj/item/trash/plate
bitesize = 4
bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
list_reagents = list("nutriment" = 12, "tomatojuice" = 20, "vitamin" = 8)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 12, "tomatojuice" = 20, /datum/reagent/consumable/nutriment/vitamin = 8)
filling_color = "#DC143C"
tastes = list("pasta" = 1, "tomato" = 1)
foodtype = GRAIN | VEGETABLES
@@ -55,8 +55,8 @@
icon = 'icons/obj/food/pizzaspaghetti.dmi'
icon_state = "meatballspaghetti"
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
list_reagents = list("nutriment" = 8, "vitamin" = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 4)
filling_color = "#F0E68C"
tastes = list("pasta" = 1, "tomato" = 1, "meat" = 1)
foodtype = GRAIN | MEAT
@@ -67,8 +67,8 @@
icon = 'icons/obj/food/pizzaspaghetti.dmi'
icon_state = "spesslaw"
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 1, "vitamin" = 6)
list_reagents = list("nutriment" = 8, "vitamin" = 6)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 6)
list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 6)
filling_color = "#F0E68C"
tastes = list("pasta" = 1, "tomato" = 1, "meat" = 1)
foodtype = GRAIN
@@ -79,8 +79,8 @@
icon = 'icons/obj/food/pizzaspaghetti.dmi'
icon_state = "chowmein"
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 3, "vitamin" = 4)
list_reagents = list("nutriment" = 7, "vitamin" = 6)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 6)
tastes = list("noodle" = 1, "tomato" = 1)
foodtype = GRAIN
@@ -90,7 +90,7 @@
icon = 'icons/obj/food/pizzaspaghetti.dmi'
icon_state = "beefnoodle"
trash = /obj/item/reagent_containers/glass/bowl
bonus_reagents = list("nutriment" = 5, "vitamin" = 6, "liquidgibs" = 3)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 6, "liquidgibs" = 3)
tastes = list("noodle" = 1, "meat" = 1)
foodtype = GRAIN | MEAT
@@ -100,6 +100,6 @@
icon = 'icons/obj/food/pizzaspaghetti.dmi'
icon_state = "butternoodles"
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 8, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("noodle" = 1, "butter" = 1)
foodtype = GRAIN | DAIRY
code/modules/food_and_drinks/food/snacks_sushi.dm
+13 -13
View File
@@ -5,7 +5,7 @@
desc = "A bowl of sticky rice for making sushi."
icon = 'modular_citadel/icons/obj/food/food.dmi'
icon_state = "sushi_rice"
list_reagents = list("sodiumchloride" = 5)
list_reagents = list(/datum/reagent/consumable/sodiumchloride = 5)
tastes = list("rice" = 5, "salt" = 1)
foodtype = GRAIN
@@ -14,7 +14,7 @@
desc = "A thin, light salt sheet of plant mater. This is commenly used in sushi recipes,"
icon = 'modular_citadel/icons/obj/food/food.dmi'
icon_state = "sea_weed"
list_reagents = list("sodiumchloride" = 2)
list_reagents = list(/datum/reagent/consumable/sodiumchloride = 2)
tastes = list("plants" = 2, "salt" = 1)
foodtype = VEGETABLES
@@ -24,7 +24,7 @@
icon = 'modular_citadel/icons/obj/food/food.dmi'
icon_state = "tuna_can"
//trash = /obj/item/trash/tuna_used //I dont know if I like this idea - A Masked Cat
list_reagents = list("sodiumchloride" = 5, "mercury" = 2)
list_reagents = list(/datum/reagent/consumable/sodiumchloride = 5, "mercury" = 2)
tastes = list("tuna" = 15, "mercury" = 1, "salt" = 3)
foodtype = MEAT
@@ -34,8 +34,8 @@
desc = "A small cylindrical filled with rice and fish."
icon = 'modular_citadel/icons/obj/food/food.dmi'
icon_state = "sushie_basic"
bonus_reagents = list("vitamin" = 2)
list_reagents = list("nutriment" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 1)
bitesize = 1
filling_color = "#F2EEEA" //rgb(242, 238, 234)
tastes = list("fish" = 1, "rice" = 1, "salt" = 1)
@@ -46,8 +46,8 @@
desc = "A pice of carp lightly placed on some rice."
icon = 'modular_citadel/icons/obj/food/food.dmi'
icon_state = "sushie_adv"
bonus_reagents = list("vitamin" = 2)
list_reagents = list("nutriment" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 2)
bitesize = 1
filling_color = "#F2EEEA" //rgb(242, 238, 234)
tastes = list("fish" = 1, "rice" = 1, "salt" = 1)
@@ -58,8 +58,8 @@
desc = "A well prepared pice of the best of the carp fillet placed on rice. Looks fancy and fresh!"
icon = 'modular_citadel/icons/obj/food/food.dmi'
icon_state = "sushie_pro"
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
list_reagents = list("nutriment" = 8, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1)
bitesize = 1
filling_color = "#F2EEEA" //rgb(242, 238, 234)
tastes = list("fish" = 1, "rice" = 1, "salt" = 1)
@@ -70,7 +70,7 @@
desc = "Spider eggs wrapped in a thin salted Kudzu pod"
icon = 'modular_citadel/icons/obj/food/food.dmi'
icon_state = "sushie_egg"
list_reagents = list("nutriment" = 3, "vitamin" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
filling_color = "#FF3333" // R225 G051 B051
tastes = list("seaweed" = 1, "salty" = 2)
foodtype = MEAT | VEGETABLES
@@ -80,7 +80,7 @@
desc = "A ball of rice with some light salt and a wrap of Kudzu skin."
icon = 'modular_citadel/icons/obj/food/food.dmi'
icon_state = "riceball"
list_reagents = list("nutriment" = 5, "sodiumchloride" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/sodiumchloride = 2)
tastes = list("rice" = 4, "salt" = 1)
foodtype = GRAIN
@@ -88,8 +88,8 @@
name = "carp sashimi"
desc = "Celebrate surviving attack from hostile alien lifeforms by hospitalising yourself."
icon_state = "sashimi"
bonus_reagents = list("nutriment" = 1, "capsaicin" = 4, "vitamin" = 4)
list_reagents = list("nutriment" = 6, "capsaicin" = 5)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, "capsaicin" = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, "capsaicin" = 5)
filling_color = "#FA8072"
tastes = list("fish" = 1, "hot peppers" = 1)
foodtype = MEAT | TOXIC
code/modules/food_and_drinks/food/snacks_vend.dm
+9 -9
View File
@@ -7,7 +7,7 @@
desc = "Nougat love it or hate it."
icon_state = "candy"
trash = /obj/item/trash/candy
list_reagents = list("nutriment" = 1, "sugar" = 3, "cocoa" = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 3, /datum/reagent/consumable/coco = 3)
junkiness = 25
filling_color = "#D2691E"
tastes = list("candy" = 1)
@@ -18,7 +18,7 @@
icon_state = "sosjerky"
desc = "Beef jerky made from the finest space cows."
trash = /obj/item/trash/sosjerky
list_reagents = list("nutriment" = 1, "sugar" = 3, "sodiumchloride" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 3, /datum/reagent/consumable/sodiumchloride = 2)
junkiness = 25
filling_color = "#8B0000"
tastes = list("dried meat" = 1)
@@ -27,7 +27,7 @@
/obj/item/reagent_containers/food/snacks/sosjerky/healthy
name = "homemade beef jerky"
desc = "Homemade beef jerky made from the finest space cows."
list_reagents = list("nutriment" = 3, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
junkiness = 0
/obj/item/reagent_containers/food/snacks/chips
@@ -36,7 +36,7 @@
icon_state = "chips"
trash = /obj/item/trash/chips
bitesize = 1
list_reagents = list("nutriment" = 1, "sugar" = 3, "sodiumchloride" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 3, /datum/reagent/consumable/sodiumchloride = 1)
junkiness = 20
filling_color = "#FFD700"
tastes = list("salt" = 1, "crisps" = 1)
@@ -47,7 +47,7 @@
icon_state = "4no_raisins"
desc = "Best raisins in the universe. Not sure why."
trash = /obj/item/trash/raisins
list_reagents = list("nutriment" = 2, "sugar" = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/sugar = 4)
junkiness = 25
filling_color = "#8B0000"
tastes = list("dried raisins" = 1)
@@ -56,7 +56,7 @@
/obj/item/reagent_containers/food/snacks/no_raisin/healthy
name = "homemade raisins"
desc = "Homemade raisins, the best in all of spess."
list_reagents = list("nutriment" = 3, "vitamin" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
junkiness = 0
foodtype = FRUIT
@@ -64,7 +64,7 @@
name = "space twinkie"
icon_state = "space_twinkie"
desc = "Guaranteed to survive longer than you will."
list_reagents = list("sugar" = 4)
list_reagents = list(/datum/reagent/consumable/sugar = 4)
junkiness = 25
filling_color = "#FFD700"
foodtype = JUNKFOOD | GRAIN | SUGAR
@@ -74,7 +74,7 @@
desc = "Bite sized cheesie snacks that will honk all over your mouth."
icon_state = "cheesie_honkers"
trash = /obj/item/trash/cheesie
list_reagents = list("nutriment" = 1, "sugar" = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 3)
junkiness = 25
filling_color = "#FFD700"
tastes = list("cheese" = 5, "crisps" = 2)
@@ -85,7 +85,7 @@
icon_state = "syndi_cakes"
desc = "An extremely moist snack cake that tastes just as good after being nuked."
trash = /obj/item/trash/syndi_cakes
list_reagents = list("nutriment" = 4, "doctorsdelight" = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 4, "doctorsdelight" = 5)
filling_color = "#F5F5DC"
tastes = list("sweetness" = 3, "cake" = 1)
foodtype = GRAIN | FRUIT | VEGETABLES
code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm
+1 -1
View File
@@ -228,7 +228,7 @@
desc = "Delicious waffle cone, but no ice cream."
icon = 'icons/obj/kitchen.dmi'
icon_state = "icecream_cone_waffle" //default for admin-spawned cones, href_list["cone"] should overwrite this all the time
list_reagents = list("nutriment" = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 4)
tastes = list("cream" = 2, "waffle" = 1)
var/ice_creamed = 0
var/cone_type
code/modules/food_and_drinks/recipes/drinks_recipes.dm
+36 -36
View File
@@ -4,19 +4,19 @@
name = "Goldschlager"
id = "goldschlager"
results = list("goldschlager" = 10)
required_reagents = list("vodka" = 10, "gold" = 1)
required_reagents = list("vodka" = 10, /datum/reagent/gold = 1)
/datum/chemical_reaction/patron
name = "Patron"
id = "patron"
results = list("patron" = 10)
required_reagents = list("tequila" = 10, "silver" = 1)
required_reagents = list("tequila" = 10, /datum/reagent/silver = 1)
/datum/chemical_reaction/bilk
name = "Bilk"
id = "bilk"
results = list("bilk" = 2)
required_reagents = list("milk" = 1, "beer" = 1)
required_reagents = list(/datum/reagent/consumable/milk = 1, "beer" = 1)
/datum/chemical_reaction/icetea
name = "Iced Tea"
@@ -40,36 +40,36 @@
name = "Moonshine"
id = "moonshine"
results = list("moonshine" = 10)
required_reagents = list("nutriment" = 5, "sugar" = 5)
required_catalysts = list("enzyme" = 5)
required_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/sugar = 5)
required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
/datum/chemical_reaction/wine
name = "Wine"
id = "wine"
results = list("wine" = 10)
required_reagents = list("grapejuice" = 10)
required_catalysts = list("enzyme" = 5)
required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
/datum/chemical_reaction/spacebeer
name = "Space Beer"
id = "spacebeer"
results = list("beer" = 10)
required_reagents = list("flour" = 10)
required_catalysts = list("enzyme" = 5)
required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
/datum/chemical_reaction/vodka
name = "Vodka"
id = "vodka"
results = list("vodka" = 10)
required_reagents = list("potato" = 10)
required_catalysts = list("enzyme" = 5)
required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
/datum/chemical_reaction/kahlua
name = "Kahlua"
id = "kahlua"
results = list("kahlua" = 5)
required_reagents = list("coffee" = 5, "sugar" = 5)
required_catalysts = list("enzyme" = 5)
required_reagents = list("coffee" = 5, /datum/reagent/consumable/sugar = 5)
required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
/datum/chemical_reaction/gin_tonic
name = "Gin and Tonic"
@@ -147,13 +147,13 @@
name = "Toxins Special"
id = "toxinsspecial"
results = list("toxinsspecial" = 5)
required_reagents = list("rum" = 2, "vermouth" = 1, "plasma" = 2)
required_reagents = list("rum" = 2, "vermouth" = 1, /datum/reagent/toxin/plasma = 2)
/datum/chemical_reaction/beepsky_smash
name = "Beepksy Smash"
id = "beepksysmash"
results = list("beepskysmash" = 5)
required_reagents = list("limejuice" = 2, "quadruple_sec" = 2, "iron" = 1)
required_reagents = list("limejuice" = 2, "quadruple_sec" = 2, /datum/reagent/iron = 1)
/datum/chemical_reaction/doctor_delight
name = "The Doctor's Delight"
@@ -184,7 +184,7 @@
id = "hooch"
results = list("hooch" = 3)
required_reagents = list ("ethanol" = 2, "welding_fuel" = 1)
required_catalysts = list("enzyme" = 1)
required_catalysts = list(/datum/reagent/consumable/enzyme = 1)
/datum/chemical_reaction/irish_coffee
name = "Irish Coffee"
@@ -268,7 +268,7 @@
name = "Singulo"
id = "singulo"
results = list("singulo" = 10)
required_reagents = list("vodka" = 5, "radium" = 1, "wine" = 5)
required_reagents = list("vodka" = 5, /datum/reagent/radium = 1, "wine" = 5)
/datum/chemical_reaction/alliescocktail
name = "Allies Cocktail"
@@ -320,7 +320,7 @@
id = "mead"
results = list("mead" = 2)
required_reagents = list("honey" = 2)
required_catalysts = list("enzyme" = 5)
required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
/datum/chemical_reaction/iced_beer
name = "Iced Beer"
@@ -344,19 +344,19 @@
name = "Cafe Latte"
id = "cafe_latte"
results = list("cafe_latte" = 2)
required_reagents = list("coffee" = 1, "milk" = 1)
required_reagents = list("coffee" = 1, /datum/reagent/consumable/milk = 1)
/datum/chemical_reaction/acidspit
name = "Acid Spit"
id = "acidspit"
results = list("acidspit" = 6)
required_reagents = list("sacid" = 1, "wine" = 5)
required_reagents = list(/datum/reagent/toxin/acid = 1, "wine" = 5)
/datum/chemical_reaction/amasec
name = "Amasec"
id = "amasec"
results = list("amasec" = 10)
required_reagents = list("iron" = 1, "wine" = 5, "vodka" = 5)
required_reagents = list(/datum/reagent/iron = 1, "wine" = 5, "vodka" = 5)
/datum/chemical_reaction/changelingsting
name = "Changeling Sting"
@@ -458,7 +458,7 @@
name = "Silencer"
id = "silencer"
results = list("silencer" = 3)
required_reagents = list("nothing" = 1, "cream" = 1, "sugar" = 1)
required_reagents = list("nothing" = 1, "cream" = 1, /datum/reagent/consumable/sugar = 1)
/datum/chemical_reaction/driestmartini
name = "Driest Martini"
@@ -482,7 +482,7 @@
name = "Vanilla Pudding"
id = "vanillapudding"
results = list("vanillapudding" = 20)
required_reagents = list("vanilla" = 5, "milk" = 5, "eggyolk" = 5)
required_reagents = list(/datum/reagent/consumable/vanilla = 5, /datum/reagent/consumable/milk = 5, "eggyolk" = 5)
/datum/chemical_reaction/drunkenblumpkin
name = "Drunken Blumpkin"
@@ -525,14 +525,14 @@
name = "Whiskey Sour"
id = "whiskey_sour"
results = list("whiskey_sour" = 3)
required_reagents = list("whiskey" = 1, "lemonjuice" = 1, "sugar" = 1)
required_reagents = list("whiskey" = 1, "lemonjuice" = 1, /datum/reagent/consumable/sugar = 1)
mix_message = "The mixture darkens to a rich gold hue."
/datum/chemical_reaction/fetching_fizz
name = "Fetching Fizz"
id = "fetching_fizz"
results = list("fetching_fizz" = 3)
required_reagents = list("nuka_cola" = 1, "iron" = 1) //Manufacturable from only the mining station
required_reagents = list("nuka_cola" = 1, /datum/reagent/iron = 1) //Manufacturable from only the mining station
mix_message = "The mixture slightly vibrates before settling."
/datum/chemical_reaction/hearty_punch
@@ -554,7 +554,7 @@
name = "Lemonade"
id = "lemonade"
results = list("lemonade" = 5)
required_reagents = list("lemonjuice" = 2, "water" = 2, "sugar" = 1, "ice" = 1)
required_reagents = list("lemonjuice" = 2, "water" = 2, /datum/reagent/consumable/sugar = 1, "ice" = 1)
mix_message = "You're suddenly reminded of home."
/datum/chemical_reaction/arnold_palmer
@@ -568,7 +568,7 @@
name = "chocolate milk"
id = "chocolate_milk"
results = list("chocolate_milk" = 2)
required_reagents = list("milk" = 1, "cocoa" = 1)
required_reagents = list(/datum/reagent/consumable/milk = 1, "cocoa" = 1)
mix_message = "The color changes as the mixture blends smoothly."
/datum/chemical_reaction/eggnog
@@ -625,21 +625,21 @@
name = "Squirt Cider"
id = "squirt_cider"
results = list("squirt_cider" = 1)
required_reagents = list("water" = 1, "tomatojuice" = 1, "nutriment" = 1)
required_reagents = list("water" = 1, "tomatojuice" = 1, /datum/reagent/consumable/nutriment = 1)
mix_message = "The mix swirls and turns a bright red that reminds you of an apple's skin."
/datum/chemical_reaction/fringe_weaver
name = "Fringe Weaver"
id = "fringe_weaver"
results = list("fringe_weaver" = 10)
required_reagents = list("ethanol" = 9, "sugar" = 1) //9 karmotrine, 1 adelhyde
required_reagents = list(/datum/reagent/consumable/ethanol = 9, /datum/reagent/consumable/sugar = 1) //9 karmotrine, 1 adelhyde
mix_message = "The mix turns a pleasant cream color and foams up."
/datum/chemical_reaction/sugar_rush
name = "Sugar Rush"
id = "sugar_rush"
results = list("sugar_rush" = 4)
required_reagents = list("sugar" = 2, "lemonjuice" = 1, "wine" = 1) //2 adelhyde (sweet), 1 powdered delta (sour), 1 karmotrine (alcohol)
required_reagents = list(/datum/reagent/consumable/sugar = 2, "lemonjuice" = 1, "wine" = 1) //2 adelhyde (sweet), 1 powdered delta (sour), 1 karmotrine (alcohol)
mix_message = "The mixture bubbles and brightens into a girly pink."
/datum/chemical_reaction/crevice_spike
@@ -654,7 +654,7 @@
id = "sake"
results = list("sake" = 10)
required_reagents = list("rice" = 10)
required_catalysts = list("enzyme" = 5)
required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
mix_message = "The rice grains ferment into a clear, sweet-smelling liquid."
/datum/chemical_reaction/peppermint_patty
@@ -692,7 +692,7 @@
name = "Mojito"
id = "mojito"
results = list("mojito" = 5)
required_reagents = list("rum" = 1, "sugar" = 1, "limejuice" = 1, "sodawater" = 1, "menthol" = 1)
required_reagents = list("rum" = 1, /datum/reagent/consumable/sugar = 1, "limejuice" = 1, "sodawater" = 1, "menthol" = 1)
/datum/chemical_reaction/fernet_cola
name = "Fernet Cola"
@@ -716,19 +716,19 @@
name = "Power Gamer"
id = "pwr_game"
results = list("pwr_game" = 5)
required_reagents = list("sodawater" = 1, "blackcrayonpowder" = 1, "sodiumchloride" = 1)
required_reagents = list("sodawater" = 1, "blackcrayonpowder" = 1, /datum/reagent/consumable/sodiumchloride = 1)
/datum/chemical_reaction/pinkmilk
name = "Strawberry Milk"
id = "pinkmilk"
results = list("pinkmilk" = 5)
required_reagents = list("aphro+" = 1, "milk" = 1)
required_reagents = list("aphro+" = 1, /datum/reagent/consumable/milk = 1)
/datum/chemical_reaction/pinktea
name = "Strawberry Tea"
id = "pinktea"
results = list("pinktea" = 5)
required_reagents = list("aphro" = 1, "arnold_palmer" = 1, "sugar" = 1)
required_reagents = list("aphro" = 1, "arnold_palmer" = 1, /datum/reagent/consumable/sugar = 1)
/datum/chemical_reaction/blank_paper
name = "Blank Paper"
@@ -775,7 +775,7 @@
name = "Rubberneck"
id = "rubberneck"
results = list("rubberneck" = 10)
required_reagents = list("ethanol" = 4, "grey_bull" = 5, "astrotame" = 1)
required_reagents = list(/datum/reagent/consumable/ethanol = 4, "grey_bull" = 5, "astrotame" = 1)
/datum/chemical_reaction/duplex
name = "Duplex"
@@ -787,13 +787,13 @@
name = "Trappist"
id = "trappist"
results = list("trappist" = 5)
required_reagents = list("ale" = 2, "holywater" = 2, "sugar" = 1)
required_reagents = list("ale" = 2, "holywater" = 2, /datum/reagent/consumable/sugar = 1)
/datum/chemical_reaction/cream_soda
name = "Cream Soda"
id = "cream_soda"
results = list("cream_soda" = 4)
required_reagents = list("sugar" = 2, "sodawater" = 2, "vanilla" = 1)
required_reagents = list(/datum/reagent/consumable/sugar = 2, "sodawater" = 2, /datum/reagent/consumable/vanilla = 1)
/datum/chemical_reaction/blazaam
name = "Blazaam"
@@ -805,7 +805,7 @@
name = "Planet Cracker"
id = "planet_cracker"
results = list("planet_cracker" = 4)
required_reagents = list("champagne" = 2, "lizardwine" = 2, "eggyolk" = 1, "gold" = 1)
required_reagents = list("champagne" = 2, "lizardwine" = 2, "eggyolk" = 1, /datum/reagent/gold = 1)
mix_message = "The liquid's color starts shifting as the nanogold is alternately corroded and redeposited."
/datum/chemical_reaction/red_queen
code/modules/food_and_drinks/recipes/food_mixtures.dm
+11 -11
View File
@@ -12,7 +12,7 @@
name = "Tofu"
id = "tofu"
required_reagents = list("soymilk" = 10)
required_catalysts = list("enzyme" = 5)
required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
mob_react = FALSE
/datum/chemical_reaction/tofu/on_reaction(datum/reagents/holder, created_volume)
@@ -24,7 +24,7 @@
/datum/chemical_reaction/chocolate_bar
name = "Chocolate Bar"
id = "chocolate_bar"
required_reagents = list("soymilk" = 2, "cocoa" = 2, "sugar" = 2)
required_reagents = list("soymilk" = 2, "cocoa" = 2, /datum/reagent/consumable/sugar = 2)
/datum/chemical_reaction/chocolate_bar/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
@@ -36,7 +36,7 @@
/datum/chemical_reaction/chocolate_bar2
name = "Chocolate Bar"
id = "chocolate_bar"
required_reagents = list("chocolate_milk" = 4, "sugar" = 2)
required_reagents = list("chocolate_milk" = 4, /datum/reagent/consumable/sugar = 2)
mob_react = FALSE
/datum/chemical_reaction/chocolate_bar2/on_reaction(datum/reagents/holder, created_volume)
@@ -67,27 +67,27 @@
name = "Soy Sauce"
id = "soysauce"
results = list("soysauce" = 5)
required_reagents = list("soymilk" = 4, "sacid" = 1)
required_reagents = list("soymilk" = 4, /datum/reagent/toxin/acid = 1)
/datum/chemical_reaction/corn_syrup
name = "corn_syrup"
id = "corn_syrup"
results = list("corn_syrup" = 5)
required_reagents = list("corn_starch" = 1, "sacid" = 1)
required_reagents = list("corn_starch" = 1, /datum/reagent/toxin/acid = 1)
required_temp = 374
/datum/chemical_reaction/caramel
name = "Caramel"
id = "caramel"
results = list("caramel" = 1)
required_reagents = list("sugar" = 1)
required_reagents = list(/datum/reagent/consumable/sugar = 1)
required_temp = 413
mob_react = FALSE
/datum/chemical_reaction/caramel_burned
name = "Caramel burned"
id = "caramel_burned"
results = list("carbon" = 1)
results = list(/datum/reagent/carbon = 1)
required_reagents = list("caramel" = 1)
required_temp = 483
mob_react = FALSE
@@ -95,8 +95,8 @@
/datum/chemical_reaction/cheesewheel
name = "Cheesewheel"
id = "cheesewheel"
required_reagents = list("milk" = 40)
required_catalysts = list("enzyme" = 5)
required_reagents = list(/datum/reagent/consumable/milk = 40)
required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
/datum/chemical_reaction/cheesewheel/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
@@ -153,7 +153,7 @@
/datum/chemical_reaction/cakebatter
name = "Cake Batter"
id = "cakebatter"
required_reagents = list("eggyolk" = 15, "flour" = 15, "sugar" = 5)
required_reagents = list("eggyolk" = 15, "flour" = 15, /datum/reagent/consumable/sugar = 5)
mix_message = "The ingredients form a cake batter."
/datum/chemical_reaction/cakebatter/on_reaction(datum/reagents/holder, created_volume)
@@ -163,7 +163,7 @@
/datum/chemical_reaction/cakebatter/vegan
id = "vegancakebatter"
required_reagents = list("soymilk" = 15, "flour" = 15, "sugar" = 5)
required_reagents = list("soymilk" = 15, "flour" = 15, /datum/reagent/consumable/sugar = 5)
/datum/chemical_reaction/ricebowl
name = "Rice Bowl"
code/modules/holiday/easter.dm
+7 -7
View File
@@ -163,7 +163,7 @@
icon_state = "briochecake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/brioche
slices_num = 6
bonus_reagents = list("nutriment" = 10, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2)
/obj/item/reagent_containers/food/snacks/cakeslice/brioche
name = "brioche cake slice"
@@ -184,10 +184,10 @@
name = "scotch egg"
desc = "A boiled egg wrapped in a delicious, seasoned meatball."
icon_state = "scotchegg"
bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
bitesize = 3
filling_color = "#FFFFF0"
list_reagents = list("nutriment" = 6)
list_reagents = list(/datum/reagent/consumable/nutriment = 6)
/datum/crafting_recipe/food/scotchegg
name = "Scotch egg"
@@ -204,8 +204,8 @@
name = "Mammi"
desc = "A bowl of mushy bread and milk. It reminds you, not too fondly, of a bowel movement."
icon_state = "mammi"
bonus_reagents = list("nutriment" = 3, "vitamin" = 1)
list_reagents = list("nutriment" = 8, "vitamin" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1)
/datum/crafting_recipe/food/mammi
name = "Mammi"
@@ -221,8 +221,8 @@
name = "chocolate bunny"
desc = "Contains less than 10% real rabbit!"
icon_state = "chocolatebunny"
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list("nutriment" = 4, "sugar" = 2, "cocoa" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 2)
filling_color = "#A0522D"
/datum/crafting_recipe/food/chocolatebunny
code/modules/hydroponics/grown/ambrosia.dm
+3 -3
View File
@@ -25,7 +25,7 @@
icon_dead = "ambrosia-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/ambrosia/deus)
reagents_add = list("space_drugs" = 0.15, "bicaridine" = 0.1, "kelotane" = 0.1, "vitamin" = 0.04, "nutriment" = 0.05, "toxin" = 0.1)
reagents_add = list(/datum/reagent/drug/space_drugs = 0.15, "bicaridine" = 0.1, "kelotane" = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05, /datum/reagent/toxin = 0.1)
/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris
seed = /obj/item/seeds/ambrosia
@@ -42,7 +42,7 @@
plantname = "Ambrosia Deus"
product = /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus
mutatelist = list(/obj/item/seeds/ambrosia/gaia)
reagents_add = list("omnizine" = 0.15, "synaptizine" = 0.15, "space_drugs" = 0.1, "vitamin" = 0.04, "nutriment" = 0.05)
reagents_add = list("omnizine" = 0.15, "synaptizine" = 0.15, /datum/reagent/drug/space_drugs = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05)
rarity = 40
/obj/item/reagent_containers/food/snacks/grown/ambrosia/deus
@@ -62,7 +62,7 @@
plantname = "Ambrosia Gaia"
product = /obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia
mutatelist = list(/obj/item/seeds/ambrosia/deus)
reagents_add = list("earthsblood" = 0.05, "nutriment" = 0.06, "vitamin" = 0.05)
reagents_add = list("earthsblood" = 0.05, /datum/reagent/consumable/nutriment = 0.06, /datum/reagent/consumable/nutriment/vitamin = 0.05)
rarity = 30 //These are some pretty good plants right here
genes = list()
weed_rate = 4
code/modules/hydroponics/grown/apple.dm
+2 -2
View File
@@ -14,7 +14,7 @@
icon_dead = "apple-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/apple/gold)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
/obj/item/reagent_containers/food/snacks/grown/apple
seed = /obj/item/seeds/apple
@@ -39,7 +39,7 @@
maturation = 10
production = 10
mutatelist = list()
reagents_add = list("gold" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
reagents_add = list(/datum/reagent/gold = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
rarity = 40 // Alchemy!
/obj/item/reagent_containers/food/snacks/grown/apple/gold
code/modules/hydroponics/grown/banana.dm
+4 -4
View File
@@ -12,7 +12,7 @@
icon_dead = "banana-dead"
genes = list(/datum/plant_gene/trait/slip, /datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/banana/mime, /obj/item/seeds/banana/bluespace, /obj/item/seeds/banana/exotic_banana)
reagents_add = list("banana" = 0.1, "potassium" = 0.1, "vitamin" = 0.04, "nutriment" = 0.02)
reagents_add = list(/datum/reagent/consumable/banana = 0.1, "potassium" = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.02)
/obj/item/reagent_containers/food/snacks/grown/banana
seed = /obj/item/seeds/banana
@@ -70,7 +70,7 @@
product = /obj/item/reagent_containers/food/snacks/grown/banana/mime
growthstages = 4
mutatelist = list()
reagents_add = list("nothing" = 0.1, "mutetoxin" = 0.1, "nutriment" = 0.02)
reagents_add = list("nothing" = 0.1, "mutetoxin" = 0.1, /datum/reagent/consumable/nutriment = 0.02)
rarity = 15
/obj/item/reagent_containers/food/snacks/grown/banana/mime
@@ -100,7 +100,7 @@
product = /obj/item/reagent_containers/food/snacks/grown/banana/bluespace
mutatelist = list()
genes = list(/datum/plant_gene/trait/slip, /datum/plant_gene/trait/teleport, /datum/plant_gene/trait/repeated_harvest)
reagents_add = list("bluespace" = 0.2, "banana" = 0.1, "vitamin" = 0.04, "nutriment" = 0.02)
reagents_add = list("bluespace" = 0.2, /datum/reagent/consumable/banana = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.02)
rarity = 30
/obj/item/reagent_containers/food/snacks/grown/banana/bluespace
@@ -137,7 +137,7 @@
name = "banana spider"
desc = "You do not know what it is, but you can bet the clown would love it."
icon_state = "exoticbanana"
list_reagents = list("nutriment" = 3, "vitamin" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
foodtype = GROSS | MEAT | RAW | FRUIT
grind_results = list("blood" = 20, "liquidgibs" = 5)
var/awakening = 0
code/modules/hydroponics/grown/beans.dm
+2 -2
View File
@@ -15,7 +15,7 @@
icon_dead = "soybean-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/soya/koi)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.05, "cooking_oil" = 0.03) //Vegetable oil!
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05, "cooking_oil" = 0.03) //Vegetable oil!
/obj/item/reagent_containers/food/snacks/grown/soybeans
seed = /obj/item/seeds/soya
@@ -40,7 +40,7 @@
product = /obj/item/reagent_containers/food/snacks/grown/koibeans
potency = 10
mutatelist = list()
reagents_add = list("carpotoxin" = 0.1, "vitamin" = 0.04, "nutriment" = 0.05)
reagents_add = list("carpotoxin" = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05)
rarity = 20
/obj/item/reagent_containers/food/snacks/grown/koibeans
code/modules/hydroponics/grown/berries.dm
+10 -10
View File
@@ -15,7 +15,7 @@
icon_dead = "berry-dead" // Same for the dead icon
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/berry/glow, /obj/item/seeds/berry/poison)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
/obj/item/reagent_containers/food/snacks/grown/berries
seed = /obj/item/seeds/berry
@@ -39,7 +39,7 @@
plantname = "Poison-Berry Bush"
product = /obj/item/reagent_containers/food/snacks/grown/berries/poison
mutatelist = list(/obj/item/seeds/berry/death)
reagents_add = list("cyanide" = 0.15, "tirizene" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
reagents_add = list(/datum/reagent/toxin/cyanide = 0.15, "tirizene" = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
rarity = 10 // Mildly poisonous berries are common in reality
/obj/item/reagent_containers/food/snacks/grown/berries/poison
@@ -65,7 +65,7 @@
lifespan = 30
potency = 50
mutatelist = list()
reagents_add = list("coniine" = 0.08, "tirizene" = 0.1, "vitamin" = 0.04, "nutriment" = 0.1)
reagents_add = list("coniine" = 0.08, "tirizene" = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
rarity = 30
/obj/item/reagent_containers/food/snacks/grown/berries/death
@@ -91,7 +91,7 @@
endurance = 25
mutatelist = list()
genes = list(/datum/plant_gene/trait/glow/white, /datum/plant_gene/trait/noreact, /datum/plant_gene/trait/repeated_harvest)
reagents_add = list("uranium" = 0.25, "iodine" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
reagents_add = list("uranium" = 0.25, "iodine" = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
rarity = 20
/obj/item/reagent_containers/food/snacks/grown/berries/glow
@@ -124,7 +124,7 @@
icon_harvest = "cherry-harvest"
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/cherry/blue, /obj/item/seeds/cherry/bulb)
reagents_add = list("nutriment" = 0.07, "sugar" = 0.07)
reagents_add = list(/datum/reagent/consumable/nutriment = 0.07, /datum/reagent/consumable/sugar = 0.07)
/obj/item/reagent_containers/food/snacks/grown/cherries
seed = /obj/item/seeds/cherry
@@ -148,7 +148,7 @@
plantname = "Blue Cherry Tree"
product = /obj/item/reagent_containers/food/snacks/grown/bluecherries
mutatelist = list()
reagents_add = list("nutriment" = 0.07, "sugar" = 0.07)
reagents_add = list(/datum/reagent/consumable/nutriment = 0.07, /datum/reagent/consumable/sugar = 0.07)
rarity = 10
/obj/item/reagent_containers/food/snacks/grown/bluecherries
@@ -173,7 +173,7 @@
product = /obj/item/reagent_containers/food/snacks/grown/cherrybulbs
genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/pink)
mutatelist = list()
reagents_add = list("nutriment" = 0.07, "sugar" = 0.07)
reagents_add = list(/datum/reagent/consumable/nutriment = 0.07, /datum/reagent/consumable/sugar = 0.07)
rarity = 10
/obj/item/reagent_containers/food/snacks/grown/cherrybulbs
@@ -207,7 +207,7 @@
icon_dead = "grape-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/grape/green)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1, "sugar" = 0.1)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1, /datum/reagent/consumable/sugar = 0.1)
/obj/item/reagent_containers/food/snacks/grown/grapes
seed = /obj/item/seeds/grape
@@ -230,7 +230,7 @@
species = "greengrape"
plantname = "Green-Grape Vine"
product = /obj/item/reagent_containers/food/snacks/grown/grapes/green
reagents_add = list("kelotane" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1, "sugar" = 0.1)
reagents_add = list("kelotane" = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1, /datum/reagent/consumable/sugar = 0.1)
// No rarity: technically it's a beneficial mutant, but it's not exactly "new"...
mutatelist = list()
@@ -254,7 +254,7 @@
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
icon_grow = "strawberry-grow"
icon_dead = "berry-dead"
reagents_add = list("vitamin" = 0.07, "nutriment" = 0.1, "sugar" = 0.2)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.07, /datum/reagent/consumable/nutriment = 0.1, /datum/reagent/consumable/sugar = 0.2)
mutatelist = list()
/obj/item/reagent_containers/food/snacks/grown/strawberry
code/modules/hydroponics/grown/cannabis.dm
+4 -4
View File
@@ -17,7 +17,7 @@
/obj/item/seeds/cannabis/death,
/obj/item/seeds/cannabis/white,
/obj/item/seeds/cannabis/ultimate)
reagents_add = list("space_drugs" = 0.15, "lipolicide" = 0.35) // gives u the munchies
reagents_add = list(/datum/reagent/drug/space_drugs = 0.15, "lipolicide" = 0.35) // gives u the munchies
/obj/item/seeds/cannabis/rainbow
@@ -39,7 +39,7 @@
plantname = "Deathweed"
product = /obj/item/reagent_containers/food/snacks/grown/cannabis/death
mutatelist = list()
reagents_add = list("cyanide" = 0.35, "space_drugs" = 0.15, "lipolicide" = 0.15)
reagents_add = list(/datum/reagent/toxin/cyanide = 0.35, /datum/reagent/drug/space_drugs = 0.15, "lipolicide" = 0.15)
rarity = 40
/obj/item/seeds/cannabis/white
@@ -50,7 +50,7 @@
plantname = "Lifeweed"
product = /obj/item/reagent_containers/food/snacks/grown/cannabis/white
mutatelist = list()
reagents_add = list("omnizine" = 0.35, "space_drugs" = 0.15, "lipolicide" = 0.15)
reagents_add = list("omnizine" = 0.35, /datum/reagent/drug/space_drugs = 0.15, "lipolicide" = 0.15)
rarity = 40
@@ -63,7 +63,7 @@
product = /obj/item/reagent_containers/food/snacks/grown/cannabis/ultimate
genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/green)
mutatelist = list()
reagents_add = list("space_drugs" = 0.3,
reagents_add = list(/datum/reagent/drug/space_drugs = 0.3,
"mindbreaker" = 0.3,
"mercury" = 0.15,
"lithium" = 0.15,
code/modules/hydroponics/grown/cereals.dm
+1 -1
View File
@@ -11,7 +11,7 @@
potency = 15
icon_dead = "wheat-dead"
mutatelist = list(/obj/item/seeds/wheat/oat, /obj/item/seeds/wheat/meat)
reagents_add = list("nutriment" = 0.04)
reagents_add = list(/datum/reagent/consumable/nutriment = 0.04)
/obj/item/reagent_containers/food/snacks/grown/wheat
seed = /obj/item/seeds/wheat
code/modules/hydroponics/grown/chili.dm
+3 -3
View File
@@ -16,7 +16,7 @@
icon_dead = "chili-dead" // Same for the dead icon
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/chili/ice, /obj/item/seeds/chili/ghost)
reagents_add = list("capsaicin" = 0.25, "vitamin" = 0.04, "nutriment" = 0.04)
reagents_add = list("capsaicin" = 0.25, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.04)
/obj/item/reagent_containers/food/snacks/grown/chili
seed = /obj/item/seeds/chili
@@ -41,7 +41,7 @@
production = 4
rarity = 20
mutatelist = list()
reagents_add = list("frostoil" = 0.25, "vitamin" = 0.02, "nutriment" = 0.02)
reagents_add = list("frostoil" = 0.25, /datum/reagent/consumable/nutriment/vitamin = 0.02, /datum/reagent/consumable/nutriment = 0.02)
/obj/item/reagent_containers/food/snacks/grown/icepepper
seed = /obj/item/seeds/chili/ice
@@ -67,7 +67,7 @@
yield = 3
rarity = 20
mutatelist = list()
reagents_add = list("condensedcapsaicin" = 0.3, "capsaicin" = 0.55, "nutriment" = 0.04)
reagents_add = list("condensedcapsaicin" = 0.3, "capsaicin" = 0.55, /datum/reagent/consumable/nutriment = 0.04)
/obj/item/reagent_containers/food/snacks/grown/ghost_chili
seed = /obj/item/seeds/chili/ghost
code/modules/hydroponics/grown/citrus.dm
+5 -5
View File
@@ -23,7 +23,7 @@
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/orange)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.05)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05)
/obj/item/reagent_containers/food/snacks/grown/citrus/lime
seed = /obj/item/seeds/lime
@@ -70,7 +70,7 @@
icon_dead = "lime-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/lime, /obj/item/seeds/orange_3d)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.05)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05)
/obj/item/reagent_containers/food/snacks/grown/citrus/orange
seed = /obj/item/seeds/orange
@@ -98,7 +98,7 @@
icon_grow = "lime-grow"
icon_dead = "lime-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.05, "haloperidol" = 0.15)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05, "haloperidol" = 0.15)
/obj/item/reagent_containers/food/snacks/grown/citrus/orange_3d
seed = /obj/item/seeds/orange_3d
@@ -134,7 +134,7 @@
icon_dead = "lime-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/firelemon)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.05)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05)
/obj/item/reagent_containers/food/snacks/grown/citrus/lemon
seed = /obj/item/seeds/lemon
@@ -159,7 +159,7 @@
lifespan = 55
endurance = 45
yield = 4
reagents_add = list("nutriment" = 0.05)
reagents_add = list(/datum/reagent/consumable/nutriment = 0.05)
/obj/item/reagent_containers/food/snacks/grown/firelemon
seed = /obj/item/seeds/firelemon
code/modules/hydroponics/grown/cocoa_vanilla.dm
+3 -3
View File
@@ -16,7 +16,7 @@
icon_dead = "cocoapod-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/cocoapod/vanillapod, /obj/item/seeds/cocoapod/bungotree)
reagents_add = list("cocoa" = 0.25, "nutriment" = 0.1)
reagents_add = list(/datum/reagent/consumable/coco = 0.25, /datum/reagent/consumable/nutriment = 0.1)
/obj/item/reagent_containers/food/snacks/grown/cocoapod
seed = /obj/item/seeds/cocoapod
@@ -39,7 +39,7 @@
product = /obj/item/reagent_containers/food/snacks/grown/vanillapod
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list()
reagents_add = list("vanilla" = 0.25, "nutriment" = 0.1)
reagents_add = list(/datum/reagent/consumable/vanilla = 0.25, /datum/reagent/consumable/nutriment = 0.1)
/obj/item/reagent_containers/food/snacks/grown/vanillapod
seed = /obj/item/seeds/cocoapod/vanillapod
@@ -64,7 +64,7 @@
production = 7
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list()
reagents_add = list("enzyme" = 0.1, "nutriment" = 0.1)
reagents_add = list(/datum/reagent/consumable/enzyme = 0.1, /datum/reagent/consumable/nutriment = 0.1)
growthstages = 4
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
icon_grow = "bungotree-grow"
code/modules/hydroponics/grown/corn.dm
+1 -1
View File
@@ -13,7 +13,7 @@
icon_grow = "corn-grow" // Uses one growth icons set for all the subtypes
icon_dead = "corn-dead" // Same for the dead icon
mutatelist = list(/obj/item/seeds/corn/snapcorn)
reagents_add = list("cornoil" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
reagents_add = list("cornoil" = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
/obj/item/reagent_containers/food/snacks/grown/corn
seed = /obj/item/seeds/corn
code/modules/hydroponics/grown/eggplant.dm
+2 -2
View File
@@ -13,7 +13,7 @@
icon_dead = "eggplant-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/eggplant/eggy)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
/obj/item/reagent_containers/food/snacks/grown/eggplant
seed = /obj/item/seeds/eggplant
@@ -36,7 +36,7 @@
lifespan = 75
production = 12
mutatelist = list()
reagents_add = list("nutriment" = 0.1)
reagents_add = list(/datum/reagent/consumable/nutriment = 0.1)
/obj/item/reagent_containers/food/snacks/grown/shell/eggy
seed = /obj/item/seeds/eggplant/eggy
code/modules/hydroponics/grown/flowers.dm
+6 -6
View File
@@ -15,7 +15,7 @@
icon_grow = "poppy-grow"
icon_dead = "poppy-dead"
mutatelist = list(/obj/item/seeds/poppy/geranium, /obj/item/seeds/poppy/lily)
reagents_add = list("bicaridine" = 0.2, "nutriment" = 0.05)
reagents_add = list("bicaridine" = 0.2, /datum/reagent/consumable/nutriment = 0.05)
/obj/item/reagent_containers/food/snacks/grown/poppy
seed = /obj/item/seeds/poppy
@@ -68,7 +68,7 @@
icon_dead = "spacemanstrumpet-dead"
mutatelist = list()
genes = list(/datum/plant_gene/reagent/polypyr)
reagents_add = list("nutriment" = 0.05)
reagents_add = list(/datum/reagent/consumable/nutriment = 0.05)
rarity = 30
/obj/item/seeds/poppy/lily/trumpet/Initialize()
@@ -119,7 +119,7 @@
growthstages = 4
genes = list(/datum/plant_gene/trait/plant_type/weed_hardy)
growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
reagents_add = list("nutriment" = 0.04)
reagents_add = list(/datum/reagent/consumable/nutriment = 0.04)
/obj/item/reagent_containers/food/snacks/grown/harebell
seed = /obj/item/seeds/harebell
@@ -148,7 +148,7 @@
icon_grow = "sunflower-grow"
icon_dead = "sunflower-dead"
mutatelist = list(/obj/item/seeds/sunflower/moonflower, /obj/item/seeds/sunflower/novaflower)
reagents_add = list("cornoil" = 0.08, "nutriment" = 0.04)
reagents_add = list("cornoil" = 0.08, /datum/reagent/consumable/nutriment = 0.04)
/obj/item/grown/sunflower // FLOWER POWER!
seed = /obj/item/seeds/sunflower
@@ -184,7 +184,7 @@
product = /obj/item/reagent_containers/food/snacks/grown/moonflower
genes = list(/datum/plant_gene/trait/glow/purple)
mutatelist = list()
reagents_add = list("moonshine" = 0.2, "vitamin" = 0.02, "nutriment" = 0.02)
reagents_add = list("moonshine" = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.02, /datum/reagent/consumable/nutriment = 0.02)
rarity = 15
/obj/item/reagent_containers/food/snacks/grown/moonflower
@@ -209,7 +209,7 @@
icon_dead = "sunflower-dead"
product = /obj/item/grown/novaflower
mutatelist = list()
reagents_add = list("condensedcapsaicin" = 0.25, "capsaicin" = 0.3, "nutriment" = 0)
reagents_add = list("condensedcapsaicin" = 0.25, "capsaicin" = 0.3, /datum/reagent/consumable/nutriment = 0)
rarity = 20
/obj/item/grown/novaflower
code/modules/hydroponics/grown/grass_carpet.dm
+6 -6
View File
@@ -16,7 +16,7 @@
icon_dead = "grass-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/grass/carpet, /obj/item/seeds/grass/fairy)
reagents_add = list("nutriment" = 0.02, "hydrogen" = 0.05)
reagents_add = list(/datum/reagent/consumable/nutriment = 0.02, "hydrogen" = 0.05)
/obj/item/reagent_containers/food/snacks/grown/grass
seed = /obj/item/seeds/grass
@@ -51,7 +51,7 @@
icon_grow = "fairygrass-grow"
icon_dead = "fairygrass-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/blue)
reagents_add = list("nutriment" = 0.02, "hydrogen" = 0.05, "space_drugs" = 0.15)
reagents_add = list(/datum/reagent/consumable/nutriment = 0.02, "hydrogen" = 0.05, /datum/reagent/drug/space_drugs = 0.15)
/obj/item/reagent_containers/food/snacks/grown/grass/fairy
seed = /obj/item/seeds/grass/fairy
@@ -66,9 +66,9 @@
for(var/datum/plant_gene/trait/glow/gene in seed.genes)
G = gene
break
stacktype = initial(stacktype)
if(G)
switch(G.type)
if(/datum/plant_gene/trait/glow/white)
@@ -85,10 +85,10 @@
stacktype = /obj/item/stack/tile/fairygrass/purple
if(/datum/plant_gene/trait/glow/pink)
stacktype = /obj/item/stack/tile/fairygrass/pink
. = ..()
// Carpet
code/modules/hydroponics/grown/kudzu.dm
+1 -1
View File
@@ -14,7 +14,7 @@
growthstages = 4
rarity = 30
var/list/mutations = list()
reagents_add = list("charcoal" = 0.04, "nutriment" = 0.02)
reagents_add = list("charcoal" = 0.04, /datum/reagent/consumable/nutriment = 0.02)
/obj/item/seeds/kudzu/Copy()
var/obj/item/seeds/kudzu/S = ..()
code/modules/hydroponics/grown/melon.dm
+2 -2
View File
@@ -12,7 +12,7 @@
icon_dead = "watermelon-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/watermelon/holy)
reagents_add = list("water" = 0.2, "vitamin" = 0.04, "nutriment" = 0.2)
reagents_add = list("water" = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.2)
/obj/item/seeds/watermelon/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is swallowing [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -46,7 +46,7 @@
product = /obj/item/reagent_containers/food/snacks/grown/holymelon
genes = list(/datum/plant_gene/trait/glow/yellow)
mutatelist = list()
reagents_add = list("holywater" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
reagents_add = list("holywater" = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
rarity = 20
/obj/item/reagent_containers/food/snacks/grown/holymelon
code/modules/hydroponics/grown/misc.dm
+6 -6
View File
@@ -80,7 +80,7 @@
growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
genes = list(/datum/plant_gene/trait/plant_type/weed_hardy, /datum/plant_gene/trait/invasive)
mutatelist = list()
reagents_add = list("nutriment" = 0.05, "silibinin" = 0.1)
reagents_add = list(/datum/reagent/consumable/nutriment = 0.05, "silibinin" = 0.1)
/obj/item/seeds/galaxythistle/Initialize()
..()
@@ -116,7 +116,7 @@
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/replicapod)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
/obj/item/reagent_containers/food/snacks/grown/cabbage
seed = /obj/item/seeds/cabbage
@@ -142,7 +142,7 @@
maturation = 3
yield = 4
growthstages = 2
reagents_add = list("sugar" = 0.25)
reagents_add = list(/datum/reagent/consumable/sugar = 0.25)
mutatelist = list(/obj/item/seeds/bamboo)
/obj/item/reagent_containers/food/snacks/grown/sugarcane
@@ -173,7 +173,7 @@
growthstages = 2
rarity = 60 // Obtainable only with xenobio+superluck.
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
reagents_add = list("sulfur" = 0.1, "carbon" = 0.1, "nitrogen" = 0.07, "potassium" = 0.05)
reagents_add = list("sulfur" = 0.1, /datum/reagent/carbon = 0.1, "nitrogen" = 0.07, "potassium" = 0.05)
/obj/item/reagent_containers/food/snacks/grown/shell/gatfruit
seed = /obj/item/seeds/gatfruit
@@ -195,7 +195,7 @@
plantname = "Cherry Bomb Tree"
product = /obj/item/reagent_containers/food/snacks/grown/cherry_bomb
mutatelist = list()
reagents_add = list("nutriment" = 0.1, "sugar" = 0.1, "blackpowder" = 0.7)
reagents_add = list(/datum/reagent/consumable/nutriment = 0.1, /datum/reagent/consumable/sugar = 0.1, "blackpowder" = 0.7)
rarity = 60 //See above
/obj/item/reagent_containers/food/snacks/grown/cherry_bomb
@@ -232,7 +232,7 @@
/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/proc/detonate()
reagents.chem_temp = 1000 //Sets off the black powder
reagents.handle_reactions()
// Lavaland cactus
/obj/item/seeds/lavaland/cactus
code/modules/hydroponics/grown/mushrooms.dm
+12 -12
View File
@@ -21,7 +21,7 @@
growthstages = 4
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("morphine" = 0.35, "charcoal" = 0.35, "nutriment" = 0)
reagents_add = list("morphine" = 0.35, "charcoal" = 0.35, /datum/reagent/consumable/nutriment = 0)
/obj/item/reagent_containers/food/snacks/grown/mushroom/reishi
seed = /obj/item/seeds/reishi
@@ -47,7 +47,7 @@
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
mutatelist = list(/obj/item/seeds/angel)
reagents_add = list("mushroomhallucinogen" = 0.04, "amatoxin" = 0.35, "nutriment" = 0, "growthserum" = 0.1)
reagents_add = list("mushroomhallucinogen" = 0.04, "amatoxin" = 0.35, /datum/reagent/consumable/nutriment = 0, "growthserum" = 0.1)
/obj/item/reagent_containers/food/snacks/grown/mushroom/amanita
seed = /obj/item/seeds/amanita
@@ -73,7 +73,7 @@
growthstages = 3
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("mushroomhallucinogen" = 0.04, "amatoxin" = 0.1, "nutriment" = 0, "amanitin" = 0.2)
reagents_add = list("mushroomhallucinogen" = 0.04, "amatoxin" = 0.1, /datum/reagent/consumable/nutriment = 0, "amanitin" = 0.2)
rarity = 30
/obj/item/reagent_containers/food/snacks/grown/mushroom/angel
@@ -99,7 +99,7 @@
growthstages = 3
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("mushroomhallucinogen" = 0.25, "nutriment" = 0.02)
reagents_add = list("mushroomhallucinogen" = 0.25, /datum/reagent/consumable/nutriment = 0.02)
/obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap
seed = /obj/item/seeds/liberty
@@ -125,7 +125,7 @@
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
mutatelist = list(/obj/item/seeds/plump/walkingmushroom)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
/obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet
seed = /obj/item/seeds/plump
@@ -149,7 +149,7 @@
yield = 1
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
mutatelist = list()
reagents_add = list("vitamin" = 0.05, "nutriment" = 0.15)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.05, /datum/reagent/consumable/nutriment = 0.15)
rarity = 30
/obj/item/reagent_containers/food/snacks/grown/mushroom/walkingmushroom
@@ -190,7 +190,7 @@
growthstages = 3
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("nutriment" = 0.1)
reagents_add = list(/datum/reagent/consumable/nutriment = 0.1)
mutatelist = list(/obj/item/seeds/chanterelle/jupitercup)
/obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle
@@ -215,7 +215,7 @@
growthstages = 2
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/reagent/liquidelectricity, /datum/plant_gene/trait/plant_type/carnivory)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("nutriment" = 0.1)
reagents_add = list(/datum/reagent/consumable/nutriment = 0.1)
/obj/item/seeds/chanterelle/jupitercup/Initialize()
..()
@@ -248,7 +248,7 @@
genes = list(/datum/plant_gene/trait/glow, /datum/plant_gene/trait/plant_type/fungal_metabolism)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
mutatelist = list(/obj/item/seeds/glowshroom/glowcap, /obj/item/seeds/glowshroom/shadowshroom)
reagents_add = list("radium" = 0.1, "phosphorus" = 0.1, "nutriment" = 0.04)
reagents_add = list(/datum/reagent/radium = 0.1, "phosphorus" = 0.1, /datum/reagent/consumable/nutriment = 0.04)
/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom
seed = /obj/item/seeds/glowshroom
@@ -293,7 +293,7 @@
product = /obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap
genes = list(/datum/plant_gene/trait/glow/red, /datum/plant_gene/trait/cell_charge, /datum/plant_gene/trait/plant_type/fungal_metabolism)
mutatelist = list()
reagents_add = list("teslium" = 0.1, "nutriment" = 0.04)
reagents_add = list("teslium" = 0.1, /datum/reagent/consumable/nutriment = 0.04)
rarity = 30
/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap
@@ -318,7 +318,7 @@
product = /obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/shadowshroom
genes = list(/datum/plant_gene/trait/glow/shadow, /datum/plant_gene/trait/plant_type/fungal_metabolism)
mutatelist = list()
reagents_add = list("radium" = 0.2, "nutriment" = 0.04)
reagents_add = list(/datum/reagent/radium = 0.2, /datum/reagent/consumable/nutriment = 0.04)
rarity = 30
/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/shadowshroom
@@ -350,7 +350,7 @@
potency = 15
growthstages = 3
rarity = 20
reagents_add = list("nutriment" = 0.1)
reagents_add = list(/datum/reagent/consumable/nutriment = 0.1)
resistance_flags = FIRE_PROOF
/obj/item/seeds/lavaland/polypore
code/modules/hydroponics/grown/nettle.dm
+2 -2
View File
@@ -11,7 +11,7 @@
growthstages = 5
genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/plant_type/weed_hardy)
mutatelist = list(/obj/item/seeds/nettle/death)
reagents_add = list("sacid" = 0.5)
reagents_add = list(/datum/reagent/toxin/acid = 0.5)
/obj/item/seeds/nettle/death
name = "pack of death-nettle seeds"
@@ -25,7 +25,7 @@
yield = 2
genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/plant_type/weed_hardy, /datum/plant_gene/trait/stinging)
mutatelist = list()
reagents_add = list("facid" = 0.5, "sacid" = 0.5)
reagents_add = list(/datum/reagent/toxin/acid/fluacid = 0.5, /datum/reagent/toxin/acid = 0.5)
rarity = 20
/obj/item/reagent_containers/food/snacks/grown/nettle // "snack"
code/modules/hydroponics/grown/onion.dm
+4 -4
View File
@@ -13,7 +13,7 @@
growthstages = 3
weed_chance = 3
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
mutatelist = list(/obj/item/seeds/onion/red)
/obj/item/reagent_containers/food/snacks/grown/onion
@@ -36,7 +36,7 @@
plantname = "Red Onion Sprouts"
weed_chance = 1
product = /obj/item/reagent_containers/food/snacks/grown/onion/red
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1, "tearjuice" = 0.05)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1, "tearjuice" = 0.05)
/obj/item/reagent_containers/food/snacks/grown/onion/red
seed = /obj/item/seeds/onion/red
@@ -61,7 +61,7 @@
name = "onion slices"
desc = "Rings, not for wearing."
icon_state = "onionslice"
list_reagents = list("nutriment" = 5, "vitamin" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
filling_color = "#C0C9A0"
gender = PLURAL
cooked_type = /obj/item/reagent_containers/food/snacks/onionrings
@@ -71,4 +71,4 @@
desc = "They shine like exceptionally low quality amethyst."
icon_state = "onionslice_red"
filling_color = "#C29ACF"
list_reagents = list("nutriment" = 5, "vitamin" = 2, "tearjuice" = 2.5)
list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 2, "tearjuice" = 2.5)
code/modules/hydroponics/grown/peach.dm
+1 -1
View File
@@ -13,7 +13,7 @@
icon_grow = "peach-grow"
icon_dead = "peach-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
/obj/item/reagent_containers/food/snacks/grown/peach
seed = /obj/item/seeds/peach
code/modules/hydroponics/grown/peanuts.dm
+2 -2
View File
@@ -8,7 +8,7 @@
yield = 6
growthstages = 4
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
reagents_add = list("vitamin" = 0.02, "nutriment" = 0.15, "cooking_oil" = 0.03)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.02, /datum/reagent/consumable/nutriment = 0.15, "cooking_oil" = 0.03)
/obj/item/reagent_containers/food/snacks/grown/peanut
seed = /obj/item/seeds/peanutseed
@@ -26,5 +26,5 @@
desc = "A handful of roasted peanuts, with or without salt."
icon_state = "roasted_peanuts"
foodtype = VEGETABLES
list_reagents = list("nutriment" = 6, "vitamin" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
juice_results = list("peanut_butter" = 3)
code/modules/hydroponics/grown/pineapple.dm
+1 -1
View File
@@ -12,7 +12,7 @@
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/apple)
reagents_add = list("vitamin" = 0.02, "nutriment" = 0.2, "water" = 0.04)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.02, /datum/reagent/consumable/nutriment = 0.2, "water" = 0.04)
/obj/item/reagent_containers/food/snacks/grown/pineapple
seed = /obj/item/seeds/pineapple
code/modules/hydroponics/grown/potato.dm
+2 -2
View File
@@ -16,7 +16,7 @@
icon_dead = "potato-dead"
genes = list(/datum/plant_gene/trait/battery)
mutatelist = list(/obj/item/seeds/potato/sweet)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
/obj/item/reagent_containers/food/snacks/grown/potato
seed = /obj/item/seeds/potato
@@ -57,7 +57,7 @@
plantname = "Sweet Potato Plants"
product = /obj/item/reagent_containers/food/snacks/grown/potato/sweet
mutatelist = list()
reagents_add = list("vitamin" = 0.1, "sugar" = 0.1, "nutriment" = 0.1)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.1, /datum/reagent/consumable/sugar = 0.1, /datum/reagent/consumable/nutriment = 0.1)
/obj/item/reagent_containers/food/snacks/grown/potato/sweet
seed = /obj/item/seeds/potato/sweet
code/modules/hydroponics/grown/pumpkin.dm
+2 -2
View File
@@ -14,7 +14,7 @@
icon_dead = "pumpkin-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/pumpkin/blumpkin)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.2)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.2)
/obj/item/reagent_containers/food/snacks/grown/pumpkin
seed = /obj/item/seeds/pumpkin
@@ -45,7 +45,7 @@
plantname = "Blumpkin Vines"
product = /obj/item/reagent_containers/food/snacks/grown/blumpkin
mutatelist = list()
reagents_add = list("ammonia" = 0.2, "chlorine" = 0.1, "nutriment" = 0.2)
reagents_add = list(/datum/reagent/ammonia = 0.2, "chlorine" = 0.1, /datum/reagent/consumable/nutriment = 0.2)
rarity = 20
/obj/item/reagent_containers/food/snacks/grown/blumpkin
code/modules/hydroponics/grown/root.dm
+4 -4
View File
@@ -12,7 +12,7 @@
growthstages = 3
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
mutatelist = list(/obj/item/seeds/carrot/parsnip)
reagents_add = list("oculine" = 0.25, "vitamin" = 0.04, "nutriment" = 0.05)
reagents_add = list("oculine" = 0.25, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05)
/obj/item/reagent_containers/food/snacks/grown/carrot
seed = /obj/item/seeds/carrot
@@ -45,7 +45,7 @@
product = /obj/item/reagent_containers/food/snacks/grown/parsnip
icon_dead = "carrot-dead"
mutatelist = list()
reagents_add = list("vitamin" = 0.05, "nutriment" = 0.05)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.05, /datum/reagent/consumable/nutriment = 0.05)
/obj/item/reagent_containers/food/snacks/grown/parsnip
seed = /obj/item/seeds/carrot/parsnip
@@ -72,7 +72,7 @@
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
icon_dead = "whitebeet-dead"
mutatelist = list(/obj/item/seeds/redbeet)
reagents_add = list("vitamin" = 0.04, "sugar" = 0.2, "nutriment" = 0.05)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/sugar = 0.2, /datum/reagent/consumable/nutriment = 0.05)
/obj/item/reagent_containers/food/snacks/grown/whitebeet
seed = /obj/item/seeds/whitebeet
@@ -98,7 +98,7 @@
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
icon_dead = "whitebeet-dead"
genes = list(/datum/plant_gene/trait/maxchem)
reagents_add = list("vitamin" = 0.05, "nutriment" = 0.05)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.05, /datum/reagent/consumable/nutriment = 0.05)
/obj/item/reagent_containers/food/snacks/grown/redbeet
seed = /obj/item/seeds/redbeet
code/modules/hydroponics/grown/tea_coffee.dm
+4 -4
View File
@@ -34,7 +34,7 @@
plantname = "Tea Astra Plant"
product = /obj/item/reagent_containers/food/snacks/grown/tea/astra
mutatelist = list(/obj/item/seeds/tea/catnip)
reagents_add = list("synaptizine" = 0.1, "vitamin" = 0.04, "teapowder" = 0.1)
reagents_add = list("synaptizine" = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, "teapowder" = 0.1)
rarity = 20
/obj/item/reagent_containers/food/snacks/grown/tea/astra
@@ -52,7 +52,7 @@
species = "catnip"
plantname = "Catnip Plant"
product = /obj/item/reagent_containers/food/snacks/grown/tea/catnip
reagents_add = list("catnip" = 0.1, "vitamin" = 0.06, "teapowder" = 0.3)
reagents_add = list("catnip" = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.06, "teapowder" = 0.3)
rarity = 50
/obj/item/reagent_containers/food/snacks/grown/tea/catnip
@@ -79,7 +79,7 @@
icon_dead = "coffee-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/coffee/robusta)
reagents_add = list("vitamin" = 0.04, "coffeepowder" = 0.1)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, "coffeepowder" = 0.1)
/obj/item/reagent_containers/food/snacks/grown/coffee
seed = /obj/item/seeds/coffee
@@ -101,7 +101,7 @@
plantname = "Coffee Robusta Bush"
product = /obj/item/reagent_containers/food/snacks/grown/coffee/robusta
mutatelist = list()
reagents_add = list("ephedrine" = 0.1, "vitamin" = 0.04, "coffeepowder" = 0.1)
reagents_add = list("ephedrine" = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, "coffeepowder" = 0.1)
rarity = 20
/obj/item/reagent_containers/food/snacks/grown/coffee/robusta
code/modules/hydroponics/grown/tobacco.dm
+2 -2
View File
@@ -13,7 +13,7 @@
growthstages = 3
icon_dead = "tobacco-dead"
mutatelist = list(/obj/item/seeds/tobacco/space)
reagents_add = list("nicotine" = 0.03, "nutriment" = 0.03)
reagents_add = list("nicotine" = 0.03, /datum/reagent/consumable/nutriment = 0.03)
/obj/item/reagent_containers/food/snacks/grown/tobacco
seed = /obj/item/seeds/tobacco
@@ -32,7 +32,7 @@
plantname = "Space Tobacco Plant"
product = /obj/item/reagent_containers/food/snacks/grown/tobacco/space
mutatelist = list()
reagents_add = list("salbutamol" = 0.05, "nicotine" = 0.08, "nutriment" = 0.03)
reagents_add = list("salbutamol" = 0.05, "nicotine" = 0.08, /datum/reagent/consumable/nutriment = 0.03)
rarity = 20
/obj/item/reagent_containers/food/snacks/grown/tobacco/space
code/modules/hydroponics/grown/tomato.dm
+4 -4
View File
@@ -12,7 +12,7 @@
icon_dead = "tomato-dead"
genes = list(/datum/plant_gene/trait/squash, /datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/tomato/blue, /obj/item/seeds/tomato/blood, /obj/item/seeds/tomato/killer)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
/obj/item/reagent_containers/food/snacks/grown/tomato
seed = /obj/item/seeds/tomato
@@ -36,7 +36,7 @@
plantname = "Blood-Tomato Plants"
product = /obj/item/reagent_containers/food/snacks/grown/tomato/blood
mutatelist = list()
reagents_add = list("blood" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
reagents_add = list("blood" = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
rarity = 20
/obj/item/reagent_containers/food/snacks/grown/tomato/blood
@@ -62,7 +62,7 @@
icon_grow = "bluetomato-grow"
mutatelist = list(/obj/item/seeds/tomato/blue/bluespace)
genes = list(/datum/plant_gene/trait/slip, /datum/plant_gene/trait/repeated_harvest)
reagents_add = list("lube" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
reagents_add = list("lube" = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
rarity = 20
/obj/item/reagent_containers/food/snacks/grown/tomato/blue
@@ -85,7 +85,7 @@
yield = 2
mutatelist = list()
genes = list(/datum/plant_gene/trait/squash, /datum/plant_gene/trait/slip, /datum/plant_gene/trait/teleport, /datum/plant_gene/trait/repeated_harvest)
reagents_add = list("lube" = 0.2, "bluespace" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
reagents_add = list("lube" = 0.2, "bluespace" = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
rarity = 50
/obj/item/reagent_containers/food/snacks/grown/tomato/blue/bluespace
code/modules/mining/lavaland/ash_flora.dm
+4 -4
View File
@@ -148,7 +148,7 @@
desc = "Some shavings from a tall mushroom. With enough, might serve as a bowl."
icon = 'icons/obj/lavaland/ash_flora.dmi'
icon_state = "mushroom_shavings"
list_reagents = list("sugar" = 3, "ethanol" = 2, "stabilizing_agent" = 3, "minttoxin" = 2)
list_reagents = list(/datum/reagent/consumable/sugar = 3, /datum/reagent/consumable/ethanol = 2, "stabilizing_agent" = 3, "minttoxin" = 2)
w_class = WEIGHT_CLASS_TINY
resistance_flags = FLAMMABLE
max_integrity = 100
@@ -166,7 +166,7 @@
/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf
name = "mushroom leaf"
desc = "A leaf, from a mushroom."
list_reagents = list("nutriment" = 3, "vitfro" = 2, "nicotine" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, "vitfro" = 2, "nicotine" = 2)
icon_state = "mushroom_leaf"
seed = /obj/item/seeds/lavaland/porcini
wine_power = 40
@@ -182,14 +182,14 @@
/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_stem
name = "mushroom stem"
desc = "A long mushroom stem. It's slightly glowing."
list_reagents = list("tinlux" = 2, "vitamin" = 1, "space_drugs" = 1)
list_reagents = list("tinlux" = 2, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/drug/space_drugs = 1)
icon_state = "mushroom_stem"
seed = /obj/item/seeds/lavaland/ember
wine_power = 60
/obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit
name = "cactus fruit"
list_reagents = list("vitamin" = 2, "nutriment" = 2, "vitfro" = 6)
list_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/nutriment = 2, "vitfro" = 6)
desc = "A cactus fruit covered in a thick, reddish skin. And some ash."
icon_state = "cactus_fruit"
seed = /obj/item/seeds/lavaland/cactus
code/modules/mining/ores_coins.dm
+7 -7
View File
@@ -358,7 +358,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
icon_state = "coin_gold_heads"
value = 50
materials = list(MAT_GOLD = MINERAL_MATERIAL_AMOUNT*0.2)
grind_results = list("gold" = 4)
grind_results = list(/datum/reagent/gold = 4)
/obj/item/coin/silver
name = "silver coin"
@@ -366,7 +366,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
icon_state = "coin_silver_heads"
value = 20
materials = list(MAT_SILVER = MINERAL_MATERIAL_AMOUNT*0.2)
grind_results = list("silver" = 4)
grind_results = list(/datum/reagent/silver = 4)
/obj/item/coin/diamond
name = "diamond coin"
@@ -374,7 +374,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
icon_state = "coin_diamond_heads"
value = 500
materials = list(MAT_DIAMOND = MINERAL_MATERIAL_AMOUNT*0.2)
grind_results = list("carbon" = 4)
grind_results = list(/datum/reagent/carbon = 4)
/obj/item/coin/iron
name = "iron coin"
@@ -382,7 +382,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
icon_state = "coin_iron_heads"
value = 1
materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT*0.2)
grind_results = list("iron" = 4)
grind_results = list(/datum/reagent/iron = 4)
/obj/item/coin/plasma
name = "plasma coin"
@@ -390,7 +390,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
icon_state = "coin_plasma_heads"
value = 100
materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT*0.2)
grind_results = list("plasma" = 4)
grind_results = list(/datum/reagent/toxin/plasma = 4)
/obj/item/coin/uranium
name = "uranium coin"
@@ -427,7 +427,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
sideslist = list("heads")
materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT*0.2)
value = 1
grind_results = list("iron" = 4)
grind_results = list(/datum/reagent/iron = 4)
/obj/item/coin/antagtoken
name = "antag token"
@@ -436,7 +436,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
desc = "A novelty coin that helps the heart know what hard evidence cannot prove."
sideslist = list("valid", "salad")
value = 0
grind_results = list("sodiumchloride" = 4)
grind_results = list(/datum/reagent/consumable/sodiumchloride = 4)
/obj/item/coin/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/stack/cable_coil))
code/modules/mob/living/simple_animal/friendly/mouse.dm
+1 -1
View File
@@ -117,7 +117,7 @@
icon_state = "mouse_gray_dead"
bitesize = 3
eatverb = "devour"
list_reagents = list("nutriment" = 3, "vitamin" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
foodtype = GROSS | MEAT | RAW
grind_results = list("blood" = 20, "liquidgibs" = 5)
code/modules/mob/living/simple_animal/hostile/banana_spider.dm
+1 -1
View File
@@ -96,7 +96,7 @@
icon_state = "bananaspider"
bitesize = 3
eatverb = "devours"
list_reagents = list("nutriment" = 3, "vitamin" = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
foodtype = GROSS | MEAT | RAW
grind_results = list("blood" = 20, "liquidgibs" = 5)
juice_results = list("banana" = 0)
code/modules/paperwork/pen.dm
+1 -1
View File
@@ -23,7 +23,7 @@
throw_range = 7
materials = list(MAT_METAL=10)
pressure_resistance = 2
grind_results = list("iron" = 2, "iodine" = 1)
grind_results = list(/datum/reagent/iron = 2, "iodine" = 1)
var/colour = "black" //what colour the ink is!
var/degrees = 0
var/font = PEN_FONT
code/modules/paperwork/photocopier.dm
+1 -1
View File
@@ -335,6 +335,6 @@
name = "toner cartridge"
icon = 'icons/obj/device.dmi'
icon_state = "tonercartridge"
grind_results = list("iodine" = 40, "iron" = 10)
grind_results = list("iodine" = 40, /datum/reagent/iron = 10)
var/charges = 5
var/max_charges = 5
code/modules/power/cell.dm
+1 -1
View File
@@ -14,7 +14,7 @@
var/charge = 0 // note %age conveted to actual charge in New
var/maxcharge = 1000
materials = list(MAT_METAL=700, MAT_GLASS=50)
grind_results = list("lithium" = 15, "iron" = 5, "silicon" = 5)
grind_results = list("lithium" = 15, /datum/reagent/iron = 5, "silicon" = 5)
var/rigged = FALSE // true if rigged to explode
var/chargerate = 100 //how much power is given every tick in a recharger
var/self_recharge = 0 //does it self recharge, over time, or not?
code/modules/reagents/chemistry/recipes/drugs.dm
+7 -7
View File
@@ -1,14 +1,14 @@
/datum/chemical_reaction/space_drugs
name = "Space Drugs"
id = "space_drugs"
results = list("space_drugs" = 3)
required_reagents = list("mercury" = 1, "sugar" = 1, "lithium" = 1)
results = list(/datum/reagent/drug/space_drugs = 3)
required_reagents = list("mercury" = 1, /datum/reagent/consumable/sugar = 1, "lithium" = 1)
/datum/chemical_reaction/crank
name = "Crank"
id = "crank"
results = list("crank" = 5)
required_reagents = list("diphenhydramine" = 1, "ammonia" = 1, "lithium" = 1, "sacid" = 1, "welding_fuel" = 1)
required_reagents = list("diphenhydramine" = 1, /datum/reagent/ammonia = 1, "lithium" = 1, /datum/reagent/toxin/acid = 1, /datum/reagent/fuel = 1)
mix_message = "The mixture violently reacts, leaving behind a few crystalline shards."
required_temp = 390
@@ -17,7 +17,7 @@
name = "Krokodil"
id = "krokodil"
results = list("krokodil" = 6)
required_reagents = list("diphenhydramine" = 1, "morphine" = 1, "cleaner" = 1, "potassium" = 1, "phosphorus" = 1, "welding_fuel" = 1)
required_reagents = list("diphenhydramine" = 1, "morphine" = 1, "cleaner" = 1, "potassium" = 1, "phosphorus" = 1, /datum/reagent/fuel = 1)
mix_message = "The mixture dries into a pale blue powder."
required_temp = 380
@@ -32,7 +32,7 @@
name = "bath_salts"
id = "bath_salts"
results = list("bath_salts" = 7)
required_reagents = list("bad_food" = 1, "saltpetre" = 1, "nutriment" = 1, "cleaner" = 1, "enzyme" = 1, "tea" = 1, "mercury" = 1)
required_reagents = list("bad_food" = 1, "saltpetre" = 1, /datum/reagent/consumable/nutriment = 1, "cleaner" = 1, /datum/reagent/consumable/enzyme = 1, "tea" = 1, "mercury" = 1)
required_temp = 374
/datum/chemical_reaction/aranesp
@@ -45,8 +45,8 @@
name = "Happiness"
id = "happiness"
results = list("happiness" = 4)
required_reagents = list("nitrous_oxide" = 2, "epinephrine" = 1, "ethanol" = 1)
required_catalysts = list("plasma" = 5)
required_reagents = list("nitrous_oxide" = 2, "epinephrine" = 1, /datum/reagent/consumable/ethanol = 1)
required_catalysts = list(/datum/reagent/toxin/plasma = 5)
/datum/chemical_reaction/skooma
name = "skooma"
code/modules/reagents/chemistry/recipes/medicine.dm
+32 -32
View File
@@ -4,7 +4,7 @@
id = "leporazine"
results = list("leporazine" = 2)
required_reagents = list("silicon" = 1, "copper" = 1)
required_catalysts = list("plasma" = 5)
required_catalysts = list(/datum/reagent/toxin/plasma = 5)
/datum/chemical_reaction/rezadone
name = "Rezadone"
@@ -22,19 +22,19 @@
name = "inacusiate"
id = "inacusiate"
results = list("inacusiate" = 2)
required_reagents = list("water" = 1, "carbon" = 1, "charcoal" = 1)
required_reagents = list("water" = 1, /datum/reagent/carbon = 1, "charcoal" = 1)
/datum/chemical_reaction/synaptizine
name = "Synaptizine"
id = "synaptizine"
results = list("synaptizine" = 3)
required_reagents = list("sugar" = 1, "lithium" = 1, "water" = 1)
required_reagents = list(/datum/reagent/consumable/sugar = 1, "lithium" = 1, "water" = 1)
/datum/chemical_reaction/charcoal
name = "Charcoal"
id = "charcoal"
results = list("charcoal" = 2)
required_reagents = list("ash" = 1, "sodiumchloride" = 1)
required_reagents = list("ash" = 1, /datum/reagent/consumable/sodiumchloride = 1)
mix_message = "The mixture yields a fine black powder."
required_temp = 380
@@ -42,31 +42,31 @@
name = "Silver Sulfadiazine"
id = "silver_sulfadiazine"
results = list("silver_sulfadiazine" = 5)
required_reagents = list("ammonia" = 1, "silver" = 1, "sulfur" = 1, "oxygen" = 1, "chlorine" = 1)
required_reagents = list(/datum/reagent/ammonia = 1, /datum/reagent/silver = 1, "sulfur" = 1, "oxygen" = 1, "chlorine" = 1)
/datum/chemical_reaction/salglu_solution
name = "Saline-Glucose Solution"
id = "salglu_solution"
results = list("salglu_solution" = 3)
required_reagents = list("sodiumchloride" = 1, "water" = 1, "sugar" = 1)
required_reagents = list(/datum/reagent/consumable/sodiumchloride = 1, "water" = 1, /datum/reagent/consumable/sugar = 1)
/datum/chemical_reaction/mine_salve
name = "Miner's Salve"
id = "mine_salve"
results = list("mine_salve" = 3)
required_reagents = list("oil" = 1, "water" = 1, "iron" = 1)
required_reagents = list(/datum/reagent/oil = 1, "water" = 1, /datum/reagent/iron = 1)
/datum/chemical_reaction/mine_salve2
name = "Miner's Salve"
id = "mine_salve"
results = list("mine_salve" = 15)
required_reagents = list("plasma" = 5, "iron" = 5, "sugar" = 1) // A sheet of plasma, a twinkie and a sheet of metal makes four of these
required_reagents = list(/datum/reagent/toxin/plasma = 5, /datum/reagent/iron = 5, /datum/reagent/consumable/sugar = 1) // A sheet of plasma, a twinkie and a sheet of metal makes four of these
/datum/chemical_reaction/synthflesh
name = "Synthflesh"
id = "synthflesh"
results = list("synthflesh" = 3)
required_reagents = list("blood" = 1, "carbon" = 1, "styptic_powder" = 1)
required_reagents = list("blood" = 1, /datum/reagent/carbon = 1, "styptic_powder" = 1)
/datum/chemical_reaction/synthtissue
name = "Synthtissue"
@@ -110,7 +110,7 @@
name = "Styptic Powder"
id = "styptic_powder"
results = list("styptic_powder" = 4)
required_reagents = list("aluminium" = 1, "hydrogen" = 1, "oxygen" = 1, "sacid" = 1)
required_reagents = list("aluminium" = 1, "hydrogen" = 1, "oxygen" = 1, /datum/reagent/toxin/acid = 1)
mix_message = "The solution yields an astringent powder."
/datum/chemical_reaction/calomel
@@ -130,7 +130,7 @@
name = "Pentetic Acid"
id = "pen_acid"
results = list("pen_acid" = 6)
required_reagents = list("welding_fuel" = 1, "chlorine" = 1, "ammonia" = 1, "formaldehyde" = 1, "sodium" = 1, "cyanide" = 1)
required_reagents = list(/datum/reagent/fuel = 1, "chlorine" = 1, /datum/reagent/ammonia = 1, "formaldehyde" = 1, "sodium" = 1, /datum/reagent/toxin/cyanide = 1)
/datum/chemical_reaction/pen_jelly
name = "Pentetic Jelly"
@@ -142,25 +142,25 @@
name = "Salicyclic Acid"
id = "sal_acid"
results = list("sal_acid" = 5)
required_reagents = list("sodium" = 1, "phenol" = 1, "carbon" = 1, "oxygen" = 1, "sacid" = 1)
required_reagents = list("sodium" = 1, /datum/reagent/phenol = 1, /datum/reagent/carbon = 1, "oxygen" = 1, /datum/reagent/toxin/acid = 1)
/datum/chemical_reaction/oxandrolone
name = "Oxandrolone"
id = "oxandrolone"
results = list("oxandrolone" = 6)
required_reagents = list("carbon" = 3, "phenol" = 1, "hydrogen" = 1, "oxygen" = 1)
required_reagents = list(/datum/reagent/carbon = 3, /datum/reagent/phenol = 1, "hydrogen" = 1, "oxygen" = 1)
/datum/chemical_reaction/salbutamol
name = "Salbutamol"
id = "salbutamol"
results = list("salbutamol" = 5)
required_reagents = list("sal_acid" = 1, "lithium" = 1, "aluminium" = 1, "bromine" = 1, "ammonia" = 1)
required_reagents = list("sal_acid" = 1, "lithium" = 1, "aluminium" = 1, "bromine" = 1, /datum/reagent/ammonia = 1)
/datum/chemical_reaction/perfluorodecalin
name = "Perfluorodecalin"
id = "perfluorodecalin"
results = list("perfluorodecalin" = 3)
required_reagents = list("hydrogen" = 1, "fluorine" = 1, "oil" = 1)
required_reagents = list("hydrogen" = 1, "fluorine" = 1, /datum/reagent/oil = 1)
required_temp = 370
mix_message = "The mixture rapidly turns into a dense pink liquid."
@@ -168,34 +168,34 @@
name = "Ephedrine"
id = "ephedrine"
results = list("ephedrine" = 4)
required_reagents = list("sugar" = 1, "oil" = 1, "hydrogen" = 1, "diethylamine" = 1)
required_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/oil = 1, "hydrogen" = 1, "diethylamine" = 1)
mix_message = "The solution fizzes and gives off toxic fumes."
/datum/chemical_reaction/diphenhydramine
name = "Diphenhydramine"
id = "diphenhydramine"
results = list("diphenhydramine" = 4)
required_reagents = list("oil" = 1, "carbon" = 1, "bromine" = 1, "diethylamine" = 1, "ethanol" = 1)
required_reagents = list(/datum/reagent/oil = 1, /datum/reagent/carbon = 1, "bromine" = 1, "diethylamine" = 1, /datum/reagent/consumable/ethanol = 1)
mix_message = "The mixture dries into a pale blue powder."
/datum/chemical_reaction/oculine
name = "Oculine"
id = "oculine"
results = list("oculine" = 3)
required_reagents = list("charcoal" = 1, "carbon" = 1, "hydrogen" = 1)
required_reagents = list("charcoal" = 1, /datum/reagent/carbon = 1, "hydrogen" = 1)
mix_message = "The mixture sputters loudly and becomes a pale pink color."
/datum/chemical_reaction/atropine
name = "Atropine"
id = "atropine"
results = list("atropine" = 5)
required_reagents = list("ethanol" = 1, "acetone" = 1, "diethylamine" = 1, "phenol" = 1, "sacid" = 1)
required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/acetone = 1, "diethylamine" = 1, /datum/reagent/phenol = 1, /datum/reagent/toxin/acid = 1)
/datum/chemical_reaction/epinephrine
name = "Epinephrine"
id = "epinephrine"
results = list("epinephrine" = 6)
required_reagents = list("phenol" = 1, "acetone" = 1, "diethylamine" = 1, "oxygen" = 1, "chlorine" = 1, "hydrogen" = 1)
required_reagents = list(/datum/reagent/phenol = 1, /datum/reagent/acetone = 1, "diethylamine" = 1, "oxygen" = 1, "chlorine" = 1, "hydrogen" = 1)
/datum/chemical_reaction/strange_reagent
name = "Strange Reagent"
@@ -207,32 +207,32 @@
name = "Mannitol"
id = "mannitol"
results = list("mannitol" = 3)
required_reagents = list("sugar" = 1, "hydrogen" = 1, "water" = 1)
required_reagents = list(/datum/reagent/consumable/sugar = 1, "hydrogen" = 1, "water" = 1)
mix_message = "The solution slightly bubbles, becoming thicker."
/datum/chemical_reaction/mutadone
name = "Mutadone"
id = "mutadone"
results = list("mutadone" = 3)
required_reagents = list("mutagen" = 1, "acetone" = 1, "bromine" = 1)
required_reagents = list("mutagen" = 1, /datum/reagent/acetone = 1, "bromine" = 1)
/datum/chemical_reaction/neurine
name = "Neurine"
id = "neurine"
results = list("neurine" = 3)
required_reagents = list("mannitol" = 1, "acetone" = 1, "oxygen" = 1)
required_reagents = list("mannitol" = 1, /datum/reagent/acetone = 1, "oxygen" = 1)
/datum/chemical_reaction/antihol
name = "antihol"
id = "antihol"
results = list("antihol" = 3)
required_reagents = list("ethanol" = 1, "charcoal" = 1, "copper" = 1)
required_reagents = list(/datum/reagent/consumable/ethanol = 1, "charcoal" = 1, "copper" = 1)
/datum/chemical_reaction/cryoxadone
name = "Cryoxadone"
id = "cryoxadone"
results = list("cryoxadone" = 3)
required_reagents = list("stable_plasma" = 1, "acetone" = 1, "mutagen" = 1)
required_reagents = list("stable_plasma" = 1, /datum/reagent/acetone = 1, "mutagen" = 1)
/datum/chemical_reaction/pyroxadone
name = "Pyroxadone"
@@ -245,25 +245,25 @@
id = "clonexadone"
results = list("clonexadone" = 2)
required_reagents = list("cryoxadone" = 1, "sodium" = 1)
required_catalysts = list("plasma" = 5)
required_catalysts = list(/datum/reagent/toxin/plasma = 5)
/datum/chemical_reaction/haloperidol
name = "Haloperidol"
id = "haloperidol"
results = list("haloperidol" = 5)
required_reagents = list("chlorine" = 1, "fluorine" = 1, "aluminium" = 1, "potass_iodide" = 1, "oil" = 1)
required_reagents = list("chlorine" = 1, "fluorine" = 1, "aluminium" = 1, "potass_iodide" = 1, /datum/reagent/oil = 1)
/datum/chemical_reaction/bicaridine
name = "Bicaridine"
id = "bicaridine"
results = list("bicaridine" = 3)
required_reagents = list("carbon" = 1, "oxygen" = 1, "sugar" = 1)
required_reagents = list(/datum/reagent/carbon = 1, "oxygen" = 1, /datum/reagent/consumable/sugar = 1)
/datum/chemical_reaction/kelotane
name = "Kelotane"
id = "kelotane"
results = list("kelotane" = 2)
required_reagents = list("carbon" = 1, "silicon" = 1)
required_reagents = list(/datum/reagent/carbon = 1, "silicon" = 1)
/datum/chemical_reaction/antitoxin
name = "Antitoxin"
@@ -293,20 +293,20 @@
name = "Corazone"
id = "corazone"
results = list("corazone" = 3)
required_reagents = list("phenol" = 2, "lithium" = 1)
required_reagents = list(/datum/reagent/phenol = 2, "lithium" = 1)
/datum/chemical_reaction/morphine
name = "Morphine"
id = "morphine"
results = list("morphine" = 2)
required_reagents = list("carbon" = 2, "hydrogen" = 2, "ethanol" = 1, "oxygen" = 1)
required_reagents = list(/datum/reagent/carbon = 2, "hydrogen" = 2, /datum/reagent/consumable/ethanol = 1, "oxygen" = 1)
required_temp = 480
/datum/chemical_reaction/modafinil
name = "Modafinil"
id = "modafinil"
results = list("modafinil" = 5)
required_reagents = list("diethylamine" = 1, "ammonia" = 1, "phenol" = 1, "acetone" = 1, "sacid" = 1)
required_reagents = list("diethylamine" = 1, /datum/reagent/ammonia = 1, /datum/reagent/phenol = 1, /datum/reagent/acetone = 1, /datum/reagent/toxin/acid = 1)
required_catalysts = list("bromine" = 1) // as close to the real world synthesis as possible
/datum/chemical_reaction/psicodine
code/modules/reagents/chemistry/recipes/others.dm
+52 -52
View File
@@ -3,7 +3,7 @@
name = "Sterilizine"
id = "sterilizine"
results = list("sterilizine" = 3)
required_reagents = list("ethanol" = 1, "charcoal" = 1, "chlorine" = 1)
required_reagents = list(/datum/reagent/consumable/ethanol = 1, "charcoal" = 1, "chlorine" = 1)
/datum/chemical_reaction/lube
name = "Space Lube"
@@ -15,7 +15,7 @@
name = "Spray Tan"
id = "spraytan"
results = list("spraytan" = 2)
required_reagents = list("orangejuice" = 1, "oil" = 1)
required_reagents = list("orangejuice" = 1, /datum/reagent/oil = 1)
/datum/chemical_reaction/spraytan2
name = "Spray Tan"
@@ -27,30 +27,30 @@
name = "Impedrezene"
id = "impedrezene"
results = list("impedrezene" = 2)
required_reagents = list("mercury" = 1, "oxygen" = 1, "sugar" = 1)
required_reagents = list("mercury" = 1, "oxygen" = 1, /datum/reagent/consumable/sugar = 1)
/datum/chemical_reaction/cryptobiolin
name = "Cryptobiolin"
id = "cryptobiolin"
results = list("cryptobiolin" = 3)
required_reagents = list("potassium" = 1, "oxygen" = 1, "sugar" = 1)
required_reagents = list("potassium" = 1, "oxygen" = 1, /datum/reagent/consumable/sugar = 1)
/datum/chemical_reaction/glycerol
name = "Glycerol"
id = "glycerol"
results = list("glycerol" = 1)
required_reagents = list("cornoil" = 3, "sacid" = 1)
required_reagents = list("cornoil" = 3, /datum/reagent/toxin/acid = 1)
/datum/chemical_reaction/sodiumchloride
name = "Sodium Chloride"
id = "sodiumchloride"
results = list("sodiumchloride" = 3)
results = list(/datum/reagent/consumable/sodiumchloride = 3)
required_reagents = list("water" = 1, "sodium" = 1, "chlorine" = 1)
/datum/chemical_reaction/plasmasolidification
name = "Solid Plasma"
id = "solidplasma"
required_reagents = list("iron" = 5, "frostoil" = 5, "plasma" = 20)
required_reagents = list(/datum/reagent/iron = 5, "frostoil" = 5, /datum/reagent/toxin/plasma = 20)
mob_react = FALSE
/datum/chemical_reaction/plasmasolidification/on_reaction(datum/reagents/holder, created_volume)
@@ -61,7 +61,7 @@
/datum/chemical_reaction/goldsolidification
name = "Solid Gold"
id = "solidgold"
required_reagents = list("frostoil" = 5, "gold" = 20, "iron" = 1)
required_reagents = list("frostoil" = 5, /datum/reagent/gold = 20, /datum/reagent/iron = 1)
mob_react = FALSE
/datum/chemical_reaction/goldsolidification/on_reaction(datum/reagents/holder, created_volume)
@@ -73,7 +73,7 @@
name = "Capsaicincondensation"
id = "capsaicincondensation"
results = list("condensedcapsaicin" = 5)
required_reagents = list("capsaicin" = 1, "ethanol" = 5)
required_reagents = list("capsaicin" = 1, /datum/reagent/consumable/ethanol = 5)
/datum/chemical_reaction/soapification
name = "Soapification"
@@ -86,7 +86,7 @@
name = "Mustard"
id = "mustard"
results = list("mustard" = 5)
required_reagents = list("mustardgrind" = 1, "water" = 10, "enzyme"= 1)
required_reagents = list("mustardgrind" = 1, "water" = 10, /datum/reagent/consumable/enzyme= 1)
/datum/chemical_reaction/soapification/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
@@ -108,7 +108,7 @@
/datum/chemical_reaction/meatification
name = "Meatification"
id = "meatification"
required_reagents = list("liquidgibs" = 10, "nutriment" = 10, "carbon" = 10)
required_reagents = list("liquidgibs" = 10, /datum/reagent/consumable/nutriment = 10, /datum/reagent/carbon = 10)
mob_react = FALSE
/datum/chemical_reaction/meatification/on_reaction(datum/reagents/holder, created_volume)
@@ -121,14 +121,14 @@
name = "Direct Carbon Oxidation"
id = "burningcarbon"
results = list("co2" = 3)
required_reagents = list("carbon" = 1, "oxygen" = 2)
required_reagents = list(/datum/reagent/carbon = 1, "oxygen" = 2)
required_temp = 777 // pure carbon isn't especially reactive.
/datum/chemical_reaction/nitrous_oxide
name = "Nitrous Oxide"
id = "nitrous_oxide"
results = list("nitrous_oxide" = 5)
required_reagents = list("ammonia" = 2, "nitrogen" = 1, "oxygen" = 2)
required_reagents = list(/datum/reagent/ammonia = 2, "nitrogen" = 1, "oxygen" = 2)
required_temp = 525
//Technically a mutation toxin
@@ -142,7 +142,7 @@
/datum/chemical_reaction/fermis_plush
name = "Fermis plush"
id = "fermis_plush"
required_reagents = list("sugar" = 10, "blood" = 10, "stable_plasma" = 10)
required_reagents = list(/datum/reagent/consumable/sugar = 10, "blood" = 10, "stable_plasma" = 10)
mob_react = FALSE
required_temp = 400
@@ -157,7 +157,7 @@
name = "Virus Food"
id = "virusfood"
results = list("virusfood" = 15)
required_reagents = list("water" = 5, "milk" = 5)
required_reagents = list("water" = 5, /datum/reagent/consumable/milk = 5)
/datum/chemical_reaction/virus_food_mutagen
name = "mutagenic agar"
@@ -175,7 +175,7 @@
name = "virus plasma"
id = "plasmavirusfood"
results = list("plasmavirusfood" = 1)
required_reagents = list("plasma" = 1, "virusfood" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1, "virusfood" = 1)
/datum/chemical_reaction/virus_food_plasma_synaptizine
name = "weakened virus plasma"
@@ -187,7 +187,7 @@
name = "sucrose agar"
id = "sugarvirusfood"
results = list("sugarvirusfood" = 2)
required_reagents = list("sugar" = 1, "mutagenvirusfood" = 1)
required_reagents = list(/datum/reagent/consumable/sugar = 1, "mutagenvirusfood" = 1)
/datum/chemical_reaction/virus_food_mutagen_salineglucose
name = "sucrose agar"
@@ -211,13 +211,13 @@
name = "Stable uranium gel"
id = "uraniumvirusfood_gold"
results = list("uraniumplasmavirusfood_stable" = 1)
required_reagents = list("uranium" = 10, "gold" = 10, "plasma" = 1)
required_reagents = list("uranium" = 10, /datum/reagent/gold = 10, /datum/reagent/toxin/plasma = 1)
/datum/chemical_reaction/virus_food_uranium_plasma_silver
name = "Stable uranium gel"
id = "uraniumvirusfood_silver"
results = list("uraniumplasmavirusfood_stable" = 1)
required_reagents = list("uranium" = 10, "silver" = 10, "plasma" = 1)
required_reagents = list("uranium" = 10, /datum/reagent/silver = 10, /datum/reagent/toxin/plasma = 1)
/datum/chemical_reaction/mix_virus
name = "Mix Virus"
@@ -249,7 +249,7 @@
name = "Mix Virus 3"
id = "mixvirus3"
required_reagents = list("plasma" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1)
level_min = 4
level_max = 6
@@ -363,7 +363,7 @@
name = "Foam surfactant"
id = "foam surfactant"
results = list("fluorosurfactant" = 5)
required_reagents = list("fluorine" = 2, "carbon" = 2, "sacid" = 1)
required_reagents = list("fluorine" = 2, /datum/reagent/carbon = 2, /datum/reagent/toxin/acid = 1)
/datum/chemical_reaction/foam
name = "Foam"
@@ -385,7 +385,7 @@
/datum/chemical_reaction/metalfoam
name = "Metal Foam"
id = "metalfoam"
required_reagents = list("aluminium" = 3, "foaming_agent" = 1, "facid" = 1)
required_reagents = list("aluminium" = 3, "foaming_agent" = 1, /datum/reagent/toxin/acid/fluacid = 1)
mob_react = FALSE
/datum/chemical_reaction/metalfoam/on_reaction(datum/reagents/holder, created_volume)
@@ -402,7 +402,7 @@
/datum/chemical_reaction/smart_foam
name = "Smart Metal Foam"
id = "smart_metal_foam"
required_reagents = list("aluminium" = 3, "smart_foaming_agent" = 1, "facid" = 1)
required_reagents = list("aluminium" = 3, "smart_foaming_agent" = 1, /datum/reagent/toxin/acid/fluacid = 1)
mob_react = TRUE
/datum/chemical_reaction/smart_foam/on_reaction(datum/reagents/holder, created_volume)
@@ -416,7 +416,7 @@
/datum/chemical_reaction/ironfoam
name = "Iron Foam"
id = "ironlfoam"
required_reagents = list("iron" = 3, "foaming_agent" = 1, "facid" = 1)
required_reagents = list(/datum/reagent/iron = 3, "foaming_agent" = 1, /datum/reagent/toxin/acid/fluacid = 1)
mob_react = FALSE
/datum/chemical_reaction/ironfoam/on_reaction(datum/reagents/holder, created_volume)
@@ -438,7 +438,7 @@
name = "Smart foaming Agent"
id = "smart_foaming_agent"
results = list("smart_foaming_agent" = 3)
required_reagents = list("foaming_agent" = 3, "acetone" = 1, "iron" = 1)
required_reagents = list("foaming_agent" = 3, /datum/reagent/acetone = 1, /datum/reagent/iron = 1)
mix_message = "The solution mixes into a frothy metal foam and conforms to the walls of its container."
@@ -447,7 +447,7 @@
/datum/chemical_reaction/ammonia
name = "Ammonia"
id = "ammonia"
results = list("ammonia" = 3)
results = list(/datum/reagent/ammonia = 3)
required_reagents = list("hydrogen" = 3, "nitrogen" = 1)
/datum/chemical_reaction/diethylamine
@@ -460,7 +460,7 @@
name = "Space cleaner"
id = "cleaner"
results = list("cleaner" = 2)
required_reagents = list("ammonia" = 1, "water" = 1)
required_reagents = list(/datum/reagent/ammonia = 1, "water" = 1)
/datum/chemical_reaction/plantbgone
name = "Plant-B-Gone"
@@ -472,52 +472,52 @@
name = "Weed Killer"
id = "weedkiller"
results = list("weedkiller" = 5)
required_reagents = list("toxin" = 1, "ammonia" = 4)
required_reagents = list("toxin" = 1, /datum/reagent/ammonia = 4)
/datum/chemical_reaction/pestkiller
name = "Pest Killer"
id = "pestkiller"
results = list("pestkiller" = 5)
required_reagents = list("toxin" = 1, "ethanol" = 4)
required_reagents = list("toxin" = 1, /datum/reagent/consumable/ethanol = 4)
/datum/chemical_reaction/drying_agent
name = "Drying agent"
id = "drying_agent"
results = list("drying_agent" = 3)
required_reagents = list("stable_plasma" = 2, "ethanol" = 1, "sodium" = 1)
required_reagents = list("stable_plasma" = 2, /datum/reagent/consumable/ethanol = 1, "sodium" = 1)
//////////////////////////////////// Other goon stuff ///////////////////////////////////////////
/datum/chemical_reaction/acetone
name = "acetone"
id = "acetone"
results = list("acetone" = 3)
required_reagents = list("oil" = 1, "welding_fuel" = 1, "oxygen" = 1)
results = list(/datum/reagent/acetone = 3)
required_reagents = list(/datum/reagent/oil = 1, /datum/reagent/fuel = 1, "oxygen" = 1)
/datum/chemical_reaction/oil
name = "Oil"
id = "oil"
results = list("oil" = 3)
required_reagents = list("welding_fuel" = 1, "carbon" = 1, "hydrogen" = 1)
results = list(/datum/reagent/oil = 3)
required_reagents = list(/datum/reagent/fuel = 1, /datum/reagent/carbon = 1, "hydrogen" = 1)
/datum/chemical_reaction/phenol
name = "phenol"
id = "phenol"
results = list("phenol" = 3)
required_reagents = list("water" = 1, "chlorine" = 1, "oil" = 1)
results = list(/datum/reagent/phenol = 3)
required_reagents = list("water" = 1, "chlorine" = 1, /datum/reagent/oil = 1)
/datum/chemical_reaction/ash
name = "Ash"
id = "ash"
results = list("ash" = 1)
required_reagents = list("oil" = 1)
required_reagents = list(/datum/reagent/oil = 1)
required_temp = 480
/datum/chemical_reaction/colorful_reagent
name = "colorful_reagent"
id = "colorful_reagent"
results = list("colorful_reagent" = 5)
required_reagents = list("stable_plasma" = 1, "radium" = 1, "space_drugs" = 1, "cryoxadone" = 1, "triple_citrus" = 1)
required_reagents = list("stable_plasma" = 1, /datum/reagent/radium = 1, /datum/reagent/drug/space_drugs = 1, "cryoxadone" = 1, "triple_citrus" = 1)
/datum/chemical_reaction/life
name = "Life"
@@ -532,7 +532,7 @@
/datum/chemical_reaction/life_friendly
name = "Life (Friendly)"
id = "life_friendly"
required_reagents = list("strange_reagent" = 1, "synthflesh" = 1, "sugar" = 1)
required_reagents = list("strange_reagent" = 1, "synthflesh" = 1, /datum/reagent/consumable/sugar = 1)
required_temp = 374
/datum/chemical_reaction/life_friendly/on_reaction(datum/reagents/holder, created_volume)
@@ -541,7 +541,7 @@
/datum/chemical_reaction/corgium
name = "corgium"
id = "corgium"
required_reagents = list("nutriment" = 1, "colorful_reagent" = 1, "strange_reagent" = 1, "blood" = 1)
required_reagents = list(/datum/reagent/consumable/nutriment = 1, "colorful_reagent" = 1, "strange_reagent" = 1, "blood" = 1)
required_temp = 374
/datum/chemical_reaction/corgium/on_reaction(datum/reagents/holder, created_volume)
@@ -554,13 +554,13 @@
name = "hair_dye"
id = "hair_dye"
results = list("hair_dye" = 5)
required_reagents = list("colorful_reagent" = 1, "radium" = 1, "space_drugs" = 1)
required_reagents = list("colorful_reagent" = 1, /datum/reagent/radium = 1, /datum/reagent/drug/space_drugs = 1)
/datum/chemical_reaction/barbers_aid
name = "barbers_aid"
id = "barbers_aid"
results = list("barbers_aid" = 5)
required_reagents = list("carpet" = 1, "radium" = 1, "space_drugs" = 1)
required_reagents = list("carpet" = 1, /datum/reagent/radium = 1, /datum/reagent/drug/space_drugs = 1)
/datum/chemical_reaction/concentrated_barbers_aid
name = "concentrated_barbers_aid"
@@ -584,7 +584,7 @@
name = "lye"
id = "lye"
results = list("lye" = 2)
required_reagents = list("ash" = 1, "water" = 1, "carbon" = 1)
required_reagents = list("ash" = 1, "water" = 1, /datum/reagent/carbon = 1)
/datum/chemical_reaction/royal_bee_jelly
name = "royal bee jelly"
@@ -596,12 +596,12 @@
name = "laughter"
id = "laughter"
results = list("laughter" = 10) // Fuck it. I'm not touching this one.
required_reagents = list("sugar" = 1, "banana" = 1)
required_reagents = list(/datum/reagent/consumable/sugar = 1, "banana" = 1)
/datum/chemical_reaction/plastic_polymers
name = "plastic polymers"
id = "plastic_polymers"
required_reagents = list("oil" = 5, "sacid" = 2, "ash" = 3)
required_reagents = list(/datum/reagent/oil = 5, /datum/reagent/toxin/acid = 2, "ash" = 3)
required_temp = 374 //lazily consistent with soap & other crafted objects generically created with heat.
/datum/chemical_reaction/plastic_polymers/on_reaction(datum/reagents/holder, created_volume)
@@ -619,14 +619,14 @@
name = "felined mutation toxic"
id = "cats"
results = list("felinidmutationtoxin" = 1)
required_reagents = list("mindbreaker" = 1, "ammonia" = 1, "water" = 1, "aphro" = 10, "stablemutationtoxin" = 1) // Maybe aphro+ if it becomes a shitty meme
required_reagents = list("mindbreaker" = 1, /datum/reagent/ammonia = 1, "water" = 1, "aphro" = 10, "stablemutationtoxin" = 1) // Maybe aphro+ if it becomes a shitty meme
required_temp = 450
/datum/chemical_reaction/moff
name = "insect mutation toxic"
id = "moffs"
results = list("mothmutationtoxin" = 1)
required_reagents = list("liquid_dark_matter" = 2, "ammonia" = 5, "lithium" = 1, "stablemutationtoxin" = 1)
required_reagents = list("liquid_dark_matter" = 2, /datum/reagent/ammonia = 5, "lithium" = 1, "stablemutationtoxin" = 1)
required_temp = 320
/datum/chemical_reaction/notlight //Harder to make do to it being a hard race to play
@@ -642,13 +642,13 @@
name = "carpet"
id = "carpet"
results = list("carpet" = 2)
required_reagents = list("space_drugs" = 1, "blood" = 1)
required_reagents = list(/datum/reagent/drug/space_drugs = 1, "blood" = 1)
/datum/chemical_reaction/carpet/black
name = "liquid black carpet"
id = "blackcarpet"
results = list("blackcarpet" = 2)
required_reagents = list("carpet" = 1, "carbon" = 1)
required_reagents = list("carpet" = 1, /datum/reagent/carbon = 1)
/datum/chemical_reaction/carpet/blackred
name = "liquid red black carpet"
@@ -660,7 +660,7 @@
name = "liquid monochrome carpet"
id = "monochromecarpet"
results = list("monochromecarpet" = 2)
required_reagents = list("carpet" = 1, "oil" = 1)
required_reagents = list("carpet" = 1, /datum/reagent/oil = 1)
/datum/chemical_reaction/carpet/blue
name = "liquid blue carpet"
@@ -678,7 +678,7 @@
name = "liquid green carpet"
id = "greencarpet"
results = list("greencarpet" = 2)
required_reagents = list("carpet" = 1, "sacid" = 1)
required_reagents = list("carpet" = 1, /datum/reagent/toxin/acid = 1)
/datum/chemical_reaction/carpet/orange
name = "liquid orange carpet"
@@ -696,7 +696,7 @@
name = "liquid red carpet"
id = "redcarpet"
results = list("redcarpet" = 2)
required_reagents = list("carpet" = 1, "welding_fuel" = 1)
required_reagents = list("carpet" = 1, /datum/reagent/fuel = 1)
/datum/chemical_reaction/carpet/royalblack
name = "liquid royal black carpet"
code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+13 -13
View File
@@ -29,7 +29,7 @@
name = "Nitroglycerin"
id = "nitroglycerin"
results = list("nitroglycerin" = 2)
required_reagents = list("glycerol" = 1, "facid" = 1, "sacid" = 1)
required_reagents = list("glycerol" = 1, /datum/reagent/toxin/acid/fluacid = 1, /datum/reagent/toxin/acid = 1)
strengthdiv = 2
/datum/chemical_reaction/reagent_explosion/nitroglycerin/on_reaction(datum/reagents/holder, created_volume)
@@ -105,12 +105,12 @@
name = "Thermite"
id = "thermite"
results = list("thermite" = 3)
required_reagents = list("aluminium" = 1, "iron" = 1, "oxygen" = 1)
required_reagents = list("aluminium" = 1, /datum/reagent/iron = 1, "oxygen" = 1)
/datum/chemical_reaction/emp_pulse
name = "EMP Pulse"
id = "emp_pulse"
required_reagents = list("uranium" = 1, "iron" = 1) // Yes, laugh, it's the best recipe I could think of that makes a little bit of sense
required_reagents = list("uranium" = 1, /datum/reagent/iron = 1) // Yes, laugh, it's the best recipe I could think of that makes a little bit of sense
/datum/chemical_reaction/emp_pulse/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
@@ -123,7 +123,7 @@
/datum/chemical_reaction/beesplosion
name = "Bee Explosion"
id = "beesplosion"
required_reagents = list("honey" = 1, "strange_reagent" = 1, "radium" = 1)
required_reagents = list("honey" = 1, "strange_reagent" = 1, /datum/reagent/radium = 1)
/datum/chemical_reaction/beesplosion/on_reaction(datum/reagents/holder, created_volume)
var/location = holder.my_atom.drop_location()
@@ -148,7 +148,7 @@
name = "stabilizing_agent"
id = "stabilizing_agent"
results = list("stabilizing_agent" = 3)
required_reagents = list("iron" = 1, "oxygen" = 1, "hydrogen" = 1)
required_reagents = list(/datum/reagent/iron = 1, "oxygen" = 1, "hydrogen" = 1)
/datum/chemical_reaction/clf3
name = "Chlorine Trifluoride"
@@ -188,7 +188,7 @@
name = "Sorium"
id = "sorium"
results = list("sorium" = 4)
required_reagents = list("mercury" = 1, "oxygen" = 1, "nitrogen" = 1, "carbon" = 1)
required_reagents = list("mercury" = 1, "oxygen" = 1, "nitrogen" = 1, /datum/reagent/carbon = 1)
/datum/chemical_reaction/sorium/on_reaction(datum/reagents/holder, created_volume)
if(holder.has_reagent(/datum/reagent/stabilizing_agent))
@@ -213,7 +213,7 @@
name = "Liquid Dark Matter"
id = "liquid_dark_matter"
results = list("liquid_dark_matter" = 3)
required_reagents = list("stable_plasma" = 1, "radium" = 1, "carbon" = 1)
required_reagents = list("stable_plasma" = 1, /datum/reagent/radium = 1, /datum/reagent/carbon = 1)
/datum/chemical_reaction/liquid_dark_matter/on_reaction(datum/reagents/holder, created_volume)
if(holder.has_reagent(/datum/reagent/stabilizing_agent))
@@ -281,7 +281,7 @@
name = "smoke_powder"
id = "smoke_powder"
results = list("smoke_powder" = 3)
required_reagents = list("potassium" = 1, "sugar" = 1, "phosphorus" = 1)
required_reagents = list("potassium" = 1, /datum/reagent/consumable/sugar = 1, "phosphorus" = 1)
/datum/chemical_reaction/smoke_powder/on_reaction(datum/reagents/holder, created_volume)
if(holder.has_reagent(/datum/reagent/stabilizing_agent))
@@ -348,7 +348,7 @@
name = "phlogiston"
id = "phlogiston"
results = list("phlogiston" = 3)
required_reagents = list("phosphorus" = 1, "sacid" = 1, "stable_plasma" = 1)
required_reagents = list("phosphorus" = 1, /datum/reagent/toxin/acid = 1, "stable_plasma" = 1)
/datum/chemical_reaction/phlogiston/on_reaction(datum/reagents/holder, created_volume)
if(holder.has_reagent(/datum/reagent/stabilizing_agent))
@@ -363,7 +363,7 @@
name = "Napalm"
id = "napalm"
results = list("napalm" = 3)
required_reagents = list("oil" = 1, "welding_fuel" = 1, "ethanol" = 1 )
required_reagents = list(/datum/reagent/oil = 1, /datum/reagent/fuel = 1, /datum/reagent/consumable/ethanol = 1 )
/datum/chemical_reaction/cryostylane
name = "cryostylane"
@@ -399,7 +399,7 @@
name = "pyrosium"
id = "pyrosium"
results = list("pyrosium" = 3)
required_reagents = list("stable_plasma" = 1, "radium" = 1, "phosphorus" = 1)
required_reagents = list("stable_plasma" = 1, /datum/reagent/radium = 1, "phosphorus" = 1)
/datum/chemical_reaction/pyrosium/on_reaction(datum/reagents/holder, created_volume)
holder.chem_temp = 20 // also cools the fuck down
@@ -409,7 +409,7 @@
name = "Teslium"
id = "teslium"
results = list("teslium" = 3)
required_reagents = list("stable_plasma" = 1, "silver" = 1, "blackpowder" = 1)
required_reagents = list("stable_plasma" = 1, /datum/reagent/silver = 1, "blackpowder" = 1)
mix_message = "<span class='danger'>A jet of sparks flies from the mixture as it merges into a flickering slurry.</span>"
required_temp = 400
@@ -466,7 +466,7 @@
name = "Firefighting Foam"
id = "firefighting_foam"
results = list("firefighting_foam" = 3)
required_reagents = list("stabilizing_agent" = 1,"fluorosurfactant" = 1,"carbon" = 1)
required_reagents = list("stabilizing_agent" = 1,"fluorosurfactant" = 1,/datum/reagent/carbon = 1)
required_temp = 200
is_cold_recipe = 1
code/modules/reagents/chemistry/recipes/slime_extracts.dm
+23 -23
View File
@@ -16,7 +16,7 @@
/datum/chemical_reaction/slime/slimespawn
name = "Slime Spawn"
id = "m_spawn"
required_reagents = list("plasma" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1)
required_container = /obj/item/slime_extract/grey
required_other = TRUE
@@ -50,7 +50,7 @@
name = "Mutation Toxin"
id = "slimetoxin"
results = list("slime_toxin" = 1)
required_reagents = list("plasma" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1)
required_other = TRUE
required_container = /obj/item/slime_extract/green
@@ -66,7 +66,7 @@
name = "Lizard Mutation Toxin"
id = "lizardmuttoxin"
results = list("lizardmutationtoxin" = 1)
required_reagents = list("radium" = 1)
required_reagents = list(/datum/reagent/radium = 1)
required_other = TRUE
required_container = /obj/item/slime_extract/green
@@ -74,7 +74,7 @@
/datum/chemical_reaction/slime/slimemetal
name = "Slime Metal"
id = "m_metal"
required_reagents = list("plasma" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1)
required_container = /obj/item/slime_extract/metal
required_other = TRUE
@@ -101,7 +101,7 @@
/datum/chemical_reaction/slime/slimemobspawn
name = "Slime Crit"
id = "m_tele"
required_reagents = list("plasma" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1)
required_container = /obj/item/slime_extract/gold
required_other = TRUE
deletes_extract = FALSE //we do delete, but we don't do so instantly
@@ -140,7 +140,7 @@
/datum/chemical_reaction/slime/slimebork
name = "Slime Bork"
id = "m_tele2"
required_reagents = list("plasma" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1)
required_container = /obj/item/slime_extract/silver
required_other = TRUE
@@ -182,7 +182,7 @@
name = "Slime Frost Oil"
id = "m_frostoil"
results = list("frostoil" = 10)
required_reagents = list("plasma" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1)
required_container = /obj/item/slime_extract/blue
required_other = TRUE
@@ -209,7 +209,7 @@
/datum/chemical_reaction/slime/slimefreeze
name = "Slime Freeze"
id = "m_freeze"
required_reagents = list("plasma" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1)
required_container = /obj/item/slime_extract/darkblue
required_other = TRUE
deletes_extract = FALSE
@@ -253,7 +253,7 @@
/datum/chemical_reaction/slime/slimefire
name = "Slime fire"
id = "m_fire"
required_reagents = list("plasma" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1)
required_container = /obj/item/slime_extract/orange
required_other = TRUE
deletes_extract = FALSE
@@ -297,7 +297,7 @@
/datum/chemical_reaction/slime/slimecell
name = "Slime Powercell"
id = "m_cell"
required_reagents = list("plasma" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1)
required_container = /obj/item/slime_extract/yellow
required_other = TRUE
@@ -322,7 +322,7 @@
/datum/chemical_reaction/slime/slimepsteroid
name = "Slime Steroid"
id = "m_steroid"
required_reagents = list("plasma" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1)
required_container = /obj/item/slime_extract/purple
required_other = TRUE
@@ -342,7 +342,7 @@
/datum/chemical_reaction/slime/slimeplasma
name = "Slime Plasma"
id = "m_plasma"
required_reagents = list("plasma" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1)
required_container = /obj/item/slime_extract/darkpurple
required_other = TRUE
@@ -354,7 +354,7 @@
/datum/chemical_reaction/slime/slimemutator
name = "Slime Mutator"
id = "m_slimemutator"
required_reagents = list("plasma" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1)
required_container = /obj/item/slime_extract/red
required_other = TRUE
@@ -395,7 +395,7 @@
/datum/chemical_reaction/slime/docility
name = "Docility Potion"
id = "m_potion"
required_reagents = list("plasma" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1)
required_container = /obj/item/slime_extract/pink
required_other = TRUE
@@ -419,7 +419,7 @@
name = "Advanced Mutation Toxin"
id = "mutationtoxin2"
results = list("amutationtoxin" = 1)
required_reagents = list("plasma" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1)
required_other = TRUE
required_container = /obj/item/slime_extract/black
@@ -427,7 +427,7 @@
/datum/chemical_reaction/slime/slimeexplosion
name = "Slime Explosion"
id = "m_explosion"
required_reagents = list("plasma" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1)
required_container = /obj/item/slime_extract/oil
required_other = TRUE
deletes_extract = FALSE
@@ -466,7 +466,7 @@
name = "Slime Potion 2"
id = "m_potion2"
required_container = /obj/item/slime_extract/lightpink
required_reagents = list("plasma" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1)
required_other = TRUE
/datum/chemical_reaction/slime/slimepotion2/on_reaction(datum/reagents/holder)
@@ -489,7 +489,7 @@
/datum/chemical_reaction/slime/adamantine
name = "Adamantine"
id = "adamantine"
required_reagents = list("plasma" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1)
required_container = /obj/item/slime_extract/adamantine
required_other = TRUE
@@ -513,7 +513,7 @@
/datum/chemical_reaction/slime/slimecrystal
name = "Slime Crystal"
id = "m_crystal"
required_reagents = list("plasma" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1)
required_container = /obj/item/slime_extract/bluespace
required_other = TRUE
@@ -537,7 +537,7 @@
/datum/chemical_reaction/slime/slimepsteroid2
name = "Slime Steroid 2"
id = "m_steroid2"
required_reagents = list("plasma" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1)
required_container = /obj/item/slime_extract/cerulean
required_other = TRUE
@@ -560,7 +560,7 @@
/datum/chemical_reaction/slime/slimestop
name = "Slime Stop"
id = "m_stop"
required_reagents = list("plasma" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1)
required_container = /obj/item/slime_extract/sepia
required_other = TRUE
@@ -597,7 +597,7 @@
/datum/chemical_reaction/slime/slimepaint
name = "Slime Paint"
id = "s_paint"
required_reagents = list("plasma" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1)
required_container = /obj/item/slime_extract/pyrite
required_other = TRUE
@@ -622,7 +622,7 @@
/datum/chemical_reaction/slime/slimeRNG
name = "Random Core"
id = "slimerng"
required_reagents = list("plasma" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1)
required_other = TRUE
required_container = /obj/item/slime_extract/rainbow
code/modules/reagents/chemistry/recipes/toxins.dm
+17 -17
View File
@@ -3,41 +3,41 @@
name = "formaldehyde"
id = "Formaldehyde"
results = list("formaldehyde" = 3)
required_reagents = list("ethanol" = 1, "oxygen" = 1, "silver" = 1)
required_reagents = list(/datum/reagent/consumable/ethanol = 1, "oxygen" = 1, /datum/reagent/silver = 1)
required_temp = 420
/datum/chemical_reaction/fentanyl
name = "fentanyl"
id = "fentanyl"
results = list("fentanyl" = 1)
required_reagents = list("space_drugs" = 1)
required_reagents = list(/datum/reagent/drug/space_drugs = 1)
required_temp = 674
/datum/chemical_reaction/cyanide
name = "Cyanide"
id = "cyanide"
results = list("cyanide" = 3)
required_reagents = list("oil" = 1, "ammonia" = 1, "oxygen" = 1)
results = list(/datum/reagent/toxin/cyanide = 3)
required_reagents = list(/datum/reagent/oil = 1, /datum/reagent/ammonia = 1, "oxygen" = 1)
required_temp = 380
/datum/chemical_reaction/itching_powder
name = "Itching Powder"
id = "itching_powder"
results = list("itching_powder" = 3)
required_reagents = list("welding_fuel" = 1, "ammonia" = 1, "charcoal" = 1)
required_reagents = list(/datum/reagent/fuel = 1, /datum/reagent/ammonia = 1, "charcoal" = 1)
/datum/chemical_reaction/facid
name = "Fluorosulfuric acid"
id = "facid"
results = list("facid" = 4)
required_reagents = list("sacid" = 1, "fluorine" = 1, "hydrogen" = 1, "potassium" = 1)
results = list(/datum/reagent/toxin/acid/fluacid = 4)
required_reagents = list(/datum/reagent/toxin/acid = 1, "fluorine" = 1, "hydrogen" = 1, "potassium" = 1)
required_temp = 380
/datum/chemical_reaction/sulfonal
name = "sulfonal"
id = "sulfonal"
results = list("sulfonal" = 3)
required_reagents = list("acetone" = 1, "diethylamine" = 1, "sulfur" = 1)
required_reagents = list(/datum/reagent/acetone = 1, "diethylamine" = 1, "sulfur" = 1)
/datum/chemical_reaction/lipolicide
name = "lipolicide"
@@ -49,32 +49,32 @@
name = "Unstable mutagen"
id = "mutagen"
results = list("mutagen" = 3)
required_reagents = list("radium" = 1, "phosphorus" = 1, "chlorine" = 1)
required_reagents = list(/datum/reagent/radium = 1, "phosphorus" = 1, "chlorine" = 1)
/datum/chemical_reaction/lexorin
name = "Lexorin"
id = "lexorin"
results = list("lexorin" = 3)
required_reagents = list("plasma" = 1, "hydrogen" = 1, "oxygen" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1, "hydrogen" = 1, "oxygen" = 1)
/datum/chemical_reaction/chloralhydrate
name = "Chloral Hydrate"
id = "chloralhydrate"
results = list("chloralhydrate" = 1)
required_reagents = list("ethanol" = 1, "chlorine" = 3, "water" = 1)
required_reagents = list(/datum/reagent/consumable/ethanol = 1, "chlorine" = 3, "water" = 1)
/datum/chemical_reaction/mutetoxin //i'll just fit this in here snugly between other unfun chemicals :v
name = "Mute Toxin"
id = "mutetoxin"
results = list("mutetoxin" = 2)
required_reagents = list("uranium" = 2, "water" = 1, "carbon" = 1)
required_reagents = list("uranium" = 2, "water" = 1, /datum/reagent/carbon = 1)
/datum/chemical_reaction/zombiepowder
name = "Zombie Powder"
id = "zombiepowder"
results = list("zombiepowder" = 2)
required_reagents = list("carpotoxin" = 5, "morphine" = 5, "copper" = 5)
/datum/chemical_reaction/ghoulpowder
name = "Ghoul Powder"
id = "ghoulpowder"
@@ -105,24 +105,24 @@
name = "Skewium"
id = "Skewium"
results = list("skewium" = 5)
required_reagents = list("rotatium" = 2, "plasma" = 2, "sacid" = 1)
required_reagents = list("rotatium" = 2, /datum/reagent/toxin/plasma = 2, /datum/reagent/toxin/acid = 1)
mix_message = "<span class='danger'>Wow! it turns out if you mix rotatium with some plasma and sulphuric acid, it gets even worse!</span>"
/datum/chemical_reaction/anacea
name = "Anacea"
id = "anacea"
results = list("anacea" = 3)
required_reagents = list("haloperidol" = 1, "impedrezene" = 1, "radium" = 1)
required_reagents = list("haloperidol" = 1, "impedrezene" = 1, /datum/reagent/radium = 1)
/datum/chemical_reaction/mimesbane
name = "Mime's Bane"
id = "mimesbane"
results = list("mimesbane" = 3)
required_reagents = list("radium" = 1, "mutetoxin" = 1, "nothing" = 1)
required_reagents = list(/datum/reagent/radium = 1, "mutetoxin" = 1, "nothing" = 1)
/datum/chemical_reaction/bonehurtingjuice
name = "Bone Hurting Juice"
id = "bonehurtingjuice"
results = list("bonehurtingjuice" = 5)
required_reagents = list("mutagen" = 1, "itching_powder" = 3, "milk" = 1)
required_reagents = list("mutagen" = 1, "itching_powder" = 3, /datum/reagent/consumable/milk = 1)
mix_message = "<span class='danger'>The mixture suddenly becomes clear and looks a lot like water. You feel a strong urge to drink it.</span>"
code/modules/reagents/reagent_containers/bottle.dm
+14 -14
View File
@@ -48,12 +48,12 @@
/obj/item/reagent_containers/glass/bottle/toxin
name = "toxin bottle"
desc = "A small bottle of toxins. Do not drink, it is poisonous."
list_reagents = list("toxin" = 30)
list_reagents = list(/datum/reagent/toxin = 30)
/obj/item/reagent_containers/glass/bottle/cyanide
name = "cyanide bottle"
desc = "A small bottle of cyanide. Bitter almonds?"
list_reagents = list("cyanide" = 30)
list_reagents = list(/datum/reagent/toxin/cyanide = 30)
/obj/item/reagent_containers/glass/bottle/spewium
name = "spewium bottle"
@@ -90,7 +90,7 @@
/obj/item/reagent_containers/glass/bottle/plasma
name = "liquid plasma bottle"
desc = "A small bottle of liquid plasma. Extremely toxic and reacts with micro-organisms inside blood."
list_reagents = list("plasma" = 30)
list_reagents = list(/datum/reagent/toxin/plasma = 30)
/obj/item/reagent_containers/glass/bottle/synaptizine
name = "synaptizine bottle"
@@ -105,7 +105,7 @@
/obj/item/reagent_containers/glass/bottle/ammonia
name = "ammonia bottle"
desc = "A small bottle of ammonia."
list_reagents = list("ammonia" = 30)
list_reagents = list(/datum/reagent/ammonia = 30)
/obj/item/reagent_containers/glass/bottle/diethylamine
name = "diethylamine bottle"
@@ -115,7 +115,7 @@
/obj/item/reagent_containers/glass/bottle/facid
name = "Fluorosulfuric Acid Bottle"
desc = "A small bottle. Contains a small amount of fluorosulfuric acid."
list_reagents = list("facid" = 30)
list_reagents = list(/datum/reagent/toxin/acid/fluacid = 30)
/obj/item/reagent_containers/glass/bottle/adminordrazine
name = "Adminordrazine Bottle"
@@ -321,7 +321,7 @@
/obj/item/reagent_containers/glass/bottle/carbon
name = "carbon bottle"
list_reagents = list("carbon" = 30)
list_reagents = list(/datum/reagent/carbon = 30)
/obj/item/reagent_containers/glass/bottle/nitrogen
name = "nitrogen bottle"
@@ -365,7 +365,7 @@
/obj/item/reagent_containers/glass/bottle/iron
name = "iron bottle"
list_reagents = list("iron" = 30)
list_reagents = list(/datum/reagent/iron = 30)
/obj/item/reagent_containers/glass/bottle/copper
name = "copper bottle"
@@ -377,31 +377,31 @@
/obj/item/reagent_containers/glass/bottle/radium
name = "radium bottle"
list_reagents = list("radium" = 30)
list_reagents = list(/datum/reagent/radium = 30)
/obj/item/reagent_containers/glass/bottle/water
name = "water bottle"
list_reagents = list("water" = 30)
list_reagents = list(/datum/reagent/water = 30)
/obj/item/reagent_containers/glass/bottle/ethanol
name = "ethanol bottle"
list_reagents = list("ethanol" = 30)
list_reagents = list(/datum/reagent/consumable/ethanol = 30)
/obj/item/reagent_containers/glass/bottle/sugar
name = "sugar bottle"
list_reagents = list("sugar" = 30)
list_reagents = list(/datum/reagent/consumable/sugar = 30)
/obj/item/reagent_containers/glass/bottle/sacid
name = "sulphuric acid bottle"
list_reagents = list("sacid" = 30)
list_reagents = list(/datum/reagent/toxin/acid = 30)
/obj/item/reagent_containers/glass/bottle/welding_fuel
name = "welding fuel bottle"
list_reagents = list("welding_fuel" = 30)
list_reagents = list(/datum/reagent/fuel = 30)
/obj/item/reagent_containers/glass/bottle/silver
name = "silver bottle"
list_reagents = list("silver" = 30)
list_reagents = list(/datum/reagent/silver = 30)
/obj/item/reagent_containers/glass/bottle/iodine
name = "iodine bottle"
code/modules/reagents/reagent_containers/glass.dm
+3 -3
View File
@@ -234,7 +234,7 @@
list_reagents = list("cryoxadone" = 30)
/obj/item/reagent_containers/glass/beaker/sulphuric
list_reagents = list("sacid" = 50)
list_reagents = list(/datum/reagent/toxin/acid = 50)
/obj/item/reagent_containers/glass/beaker/slime
list_reagents = list("slimejelly" = 50)
@@ -335,7 +335,7 @@
icon = 'icons/obj/drinks.dmi'
icon_state = "smallbottle"
item_state = "bottle"
list_reagents = list("water" = 49.5, "fluorine" = 0.5)//see desc, don't think about it too hard
list_reagents = list(/datum/reagent/water = 49.5, "fluorine" = 0.5)//see desc, don't think about it too hard
materials = list(MAT_GLASS=0)
volume = 50
amount_per_transfer_from_this = 10
@@ -352,7 +352,7 @@
desc = "A fresh commercial-sized bottle of water."
icon_state = "largebottle"
materials = list(MAT_GLASS=0)
list_reagents = list("water" = 100)
list_reagents = list(/datum/reagent/water = 100)
volume = 100
amount_per_transfer_from_this = 20
container_HP = 1
code/modules/reagents/reagent_containers/pill.dm
+6 -6
View File
@@ -82,14 +82,14 @@
name = "toxins pill"
desc = "Highly toxic."
icon_state = "pill5"
list_reagents = list("toxin" = 50)
list_reagents = list(/datum/reagent/toxin = 50)
roundstart = 1
/obj/item/reagent_containers/pill/cyanide
name = "cyanide pill"
desc = "Don't swallow this."
icon_state = "pill5"
list_reagents = list("cyanide" = 50)
list_reagents = list(/datum/reagent/toxin/cyanide = 50)
roundstart = 1
/obj/item/reagent_containers/pill/adminordrazine
@@ -138,7 +138,7 @@
name = "mannitol pill"
desc = "Used to treat brain damage."
icon_state = "pill17"
list_reagents = list("mannitol" = 50)
list_reagents = list(/datum/reagent/medicine/mannitol = 50)
roundstart = 1
/obj/item/reagent_containers/pill/mutadone
@@ -187,14 +187,14 @@
name = "prussian blue pill"
desc = "Used to treat heavy radition poisoning."
icon_state = "prussian_blue"
list_reagents = list("prussian_blue" = 25, "water" = 10)
list_reagents = list("prussian_blue" = 25, /datum/reagent/water = 10)
roundstart = 1
/obj/item/reagent_containers/pill/mutarad
name = "radiation treatment deluxe pill"
desc = "Used to treat heavy radition poisoning and genetic defects."
icon_state = "anit_rad_fixgene"
list_reagents = list("prussian_blue" = 15, "potass_iodide" = 15, "mutadone" = 15, "water" = 5)
list_reagents = list("prussian_blue" = 15, "potass_iodide" = 15, "mutadone" = 15, /datum/reagent/water = 5)
roundstart = 1
///////////////////////////////////////// this pill is used only in a legion mob drop
@@ -212,7 +212,7 @@
/obj/item/reagent_containers/pill/happy
name = "happy pill"
list_reagents = list("sugar" = 10, "space_drugs" = 10)
list_reagents = list(/datum/reagent/consumable/sugar = 10, /datum/reagent/drug/space_drugs = 10)
/obj/item/reagent_containers/pill/lsd
code/modules/reagents/reagent_containers/spray.dm
+1 -1
View File
@@ -218,7 +218,7 @@
item_state = "sunflower"
amount_per_transfer_from_this = 1
volume = 10
list_reagents = list("water" = 10)
list_reagents = list(/datum/reagent/water = 10)
/obj/item/reagent_containers/spray/waterflower/attack_self(mob/user) //Don't allow changing how much the flower sprays
return
code/modules/reagents/reagent_containers/syringes.dm
+2 -2
View File
@@ -211,7 +211,7 @@
/obj/item/reagent_containers/syringe/plasma
name = "syringe (plasma)"
desc = "Contains plasma."
list_reagents = list("plasma" = 15)
list_reagents = list(/datum/reagent/toxin/plasma = 15)
/obj/item/reagent_containers/syringe/lethal
name = "lethal injection syringe"
@@ -223,7 +223,7 @@
list_reagents = list("chloralhydrate" = 50)
/obj/item/reagent_containers/syringe/lethal/execution
list_reagents = list("amatoxin" = 15, "formaldehyde" = 15, "cyanide" = 10, "facid" = 10) //Citadel edit, changing out plasma from lethals
list_reagents = list("amatoxin" = 15, "formaldehyde" = 15, /datum/reagent/toxin/cyanide = 10, /datum/reagent/toxin/acid/fluacid = 10) //Citadel edit, changing out plasma from lethals
/obj/item/reagent_containers/syringe/mulligan
name = "Mulligan"
code/modules/research/xenobiology/crossbreeding/_misc.dm
+1 -1
View File
@@ -50,7 +50,7 @@
filling_color = "#964B00"
tastes = list("cardboard" = 3, "sadness" = 3)
foodtype = null //Don't ask what went into them. You're better off not knowing.
list_reagents = list("stabilizednutriment" = 10, "nutriment" = 2) //Won't make you fat. Will make you question your sanity.
list_reagents = list("stabilizednutriment" = 10, /datum/reagent/consumable/nutriment = 2) //Won't make you fat. Will make you question your sanity.
/obj/item/reagent_containers/food/snacks/rationpack/checkLiked(fraction, mob/M) //Nobody likes rationpacks. Nobody.
if(last_check_time + 50 < world.time)
code/modules/surgery/organs/organ_internal.dm
+1 -1
View File
@@ -173,7 +173,7 @@
name = "appendix"
icon_state = "appendix"
icon = 'icons/obj/surgery.dmi'
list_reagents = list("nutriment" = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 5)
foodtype = RAW | MEAT | GROSS
code/modules/vore/eating/voreitems.dm
+1 -1
View File
@@ -59,4 +59,4 @@
name = "Ickypak"
id = "ickypak"
results = list("ickypak" = 2)
required_reagents = list("chlorine" = 2 , "oil" = 1) */
required_reagents = list("chlorine" = 2 , /datum/reagent/oil = 1) */