diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm
index 214683449ef..6a3b1791c85 100644
--- a/code/game/gamemodes/meteor/meteors.dm
+++ b/code/game/gamemodes/meteor/meteors.dm
@@ -267,7 +267,7 @@
//Meaty Ore Xeno edition
/obj/effect/meteor/meaty/xeno
color = "#5EFF00"
- meteordrop = /obj/item/weapon/reagent_containers/food/snacks/xenomeat
+ meteordrop = /obj/item/weapon/reagent_containers/food/snacks/meat/xeno
meteorgibs = /obj/effect/gibspawner/xeno
/obj/effect/meteor/meaty/xeno/ram_turf(var/turf/T)
diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm
index 6b43db959e0..7dc66d1970e 100644
--- a/code/game/objects/structures/kitchen_spike.dm
+++ b/code/game/objects/structures/kitchen_spike.dm
@@ -90,11 +90,11 @@
user << "You remove the hide from the alien!"
else if(src.meat > 1)
src.meat--
- new /obj/item/weapon/reagent_containers/food/snacks/xenomeat(src.loc )
+ new /obj/item/weapon/reagent_containers/food/snacks/meat/xeno(src.loc )
usr << "You remove some meat from the alien."
else if(src.meat == 1)
src.meat--
- new /obj/item/weapon/reagent_containers/food/snacks/xenomeat(src.loc)
+ new /obj/item/weapon/reagent_containers/food/snacks/meat/xeno(src.loc)
usr << "You remove the last piece of meat from the alien!"
src.icon_state = "spike"
src.occupied = 0
diff --git a/code/modules/crafting/table.dm b/code/modules/crafting/table.dm
index 44a7c96dcad..739a170a955 100644
--- a/code/modules/crafting/table.dm
+++ b/code/modules/crafting/table.dm
@@ -1,3 +1,5 @@
+#define TABLECRAFT_MAX_ITEMS 20
+
/obj/structure/table
var/list/table_contents = list()
@@ -62,8 +64,8 @@
if(do_after(user, R.time))
if(!check_contents(R) || !check_tools(user, R))
return 0
- var/list/parts = del_reqs(R)
var/atom/movable/I = new R.result (loc)
+ var/list/parts = del_reqs(R, I)
for(var/A in parts)
if(istype(A, /obj/item))
var/atom/movable/B = A
@@ -76,9 +78,12 @@
return 1
return 0
-/obj/structure/table/proc/del_reqs(datum/table_recipe/R)
+/obj/structure/table/proc/del_reqs(datum/table_recipe/R, atom/movable/resultobject)
var/list/Deletion = list()
var/amt
+ var/reagenttransfer = 0
+ if(istype(resultobject,/obj/item/weapon/reagent_containers))
+ reagenttransfer = 1
for(var/A in R.reqs)
amt = R.reqs[A]
if(ispath(A, /obj/item/stack))
@@ -104,6 +109,9 @@
Deletion.Add(I)
I.loc = null //remove it from the table loc so that we don't locate the same item every time (will be relocated inside the crafted item in construct_item())
amt--
+ if(reagenttransfer && istype(I,/obj/item/weapon/reagent_containers))
+ var/obj/item/weapon/reagent_containers/RC = I
+ RC.reagents.trans_to(resultobject, RC.reagents.total_volume)
break item_loop
else
var/datum/reagent/RG = new A
@@ -112,7 +120,10 @@
if(ispath(B, /obj/item/weapon/reagent_containers))
var/obj/item/RC = locate(B) in loc
if(RC.reagents.has_reagent(RG.id, amt))
- RC.reagents.remove_reagent(RG.id, amt)
+ if(reagenttransfer)
+ RC.reagents.trans_id_to(resultobject,RG.id, amt)
+ else
+ RC.reagents.remove_reagent(RG.id, amt)
RG.volume = amt
Deletion.Add(RG)
break reagent_loop
@@ -120,7 +131,10 @@
Deletion.Add(RG)
RG.volume += RC.reagents.get_reagent_amount(RG.id)
amt -= RC.reagents.get_reagent_amount(RG.id)
- RC.reagents.del_reagent(RG.id)
+ if(reagenttransfer)
+ RC.reagents.trans_id_to(resultobject,RG.id, RG.volume)
+ else
+ RC.reagents.del_reagent(RG.id)
var/list/partlist = list(R.parts.len)
for(var/M in R.parts)
@@ -180,6 +194,7 @@
var/Item_amount = 0
for(var/obj/item/I in loc)
Item_amount++
- if(Item_amount <= 20) //is the table crowded?
+ if(Item_amount <= TABLECRAFT_MAX_ITEMS) //is the table crowded?
return 1
+ #undef TABLECRAFT_MAX_ITEMS
\ No newline at end of file
diff --git a/code/modules/food&drinks/food/customizables.dm b/code/modules/food&drinks/food/customizables.dm
index b72751fdd1f..720e497b1f9 100644
--- a/code/modules/food&drinks/food/customizables.dm
+++ b/code/modules/food&drinks/food/customizables.dm
@@ -112,17 +112,12 @@
overlays += I
-/obj/item/weapon/reagent_containers/food/snacks/customizable/create_slices(slices_lost)
- if(!slice_path || !slices_num)
- return
- var/reagents_per_slice = reagents.total_volume/slices_num
- for(var/i=1 to (slices_num-slices_lost))
- var/obj/item/weapon/reagent_containers/food/snacks/slice = new slice_path (loc)
- slice.name = "[customname] [initial(slice.name)]"
- slice.filling_color = filling_color
- slice.update_overlays(src)
- reagents.trans_to(slice,reagents_per_slice)
- qdel(src)
+
+/obj/item/weapon/reagent_containers/food/snacks/customizable/initialize_slice(obj/item/weapon/reagent_containers/food/snacks/slice)
+ slice.name = "[customname] [initial(slice.name)]"
+ slice.filling_color = filling_color
+ slice.update_overlays(src)
+
/obj/item/weapon/reagent_containers/food/snacks/customizable/Destroy()
for(. in ingredients)
diff --git a/code/modules/food&drinks/food/snacks.dm b/code/modules/food&drinks/food/snacks.dm
index 441ab292033..a596eeb6f44 100644
--- a/code/modules/food&drinks/food/snacks.dm
+++ b/code/modules/food&drinks/food/snacks.dm
@@ -180,17 +180,19 @@
"You inaccurately slice [src] with your [W]!" \
)
slices_lost = rand(1,min(1,round(slices_num/2)))
- create_slices(slices_lost)
-/obj/item/weapon/reagent_containers/food/snacks/proc/create_slices(slices_lost)
if(!slice_path && !slices_num)
return
var/reagents_per_slice = reagents.total_volume/slices_num
for(var/i=1 to (slices_num-slices_lost))
- var/obj/slice = new slice_path (src.loc)
+ var/obj/item/weapon/reagent_containers/food/snacks/slice = new slice_path (loc)
+ initialize_slice(slice)
reagents.trans_to(slice,reagents_per_slice)
qdel(src)
+/obj/item/weapon/reagent_containers/food/snacks/proc/initialize_slice(obj/item/weapon/reagent_containers/food/snacks/slice)
+ return
+
/obj/item/weapon/reagent_containers/food/snacks/proc/update_overlays(obj/item/weapon/reagent_containers/food/snacks/S)
overlays.Cut()
var/image/I = new(src.icon, "[initial(icon_state)]_filling")
@@ -201,6 +203,10 @@
overlays += I
+// cook() is called when microwaving the food
+/obj/item/weapon/reagent_containers/food/snacks/proc/initialize_cooked_food(obj/item/weapon/reagent_containers/food/snacks/S)
+ if(reagents)
+ reagents.trans_to(S, reagents.total_volume)
/obj/item/weapon/reagent_containers/food/snacks/Destroy()
if(contents)
@@ -208,7 +214,6 @@
something.loc = get_turf(src)
..()
-
/obj/item/weapon/reagent_containers/food/snacks/attack_animal(mob/M)
if(isanimal(M))
if(iscorgi(M))
diff --git a/code/modules/food&drinks/food/snacks/dough.dm b/code/modules/food&drinks/food/snacks/dough.dm
index e5c6835f565..69174c7e97c 100644
--- a/code/modules/food&drinks/food/snacks/dough.dm
+++ b/code/modules/food&drinks/food/snacks/dough.dm
@@ -27,7 +27,6 @@
icon = 'icons/obj/food_ingredients.dmi'
icon_state = "dough"
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/store/bread/plain
- bitesize = 2
list_reagents = list("nutriment" = 3)
w_class = 3
@@ -62,20 +61,17 @@
desc = "Add ingredients to make a pizza"
icon = 'icons/obj/food_ingredients.dmi'
icon_state = "pizzabread"
- bitesize = 2
custom_food_type = /obj/item/weapon/reagent_containers/food/snacks/customizable/pizza
- list_reagents = list("nutriment" = 2)
+ list_reagents = list("nutriment" = 1)
w_class = 3
/obj/item/weapon/reagent_containers/food/snacks/doughslice
name = "dough slice"
- desc = "A building block of an impressive dish."
+ desc = "A slice of dough. Can be cooked into a bun."
icon = 'icons/obj/food_ingredients.dmi'
icon_state = "doughslice"
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/bun
- bitesize = 2
- list_reagents = list("nutriment" = 1)
filling_color = "#CD853F"
@@ -84,8 +80,7 @@
desc = "A base for any self-respecting burger."
icon = 'icons/obj/food.dmi'
icon_state = "bun"
- bitesize = 2
- list_reagents = list("nutriment" = 4)
+ list_reagents = list("nutriment" = 1)
custom_food_type = /obj/item/weapon/reagent_containers/food/snacks/customizable/burger
filling_color = "#CD853F"
@@ -94,9 +89,8 @@
desc = "Cook it to get a cake."
icon = 'icons/obj/food_ingredients.dmi'
icon_state = "cakebatter"
- bitesize = 2
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/store/cake/plain
- list_reagents = list("nutriment" = 4)
+ list_reagents = list("nutriment" = 1)
w_class = 3
// Cake batter + rolling pin = pie dough
@@ -116,8 +110,25 @@
desc = "Cook it to get a pie."
icon = 'icons/obj/food_ingredients.dmi'
icon_state = "piedough"
- bitesize = 2
- slice_path = /obj/item/weapon/reagent_containers/food/snacks/doughslice
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/rawpastrybase
+ slices_num = 3
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/pie/plain
- list_reagents = list("nutriment" = 4)
+ list_reagents = list("nutriment" = 1)
w_class = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/rawpastrybase
+ name = "raw pastry base"
+ desc = "Must be cooked before use."
+ icon = 'icons/obj/food_ingredients.dmi'
+ icon_state = "rawpastrybase"
+ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/pastrybase
+ filling_color = "#CD853F"
+
+/obj/item/weapon/reagent_containers/food/snacks/pastrybase
+ name = "pastry base"
+ desc = "A base for any self-respecting pastry"
+ icon = 'icons/obj/food_ingredients.dmi'
+ icon_state = "pastrybase"
+ list_reagents = list("nutriment" = 1)
+ filling_color = "#CD853F"
+
diff --git a/code/modules/food&drinks/food/snacks/meat.dm b/code/modules/food&drinks/food/snacks/meat.dm
index 4f487914b03..f4edbd25d4e 100644
--- a/code/modules/food&drinks/food/snacks/meat.dm
+++ b/code/modules/food&drinks/food/snacks/meat.dm
@@ -5,19 +5,43 @@
dried_type = /obj/item/weapon/reagent_containers/food/snacks/sosjerky
bitesize = 3
list_reagents = list("nutriment" = 3)
- cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meatsteak
- slice_path = /obj/item/weapon/reagent_containers/food/snacks/rawcutlet
+ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/rawcutlet/plain
slices_num = 3
filling_color = "#FF0000"
-/obj/item/weapon/reagent_containers/food/snacks/meat/synthmeat
- name = "synthmeat"
- desc = "A synthetic slab of meat."
+/obj/item/weapon/reagent_containers/food/snacks/meat/initialize_slice(obj/item/weapon/reagent_containers/food/snacks/slice)
+ var/image/I = new(icon, "rawcutlet_coloration")
+ I.color = filling_color
+ slice.overlays += I
+ slice.filling_color = filling_color
+
+
+///////////////////////////////////// HUMAN MEATS //////////////////////////////////////////////////////
+
/obj/item/weapon/reagent_containers/food/snacks/meat/human
name = "-meat"
var/subjectname = ""
var/subjectjob = null
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/rawcutlet/plain/human
+
+/obj/item/weapon/reagent_containers/food/snacks/meat/human/initialize_slice(obj/item/weapon/reagent_containers/food/snacks/rawcutlet/plain/human/slice)
+ ..()
+ if(subjectname)
+ slice.subjectname = subjectname
+ slice.name = "[subjectname] [initial(slice.name)]"
+ else if(subjectjob)
+ slice.subjectjob = subjectjob
+ slice.name = "[subjectjob] [initial(slice.name)]"
+
+/obj/item/weapon/reagent_containers/food/snacks/meat/human/initialize_cooked_food(obj/item/weapon/reagent_containers/food/snacks/S)
+ ..()
+ if(subjectname)
+ S.name = "[subjectname] [initial(S.name)]"
+ else if(subjectjob)
+ S.name = "[subjectjob] [initial(S.name)]"
+
/obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/slime
icon_state = "slimemeat"
@@ -61,6 +85,7 @@
icon_state = "skeletonmeat"
desc = "There's a point where this needs to stop and clearly we have passed it"
filling_color = "#F0F0F0"
+ slice_path = null //can't slice a bone into cutlets
/obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/zombie
name = "-meat (rotten)"
@@ -68,13 +93,155 @@
desc = "Halfway to becoming fertilizer for your garden."
filling_color = "#6B8E23"
+
+
+
+
+
+////////////////////////////////////// OTHER MEATS ////////////////////////////////////////////////////////
+
+
+/obj/item/weapon/reagent_containers/food/snacks/meat/synthmeat
+ name = "synthmeat"
+ desc = "A synthetic slab of meat."
+
/obj/item/weapon/reagent_containers/food/snacks/meat/monkey
- //same as plain meat
+ name = "monkey meat"
/obj/item/weapon/reagent_containers/food/snacks/meat/corgi
- name = "Corgi meat"
+ name = "corgi meat"
desc = "Tastes like... well you know..."
/obj/item/weapon/reagent_containers/food/snacks/meat/pug
- name = "Pug meat"
- desc = "Tastes like... well you know..."
\ No newline at end of file
+ name = "pug meat"
+ desc = "Tastes like... well you know..."
+
+/obj/item/weapon/reagent_containers/food/snacks/meat/killertomato
+ name = "tomato slice"
+ desc = "A slice from a huge tomato."
+ icon_state = "tomatomeat"
+ list_reagents = list("nutriment" = 2)
+ filling_color = "#FF0000"
+ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meatsteak/killertomato
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/rawcutlet/killertomato
+
+/obj/item/weapon/reagent_containers/food/snacks/meat/bear
+ name = "bear meat"
+ desc = "A very manly slab of meat."
+ icon_state = "bearmeat"
+ list_reagents = list("nutriment" = 12, "morphine" = 5, "vitamin" = 2)
+ filling_color = "#FFB6C1"
+ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meatsteak/bear
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/rawcutlet/bear
+
+
+/obj/item/weapon/reagent_containers/food/snacks/meat/xeno
+ name = "xeno meat"
+ desc = "A slab of meat"
+ icon_state = "xenomeat"
+ list_reagents = list("nutriment" = 3, "vitamin" = 1)
+ bitesize = 4
+ filling_color = "#32CD32"
+ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meatsteak/xeno
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/rawcutlet/xeno
+
+/obj/item/weapon/reagent_containers/food/snacks/meat/spider
+ name = "spider meat"
+ desc = "A slab of spider meat."
+ icon_state = "spidermeat"
+ list_reagents = list("nutriment" = 3, "toxin" = 3, "vitamin" = 1)
+ filling_color = "#7CFC00"
+ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meatsteak/spider
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/rawcutlet/spider
+
+
+
+
+////////////////////////////////////// MEAT STEAKS ///////////////////////////////////////////////////////////
+
+
+/obj/item/weapon/reagent_containers/food/snacks/meatsteak
+ name = "meat steak"
+ desc = "A piece of hot spicy meat."
+ icon_state = "meatsteak"
+ list_reagents = list("nutriment" = 1, "vitamin" = 1)
+ filling_color = "#B22222"
+
+/obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain
+
+/obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain/human
+
+/obj/item/weapon/reagent_containers/food/snacks/meatsteak/killertomato
+ name = "killer tomato steak"
+
+/obj/item/weapon/reagent_containers/food/snacks/meatsteak/bear
+ name = "bear steak"
+
+/obj/item/weapon/reagent_containers/food/snacks/meatsteak/xeno
+ name = "xeno steak"
+
+/obj/item/weapon/reagent_containers/food/snacks/meatsteak/spider
+ name = "spider steak"
+
+
+
+//////////////////////////////// MEAT CUTLETS ///////////////////////////////////////////////////////
+
+
+/obj/item/weapon/reagent_containers/food/snacks/rawcutlet
+ name = "raw cutlet"
+ desc = "A raw meat cutlet."
+ icon_state = "rawcutlet"
+ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/cutlet/plain
+ bitesize = 2
+ filling_color = "#B22222"
+
+/obj/item/weapon/reagent_containers/food/snacks/rawcutlet/plain
+
+/obj/item/weapon/reagent_containers/food/snacks/rawcutlet/plain/human
+ var/subjectname = ""
+ var/subjectjob = null
+
+/obj/item/weapon/reagent_containers/food/snacks/rawcutlet/plain/human/initialize_cooked_food(obj/item/weapon/reagent_containers/food/snacks/S)
+ ..()
+ if(subjectname)
+ S.name = "[subjectname] [initial(S.name)]"
+ else if(subjectjob)
+ S.name = "[subjectjob] [initial(S.name)]"
+
+/obj/item/weapon/reagent_containers/food/snacks/rawcutlet/killertomato
+ name = "raw killer tomato cutlet"
+
+/obj/item/weapon/reagent_containers/food/snacks/rawcutlet/bear
+ name = "raw bear cutlet"
+
+/obj/item/weapon/reagent_containers/food/snacks/rawcutlet/xeno
+ name = "raw xeno cutlet"
+
+/obj/item/weapon/reagent_containers/food/snacks/rawcutlet/spider
+ name = "raw spider cutlet"
+
+
+/obj/item/weapon/reagent_containers/food/snacks/cutlet
+ name = "cutlet"
+ desc = "A cooked meat cutlet."
+ icon_state = "cutlet"
+ bitesize = 2
+ list_reagents = list("nutriment" = 1, "vitamin" = 1)
+ filling_color = "#B22222"
+
+/obj/item/weapon/reagent_containers/food/snacks/cutlet/plain
+
+/obj/item/weapon/reagent_containers/food/snacks/cutlet/plain/human
+
+/obj/item/weapon/reagent_containers/food/snacks/cutlet/killertomato
+ name = "killer tomato cutlet"
+
+/obj/item/weapon/reagent_containers/food/snacks/cutlet/bear
+ name = "bear cutlet"
+
+/obj/item/weapon/reagent_containers/food/snacks/cutlet/xeno
+ name = "xeno cutlet"
+
+/obj/item/weapon/reagent_containers/food/snacks/cutlet/spider
+ name = "spider cutlet"
diff --git a/code/modules/food&drinks/food/snacks_bread.dm b/code/modules/food&drinks/food/snacks_bread.dm
index 74a8223b6ca..27546f4c6f0 100644
--- a/code/modules/food&drinks/food/snacks_bread.dm
+++ b/code/modules/food&drinks/food/snacks_bread.dm
@@ -26,7 +26,7 @@
desc = "The culinary base of every self-respecting eloquen/tg/entleman."
icon_state = "meatbread"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/breadslice/meat
- list_reagents = list("nutriment" = 30, "vitamin" = 10)
+ list_reagents = list("nutriment" = 5, "vitamin" = 10)
/obj/item/weapon/reagent_containers/food/snacks/breadslice/meat
name = "meatbread slice"
@@ -38,7 +38,7 @@
desc = "The culinary base of every self-respecting eloquen/tg/entleman. Extra Heretical."
icon_state = "xenomeatbread"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/breadslice/xenomeat
- list_reagents = list("nutriment" = 30, "vitamin" = 10)
+ list_reagents = list("nutriment" = 5, "vitamin" = 10)
/obj/item/weapon/reagent_containers/food/snacks/breadslice/xenomeat
name = "xenomeatbread slice"
@@ -51,7 +51,7 @@
desc = "Reassuringly green meatloaf made from spider meat."
icon_state = "spidermeatbread"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/breadslice/spidermeat
- list_reagents = list("nutriment" = 30, "vitamin" = 10)
+ list_reagents = list("nutriment" = 5, "vitamin" = 10)
/obj/item/weapon/reagent_containers/food/snacks/breadslice/spidermeat
name = "spider meat bread slice"
@@ -64,7 +64,7 @@
desc = "A heavenly and filling treat."
icon_state = "bananabread"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/breadslice/banana
- list_reagents = list("nutriment" = 20, "banana" = 20)
+ list_reagents = list("nutriment" = 5, "banana" = 20)
/obj/item/weapon/reagent_containers/food/snacks/breadslice/banana
@@ -78,7 +78,7 @@
desc = "Like meatbread but for vegetarians. Not guaranteed to give superpowers."
icon_state = "tofubread"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/breadslice/tofu
- list_reagents = list("nutriment" = 30, "vitamin" = 10)
+ list_reagents = list("nutriment" = 5, "vitamin" = 10)
/obj/item/weapon/reagent_containers/food/snacks/breadslice/tofu
name = "tofubread slice"
@@ -91,7 +91,7 @@
desc = "Yum yum yum!"
icon_state = "creamcheesebread"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/breadslice/creamcheese
- list_reagents = list("nutriment" = 20, "vitamin" = 5)
+ list_reagents = list("nutriment" = 5, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/breadslice/creamcheese
name = "cream cheese bread slice"
@@ -108,6 +108,6 @@
name = "baguette"
desc = "Bon appetit!"
icon_state = "baguette"
- list_reagents = list("nutriment" = 6, "blackpepper" = 1, "sodiumchloride" = 1, "vitamin" = 1)
+ list_reagents = list("nutriment" = 2, "vitamin" = 2)
bitesize = 3
w_class = 3
\ No newline at end of file
diff --git a/code/modules/food&drinks/food/snacks_burgers.dm b/code/modules/food&drinks/food/snacks_burgers.dm
index e1a2e40d2eb..2d56e347f32 100644
--- a/code/modules/food&drinks/food/snacks_burgers.dm
+++ b/code/modules/food&drinks/food/snacks_burgers.dm
@@ -6,7 +6,7 @@
name = "burger"
desc = "The cornerstone of every nutritious breakfast."
icon_state = "hburger"
- list_reagents = list("nutriment" = 6, "vitamin" = 1)
+ list_reagents = list("nutriment" = 2, "vitamin" = 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/burger/human
@@ -24,7 +24,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"
- list_reagents = list("nutriment" = 6, "carpotoxin" = 3, "vitamin" = 5)
+ list_reagents = list("nutriment" = 2, "vitamin" = 3)
/obj/item/weapon/reagent_containers/food/snacks/burger/tofu
name = "tofu burger"
@@ -35,14 +35,14 @@
name = "roburger"
desc = "The lettuce is the only organic component. Beep."
icon_state = "roburger"
- list_reagents = list("nutriment" = 6, "nanomachines" = 2, "vitamin" = 5)
+ list_reagents = list("nutriment" = 2, "nanomachines" = 2, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/burger/roburgerbig
name = "roburger"
desc = "This massive patty looks like poison. Beep."
icon_state = "roburger"
volume = 120
- list_reagents = list("nutriment" = 20, "nanomachines" = 80, "vitamin" = 20)
+ list_reagents = list("nutriment" = 5, "nanomachines" = 70, "vitamin" = 10)
/obj/item/weapon/reagent_containers/food/snacks/burger/xeno
name = "xenoburger"
@@ -63,7 +63,7 @@
name = "brainburger"
desc = "A strange looking burger. It looks almost sentient."
icon_state = "brainburger"
- list_reagents = list("nutriment" = 6, "mannitol" = 6, "vitamin" = 5)
+ list_reagents = list("nutriment" = 1, "mannitol" = 6, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/burger/ghost
name = "ghost burger"
@@ -75,42 +75,42 @@
desc = "Perfect for hiding the fact it's burnt to a crisp."
icon_state = "cburger"
color = "#DA0000FF"
- list_reagents = list("nutriment" = 6, "redcrayonpowder" = 10, "vitamin" = 5)
+ list_reagents = list("redcrayonpowder" = 10, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/burger/orange
name = "orange burger"
desc = "Contains 0% juice."
icon_state = "cburger"
color = "#FF9300FF"
- list_reagents = list("nutriment" = 6, "orangecrayonpowder" = 10, "vitamin" = 5)
+ list_reagents = list("orangecrayonpowder" = 10, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/burger/yellow
name = "yellow burger"
desc = "Bright to the last bite."
icon_state = "cburger"
color = "#FFF200FF"
- list_reagents = list("nutriment" = 6, "yellowcrayonpowder" = 10, "vitamin" = 5)
+ list_reagents = list("yellowcrayonpowder" = 10, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/burger/green
name = "green burger"
desc = "It's not tainted meat, it's painted meat!"
icon_state = "cburger"
color = "#A8E61DFF"
- list_reagents = list("nutriment" = 6, "greencrayonpowder" = 10, "vitamin" = 5)
+ list_reagents = list("greencrayonpowder" = 10, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/burger/blue
name = "blue burger"
desc = "Is this blue rare?"
icon_state = "cburger"
color = "#00B7EFFF"
- list_reagents = list("nutriment" = 6, "bluecrayonpowder" = 10, "vitamin" = 5)
+ list_reagents = list("bluecrayonpowder" = 10, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/burger/purple
name = "purple burger"
desc = "Regal and low class at the same time."
icon_state = "cburger"
color = "#DA00FFFF"
- list_reagents = list("nutriment" = 6, "purplecrayonpowder" = 10, "vitamin" = 5)
+ list_reagents = list("purplecrayonpowder" = 10, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/burger/spell
name = "spell burger"
@@ -121,7 +121,7 @@
name = "big bite burger"
desc = "Forget the Big Mac. THIS is the future!"
icon_state = "bigbiteburger"
- list_reagents = list("nutriment" = 14, "vitamin" = 5)
+ list_reagents = list("vitamin" = 6)
w_class = 3
/obj/item/weapon/reagent_containers/food/snacks/burger/jelly
@@ -130,14 +130,14 @@
icon_state = "jellyburger"
/obj/item/weapon/reagent_containers/food/snacks/burger/jelly/slime
- list_reagents = list("nutriment" = 6, "slimejelly" = 5, "vitamin" = 5)
+ list_reagents = list("slimejelly" = 5, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/burger/jelly/cherry
- list_reagents = list("nutriment" = 6, "cherryjelly" = 5, "vitamin" = 5)
+ list_reagents = list("cherryjelly" = 5, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/burger/superbite
name = "super bite burger"
desc = "This is a mountain of a burger. FOOD!"
icon_state = "superbiteburger"
- list_reagents = list("nutriment" = 46, "vitamin" = 5)
+ list_reagents = list("vitamin" = 10)
w_class = 3
diff --git a/code/modules/food&drinks/food/snacks_cake.dm b/code/modules/food&drinks/food/snacks_cake.dm
index c3319e2aa71..1434a757545 100644
--- a/code/modules/food&drinks/food/snacks_cake.dm
+++ b/code/modules/food&drinks/food/snacks_cake.dm
@@ -13,7 +13,7 @@
desc = "A plain cake, not a lie."
icon_state = "plaincake"
custom_food_type = /obj/item/weapon/reagent_containers/food/snacks/customizable/cake
- list_reagents = list("nutriment" = 10, "vitamin" = 5)
+ list_reagents = list("nutriment" = 5, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/plain
name = "vanilla cake slice"
@@ -27,7 +27,7 @@
icon_state = "carrotcake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/cakeslice/carrot
slices_num = 5
- list_reagents = list("nutriment" = 20, "oculine" = 10, "vitamin" = 10)
+ list_reagents = list("oculine" = 10, "vitamin" = 10)
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/carrot
name = "carrot cake slice"
@@ -42,7 +42,7 @@
icon_state = "braincake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/cakeslice/brain
slices_num = 5
- list_reagents = list("nutriment" = 20, "mannitol" = 10, "vitamin" = 10)
+ list_reagents = list("mannitol" = 10, "vitamin" = 10)
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/brain
@@ -57,7 +57,7 @@
icon_state = "cheesecake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/cakeslice/cheese
slices_num = 5
- list_reagents = list("nutriment" = 20, "vitamin" = 10)
+ list_reagents = list("vitamin" = 10)
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/cheese
@@ -73,7 +73,7 @@
icon_state = "orangecake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/cakeslice/orange
slices_num = 5
- list_reagents = list("nutriment" = 20, "vitamin" = 10)
+ list_reagents = list("vitamin" = 10)
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/orange
name = "orange cake slice"
@@ -87,7 +87,7 @@
icon_state = "limecake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/cakeslice/lime
slices_num = 5
- list_reagents = list("nutriment" = 20, "vitamin" = 10)
+ list_reagents = list("vitamin" = 10)
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/lime
name = "lime cake slice"
@@ -102,7 +102,7 @@
icon_state = "lemoncake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/cakeslice/lemon
slices_num = 5
- list_reagents = list("nutriment" = 20, "vitamin" = 10)
+ list_reagents = list("vitamin" = 10)
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/lemon
@@ -118,7 +118,7 @@
icon_state = "chocolatecake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/cakeslice/chocolate
slices_num = 5
- list_reagents = list("nutriment" = 20, "vitamin" = 10)
+ list_reagents = list("vitamin" = 10)
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/chocolate
@@ -134,7 +134,7 @@
icon_state = "birthdaycake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/cakeslice/birthday
slices_num = 5
- list_reagents = list("nutriment" = 20, "sprinkles" = 10, "vitamin" = 10)
+ list_reagents = list("sprinkles" = 10, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/birthday
name = "birthday cake slice"
@@ -149,7 +149,7 @@
icon_state = "applecake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/cakeslice/apple
slices_num = 5
- list_reagents = list("nutriment" = 20, "vitamin" = 10)
+ list_reagents = list("vitamin" = 10)
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/apple
name = "apple cake slice"
diff --git a/code/modules/food&drinks/food/snacks_egg.dm b/code/modules/food&drinks/food/snacks_egg.dm
index 5b3f1ec649f..1242f615521 100644
--- a/code/modules/food&drinks/food/snacks_egg.dm
+++ b/code/modules/food&drinks/food/snacks_egg.dm
@@ -5,14 +5,14 @@
name = "chocolate egg"
desc = "Such, sweet, fattening food."
icon_state = "chocolateegg"
- list_reagents = list("nutriment" = 4, "sugar" = 2, "vitamin" = 2)
+ list_reagents = list("nutriment" = 1, "vitamin" = 1)
filling_color = "#A0522D"
/obj/item/weapon/reagent_containers/food/snacks/egg
name = "egg"
desc = "An egg!"
icon_state = "egg"
- list_reagents = list("nutriment" = 1, "vitamin" = 1)
+ list_reagents = list("nutriment" = 1)
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/boiledegg
filling_color = "#F0E68C"
@@ -73,7 +73,7 @@
name = "fried egg"
desc = "A fried egg, with a touch of salt and pepper."
icon_state = "friedegg"
- list_reagents = list("nutriment" = 2, "sodiumchloride" = 1, "blackpepper" = 1, "vitamin" = 1)
+ list_reagents = list("nutriment" = 1, "vitamin" = 1)
bitesize = 1
filling_color = "#FFFFF0"
@@ -81,7 +81,7 @@
name = "boiled egg"
desc = "A hard boiled egg."
icon_state = "egg"
- list_reagents = list("nutriment" = 2, "vitamin" = 2)
+ list_reagents = list("nutriment" = 1, "vitamin" = 1)
filling_color = "#FFFFF0"
/obj/item/weapon/reagent_containers/food/snacks/omelette //FUCK THIS
@@ -89,7 +89,7 @@
desc = "That's all you can say!"
icon_state = "omelette"
trash = /obj/item/trash/plate
- list_reagents = list("nutriment" = 7, "vitamin" = 2)
+ list_reagents = list("nutriment" = 1, "vitamin" = 2)
bitesize = 1
w_class = 3
@@ -113,6 +113,6 @@
name = "eggs benedict"
desc = "There is only one egg on this, how rude."
icon_state = "benedict"
- list_reagents = list("nutriment" = 6, "vitamin" = 4)
+ list_reagents = list("vitamin" = 4)
trash = /obj/item/trash/plate
w_class = 3
\ No newline at end of file
diff --git a/code/modules/food&drinks/food/snacks_meat.dm b/code/modules/food&drinks/food/snacks_meat.dm
index 8f811965746..1ea51580a43 100644
--- a/code/modules/food&drinks/food/snacks_meat.dm
+++ b/code/modules/food&drinks/food/snacks_meat.dm
@@ -8,7 +8,7 @@
desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!"
icon_state = "cubancarp"
trash = /obj/item/trash/plate
- list_reagents = list("nutriment" = 6, "vitamin" = 3)
+ list_reagents = list("nutriment" = 1, "vitamin" = 4)
bitesize = 3
filling_color = "#CD853F"
@@ -32,7 +32,7 @@
name = "fish fingers"
desc = "A finger of fish."
icon_state = "fishfingers"
- list_reagents = list("nutriment" = 4)
+ list_reagents = list("nutriment" = 1, "vitamin" = 2)
bitesize = 1
filling_color = "#CD853F"
@@ -40,7 +40,7 @@
name = "fish and chips"
desc = "I do say so myself chap."
icon_state = "fishandchips"
- list_reagents = list("nutriment" = 6)
+ list_reagents = list("nutriment" = 1, "vitamin" = 2)
filling_color = "#FA8072"
////////////////////////////////////////////MEATS AND ALIKE////////////////////////////////////////////
@@ -52,34 +52,6 @@
list_reagents = list("nutriment" = 2)
filling_color = "#F0E68C"
-/obj/item/weapon/reagent_containers/food/snacks/tomatomeat
- name = "tomato slice"
- desc = "A slice from a huge tomato."
- icon_state = "tomatomeat"
- list_reagents = list("nutriment" = 2)
- filling_color = "#FF0000"
-
-/obj/item/weapon/reagent_containers/food/snacks/bearmeat
- name = "bear meat"
- desc = "A very manly slab of meat."
- icon_state = "bearmeat"
- list_reagents = list("nutriment" = 12, "morphine" = 5, "vitamin" = 2)
-
-/obj/item/weapon/reagent_containers/food/snacks/xenomeat
- name = "meat"
- desc = "A slab of meat"
- icon_state = "xenomeat"
- list_reagents = list("nutriment" = 3, "vitamin" = 1)
- bitesize = 4
- filling_color = "#32CD32"
-
-/obj/item/weapon/reagent_containers/food/snacks/spidermeat
- name = "spider meat"
- desc = "A slab of spider meat."
- icon_state = "spidermeat"
- list_reagents = list("nutriment" = 3, "toxin" = 3, "vitamin" = 1)
- filling_color = "#7CFC00"
-
/obj/item/weapon/reagent_containers/food/snacks/spiderleg
name = "spider leg"
desc = "A still twitching leg of a giant spider... you don't really want to eat this, do you?"
@@ -93,20 +65,19 @@
desc = "Now you can feel like a real tourist vacationing in Ireland."
icon_state = "cornedbeef"
trash = /obj/item/trash/plate
- list_reagents = list("nutriment" = 6)
+ list_reagents = list("nutriment" = 1, "vitamin" = 4)
/obj/item/weapon/reagent_containers/food/snacks/faggot
name = "faggot"
desc = "A great meal all round. Not a cord of wood."
icon_state = "faggot"
- list_reagents = list("nutriment" = 1, "vitamin" = 1)
+ list_reagents = list("nutriment" = 3, "vitamin" = 1)
filling_color = "#800000"
/obj/item/weapon/reagent_containers/food/snacks/sausage
name = "sausage"
desc = "A piece of mixed, long meat."
icon_state = "sausage"
- list_reagents = list("nutriment" = 5, "vitamin" = 1)
filling_color = "#CD5C5C"
/obj/item/weapon/reagent_containers/food/snacks/sausage/New()
@@ -118,7 +89,7 @@
desc = "A savory dish of alien wing wang in soy."
icon_state = "wingfangchu"
trash = /obj/item/weapon/reagent_containers/glass/bowl
- list_reagents = list("nutriment" = 6, "vitamin" = 2)
+ list_reagents = list("nutriment" = 1, "vitamin" = 2)
/obj/item/weapon/reagent_containers/food/snacks/kebab
trash = /obj/item/stack/rods
@@ -128,24 +99,17 @@
/obj/item/weapon/reagent_containers/food/snacks/kebab/human
name = "human-kebab"
desc = "A human meat, on a stick."
- list_reagents = list("nutriment" = 10, "vitamin" = 6)
+ list_reagents = list("nutriment" = 1, "vitamin" = 6)
/obj/item/weapon/reagent_containers/food/snacks/kebab/monkey
name = "meat-kebab"
desc = "Delicious meat, on a stick."
- list_reagents = list("nutriment" = 8, "vitamin" = 2)
+ list_reagents = list("nutriment" = 1, "vitamin" = 2)
/obj/item/weapon/reagent_containers/food/snacks/kebab/tofu
name = "tofu-kebab"
desc = "Vegan meat, on a stick."
- list_reagents = list("nutriment" = 8)
-
-/obj/item/weapon/reagent_containers/food/snacks/meatsteak
- name = "meat steak"
- desc = "A piece of hot spicy meat."
- icon_state = "meatsteak"
- list_reagents = list("nutriment" = 8, "sodiumchloride" = 1, "blackpepper" = 1, "vitamin" = 1)
- filling_color = "#B22222"
+ list_reagents = list("nutriment" = 1)
/obj/item/weapon/reagent_containers/food/snacks/monkeycube
name = "monkey cube"
@@ -153,7 +117,7 @@
icon_state = "monkeycube"
bitesize = 12
wrapped = 0
- list_reagents = list("nutriment" = 5)
+ list_reagents = list("nutriment" = 2)
filling_color = "#CD853F"
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/afterattack(obj/O, mob/user,proximity)
@@ -189,7 +153,7 @@
name = "enchiladas"
desc = "Viva La Mexico!"
icon_state = "enchiladas"
- list_reagents = list("nutriment" = 8, "capsaicin" = 6)
+ list_reagents = list("nutriment" = 1, "vitamin" = 2)
bitesize = 4
filling_color = "#FFA07A"
@@ -198,7 +162,7 @@
desc = "Even non-vegetarians will LOVE this!"
icon_state = "stewedsoymeat"
trash = /obj/item/trash/plate
- list_reagents = list("nutriment" = 8)
+ list_reagents = list("nutriment" = 1)
filling_color = "#D2691E"
/obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat/New()
@@ -210,7 +174,7 @@
desc = "A giant spider's leg that's still twitching after being cooked. Gross!"
icon_state = "spiderlegcooked"
trash = /obj/item/trash/plate
- list_reagents = list("nutriment" = 2, "capsaicin" = 2)
+ list_reagents = list("nutriment" = 1, "capsaicin" = 2, "vitamin" = 2)
filling_color = "#000000"
/obj/item/weapon/reagent_containers/food/snacks/spidereggsham
@@ -218,7 +182,7 @@
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
- list_reagents = list("nutriment" = 6, "sodiumchloride" = 1, "toxin" = 3)
+ list_reagents = list("nutriment" = 1, "vitamin" = 3)
bitesize = 4
filling_color = "#7FFF00"
@@ -226,24 +190,5 @@
name = "carp sashimi"
desc = "Celebrate surviving attack from hostile alien lifeforms by hospitalising yourself."
icon_state = "sashimi"
- list_reagents = list("nutriment" = 6, "capsaicin" = 4)
+ list_reagents = list("nutriment" = 1, "capsaicin" = 4, "vitamin" = 4)
filling_color = "#FA8072"
-
-/obj/item/weapon/reagent_containers/food/snacks/rawcutlet
- name = "raw cutlet"
- desc = "A raw meat cutlet."
- icon = 'icons/obj/food_ingredients.dmi'
- icon_state = "rawcutlet"
- cooked_type = /obj/item/weapon/reagent_containers/food/snacks/cutlet
- bitesize = 2
- list_reagents = list("nutriment" = 2)
- filling_color = "#B22222"
-
-/obj/item/weapon/reagent_containers/food/snacks/cutlet
- name = "cutlet"
- desc = "A cooked meat cutlet."
- icon = 'icons/obj/food_ingredients.dmi'
- icon_state = "cutlet"
- bitesize = 2
- list_reagents = list("nutriment" = 4, "vitamin" = 1)
- filling_color = "#B22222"
diff --git a/code/modules/food&drinks/food/snacks_other.dm b/code/modules/food&drinks/food/snacks_other.dm
index af27d1e4990..5abc827d954 100644
--- a/code/modules/food&drinks/food/snacks_other.dm
+++ b/code/modules/food&drinks/food/snacks_other.dm
@@ -34,7 +34,7 @@
desc = "Such, sweet, fattening food."
icon_state = "chocolatebarunwrapped"
wrapped = 0
- list_reagents = list("nutriment" = 4, "sugar" = 2, "cocoa" = 2, "vitamin" = 1)
+ list_reagents = list("nutriment" = 2, "sugar" = 2, "cocoa" = 2)
filling_color = "#A0522D"
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/attack_self(mob/user)
@@ -78,7 +78,7 @@
name = "loaded baked potato"
desc = "Totally baked."
icon_state = "loadedbakedpotato"
- list_reagents = list("nutriment" = 6)
+ list_reagents = list("nutriment" = 1, "vitamin" = 2)
filling_color = "#D2B48C"
/obj/item/weapon/reagent_containers/food/snacks/fries
@@ -102,7 +102,7 @@
desc = "Fries. Covered in cheese. Duh."
icon_state = "cheesyfries"
trash = /obj/item/trash/plate
- list_reagents = list("nutriment" = 6)
+ list_reagents = list("nutriment" = 1, "vitamin" = 2)
filling_color = "#FFD700"
/obj/item/weapon/reagent_containers/food/snacks/badrecipe
@@ -125,7 +125,7 @@
desc = "An apple coated in sugary sweetness."
icon_state = "candiedapple"
bitesize = 3
- list_reagents = list("nutriment" = 3, "sugar" = 3)
+ list_reagents = list("nutriment" = 2, "sugar" = 3)
filling_color = "#FF4500"
/obj/item/weapon/reagent_containers/food/snacks/mint
@@ -141,14 +141,14 @@
name = "egg wrap"
desc = "The precursor to Pigs in a Blanket."
icon_state = "wrap"
- list_reagents = list("nutriment" = 5)
+ list_reagents = list("nutriment" = 1, "vitamin" = 3)
filling_color = "#F0E68C"
/obj/item/weapon/reagent_containers/food/snacks/beans
name = "tin of beans"
desc = "Musical fruit in a slightly less musical container."
icon_state = "beans"
- list_reagents = list("nutriment" = 10)
+ list_reagents = list("nutriment" = 1, "vitamin" = 1)
filling_color = "#B22222"
/obj/item/weapon/reagent_containers/food/snacks/spidereggs
@@ -162,14 +162,14 @@
name = "chocolate coin"
desc = "A completely edible but nonflippable festive coin."
icon_state = "chococoin"
- list_reagents = list("nutriment" = 2, "sugar" = 2, "cocoa" = 2)
+ list_reagents = list("nutriment" = 1, "sugar" = 1)
filling_color = "#A0522D"
/obj/item/weapon/reagent_containers/food/snacks/chocoorange
name = "chocolate orange"
desc = "A festive chocolate orange"
icon_state = "chocoorange"
- list_reagents = list("nutriment" = 4, "sugar" = 2, "cocoa" = 2)
+ list_reagents = list("nutriment" = 1, "sugar" = 1)
filling_color = "#A0522D"
/obj/item/weapon/reagent_containers/food/snacks/eggplantparm
@@ -177,5 +177,5 @@
desc = "The only good recipe for eggplant."
icon_state = "eggplantparm"
trash = /obj/item/trash/plate
- list_reagents = list("nutriment" = 6, "vitamin" = 3)
+ list_reagents = list("nutriment" = 1, "vitamin" = 3)
filling_color = "#BA55D3"
\ No newline at end of file
diff --git a/code/modules/food&drinks/food/snacks_pastry.dm b/code/modules/food&drinks/food/snacks_pastry.dm
index 889ea192469..20171e5e471 100644
--- a/code/modules/food&drinks/food/snacks_pastry.dm
+++ b/code/modules/food&drinks/food/snacks_pastry.dm
@@ -7,7 +7,7 @@
desc = "Goes great with Robust Coffee."
icon_state = "donut1"
bitesize = 5
- list_reagents = list("nutriment" = 3, "sugar" = 1)
+ list_reagents = list("sugar" = 1)
var/extra_reagent = null
/obj/item/weapon/reagent_containers/food/snacks/donut/New()
@@ -35,7 +35,7 @@
name = "jelly donut"
desc = "You jelly?"
icon_state = "jdonut1"
- list_reagents = list("nutriment" = 3, "sugar" = 1)
+ list_reagents = list("sugar" = 1, "vitamin" = 1)
extra_reagent = "berryjuice"
/obj/item/weapon/reagent_containers/food/snacks/donut/jelly/New()
@@ -64,7 +64,7 @@
name = "muffin"
desc = "A delicious and spongy little cake."
icon_state = "muffin"
- list_reagents = list("nutriment" = 6)
+ list_reagents = list("vitamin" = 1)
/obj/item/weapon/reagent_containers/food/snacks/muffin/berry
name = "berry muffin"
@@ -82,7 +82,7 @@
desc = "A legendary egg custard that makes friends out of enemies. Probably too hot for a cat to eat."
icon_state = "chawanmushi"
trash = /obj/item/weapon/reagent_containers/glass/bowl
- list_reagents = list("nutriment" = 6)
+ list_reagents = list("vitamin" = 1)
////////////////////////////////////////////WAFFLES////////////////////////////////////////////
@@ -91,7 +91,7 @@
desc = "Mmm, waffles."
icon_state = "waffles"
trash = /obj/item/trash/waffles
- list_reagents = list("nutriment" = 7, "vitamin" = 1)
+ list_reagents = list("vitamin" = 1)
filling_color = "#D2691E"
/obj/item/weapon/reagent_containers/food/snacks/soylentgreen
@@ -99,7 +99,7 @@
desc = "Not made of people. Honest." //Totally people.
icon_state = "soylent_green"
trash = /obj/item/trash/waffles
- list_reagents = list("nutriment" = 9, "vitamin" = 1)
+ list_reagents = list("vitamin" = 1)
filling_color = "#9ACD32"
/obj/item/weapon/reagent_containers/food/snacks/soylenviridians
@@ -107,7 +107,7 @@
desc = "Not made of people. Honest." //Actually honest for once.
icon_state = "soylent_yellow"
trash = /obj/item/trash/waffles
- list_reagents = list("nutriment" = 9, "vitamin" = 1)
+ list_reagents = list("vitamin" = 1)
filling_color = "#9ACD32"
/obj/item/weapon/reagent_containers/food/snacks/rofflewaffles
@@ -116,7 +116,7 @@
icon_state = "rofflewaffles"
trash = /obj/item/trash/waffles
bitesize = 4
- list_reagents = list("nutriment" = 8, "mushroomhallucinogen" = 8, "vitamin" = 2)
+ list_reagents = list("vitamin" = 2)
filling_color = "#00BFFF"
////////////////////////////////////////////OTHER////////////////////////////////////////////
@@ -126,7 +126,7 @@
desc = "COOKIE!!!"
icon_state = "COOKIE!!!"
bitesize = 1
- list_reagents = list("nutriment" = 5)
+ list_reagents = list("nutriment" = 1)
filling_color = "#F0E68C"
/obj/item/weapon/reagent_containers/food/snacks/donkpocket
@@ -140,27 +140,27 @@
/obj/item/weapon/reagent_containers/food/snacks/donkpocket/warm
name = "\improper Warm Donk-pocket"
desc = "The heated food of choice for the seasoned traitor."
- list_reagents = list("nutriment" = 4, "omnizine" = 4)
+ list_reagents = list("omnizine" = 4)
/obj/item/weapon/reagent_containers/food/snacks/fortunecookie
name = "fortune cookie"
desc = "A true prophecy in each cookie!"
icon_state = "fortune_cookie"
- list_reagents = list("nutriment" = 3)
+ list_reagents = list("nutriment" = 2)
filling_color = "#F4A460"
/obj/item/weapon/reagent_containers/food/snacks/poppypretzel
name = "poppy pretzel"
desc = "It's all twisted up!"
icon_state = "poppypretzel"
- list_reagents = list("nutriment" = 5)
+ list_reagents = list("nutriment" = 1, "vitamin" = 2)
filling_color = "#F0E68C"
/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit
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"
- list_reagents = list("nutriment" = 5, "vitamin" = 1)
+ list_reagents = list("nutriment" = 1, "vitamin" = 1)
filling_color = "#F0E68C"
/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit/New()
@@ -183,26 +183,26 @@
desc = "Fresh footlong ready to go down on."
icon_state = "hotdog"
bitesize = 3
- list_reagents = list("nutriment" = 6, "ketchup" = 3, "vitamin" = 3)
+ list_reagents = list("nutriment" = 1, "vitamin" = 3)
filling_color = "#8B0000"
/obj/item/weapon/reagent_containers/food/snacks/meatbun
name = "meat bun"
desc = "Has the potential to not be Dog."
icon_state = "meatbun"
- list_reagents = list("nutriment" = 4, "vitamin" = 2)
+ list_reagents = list("nutriment" = 1, "vitamin" = 2)
filling_color = "#8B0000"
/obj/item/weapon/reagent_containers/food/snacks/sugarcookie
name = "sugar cookie"
desc = "Just like your little sister used to make."
icon_state = "sugarcookie"
- list_reagents = list("nutriment" = 3, "sugar" = 3)
+ list_reagents = list("nutriment" = 1, "sugar" = 3)
filling_color = "#CD853F"
/obj/item/weapon/reagent_containers/food/snacks/chococornet
name = "chocolate cornet"
desc = "Which side's the head, the fat end or the thin end?"
icon_state = "chococornet"
- list_reagents = list("nutriment" = 6, "sodiumchloride" = 1, "vitamin" = 1)
+ list_reagents = list("nutriment" = 1, "vitamin" = 1)
filling_color = "#FFE4C4"
diff --git a/code/modules/food&drinks/food/snacks_pie.dm b/code/modules/food&drinks/food/snacks_pie.dm
index 74255b13950..6bdbc6e0cda 100644
--- a/code/modules/food&drinks/food/snacks_pie.dm
+++ b/code/modules/food&drinks/food/snacks_pie.dm
@@ -9,14 +9,14 @@
desc = "A simple pie, still delicious."
icon_state = "pie"
custom_food_type = /obj/item/weapon/reagent_containers/food/snacks/customizable/pie
- list_reagents = list("nutriment" = 4, "vitamin" = 2)
+ list_reagents = list("nutriment" = 1, "vitamin" = 1)
/obj/item/weapon/reagent_containers/food/snacks/pie/cream
name = "banana cream pie"
desc = "Just like back home, on clown planet! HONK!"
icon_state = "pie"
trash = /obj/item/trash/plate
- list_reagents = list("nutriment" = 4, "banana" = 5, "vitamin" = 5)
+ list_reagents = list("nutriment" = 2, "vitamin" = 2)
/obj/item/weapon/reagent_containers/food/snacks/pie/cream/throw_impact(atom/hit_atom)
..()
@@ -29,21 +29,21 @@
name = "berry clafoutis"
desc = "No black birds, this is a good sign."
icon_state = "berryclafoutis"
- list_reagents = list("nutriment" = 4, "berryjuice" = 5, "vitamin" = 2)
+ list_reagents = list("nutriment" = 1, "vitamin" = 2)
/obj/item/weapon/reagent_containers/food/snacks/pie/meatpie
name = "meat-pie"
icon_state = "meatpie"
desc = "An old barber recipe, very delicious!"
- list_reagents = list("nutriment" = 10, "vitamin" = 5)
+ list_reagents = list("nutriment" = 1, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/pie/tofupie
name = "tofu-pie"
icon_state = "meatpie"
desc = "A delicious tofu pie."
- list_reagents = list("nutriment" = 10, "vitamin" = 2)
+ list_reagents = list("nutriment" = 1, "vitamin" = 2)
@@ -52,14 +52,14 @@
desc = "Sweet and tasty poison pie."
icon_state = "amanita_pie"
bitesize = 4
- list_reagents = list("nutriment" = 5, "amatoxin" = 3, "mushroomhallucinogen" = 1, "vitamin" = 4)
+ list_reagents = list("nutriment" = 1, "vitamin" = 4)
/obj/item/weapon/reagent_containers/food/snacks/pie/plump_pie
name = "plump pie"
desc = "I bet you love stuff made out of plump helmets!"
icon_state = "plump_pie"
- list_reagents = list("nutriment" = 8, "vitamin" = 4)
+ list_reagents = list("nutriment" = 1, "vitamin" = 4)
/obj/item/weapon/reagent_containers/food/snacks/pie/plump_pie/New()
..()
@@ -74,7 +74,7 @@
icon_state = "xenomeatpie"
desc = "A delicious meatpie. Probably heretical."
trash = /obj/item/trash/plate
- list_reagents = list("nutriment" = 10, "vitamin" = 5)
+ list_reagents = list("nutriment" = 1, "vitamin" = 5)
@@ -82,7 +82,7 @@
name = "apple pie"
desc = "A pie containing sweet sweet love...or apple."
icon_state = "applepie"
- list_reagents = list("nutriment" = 4, "vitamin" = 3)
+ list_reagents = list("nutriment" = 1, "vitamin" = 3)
@@ -90,7 +90,7 @@
name = "cherry pie"
desc = "Taste so good, make a grown man cry."
icon_state = "cherrypie"
- list_reagents = list("nutriment" = 4, "vitamin" = 2)
+ list_reagents = list("nutriment" = 1, "vitamin" = 2)
/obj/item/weapon/reagent_containers/food/snacks/pumpkinpie
@@ -99,7 +99,7 @@
icon_state = "pumpkinpie"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice
slices_num = 5
- list_reagents = list("nutriment" = 15, "vitamin" = 5)
+ list_reagents = list("nutriment" = 1, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice
name = "pumpkin pie slice"
@@ -111,4 +111,4 @@
name = "golden apple streusel tart"
desc = "A tasty dessert that won't make it through a metal detector."
icon_state = "gappletart"
- list_reagents = list("nutriment" = 8, "gold" = 5, "vitamin" = 4)
\ No newline at end of file
+ list_reagents = list("nutriment" = 1, "vitamin" = 4)
\ No newline at end of file
diff --git a/code/modules/food&drinks/food/snacks_pizza.dm b/code/modules/food&drinks/food/snacks_pizza.dm
index 7a8bad74614..c5afdb0edd5 100644
--- a/code/modules/food&drinks/food/snacks_pizza.dm
+++ b/code/modules/food&drinks/food/snacks_pizza.dm
@@ -11,7 +11,7 @@
icon_state = "pizzamargherita"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/margherita
slices_num = 6
- list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5)
+ list_reagents = list("vitamin" = 5)
@@ -27,7 +27,7 @@
icon_state = "meatpizza"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/meatpizza
slices_num = 6
- list_reagents = list("nutriment" = 40, "tomatojuice" = 6, "vitamin" = 8)
+ list_reagents = list("vitamin" = 8)
/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/meatpizza
name = "meatpizza slice"
@@ -41,7 +41,7 @@
icon_state = "mushroompizza"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/mushroompizza
slices_num = 6
- list_reagents = list("nutriment" = 30, "vitamin" = 5)
+ list_reagents = list("vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/mushroompizza
name = "mushroom pizza slice"
@@ -55,7 +55,7 @@
icon_state = "vegetablepizza"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/vegetablepizza
slices_num = 6
- list_reagents = list("nutriment" = 25, "tomatojuice" = 6, "oculine" = 12, "vitamin" = 5)
+ list_reagents = list("vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/vegetablepizza
name = "vegetable pizza slice"
@@ -226,20 +226,28 @@
/obj/item/pizzabox/margherita/New()
pizza = new /obj/item/weapon/reagent_containers/food/snacks/pizza/margherita(src)
+ pizza.reagents.add_reagent("nutrient", 30)
+ pizza.reagents.add_reagent("tomatojuice", 6)
boxtag = "Margherita Deluxe"
update_icon()
/obj/item/pizzabox/vegetable/New()
pizza = new /obj/item/weapon/reagent_containers/food/snacks/pizza/vegetablepizza(src)
+ pizza.reagents.add_reagent("nutrient", 25)
+ pizza.reagents.add_reagent("tomatojuice", 6)
+ pizza.reagents.add_reagent("oculine", 12)
boxtag = "Gourmet Vegatable"
update_icon()
/obj/item/pizzabox/mushroom/New()
pizza = new /obj/item/weapon/reagent_containers/food/snacks/pizza/mushroompizza(src)
+ pizza.reagents.add_reagent("nutrient", 30)
boxtag = "Mushroom Special"
update_icon()
/obj/item/pizzabox/meat/New()
pizza = new /obj/item/weapon/reagent_containers/food/snacks/pizza/meatpizza(src)
+ pizza.reagents.add_reagent("nutrient", 30)
+ pizza.reagents.add_reagent("tomatojuice", 6)
boxtag = "Meatlover's Supreme"
update_icon()
\ No newline at end of file
diff --git a/code/modules/food&drinks/food/snacks_salad.dm b/code/modules/food&drinks/food/snacks_salad.dm
index a2753415eab..a39f11820cb 100644
--- a/code/modules/food&drinks/food/snacks_salad.dm
+++ b/code/modules/food&drinks/food/snacks_salad.dm
@@ -13,16 +13,16 @@
name = "\improper Aesir salad"
desc = "Probably too incredible for mortal men to fully enjoy."
icon_state = "aesirsalad"
- list_reagents = list("nutriment" = 8, "tomatojuice" = 8, "vitamin" = 6)
+ list_reagents = list("omnizine" = 8, "vitamin" = 6)
/obj/item/weapon/reagent_containers/food/snacks/salad/herbsalad
name = "herb salad"
desc = "A tasty salad with apples on top."
icon_state = "herbsalad"
- list_reagents = list("nutriment" = 8, "vitamin" = 4)
+ list_reagents = list("vitamin" = 4)
/obj/item/weapon/reagent_containers/food/snacks/salad/validsalad
name = "valid salad"
desc = "It's just an herb salad with meatballs and fried potato slices. Nothing suspicious about it."
icon_state = "validsalad"
- list_reagents = list("nutriment" = 8, "doctorsdelight" = 5, "vitamin" = 4)
+ list_reagents = list("doctorsdelight" = 5, "vitamin" = 4)
diff --git a/code/modules/food&drinks/food/snacks_sandwichtoast.dm b/code/modules/food&drinks/food/snacks_sandwichtoast.dm
index 4c2a84c28e6..c4c3d246324 100644
--- a/code/modules/food&drinks/food/snacks_sandwichtoast.dm
+++ b/code/modules/food&drinks/food/snacks_sandwichtoast.dm
@@ -4,7 +4,7 @@
desc = "A grand creation of meat, cheese, bread, and several leaves of lettuce! Arthur Dent would be proud."
icon_state = "sandwich"
trash = /obj/item/trash/plate
- list_reagents = list("nutriment" = 6, "vitamin" = 1)
+ list_reagents = list("nutriment" = 1, "vitamin" = 1)
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/toastedsandwich
/obj/item/weapon/reagent_containers/food/snacks/toastedsandwich
@@ -12,14 +12,14 @@
desc = "Now if you only had a pepper bar."
icon_state = "toastedsandwich"
trash = /obj/item/trash/plate
- list_reagents = list("nutriment" = 6, "carbon" = 2)
+ list_reagents = list("nutriment" = 1, "carbon" = 2)
/obj/item/weapon/reagent_containers/food/snacks/grilledcheese
name = "grilled cheese sandwich"
desc = "Goes great with Tomato soup!"
icon_state = "toastedsandwich"
trash = /obj/item/trash/plate
- list_reagents = list("nutriment" = 7, "vitamin" = 1)
+ list_reagents = list("nutriment" = 1, "vitamin" = 1)
/obj/item/weapon/reagent_containers/food/snacks/jellysandwich
name = "jelly sandwich"
@@ -29,22 +29,23 @@
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/slime
- list_reagents = list("nutriment" = 2, "slimejelly" = 5, "vitamin" = 2)
+ list_reagents = list("slimejelly" = 5, "vitamin" = 2)
+
/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry
- list_reagents = list("nutriment" = 2, "cherryjelly" = 5, "vitamin" = 2)
+ list_reagents = list("cherryjelly" = 5, "vitamin" = 2)
/obj/item/weapon/reagent_containers/food/snacks/icecreamsandwich
name = "icecream sandwich"
desc = "Portable Ice-cream in it's own packaging."
icon_state = "icecreamsandwich"
- list_reagents = list("nutriment" = 2, "ice" = 2)
+ list_reagents = list("nutriment" = 1, "ice" = 2)
/obj/item/weapon/reagent_containers/food/snacks/notasandwich
name = "not-a-sandwich"
desc = "Something seems to be wrong with this, you can't quite figure what. Maybe it's his moustache."
icon_state = "notasandwich"
trash = /obj/item/trash/plate
- list_reagents = list("nutriment" = 6, "vitamin" = 6)
+ list_reagents = list("vitamin" = 6)
/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast
name = "jellied toast"
@@ -54,13 +55,13 @@
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/cherry
- list_reagents = list("nutriment" = 2, "cherryjelly" = 5, "vitamin" = 2)
+ list_reagents = list("cherryjelly" = 5, "vitamin" = 2)
/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/slime
- list_reagents = list("nutriment" = 2, "slimejelly" = 5, "vitamin" = 2)
+ list_reagents = list("slimejelly" = 5, "vitamin" = 2)
/obj/item/weapon/reagent_containers/food/snacks/twobread
name = "two bread"
desc = "This seems awfully bitter."
icon_state = "twobread"
- list_reagents = list("nutriment" = 2, "vitamin" = 2)
+ list_reagents = list("nutriment" = 1, "vitamin" = 2)
diff --git a/code/modules/food&drinks/food/snacks_soup.dm b/code/modules/food&drinks/food/snacks_soup.dm
index 03f2969ac07..e97581a0962 100644
--- a/code/modules/food&drinks/food/snacks_soup.dm
+++ b/code/modules/food&drinks/food/snacks_soup.dm
@@ -11,7 +11,7 @@
name = "wish soup"
desc = "I wish this was soup."
icon_state = "wishsoup"
- list_reagents = list("nutriment" = 2, "water" = 5)
+ list_reagents = list("water" = 1)
/obj/item/weapon/reagent_containers/food/snacks/soup/wish/New()
..()
@@ -26,43 +26,43 @@
name = "meatball soup"
desc = "You've got balls kid, BALLS!"
icon_state = "meatballsoup"
- list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 5)
+ list_reagents = list("nutriment" = 1, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/soup/slime
name = "slime soup"
desc = "If no water is available, you may substitute tears."
icon_state = "slimesoup"
- list_reagents = list("nutriment" = 2, "slimejelly" = 5, "water" = 10, "vitamin" = 5)
+ list_reagents = list("nutriment" = 1, "slimejelly" = 5, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/soup/blood
name = "tomato soup"
desc = "Smells like copper."
icon_state = "tomatosoup"
- list_reagents = list("nutriment" = 2, "blood" = 10, "water" = 5, "vitamin" = 6)
+ list_reagents = list("nutriment" = 1, "vitamin" = 6)
/obj/item/weapon/reagent_containers/food/snacks/soup/clownstears
name = "clown's tears"
desc = "Not very funny."
icon_state = "clownstears"
- list_reagents = list("nutriment" = 4, "banana" = 5, "water" = 10, "vitamin" = 8)
+ list_reagents = list("nutriment" = 1, "vitamin" = 8)
/obj/item/weapon/reagent_containers/food/snacks/soup/vegetable
name = "vegetable soup"
desc = "A true vegan meal."
icon_state = "vegetablesoup"
- list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 4)
+ list_reagents = list("nutriment" = 1, "vitamin" = 4)
/obj/item/weapon/reagent_containers/food/snacks/soup/nettle
name = "nettle soup"
desc = "To think, the botanist would've beat you to death with one of these."
icon_state = "nettlesoup"
- list_reagents = list("nutriment" = 8, "omnizine" = 5, "water" = 6, "vitamin" = 5)
+ list_reagents = list("nutriment" = 1, "omnizine" = 5, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/soup/mystery
name = "mystery soup"
desc = "The mystery is, why aren't you eating it?"
icon_state = "mysterysoup"
- list_reagents = list("nutriment" = 6, "tomatojuice" = 2)
+ list_reagents = list("nutriment" = 1, "tomatojuice" = 2)
var/extra_reagent = null
/obj/item/weapon/reagent_containers/food/snacks/soup/mystery/New()
..()
@@ -74,43 +74,43 @@
name = "hot chili"
desc = "A five alarm Texan Chili!"
icon_state = "hotchili"
- list_reagents = list("nutriment" = 8, "capsaicin" = 1, "tomatojuice" = 2, "vitamin" = 2)
+ list_reagents = list("nutriment" = 1, "vitamin" = 2)
/obj/item/weapon/reagent_containers/food/snacks/soup/coldchili
name = "cold chili"
desc = "This slush is barely a liquid!"
icon_state = "coldchili"
- list_reagents = list("nutriment" = 5, "frostoil" = 1, "tomatojuice" = 2, "vitamin" = 2)
+ list_reagents = list("nutriment" = 1, "vitamin" = 2)
/obj/item/weapon/reagent_containers/food/snacks/soup/monkeysdelight
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"
- list_reagents = list("nutriment" = 10, "banana" = 5, "blackpepper" = 1, "sodiumchloride" = 1, "vitamin" = 5)
+ list_reagents = list("nutriment" = 1, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/soup/tomato
name = "tomato soup"
desc = "Drinking this feels like being a vampire! A tomato vampire..."
icon_state = "tomatosoup"
- list_reagents = list("nutriment" = 8, "tomatojuice" = 10, "vitamin" = 3)
+ list_reagents = list("nutriment" = 1, "vitamin" = 3)
/obj/item/weapon/reagent_containers/food/snacks/soup/milo
name = "milosoup"
desc = "The universes best soup! Yum!!!"
icon_state = "milosoup"
- list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 3)
+ list_reagents = list("nutriment" = 1, "vitamin" = 3)
/obj/item/weapon/reagent_containers/food/snacks/soup/mushroom
name = "chantrelle soup"
desc = "A delicious and hearty mushroom soup."
icon_state = "mushroomsoup"
- list_reagents = list("nutriment" = 8, "vitamin" = 5)
+ list_reagents = list("nutriment" = 1, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/soup/beet
name = "beet soup"
desc = "Wait, how do you spell it again..?"
icon_state = "beetsoup"
- list_reagents = list("nutriment" = 8, "vitamin" = 5)
+ list_reagents = list("nutriment" = 1, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/soup/beet/New()
..()
@@ -122,18 +122,18 @@
desc = "Jello gelatin, from Alfred Hubbard's cookbook."
icon_state = "spacylibertyduff"
bitesize = 3
- list_reagents = list("nutriment" = 6, "mushroomhallucinogen" = 6)
+ list_reagents = list("nutriment" = 1, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/soup/amanitajelly
name = "amanita jelly"
desc = "Looks curiously toxic."
icon_state = "amanitajelly"
bitesize = 3
- list_reagents = list("nutriment" = 6, "amatoxin" = 6, "mushroomhallucinogen" = 6)
+ list_reagents = list("nutriment" = 1, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/soup/stew
name = "stew"
desc = "A nice and warm stew. Healthy and strong."
icon_state = "stew"
- list_reagents = list("nutriment" = 10, "tomatojuice" = 5, "oculine" = 5, "water" = 5)
+ list_reagents = list("nutriment" = 1, "vitamin" = 5)
bitesize = 7
diff --git a/code/modules/food&drinks/food/snacks_spaghetti.dm b/code/modules/food&drinks/food/snacks_spaghetti.dm
index cb3771f5c44..88ae3114c57 100644
--- a/code/modules/food&drinks/food/snacks_spaghetti.dm
+++ b/code/modules/food&drinks/food/snacks_spaghetti.dm
@@ -12,7 +12,7 @@
desc = "A plain dish of noodles, this needs more ingredients."
icon_state = "spaghettiboiled"
trash = /obj/item/trash/plate
- list_reagents = list("nutriment" = 2, "vitamin" = 1)
+ list_reagents = list("nutriment" = 2)
custom_food_type = /obj/item/weapon/reagent_containers/food/snacks/customizable/pasta
filling_color = "#F0E68C"
@@ -22,7 +22,7 @@
icon_state = "pastatomato"
trash = /obj/item/trash/plate
bitesize = 4
- list_reagents = list("nutriment" = 6, "tomatojuice" = 10, "vitamin" = 4)
+ list_reagents = list("nutriment" = 1, "vitamin" = 4)
filling_color = "#DC143C"
/obj/item/weapon/reagent_containers/food/snacks/copypasta
@@ -31,7 +31,7 @@
icon_state = "copypasta"
trash = /obj/item/trash/plate
bitesize = 4
- list_reagents = list("nutriment" = 12, "tomatojuice" = 20, "vitamin" = 8)
+ list_reagents = list("nutriment" = 1, "vitamin" = 4)
filling_color = "#DC143C"
/obj/item/weapon/reagent_containers/food/snacks/meatballspaghetti
@@ -39,7 +39,7 @@
desc = "Now that's a nic'e meatball!"
icon_state = "meatballspaghetti"
trash = /obj/item/trash/plate
- list_reagents = list("nutriment" = 8, "vitamin" = 4)
+ list_reagents = list("nutriment" = 1, "vitamin" = 4)
filling_color = "#F0E68C"
/obj/item/weapon/reagent_containers/food/snacks/spesslaw
@@ -47,5 +47,5 @@
desc = "A lawyers favourite."
icon_state = "spesslaw"
trash = /obj/item/trash/plate
- list_reagents = list("nutriment" = 8, "vitamin" = 6)
+ list_reagents = list("nutriment" = 1, "vitamin" = 6)
filling_color = "#F0E68C"
diff --git a/code/modules/food&drinks/kitchen machinery/microwave.dm b/code/modules/food&drinks/kitchen machinery/microwave.dm
index 907fe0d80f8..8c972d958b6 100644
--- a/code/modules/food&drinks/kitchen machinery/microwave.dm
+++ b/code/modules/food&drinks/kitchen machinery/microwave.dm
@@ -242,16 +242,16 @@
return
stop()
- for (var/obj/item/weapon/reagent_containers/food/snacks/F in contents)
- if (F.cooked_type)
- var/obj/item/weapon/reagent_containers/food/snacks/S = new F.cooked_type (loc)
- if(F.reagents)
- F.reagents.trans_to(S, F.reagents.total_volume)
+ for(var/obj/item/weapon/reagent_containers/food/snacks/F in contents)
+ if(F.cooked_type)
+ var/obj/item/weapon/reagent_containers/food/snacks/S = new F.cooked_type (get_turf(src))
+ F.initialize_cooked_food(S)
else
- new /obj/item/weapon/reagent_containers/food/snacks/badrecipe(loc)
+ new /obj/item/weapon/reagent_containers/food/snacks/badrecipe(src)
if(dirty < 100)
dirty++
qdel(F)
+
return
/obj/machinery/microwave/proc/microwaving(var/seconds as num)
@@ -272,15 +272,15 @@
return 0
/obj/machinery/microwave/proc/start()
- src.visible_message("The microwave turns on.", "You hear a microwave.")
- src.operating = 1
- src.icon_state = "mw1"
- src.updateUsrDialog()
+ visible_message("The microwave turns on.", "You hear a microwave.")
+ operating = 1
+ icon_state = "mw1"
+ updateUsrDialog()
/obj/machinery/microwave/proc/abort()
- src.operating = 0 // Turn it off again aferwards
- src.icon_state = "mw"
- src.updateUsrDialog()
+ operating = 0 // Turn it off again aferwards
+ icon_state = "mw"
+ updateUsrDialog()
/obj/machinery/microwave/proc/stop()
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
@@ -290,37 +290,41 @@
for (var/obj/O in contents)
O.loc = src.loc
usr << "You dispose of the microwave contents."
- src.updateUsrDialog()
+ updateUsrDialog()
/obj/machinery/microwave/proc/muck_start()
playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) // Play a splat sound
- src.icon_state = "mwbloody1" // Make it look dirty!!
+ icon_state = "mwbloody1" // Make it look dirty!!
/obj/machinery/microwave/proc/muck_finish()
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
- src.visible_message("The microwave gets covered in muck!")
- src.dirty = 100 // Make it dirty so it can't be used util cleaned
- src.icon_state = "mwbloody" // Make it look dirty too
- src.operating = 0 // Turn it off again aferwards
- src.updateUsrDialog()
+ visible_message("The microwave gets covered in muck!")
+ dirty = 100 // Make it dirty so it can't be used util cleaned
+ icon_state = "mwbloody" // Make it look dirty too
+ operating = 0 // Turn it off again aferwards
+ updateUsrDialog()
+ for(var/obj/item/weapon/reagent_containers/food/snacks/S in src)
+ if(prob(50))
+ new /obj/item/weapon/reagent_containers/food/snacks/badrecipe(src)
+ qdel(S)
/obj/machinery/microwave/proc/broke()
var/datum/effect/effect/system/spark_spread/s = new
s.set_up(2, 1, src)
s.start()
- src.icon_state = "mwb" // Make it look all busted up and shit
- src.visible_message("The microwave breaks!") //Let them know they're stupid
- src.broken = 2 // Make it broken so it can't be used util fixed
- src.flags = null //So you can't add condiments
- src.operating = 0 // Turn it off again aferwards
- src.updateUsrDialog()
+ icon_state = "mwb" // Make it look all busted up and shit
+ visible_message("The microwave breaks!") //Let them know they're stupid
+ broken = 2 // Make it broken so it can't be used util fixed
+ flags = null //So you can't add condiments
+ operating = 0 // Turn it off again aferwards
+ updateUsrDialog()
/obj/machinery/microwave/Topic(href, href_list)
if(..() || panel_open)
return
usr.set_machine(src)
- if(src.operating)
+ if(operating)
updateUsrDialog()
return
diff --git a/code/modules/food&drinks/recipes/food_mixtures.dm b/code/modules/food&drinks/recipes/food_mixtures.dm
index 2df8544afe4..d468f33dfde 100644
--- a/code/modules/food&drinks/recipes/food_mixtures.dm
+++ b/code/modules/food&drinks/recipes/food_mixtures.dm
@@ -123,7 +123,6 @@
/datum/chemical_reaction/cakebatter/on_reaction(var/datum/reagents/holder)
var/obj/item/weapon/reagent_containers/food/snacks/S = new /obj/item/weapon/reagent_containers/food/snacks/cakebatter
S.loc = get_turf(holder.my_atom)
- S.reagents.add_reagent("vitamin", 2)
if(holder && holder.my_atom)
qdel(holder.my_atom)
@@ -139,39 +138,16 @@
/datum/chemical_reaction/piedough/on_reaction(var/datum/reagents/holder)
var/obj/item/weapon/reagent_containers/food/snacks/S = new /obj/item/weapon/reagent_containers/food/snacks/piedough
S.loc = get_turf(holder.my_atom)
- S.reagents.add_reagent("vitamin", 2)
if(holder && holder.my_atom)
qdel(holder.my_atom)
-/datum/chemical_reaction/cakebatter2
- name = "Cake Batter2"
- id = "cakebatter2"
- result = null
+/datum/chemical_reaction/cakebatter/alt
+ id = "cakebatteralt"
required_reagents = list("soymilk" = 5)
- result_amount = 1
- required_container = /obj/item/weapon/reagent_containers/food/snacks/dough
- mix_message = "The dough forms a cake batter."
-/datum/chemical_reaction/cakebatter2/on_reaction(var/datum/reagents/holder)
- var/obj/item/weapon/reagent_containers/food/snacks/S = new /obj/item/weapon/reagent_containers/food/snacks/cakebatter
- S.loc = get_turf(holder.my_atom)
- if(holder && holder.my_atom)
- qdel(holder.my_atom)
-
-/datum/chemical_reaction/piedough2
- name = "Pie Dough2"
- id = "piedough2"
- result = null
+/datum/chemical_reaction/piedough/alt
+ id = "piedoughalt"
required_reagents = list("soymilk" = 5)
- result_amount = 1
- required_container = /obj/item/weapon/reagent_containers/food/snacks/flatdough
- mix_message = "The dough forms a pie dough."
-
-/datum/chemical_reaction/piedough2/on_reaction(var/datum/reagents/holder)
- var/obj/item/weapon/reagent_containers/food/snacks/S = new /obj/item/weapon/reagent_containers/food/snacks/piedough
- S.loc = get_turf(holder.my_atom)
- if(holder && holder.my_atom)
- qdel(holder.my_atom)
/datum/chemical_reaction/imitationcarpmeat
name = "Imitation Carpmeat"
@@ -187,3 +163,23 @@
S.loc = get_turf(holder.my_atom)
if(holder && holder.my_atom)
qdel(holder.my_atom)
+
+/datum/chemical_reaction/rawpastrybase
+ name = "Raw Pastry Base"
+ id = "rawpastrybase"
+ result = null
+ required_reagents = list("milk" = 5)
+ result_amount = 1
+ required_container = /obj/item/weapon/reagent_containers/food/snacks/doughslice
+ mix_message = "The doughslice forms a raw pastry base"
+
+/datum/chemical_reaction/rawpastrybase/on_reaction(var/datum/reagents/holder)
+ var/obj/item/weapon/reagent_containers/food/snacks/S = new /obj/item/weapon/reagent_containers/food/snacks/rawpastrybase
+ S.loc = get_turf(holder.my_atom)
+ if(holder && holder.my_atom)
+ qdel(holder.my_atom)
+
+/datum/chemical_reaction/rawpastrybase/alt
+ id = "rawpastrybasealt"
+ required_reagents = list("soymilk" = 5)
+
diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_bread.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_bread.dm
index f6162ef4729..566c4e8eb5f 100644
--- a/code/modules/food&drinks/recipes/tablecraft/recipes_bread.dm
+++ b/code/modules/food&drinks/recipes/tablecraft/recipes_bread.dm
@@ -7,7 +7,7 @@
name = "Meat bread"
reqs = list(
/obj/item/weapon/reagent_containers/food/snacks/store/bread/plain = 1,
- /obj/item/weapon/reagent_containers/food/snacks/meat = 3,
+ /obj/item/weapon/reagent_containers/food/snacks/cutlet/plain = 3,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 3
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/meat
@@ -16,7 +16,7 @@
name = "Xenomeat bread"
reqs = list(
/obj/item/weapon/reagent_containers/food/snacks/store/bread/plain = 1,
- /obj/item/weapon/reagent_containers/food/snacks/xenomeat = 3,
+ /obj/item/weapon/reagent_containers/food/snacks/cutlet/xeno = 3,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 3
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/xenomeat
@@ -25,7 +25,7 @@
name = "Spidermeat bread"
reqs = list(
/obj/item/weapon/reagent_containers/food/snacks/store/bread/plain = 1,
- /obj/item/weapon/reagent_containers/food/snacks/spidermeat = 3,
+ /obj/item/weapon/reagent_containers/food/snacks/cutlet/spider = 3,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 3
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/spidermeat
diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_burger.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_burger.dm
index d1d49e7394b..801f64e40bf 100644
--- a/code/modules/food&drinks/recipes/tablecraft/recipes_burger.dm
+++ b/code/modules/food&drinks/recipes/tablecraft/recipes_burger.dm
@@ -8,14 +8,14 @@
name = "Human burger"
reqs = list(
/obj/item/weapon/reagent_containers/food/snacks/bun = 1,
- /obj/item/weapon/reagent_containers/food/snacks/meat/human = 1
+ /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain/human = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/human
/datum/table_recipe/burger
name = "Burger"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/meat = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain = 1,
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
@@ -40,7 +40,7 @@
/datum/table_recipe/xenoburger
name = "Xeno burger"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/xenomeat = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/meatsteak/xeno = 1,
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/xeno
@@ -88,7 +88,7 @@
/datum/table_recipe/redburger
name = "Red burger"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/meat = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain = 1,
/obj/item/toy/crayon/red = 1,
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
@@ -97,7 +97,7 @@
/datum/table_recipe/orangeburger
name = "Orange burger"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/meat = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain = 1,
/obj/item/toy/crayon/orange = 1,
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
@@ -106,7 +106,7 @@
/datum/table_recipe/yellowburger
name = "Yellow burger"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/meat = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain = 1,
/obj/item/toy/crayon/yellow = 1,
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
@@ -115,7 +115,7 @@
/datum/table_recipe/greenburger
name = "Green burger"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/meat = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain = 1,
/obj/item/toy/crayon/green = 1,
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
@@ -124,7 +124,7 @@
/datum/table_recipe/blueburger
name = "Blue burger"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/meat = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain = 1,
/obj/item/toy/crayon/blue = 1,
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
@@ -133,7 +133,7 @@
/datum/table_recipe/purpleburger
name = "Purple burger"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/meat = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain = 1,
/obj/item/toy/crayon/purple = 1,
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
@@ -157,7 +157,7 @@
/datum/table_recipe/bigbiteburger
name = "Big bite burger"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/meat = 3,
+ /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain = 3,
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/bigbite
@@ -167,7 +167,7 @@
reqs = list(
/datum/reagent/consumable/sodiumchloride = 5,
/datum/reagent/consumable/blackpepper = 5,
- /obj/item/weapon/reagent_containers/food/snacks/meat = 5,
+ /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain = 5,
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 4,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 3,
/obj/item/weapon/reagent_containers/food/snacks/egg = 2,
diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_meat.dm
index c4e0830b09a..b28c9a2d00b 100644
--- a/code/modules/food&drinks/recipes/tablecraft/recipes_meat.dm
+++ b/code/modules/food&drinks/recipes/tablecraft/recipes_meat.dm
@@ -6,15 +6,15 @@
name = "Human kebab"
reqs = list(
/obj/item/stack/rods = 1,
- /obj/item/weapon/reagent_containers/food/snacks/meat/human = 2
+ /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain/human = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/kebab/human
-/datum/table_recipe/monkeykebab
- name = "Monkey kebab"
+/datum/table_recipe/kebab
+ name = "Kebab"
reqs = list(
/obj/item/stack/rods = 1,
- /obj/item/weapon/reagent_containers/food/snacks/meat/monkey = 2
+ /obj/item/weapon/reagent_containers/food/snacks/meatsteak = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/kebab/monkey
@@ -51,7 +51,7 @@
name = "Fish fingers"
reqs = list(
/datum/reagent/consumable/flour = 5,
- /obj/item/weapon/reagent_containers/food/snacks/doughslice = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/bun = 1,
/obj/item/weapon/reagent_containers/food/snacks/carpmeat = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/fishfingers
@@ -72,7 +72,7 @@
reqs = list(
/datum/reagent/consumable/sodiumchloride = 1,
/obj/item/weapon/reagent_containers/food/snacks/spidereggs = 1,
- /obj/item/weapon/reagent_containers/food/snacks/spidermeat = 1
+ /obj/item/weapon/reagent_containers/food/snacks/cutlet/spider = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/spidereggsham
@@ -82,7 +82,7 @@
name = "Corned beef"
reqs = list(
/datum/reagent/consumable/sodiumchloride = 5,
- /obj/item/weapon/reagent_containers/food/snacks/meat = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/meatsteak = 1,
/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/cornedbeef
@@ -91,7 +91,7 @@
name = "Wingfangchu"
reqs = list(
/datum/reagent/consumable/soysauce = 5,
- /obj/item/weapon/reagent_containers/food/snacks/xenomeat = 1
+ /obj/item/weapon/reagent_containers/food/snacks/cutlet/xeno = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/wingfangchu
diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_misc.dm
index 5f171fd0796..f185b8e5cba 100644
--- a/code/modules/food&drinks/recipes/tablecraft/recipes_misc.dm
+++ b/code/modules/food&drinks/recipes/tablecraft/recipes_misc.dm
@@ -73,7 +73,7 @@
time = 40
reqs = list(/datum/reagent/consumable/sodiumchloride = 1,
/datum/reagent/consumable/blackpepper = 1,
- /obj/item/weapon/reagent_containers/food/snacks/doughslice = 2
+ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/baguette
diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_pastry.dm
index 859032595d5..2687c9aa6c9 100644
--- a/code/modules/food&drinks/recipes/tablecraft/recipes_pastry.dm
+++ b/code/modules/food&drinks/recipes/tablecraft/recipes_pastry.dm
@@ -8,7 +8,7 @@
reqs = list(
/datum/reagent/consumable/frostoil = 5,
/datum/reagent/consumable/capsaicin = 5,
- /obj/item/weapon/reagent_containers/food/snacks/doughslice = 1
+ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/donut/chaos
@@ -17,7 +17,7 @@
name = "Donut"
reqs = list(
/datum/reagent/consumable/sugar = 1,
- /obj/item/weapon/reagent_containers/food/snacks/doughslice = 1
+ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/donut
@@ -25,7 +25,7 @@
name = "Jelly donut"
reqs = list(
/datum/reagent/consumable/berryjuice = 5,
- /obj/item/weapon/reagent_containers/food/snacks/doughslice = 1
+ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly
@@ -33,7 +33,7 @@
name = "Cherry jelly donut"
reqs = list(
/datum/reagent/consumable/cherryjelly = 5,
- /obj/item/weapon/reagent_containers/food/snacks/doughslice = 1
+ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly/cherryjelly
@@ -41,7 +41,7 @@
name = "Slime jelly donut"
reqs = list(
/datum/reagent/toxin/slimejelly = 5,
- /obj/item/weapon/reagent_containers/food/snacks/doughslice = 1
+ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly/slimejelly
@@ -51,7 +51,7 @@
time = 15
name = "Waffles"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/doughslice = 2
+ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/waffles
@@ -59,7 +59,7 @@
/datum/table_recipe/soylenviridians
name = "Soylent viridians"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/doughslice = 2,
+ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 2,
/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/soylenviridians
@@ -67,7 +67,7 @@
/datum/table_recipe/soylentgreen
name = "Soylent green"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/doughslice = 2,
+ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 2,
/obj/item/weapon/reagent_containers/food/snacks/meat/human = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/soylentgreen
@@ -77,7 +77,7 @@
name = "Roffle waffles"
reqs = list(
/datum/reagent/mushroomhallucinogen = 5,
- /obj/item/weapon/reagent_containers/food/snacks/doughslice = 2
+ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/rofflewaffles
@@ -87,7 +87,7 @@
time = 15
name = "Donkpocket"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/doughslice = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1,
/obj/item/weapon/reagent_containers/food/snacks/faggot = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket
@@ -100,7 +100,7 @@
name = "Muffin"
reqs = list(
/datum/reagent/consumable/milk = 5,
- /obj/item/weapon/reagent_containers/food/snacks/doughslice = 1
+ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/muffin
@@ -108,7 +108,7 @@
name = "Berry muffin"
reqs = list(
/datum/reagent/consumable/milk = 5,
- /obj/item/weapon/reagent_containers/food/snacks/doughslice = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1,
/obj/item/weapon/reagent_containers/food/snacks/grown/berries = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/muffin/berry
@@ -117,7 +117,7 @@
name = "Booberry muffin"
reqs = list(
/datum/reagent/consumable/milk = 5,
- /obj/item/weapon/reagent_containers/food/snacks/doughslice = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1,
/obj/item/weapon/reagent_containers/food/snacks/grown/berries = 1,
/obj/item/weapon/ectoplasm = 1
)
@@ -159,7 +159,7 @@
name = "Sugar cookie"
reqs = list(
/datum/reagent/consumable/sugar = 5,
- /obj/item/weapon/reagent_containers/food/snacks/doughslice = 1
+ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/sugarcookie
@@ -167,7 +167,7 @@
time = 15
name = "Fortune cookie"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/doughslice = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1,
/obj/item/weapon/paper = 1
)
parts = list(
@@ -180,7 +180,7 @@
name = "Poppy pretzel"
reqs = list(
/obj/item/seeds/poppyseed = 1,
- /obj/item/weapon/reagent_containers/food/snacks/doughslice = 1
+ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/poppypretzel
@@ -188,7 +188,7 @@
time = 15
name = "Plumphelmet biscuit"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/doughslice = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1,
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit
@@ -198,7 +198,7 @@
name = "Cracker"
reqs = list(
/datum/reagent/consumable/sodiumchloride = 1,
- /obj/item/weapon/reagent_containers/food/snacks/doughslice = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1,
)
result = /obj/item/weapon/reagent_containers/food/snacks/cracker
@@ -206,7 +206,7 @@
name = "Choco cornet"
reqs = list(
/datum/reagent/consumable/sodiumchloride = 1,
- /obj/item/weapon/reagent_containers/food/snacks/doughslice = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1,
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/chococornet
diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_pie.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_pie.dm
index 9e5db90e497..89793d65b33 100644
--- a/code/modules/food&drinks/recipes/tablecraft/recipes_pie.dm
+++ b/code/modules/food&drinks/recipes/tablecraft/recipes_pie.dm
@@ -18,7 +18,7 @@
/datum/reagent/consumable/blackpepper = 1,
/datum/reagent/consumable/sodiumchloride = 1,
/obj/item/weapon/reagent_containers/food/snacks/pie/plain = 1,
- /obj/item/weapon/reagent_containers/food/snacks/meat = 1
+ /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pie/meatpie
@@ -34,7 +34,7 @@
name = "Xeno pie"
reqs = list(
/obj/item/weapon/reagent_containers/food/snacks/pie/plain = 1,
- /obj/item/weapon/reagent_containers/food/snacks/xenomeat = 1
+ /obj/item/weapon/reagent_containers/food/snacks/cutlet/xeno = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pie/xemeatpie
diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm
index e7023880534..e08f84a93fd 100644
--- a/code/modules/mob/living/simple_animal/hostile/alien.dm
+++ b/code/modules/mob/living/simple_animal/hostile/alien.dm
@@ -10,7 +10,7 @@
response_disarm = "shoves"
response_harm = "hits"
speed = 0
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/xeno
skin_type = /obj/item/stack/sheet/animalhide/xeno
meat_amount = 3
maxHealth = 100
diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index 748e216feed..6e6022cd1ee 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -13,7 +13,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/bearmeat
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/bear
meat_amount = 3
response_help = "pets"
response_disarm = "gently pushes aside"
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index fa45d328e39..b4582cd4d46 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -33,7 +33,7 @@
speak_chance = 5
turns_per_move = 5
see_in_dark = 10
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/spidermeat
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/spider
meat_amount = 2
response_help = "pets"
response_disarm = "gently pushes aside"
diff --git a/code/modules/mob/living/simple_animal/hostile/killertomato.dm b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
index 6a7a2dc9b4c..5f746f8a27f 100644
--- a/code/modules/mob/living/simple_animal/hostile/killertomato.dm
+++ b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
@@ -9,7 +9,7 @@
maxHealth = 30
health = 30
see_in_dark = 3
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/tomatomeat
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/killertomato
meat_amount = 1
response_help = "prods"
response_disarm = "pushes aside"
diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi
index 9b53a7330ea..e3aa5175068 100644
Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ
diff --git a/icons/obj/food_ingredients.dmi b/icons/obj/food_ingredients.dmi
index aa66fd411c6..6e122ca9a36 100644
Binary files a/icons/obj/food_ingredients.dmi and b/icons/obj/food_ingredients.dmi differ