From 732a54fe63c2e06a75011d7895bd1bc35eb19ae3 Mon Sep 17 00:00:00 2001 From: phil235 Date: Sun, 8 Feb 2015 21:36:54 +0100 Subject: [PATCH] Making all meat subtypes of snacks/meat Adding specific cutlets and raw cutlets for a lot of types of meat. Enabling reagent transfer from ingredients to resulting dish for foodtablecrafting Adjusting tablecraft food recipes reagents accordingly. Adding raw pastry base and pastry base food and including it into certain recipes. --- code/game/gamemodes/meteor/meteors.dm | 2 +- code/game/objects/structures/kitchen_spike.dm | 4 +- code/modules/crafting/table.dm | 25 ++- .../modules/food&drinks/food/customizables.dm | 17 +- code/modules/food&drinks/food/snacks.dm | 13 +- code/modules/food&drinks/food/snacks/dough.dm | 37 ++-- code/modules/food&drinks/food/snacks/meat.dm | 185 +++++++++++++++++- code/modules/food&drinks/food/snacks_bread.dm | 14 +- .../food&drinks/food/snacks_burgers.dm | 30 +-- code/modules/food&drinks/food/snacks_cake.dm | 20 +- code/modules/food&drinks/food/snacks_egg.dm | 12 +- code/modules/food&drinks/food/snacks_meat.dm | 85 ++------ code/modules/food&drinks/food/snacks_other.dm | 18 +- .../modules/food&drinks/food/snacks_pastry.dm | 34 ++-- code/modules/food&drinks/food/snacks_pie.dm | 24 +-- code/modules/food&drinks/food/snacks_pizza.dm | 16 +- code/modules/food&drinks/food/snacks_salad.dm | 6 +- .../food&drinks/food/snacks_sandwichtoast.dm | 21 +- code/modules/food&drinks/food/snacks_soup.dm | 36 ++-- .../food&drinks/food/snacks_spaghetti.dm | 10 +- .../kitchen machinery/microwave.dm | 58 +++--- .../food&drinks/recipes/food_mixtures.dm | 52 +++-- .../recipes/tablecraft/recipes_bread.dm | 6 +- .../recipes/tablecraft/recipes_burger.dm | 22 +-- .../recipes/tablecraft/recipes_meat.dm | 16 +- .../recipes/tablecraft/recipes_misc.dm | 2 +- .../recipes/tablecraft/recipes_pastry.dm | 38 ++-- .../recipes/tablecraft/recipes_pie.dm | 4 +- .../mob/living/simple_animal/hostile/alien.dm | 2 +- .../mob/living/simple_animal/hostile/bear.dm | 2 +- .../simple_animal/hostile/giant_spider.dm | 2 +- .../simple_animal/hostile/killertomato.dm | 2 +- icons/obj/food.dmi | Bin 92163 -> 93195 bytes icons/obj/food_ingredients.dmi | Bin 3175 -> 2587 bytes 34 files changed, 481 insertions(+), 334 deletions(-) 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 9b53a7330eaf77e9bc6a722b0e2d1bf476165579..e3aa51750680cf7f7e6eecbe2e305ffa834c3194 100644 GIT binary patch delta 19419 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 E1H+wwBme*a delta 18379 zcmbTcWl&r}*DX9)u;6aNg9f+Y1b6o!!QBHv4-!1V-3EfYJ3)d&aCdhf-0$Rh-+OP} zs<*x$-;b#|by`k$@9y1uueBoQ5rW1MVrT$cFAW_x33FFd7i%XsYexqV=vzi++L+5W z4|?C&jrtYMoY^pE>L56XwUx7;yFPIntAzp^d*clSSZh=;iUcv3t*`!*I>D*yO;;`|hqX{isyZ2Q_r58-u)}5_TAO@kZHx`VN4W z_35WAJvvrYwk3Eq3AJ^!6QfG5zPwQ1Tv+M?LFBa0@*UL-F(;2P^ zo*QEjjLYZvz^npp_04X@{L0gX-_kI59|e=keCNKUwUfK`b^dv`S*DW47SB|=2%Dq+ zMJWYLV+|^o3inkuV6&9_8N2T-4;0#+_B@;ISrZ>`;0#>fZub5AJ%e1xRbN#Q0r+OH z=&5DQBZ6-X39f|rPvT<}-FM{3L&2HHtxfUIKJ$ZqQpaW@jUEuf=2<^Qk*%Zv8>a#i zF%l046|YmX*8}$&^6Jdv%0Egs+U|5>svz2u+U=bI_Qn^J-^P!l4o*OQ{p7KKn%&^A zGh>^QMUk_bXn-BP8?mF^ZU#|sW}?|I3L*SbwEm!a`ClHJyMLDF_({liV6Z^!jWfCs z?2p&EWIF-RM2HFC;{JEBQ(Gt*Cr$%df#!?RFvQyG&6Z|gHw;u|_0ilm)u^r4&XZbH zHQ3wn4jmr@e7?{%pE&@v&Zonc#b0nWMO7pVgf+^zl`tPV2PvG488HcW!?!+*vqx$o z=uBF~67NcmY!Y3WrVPX5mRoGS{UuH*OYsPD@hEEvv}4CCOVykRjkAvFE86+!+U#GL z@zGN(mt9VBZlw4_W^a>P?NbY}^z_$Imx5IURWU~PH&O*WF*e*lcHeskMWRmx#W1jE zo|{r|c07vI`GdiJ5XN z?U*hR3|1cki@D@LfV^(zq?K#@%aESg&a8j4Bi7Bp02|6Uz<`!9A1O{eA2*NjmwKBr z<$-BHjbWB8sgQvwKdD$EyEc^xMt#SQXwl92o%DezTyjmIT|>s)=O!VSj`+>(Kzh%^ ze(P-OK5QkM?Coj~dVT%G_eCiqaJ140F+>_cJ?$Y&dU!i8yL|DZ$MB@RBx6(GGw=n7 zi@*WnwmAXF0AE2Mx1*?mu}$~ejJAX)Di)Aetc@wgb;16(SBo9F4ktU9n|$)-JcY{ngwy>zsC0;%xWH#*_znmfu<9n$eAp_idoa=dEDh zdOT8Cr*b)8m&KQN4!-B6|h24ANCk00E!=5~d7u=&52*ONAxyv{hW) zt(IPaAKo%udrE~z6RB6ozDVYB4|27QSlNi?OF;~1hF}x&?PTfPbPfvPzTwZzVe@oy zX&|)V#h|CpDG-my`z|EY6w=HzIlm-CrlvV`i7VoMzkh2etPp8#q6F) z(s$QtUN1{_oMWdfWy%s;q2uFjJWUaXNbY(PtCa;3R!Q)$`I0*xY?6Ij0)zSXHP~iEu^pW&fyW?Yf!E zDK2I9djEX;>iY~iU1??cs5(0I6NN2@ep`v)cZ$<)S*69Oq`BzoN{9bm9qtg(0n1)E z3Za1WF^c;4`jgoEJDs%L1Vinloz zcu~B)+Av4GJd5g0_fchKK=`EZ<+yCa>GFKU%z{Rv4H zY2;wH21g)t>n_YuS9n{zX7{$=sxQt_KaQ+_?C~06%at1|Of8@0dGsiFsc>ImKvOXG zXKt1ya;y*l;EeTt{N#v^l#H5I{rw`z+Sb|iljQNYBj0t#O9@9P?AWmHEt&_X1_$tD zDhFIqzno7<+t3zm6r^il9exl-3+R_fOR?sa6&`sf$XTBf9t4k*^3~}t+JFE>kt1e6R0Mo6WGC(C0&EJlm}5x6`<)%} zYJ~KIko_IjC(0(vcvD27a4YsHF`S{S`AM??U0zHyWc6*^kF_783FxFu*wqz?cK!X$ zQr&(TefZqgj`okmO!^cUjJmkc^gAix$}vd z4~MHKZDZOQS=*S*UQTewV2w^l4%`8^D3oVu6W$e0DHb&QHfzhTEkIpWNp6KErG0Fg ztpkWsl&2MUZ)kgT=etq>J9O?{Zn_U^qBnX2>p`u|Qo?$A(~{KoA&0yo0s^6b{!qhd z83*dNxKS=O6o-~Zegs5eAeFcB_V)G~T7Ul1bZUOba`J_s_?)5_R5bm(1vjM+bz{b_ zQVT~s-Oarsmut!E>ysp1<6HA#V|EBeS2&O#ksjbaU31e6DzCWfG9PR2xIS!&z^*3( zPZ`gn&y;aNQr*XUU|88dN4G&VUvz(`6ky!CjI9`LHq`S%@K_3Wrl>QlJTU4R4v#8J zii~%szonrQaMBVey|`hhR~jjudc35H_+EawnNDWs97P_0xaQ=hN=9iE2>SGg8NH${ zNKW=)H>=eekG;#%trGoxh9I??jrTbdxCd9TaGN&Gq?7@7h}qJC33B7oFj&MJ~`uu2rVgDK;06AyRi2gtu8Wp1zg6*px_r=yPV?enV`3`FgyzkNB z5Ostb`}p^r7yNMwnH%!FNwTCcuz|5NM~ql|LS$7v(fg4FQL}TC_+&g*^zW6qgxVk6 z`ys?1qP*%=#<_8>Jt~DL^LW+nZqCSryAr~$oh{@h1+Z}J3e;Fk)d{MhPrJj20t^kA zqkKXmu1Q}aonA)2j!}Sr#{Rvs1`c#4RHS(SUgaX`kbG_0qG5KOUH{?qQt`Fb-vLzc z@vDv^@hI=ZK?cgnY-fZv&D3&&>{h}O6<9=l_4QjOMXxoR4!1_utvXzZf4#D@*j8q6 z^(9m6pt91NP;ud%$6kWSq9Us^*Y!rdM@RgcrE5OYH>BvSbjs+=sNy?D-axqzW=Rpf zTB(Bg&e@80m~Ca^;}^Rn_id9=@*3p7m(i_!kBcZ4e(zyEOUC?$HC@qtflM-KWF_n% znq36EyHDk@C)PU|2qChWSNF%|Yu0~QayBd$7~y^0h-~s8P-!&ss1P~r6g<;gntxkCMZF=U_qN=IsJ3!;aVvhY5 z?Tmr{WCgAR z`a}m1-Mpw7xPt{JvMSZ!C*N{UNj|Od{O%1kaZlN=}T&=yux>gN4Yot{`+?yv}l;EoIPnq zJ>!n_$F*YIb?N99TXxeF{K2xy7MF^i$wzp-E>r8BwIU5G3+tgt-1hdD4&&}$qqG4!zX#1|!Fs>T z?dDnAB|gZ=z=Ly-U%#5AJ+Snq5msf(zVOQ}WlNp|zwc_y-fnlv7yD?)!@|`E{w%-f z6j54w2Y3Fc2p5xUuOE73=I;nR)zzF|_R-_IzdeH*eeZ{z&MB0i`hoM-qY7$TZcV&Y zPXq+&G(b&de6JY;4$MhcYga~D4DLYus z#dKXYg_nHXL|j@o7d-SH*}EXby>yzBVzSM_>Lld72-%4-x?uka+3=rX@SLIm|6hDI zI-4TqOLYT=FZH&3Yto&aM?p~x7b!>7@oU0xD8Og{T#EgaXeziuj*P!GJ}M*&4tm+N z&%+RIVY7Ks#T$XPV}HP)Rr7p!sNpHP3i1`^sw+9-jr$SB^H#??2D=I;^+_tuxrUG} zK(W{-arn7&^ah)46wZr35C8h(AHP>!QcO1EC^Wv%QT3<=HUvFyR6>ZMrT`8fcIp#s z6#$b0O8?2S_3>>&d^c{(0}|mldK2@Z>-TiW((g|i_vWdviIv1dvc@PU8bwEYa4ntS zRf6Ux$xboG@Ejb0@QlJJIpS(8dARxkBR@0?=*xH14#)3N$*_ia)dLWbtG>`CUiPS2 z-u4_E$jcO*AAHz+NQI4wQ>VD(87|L@J#W%o;6kBgKk?x&3Vk3cpIxYLP!+u#|^ZPcR*}-TbBtF=CGMaHwrigD0Q+GF?+*S-pp+>4} zov5Fk;`#F&Z91h^{P#<5jTJ+|m0Jdeki^zj^pvh)lv1I1;S|~)?N!(H0Sm|H58{S& zw%I;M@~qcP6u$vg_&m>(#jriNAcvqhw6_AlcmQUkYXoiXgp9j84;dL*20v}|-O}&- z$iHl}Y8rD>%lUJ+xbX>afU`5Zfq_9c|6LHX7_WgV8uoaDQ9FuH;Wi@8CjMyti3(QD zlhrr{RtHV;r~~T<#K;E&I;q@zaY!!mG3_S4LDwvqKnNg&v?*G-cIo&kU)KBgzK_4Y znF+h{HRPD8xTOkHGSJZTS~H2oU?_QUQ3H#3(CuvXw}z(X#d^mJ(=hOSq&ld~7J-D; zYt@UmojE3A(1;t|FaGC(Rb12`9lm@^Oc=FulEuR>{2<}ctye|*^E$!(4|m>{**A+r zkrM_Vc$Wa7+t~(6k59iZgAmF>?*pDt1ANRaecpJNwlV8;{u#u;XG=7ND2-2k(B?4B z^YSDYoQnQ^ZD+jX1<%~}^bSTnOo&c-MDOETUaS$Yr%~mB2nm8`E_i{v*t<_{~3W< z@$|?1S6!kLciY*rYY$xk?w;14<=g-XyQ&IOA8^F~<~Pg;LqM3Qk&=C3hGRwH-jBbG zyjDln4yb331kA=Lh;UQ$qJ9b#A|&H)ZbZ6Zd6u69vPR;08i|X+A8|63LKCv0x;8qG zT!0*FYq3J|rY%y~N z6*!20{!QmqZZ|b#2i+U8@@G~k8zslSy9+8_^Wc)uc@iei3Zx>&AQkuIkY6QTL{S>A zI%9iSwtL&W@LVzF+yt*E8nTJMGv4&N9|km-ch0@8R)SJ+Hs)T%oTGL_njw+@JW41R z@5O|)OQ9*@tlRbBOqt>Dw34BrumOzkbUf5uTNlPW>BSwJ9yD#Y=60xnjGxWeGh$Ka zqF&{xzd``n_*LigLjmIz+4$#~+DjsPzZdVC?_@}f*WMugBLvM(6F69lY-Er$ppJ*$ zss7IIW$4xn`4Ya8%~7~vwzkB-mr>wZOBZP~U2bCH9hFG#m=UG?eA_!1Tj|gd5Byva z3geefB@x+=WKV={JfQ<)MVHa6mU}G*byL*F2z#9+Lh^Q^{w8$+K6Kv#zMZLt#gBuZ z_2=&+p|vb`-=U0NFN38y_)l~JH$6}3(wQNFdDMW@D)bfAw-)2Gp_tE{XV7t;9vaV$tP+pP`Q?F9G+->+;4pL7Ab{?LbT;=Cu~c+ z+eRU^jGq+v)!c5eF(-SEE(XnP;s9lv3AVsT@~dWcDmHXNqayV3I_KHI`$#p>IlW4h zl=oGy;i{wM)|G+pt!{p>h-@6|9%d@JDJr_@m3NmsSsl9<*v*ShMY5J4`iKh4<5p>E zM?Ss0TsoTQ(uT?3=7l;kmcBUe zj}#jME)gt)BJ2F^)U-Mfz>9zFbosYHnY{6j-Xm?5v~FBnB4U;9*$RW{n%WH?}!+KWj z#9-yGA3`J$rxarukrOS54#kPzJIx+Y zE415Pp13`K#aHtBl6Qy%@U5_WO4>^fY_-IsBMJOUaOCvGp+U5QqwBFE@fK2hmtL}P z>6`#@1Tmni!HVz!EnYjr{d#Faq0*T^f2}8W=dPCN0A#mV9nm*qc0+W_jf$IR)1&!; z^n9*=@bO1L32QtzFijx-^ZgLs(q7LZ``Fm86Dwq56~~}uNXeYlh3t#iT(#9T>08pG zKe6BoiY8e*uKAjp6n+l}32BpesD?l9HEMb-CzdfET6p<^7gL>R?Zst0NKGw0JqytU zy2^H>Pb@2>pZ_(=@-h!0S$Sh%upnmVcd#*i0$ls2(+E7$)p}bUSdLT(s~n7)iUd+f z5+&@gptL;O*x2THdsf_m1P=J6iL%v7V((0u>)_yL4Nh7nsPO2EJ1j0PhBEwRP3@;$ z>6%NNdnzMfJM!t`uQrWnJQsQK4SibP{lDI6(v_j#p}g#ljUG$^R8dvfx;VHr51>;Uo>aEOOC%uwNCx}{5BBz6iI1xfDzwn(pyEFeH%a?a_YgEdKnBt zevjMLG4wz^DIg484$1Zb@-ZJt_z-<8WNpFs>g|{m0iqO`NGvY6ScDNW;r(U<1h6!i zNbs-$#*^$drC(8?PtXdVVUb|4|GgDuJHY%u6)53lpl#t{yYc{Wq?mvGzz52P{&$z~ z@#vJI|7nc$p6rwVfAyol{~d()p$ z5k<)wjODY=n<0d%EUf!|>7>_zw`j`yY-D4ugC(bCGIZ_i`em0F750d3t{qU(CmDUC zbo2DWR^bqLsGNMOYpAK)yR$N9a5wF)Mm#0Qob0sL^u?joA)xpUm9; zxIzWW@?z{4aJ879i5biy2mZ>g7|mpU-ZW42J*^Z-l)Evng&EJt_&Ru!?S(p4lCOJs zQt0=r-TrueG+)ho^#SXX+d=HpL^^ggyLjdNs@TY(KI{GMYx!@_xRFgzcJoL+OLQHQ z!Q=K`o;5P^H(%ky^fVCVr@-)$Y}oDjIt>nHefOTngF+X{+_opoIp8zg#f29(_FFzu zuXmmj!uxY`-m)@m=c59Kl}dD#cchR9QNkYDJ%|-3Jjwd7WyJf#I{D-2AsIE&Y ziyPCIK4Zma8{f01mxUjnRd2owZEPT>+_jM>VJ0092nlh@Hu#@TuQxw0K4 zCU^A6jc~S7kj^LVc$l>|G;$|_P=BXBu2hXq>e_Y4m zIIHpXJ`{0#X96>)5S2%!Yg66*FpLqJPi$G<-IA~TT(HyHL8M^6<`BiF3^hez(N>>d zQiaYPwrSG^zyJ?cuYa)V7C}&O&eYJbl}$e^eD>ib$5V(`d&_Q0^+{7598>UDR~9c` zCa}!8>Va5BCSgxVxJiX+Soyq$K4(DLq>b9llkBRMnHZkeW5g(Sc;Xfapb`s7I{8+v zJxq0VA>UTdtBj%@=%ww4U7(;!YxPi94BZ(O4-0C**YrNQ5NP6LK7dgz{ch>w$9A~D zFm_{vfokhwGo8kYu)?gNjeZf9KRY($SE&Wc(VCBcxOgA=fYsr_cwvyE^TnT7EwT6B zer)BbbhI9pB`0LVRGYB2qbxJc665nMrfi7#ndIs^zg5Tryr!`Xa`P83bUJ>r$@dd z_H*QCr61osVzavB}y9;Tjo0F^{4Fr^XS+R5B8w65ipbVTU@#B zS;Vp8ua1{D2#iw(7}-6X_y6cJI2Dwm$P#=p9n zXe_a->`2E_7LJ4rTD{e+&`uZ6H1+8SI`-{Cb@^k9WrKjgbFV*Je6*Oh7;i92? z{8JLBaPuT~w;s*v+)dD4FceM8nb|N2KroRbaDVU6&3uuFcl$`&x@PR<&hq|NR*g(5 zC9|vRPqP{gtxPOffJZp2n>`qKoiO*ERqa7EyLWC*`;^x8$NYv0qp9=D?WFEbe#MNa zNk(!+91HeVcFnA)NnA3j1Dy3oDXUY8TMnQH;;qhojXapZLEsOmk(%UOSF3~viXog# zv{zA_n!f4nzi33{t_v%=dS_1r0a7=U0wp)ZcDMR@{-UeC0D+ zaSa`k`ORoD@vPdlwnjU<>>?5?)$4T?zxVSurt5LmW=fx2&CoVT^Y)J%2QYUi|z8vSxbE2_QAAE1U((-jV!53$6 zaBzBhT18FmPxvv;r1#lx#P4!ZRKiEI<@6h`Pi5IqktVBim72K~cA*?<>hkki9Z=kxQ165CT1kD5Oc0Bf(SS#=u zN`+pnxi>WCJCIbXWW~fspi4qLFzR$IY9+SQ^mYy9>gvq%a1KCNUjy7c1|VmC&-~Zb z4%$K>gx;UIqm_b54EG9bubk^P+%ZWxw6RLigV>|L{pz@=A(B}hbA0)!793&o!E)4X z>Ja>1vIQk?K)Fl^#{cSVq1RFZhsR%<{YKWYBpZESn%=?Im|IrB4bm61Gcjy$9sK86 zg|N=ou`A8`~G0+@67t4hc3sd3Bm5x3gQjjT{O+fq9NTTO=h{ zr2KA3r89C`TKKZEvdeB$idJ02Jiq7E$<%rZ3kpJ3T0KG&0aKTT1f#Z$*#;aguBM`r zk}fN*m=wb3hTOP}jy)6ErVNrPXxH~UB;$43a+2qW2?$tJt#fOo%_UQ6cF5fO;u9?|(oO1_{Mh^7IYvZ@0ZEH?TAXk8d3k2R44AcZSg9x)pieMGwKd|LCl?nyaO$RSd}uQ&hA^d-PX~77;Ve zZL1WR*|2!LIf3q+^C8=g{09$xN?`jw;)x!6YI5?|kg{yJPlLUzEV8byE`1z)OhQ5r zBDs(Mj7@%1Q_9IwWi8An{qdR|UfuvBhNdpj22 zU|bZFGjHpJO}!N}UIw#p@Pt+NOAE@O@L^!{v*lYu7&)a7C}map4i8VVuI}z3EOchE zQP=8hRs6H}$tO^Qy}+-lU?O%gD0!m8b_WOBc0(LunH8?nP9?0o@|B>u8E6JUYu1+m zH%uVAmz!79r3QNtsjyGV+0YRy7nCjkb}vTCC@8gSNg%FCwoqFm?xoW(JxJbWe1C6s zrc{x|!L+OcV!5+mOGklT8Hf75I=0FtuM!r-p zLozIsmm2c|H>DsoqRW6Y3J632l9dqC@TQR|Mq>CgrSC)GbAJJ)dvQCjxX!!Z|bAH-rA!Ze5i;(exgu0(ml6c{1VS0&UbpKc#m6 zrUvzzY&2r5!gi89YZ$&f(TR;kN4g^VSYuI{Vp_xuW z3@{?6rlww00vsQlX{qby4yich(>2M#J8dNINoT&!n?}bbCQ9n*5o?tuCM6{aL)6vO zezCxPDv{{z?X~-DdsK8Ovi!ghu6{CqqGe*D;O6EwIZlCbtzxt$75HM5Pss!@^UqoLuf6XOxZf5`qJlP62~I# z0;T~dl`7@N!#UUOV?~r=g-Pt1cRr3l1XW7JsI4bar2Q5bw?{{_Sgh=WJ72!%(q*?G z94?8Tg)%n!@TFm+vRj0bMvg8LO5~npPajw3zVl@bdEWgTs{Nh2+?dLF7v-#!JMZODloEpjlpRZDa}|j-uj+`4i^=lo$o= zo>pNY_cL>)(Wv;C6r1;JzAv7_ej5nftsZ{oJl`)L5UCw(uw~T?RRMipm?+X@@Y+_F z4UZ{zdKa8*Gip(JduQ-gsPPb{G9QY z*L-!4!3zkR>DDo_Zp~cHkV|`zX(@YXEBW%)*=gs~r^pOoT)lPsHlw{WwQS^h^0Cd3 zoF^SGNNlX*>HM8&1row7vRV>gyY-B90$!Xj74-!Ilzk2+Bvw82SPTKS~#1FNw$ zF@-Q!kLYlJAAs$&s8s__T1^#7vHKf!2}bT zf1oME1Rsv^Mu{1?|edqB?9zJtkEr?pR_N)wIA}fk=V~G{cJ*Zky_2p%1`YmByo^PrDwpp_sZZV1qoA+0dnB7Vp^7vjOsrY4OwkoY1cUG`N zs%0~RNk&P@0-7TTzCK-U@9mXxOnalK0GgV;Hz!NoHV`o`1xDH!r4pIrcV!OX6<0J?+b{bmp^gcfjp&z|LHd#<;7*2JilE9H-0iTFa9^7 zaFxTs1^Eb>e(U(0~I7reKJKhNTpj_v4_YlJHzwcA%-J3q$@0rc*5KpTti z%OUqOii&rwe)*f{j@y?35sPPvO#wv7K+tLPV)hV*(;%{nvr;veE8dOXgguGrnEzJ1 zOg^cU2Z1q=RM^gZ?+E;h1~BM-y|-1t;MJ@*0Tn4zS9{a7JuG-Nku}`?eD9$_Mon$) z!MFXli%@?1#S$O_Y09}qQnH<@2^fo(KlJqUsC@oRs(BCdOY2_suCOv|_8em8`56uA zhfn@mT#Q=GiasU<%&7zZT-JpRWItayY$E$(*eY9g(;Yr??ucV|ZrI zzXK3fasZQ*Jg_fZh7R8pB-8k#)(csRNXq*>n3h!{@?_!e;g(Wym0d?h9vmJz#Uh|6d6C zukLKvyzH<}Cnl;`;dA91pZ}op@UiAP|9Pzy3oW)QL`KCqs`#0LIx z27$4^$j{I)k)$H1M4S&$_ic(OgwT|Lu+B9xk zxvjhLizo5&@Z9L`X6+;$lP}}~H$rzb7dY0dZJvidP%Q}}I_bLWS1``nZ+gf&xi%U@ zr?StN{_kEGJu~YFI4JqeOwf@_xe9^|vfk*1`CDlRy!*y2-D0AY#9xUN^Jfi%{AUZi z!M#dJ3-zQ;Cwa=!^S7Pvi}y$@esZqz`Nmzy_*tBmqea7(BWW{d{IR$|jxx4LY|;mP zDP3J61_lOb9B*8&cj5Jq<)4_Dku)&K#LS^ThYm%SX^$`Tv*TWPA2O{NbqPqw&X21H z1Z;Y`jT4lViA;NSn|G&^e1fbsUH=pVYwH3<*Y8neNruG@ffLk&pmrAX=bYJe`g@eF z5hDCH>kAS&4{@8Zr#|};d(=jX^tf-OQ|-aaL$S4o z_u*$FpNGbXZ-Z&YNLH6AQWf6Y*xFX>mDe>is2LfJWqfpnrq}SFXr-~p;|C?Yy#@5j z-9O2zOagr_;r84?)F{yg$BG7*C#DRzvnOvjAxDvith_!jQV@!of1(;o*cor9d1U z9MdIGVF$cq2{sf!V`E9SU4G<4K*hL{iT1A7U#u}lMGp<)wzs8f_$ha7Nq?_eRPGod zLtE5%&fKw6T328HrCR4fpaP(CO|XV{!tc29%+fn&3;`rfs0zWZiy?{dSv)w%gI6x1~4B9@hr z$^QL2b9Pn>8wW?cMErexI5hWKc4&N}{ri{n`OObb=$^~RNs}ybBZVy!#s9a4HvXjz z?aGrKEn)W%r;IL>11H}C?u)$cnK=Zke>G`~N)7`V#h{RHbr`uizvKR~ zCs4ZH82|^$D<~L>ga+`;(#dIW88ZD7gMJOqygmx9A`Zy>LQ-%-+~3gf=fJSEIiBwx zWgVc8f$Z(No-Ti6WMWcH>-5Ui2!=k%Dk#v1h=2qCz%pdq{%U+G8h+@LMg#I8Q~F+p z!1LD(CAv8yK*-VkH^T?RHbS}@H-1v|QBiLJT46fe~cUEWPf0WZ<>&_yn8ZB4)28_S)sIXFJu2AHs#A&apJ%eSK0O zsLr#zyd0!ct~HwRF=)byhLba%Ou)UfoO+Dh5%+$cEX5H9|Fj8FOGr`HSQlAT#rzEg z(H%%v<1_&sa?xKI*Da1U*a)jDaGGN_Go?CqhLL}ds*>JmY?lsn+1MP(D9LT#g~thF zb7{HVJ%M`m>nSfML}ST!2%uU&+WY(alB=s1+ILS)Rx&DLQey#%A4TC=BjHbH9Ap<7 z>G_=A(hD8(qaz~V%Djt4jPB26iQZ;~T!`MUF;d}venx%)ONhUqprT%U6Z{wVLUNHX z2EfwhscO&Gwt#J%i!=Sz-4E}!Zk@m!*T*^9XP+-|L z=4UuAE=&)F69L%5s@RuGWV>yqqnQKOZ-JE_Naa<9~>O)^L0o&_obQS z=uoTb8y-GB?E1yGfq?;)+t=daVht^=O_$~r0S^{vWQet(B~<6|zL7nEZZ^I^ zFCU{gC*?}Ql|&F5TMI9KGeYR!mwRTy9WeJ1qx_L8t3?Nt#xwue20ZHqHvF1B;_cOWOuoXk@?rHvF1dQNd!zqu;SJIq|Dm zk{XJrIB!C5;&$Y0R!mU?TSbDD*8Y3 z77Lo0nH4>&i3*F_@Y>GU#JH?E^_Lw)uNS}-PAxcEuCDLK8Xpu_Ru+0(BT}iucr_pF z_!+5x`9cX;)OrqFzvu8Y_axpKv*Rhv1mj(>r;ltW?pQ03r*Or_)gAw`yY|GrAc~fY zq1qU-bQp}Ig&s%RJlJhF{+YAo>p7z_=y2v69m%1zuG5a?UbvK|gO|GgTHZ^*X9kqQ zLFP)+pxtvLU@WWAsL!O@*u?^KsfyhHhI6U<0bnV@1K0fW?NLY%o%Y=Py_iB361j>yRIA;2@Hl-uLYc6ZJ7 zQtoONG$4>7dK$Ni>L+AvEPTToz~JUd%;)y>b{JdgwV5R1pF)BB$CUbvxm*X>N*k!~ zq1WU%;P&-vz6%&d^6=L}&ud(9*OvjL_W~qjtRqw$)_g8U+8$3^mu=d(e_3wR3tX;q znkGCZ6vWEBES{{q!u~r@;=(L(cwpYv)r5rCEgdZ%`0q#_+S=M-ggqv!pf;0!@GD>GR59PB*DxB+H*I@&?@?6)w-ZGYrE z2k-xZ8-cU~W*iq6{p4G2{D=vZ{>R65?#J_369ttQR63vLwYo#NZ3jdB%q0$7zJVvt z-oq*?Z)H|uGK&VW<3m#vAnad`IWelP(g(wFurr_pZX=rDdpv?}dfNOJr^^vu=#E6B zf+C#HkGIkqes2U2_?pg?9mQHSR9E9)UK&3|{St?Q6J}7k&Hb2`W1xW8?I|LzV|~dc z+;=3kCd&W@>^x@+O75g=XA5V@c+MA*7f3Lw`0isoIboM*7~sLPO8eE5Uv@05f@OHc zXihqCQE%yEy_Z){-;3(q@t81ErjU1%W~o;3a1@!qtaPBBzP@gQ-NJX_liwnXvw}>C ziOo%iB}+5rB9qLA)ReTHBv^tcPbPz*?~q~dp1r|PHGwkRay0oJac9clm>E?Q_SI?Y zSzKD0oS&aCB7jbcRQy1{3^jg+fQQ4fAA?az+wxTnSHe8}@PyMW!CP>b#FJV<2WJ;9 z(P1ScZgCgpV|;c%!EbhfZStXa+TH#TxLiWyhf%3!K(gv>x!~$2&GJa~(w%#!^!7Jf zwIYvY@R-cvP}YEpi>u0Rfy2Lu%h!OpuG~`#7AYwfFtWmT2I&g=hw%s**xid?pJ738 zgrp`LB}l*JidRh^E3dGAsQ6s=0`?w5rRq0JBoDqIMsB&)5skn^lK?b-b-j^%d!$DA zyY$lz?H&x(X%z?T5#IHHtDON|Tv;IsDl~Sn}V3 zvHt9>|JHV=nvr&CwqarATR`0XRL|c*Q6%71SgU{b)D0 zHNkrb0uYGYNsWLZZ*6U@p`r2Pwg5VEu?{PnmsX3m#xL`@X1FpzD`4#;f*GT>yq_!a&e=`E zY|vigv_ou#V~4QKl5ykG&R=j|@$eA&=|Ym#-fe%nfuo$!!(=i@H&FQLT>QEnnvwK~ z$*{dg`qw*7c-1JZ`u5)WMmNp-_iF!Zk&&L6c`p~7b$JNvH!z>LBy98d#p3=&^^($) z=Kq^)a!P((!2e@L`|a~g@2&cISpJ_w{zt)2$`aZwe}E3{bOR1&obb=f%j;n2WqtZS ztRjVfH+r$wBBsWs3G%?@ zhk~4|IoGUP=Qnl!1I^NjxAyDMbcJg|5|Y{_lg@k)d3eWx~S?f z{))N#+~mr^<@5ZP`rH4Vl6ra?uz+~XTKErzoeq0BD|_8TsdW#7-g2z%I6rx>n|wr-WsO+=9#aooqSupo{PU$dmsZTLxF8Slj5^RW zz)_KxS5^j3yfrOxp^0O!IIz?e(J($l)zS1|uxx^(Hr>hF0*#>Q7~hsRZ_uHXAjYQ9RH zQti6>cg4w{>Qdy+U77N1nip^YWQLtV=AG4dFU>Sg-w>gbBA)7=Dh*Bp-i;fq9KYW? z>Av|_@$a|)#V5>O5Th4cslL<`37coVcE$QOAi{P{;1EA&VohIup_T*!bc^zXWHLf8o&1WpKjIV^uDJ^hOg z_q2uKtE=r_=X5UGS?w_}yxyy`o0qj~`4D4h4sr&CCEMmfG_S+-W*i z>izXVZ=8B`>gcSw*5zK^kuo2j>+Q>$zihLe!RO~XFIPU!yH+o}uex>a^1j`buXfCS ze<}E9=d?dQZjdA~l~dWF`rDhthlg67z1)_l>M}4eoCmEXI5y9=dWYTnU*3B03YR0} z7wy!(@W=G=TGgPBp{ldq^iTIF=zFx<>j0#fJsAEUluJ zALKsP1}g0vR)p7qRx3AsbOJ4ImN18Kl-4u~K$a+Ts42nLHJc+ZY{piHef-ZjO>n(s U^sftNfu3XVboFyt=akR{0KOT>*#H0l diff --git a/icons/obj/food_ingredients.dmi b/icons/obj/food_ingredients.dmi index aa66fd411c61ae62ab543e17477bbfb75dae948a..6e122ca9a363e755565d2f5bc64de6dd5c0f9d1f 100644 GIT binary patch literal 2587 zcmZWr2T+sQ7XBkhlOn=OF%S?0#09CLh=8J@1`~;)2ofn$1(XOp2@pbLH57pbmg*9a zrqU#UK|0bQ;8GH#BSm^MAbqnlJMYcgow?_pIdkvK{qA?}{myxTur%i55$6E_fX~$A z#%-3z{AFAmta&;mP@ClnpQ3EAH(dRlAA9&=J$!utASffIw}&S}w_Fte`k`yIBM4hsU0c>B3HR`bizUVhV!4J&Vw z^812^&4qzA6fjjI%^!=_4FQuGt^bQ0kp)(Mc!gAi&h#Bl)txRp$ATtfwAtYkj)zH2Sk zc1(|Tc9chskGlAzVNJKLS7-4+>*CDfBRO`j-xp7VN_jr}BnP{@ftEFqfqSw+@OKs~ z(I~F)J+jpT&_z-#1`u*K4`_Wg{5(V-mc!H+OG;^tWxP-NRi%pvqSR}>AT+X<1)21?b zo4RH`XX&=I+3#y`^FYD@z{@z-m#(b+YO{ntHE$U|rLWarDOA3&-%5lS96x#QZ_W9N zL64kEMjt#`yn3)yueF}ryVg8+m6-9rfE(p-}iDmJ;D$pr9ob}v7V zfq*RV)u0*4Fd z^ze0!Y%L)L(l8{+aiT0g`$sI}{i+-Gcy(Kjb%nhCVS%tCuZ6NBeqzp}jKk)M^){`E z*5%PBGin|HUe>hTMXh~)%cfTd3=ZWjd8OBieMfS}-}W2QKrtTlQMkue;O+F?pC10i zrDV}e*FjX5E#d}7`rMa&e498w7Zh%R@Ffz5sn~;d>1nK)4YfRSr)0dLMQc2Kxfm9> z&yTAP)Oz|cfQ?^1`2+~J74^F-i9JtON|Z+=Sa)d~O}={NG%toe9s(fFzsnONJ^ZGV z7fpg%asQPLKJmFpUKaFdNiZXZL- zMr{R^eW7yrRmn5sfb$d;zN`U2X=8BSCI5$6tK)7hJK$_A5Z|hM*)Dw%amo5Cv+5{9 z;AltnOUM(($ZXr!m)n!GLTx5g-SCSikwQF8{K+^=1FJP71NG*L^h@r=OvCLDQMCpX zl^(EdEaP#bl%x6y$kDkDlz4dVNFFU0EN>ZhM)3W}v)as1!vvM9VM1#(`?ltlP@*+@ z;|~V%Simx4XqnG7pDaSlJl`uBRP!T^=grv++H)3uQn}QX{H&Omd++8m0Q}Ia(6Pfr z4jrd18wa=)_?9#^eqU*Ty*pY$=f);63l<>r%EWm-_9-}YgR=T4brHzrHcPZZGBpM~ zH7(qJ?i7m`%#PaHvB#;a@HN?az(RBgd2)(%cM34-ztIv5HAoGAJY4qla{XeR>Qnh< zUD$|D!1pZtl6`h;)$1B;e*LaP5Q+Sj3?LRr-#&ShwTEdU)2kP{IS`6tLZ_R~HJ5@; z1PfNl>iknU{!c~z6+}w*1;uS}$nlMxfiH_YRjXFa@@X6FQF3P&WWI_hO^~-Zm40Hm~k#&Ou~S^3+_pP`+adq+hS4f zZjKB{SU4}!`mFP2C&^Wa_EH~Suwn*U#f-tzsCH-eD?9CB=Q6=Q%UPPFX z)$4Ca%Y(6AJ=^VypXveG9z-JBd+nQarP~yz3ba zBcRvlcjFym&5#Jy6E;>aGu>a542~34da##ITN89nmTez>Y>A;Od(`zNBzI>Eulqa~ zVAwxDX%z3YN3|}9`K;c_TSo&qNDr>Pb==qGOtElQ!)$i)5XjHx+)&s(9f{{fhFcYq zu;5*03#J9i>=QyB)(r*xTrQP&J(|DasoeL#N*Qnz2)_!2kqI8NK126>&{#}PLWMS; zYdG}`f8_b}*6_J%U81w<$R~(cy+Yxs(#NnwBc-}wLU;G1`HpjAp9YFs)5skAk)(?8 zLN$F?Bi>6x8t9n}S0?#&Jc5hgzY}zU66aJaITP;+c#F(fIG(zlM$TX|E{1lL@uABC zxJn|KB!#6UL_^aiHdidr{5vOT0|&T$l2HA-hWso0|E(_nTPdHlHnsx$3w@I5Vlm#n z!#kn11F5V5#ZtLXWUa%isa%^+j;4cwkq~-OcQUj=RqNU}YtdkTL6&d@34&Y%0PYuW zINps{^XO3T{{fATCUGbPr;9D0o~2Fm)?67u+=17Z6!*Q>5(%f%3Et4CcQrW}22}mp zPO@wd6^JWPt5P0Fzx1v-9z#hxozS3Vxu1WR5>v<37BH z^i_5mW(N>?IR|^XV9Wfu?EwA(6pony{)i@cs~HY&t=K1v)NA?4<@^O9?k|g``=Lc~YhuZ_J7mFSv(r`C@^8eUxyGi7ytIyrl-Uh)fueju zx4syqh^GwKTY4i{Q?oHWN;szdLAeyMAw4SVv)h^w6o2%^T3qab1q022C=iTgsJWv6 zL-aWEjNoEgBQNXA$R^KAbn7={dl()J=}lM7J>0z|+K6C{l>bze3JwS&HO{9isZQsX z<%F)BWsv1ib|4=Oo=zG;fkkMuIvJy2uf}(B6;6J=x)DH&9Ed183xgmAq5<7W1DbsA3Pj^Nl4v^r&apoX zpKM-Kq-a)OlSbZy>2?_=D$OPB9+da72|l)JkX~K*&hmZ?vzitvIs6`5ZTWDj?WoC3 zjP+V1f8m6baxD1OHvOuMO+NFi>Q9b2DEhX8I`|v_aG*^LbZtWO*7H$F-cKU^9mM(o zHiyi*EeT#M)bB$Y&)w{t#}wT4kc2`5{z2{Hao?7S+stDZ3XoNTF z=N#*n>z7LtAQ$eB^XQE+bCSg0)xYK&X!__jn7Q*S{^!#-@(y9|BJbB13J%#DbDv=N{mzWVnsAp!F#18LY=24fxZf6MWag?rI(;&c-q)r=hs;Sb7Jm~W39h7 zkXo&p;h*eG93~}!&Lc;$5ej{=X9~o!`$P8C4%*5e8q%kwDytbfqGp2fp&NTy-K@S|Q};Ice(Wfd4WF>eKQ zA{6B)`0}PeNdf`TQ=0oxtK#9KFA{p(-NGTkRAS=L4CqE(6CZ9}yy_5!4wtLyGjwXjxOG0z2 z&x6IrMUz1NlDa+zTnJXzp&ty~4x1~Vk)j7m3qj($%(&aegFy=IXknvvu1mxF_O@?f z!AYl1v@stAsFB_T#8x0+H(40BZ(}Jyae+5_6C(m_R4=e#Ovqj;`XA#&yMwqTpRHSx zIzgS82LUq7`KMAQUjVG=Uv0}_;4D_o$p{+1k!SOk1d`+k^>UP6+@Ur)VW!f2Bw>xIE$Z{w0_x_DysU)bg zxsc5ohPc>qS}>(+cH>#F{P@;qUNIw_Rjr{%uwdu?%afFNHOsmo=|FN_8LK&%vu!HUXNodz zPncySTR~iteE|;}@ag|kk^c&bodGxb+Z!{ieA)KVsqagP_IId8)^{7+3WnG%e*@cS zkp`(uy6IPXM^u0N6$r^Qsd3{x1yk3*k^C1=0$aXq6|uMy zR6{>{oinsd=M?8-kEWuQRkhVTWUtSwg%d;xNG1Y;2|(5>psGH&;zz334nk(kZV4qm zXu7ANEH}X90KdDorIFxLJN{Y3uyrH?eKH7rRUQp?+Gu%QTF<2Z>J+0=!aq4HXYl-i zo>1VN7I|H+axIQ8(sjb3OzsmZcC~)LUPi!zy=V4nhzLzBP`hqwS)V!vI8_3Y8fCq} zX^h-a3t+ah!Y&U+VTN4r>u>Di^*gSol0Y9Z@UXC0ywlAlWtvKR^Eq{9^Fv!?VJ|{J9sS3H(qZD+w zMc*6Cxp^6VC}NZOj2t}5(Vbdgmxq1J;Al#98U!r8kO4BJ zau&Ojz+bz>g&&cAj*{s5T>0br$3g^Y{-ap%R~zm+f1%fU!hUZI!y ztT;VD);M}W_c?Xnz{f=Cw&GfE?BkG8Du?UN(jbyHCL{l4b$cXt&rsiCllrj3aY5%2$#}pVUDgk~jb0z0n7XpG?$|Q!xyOf6t3Eih6WLf}t-e z?hZ%pe4E0|C$OO->#@gO+28kb~`p%Zz4OgchlJNZ-ke^WxFI5ttQYt-qA0z%m%qi{dW~Q06UO#c(KyerR?w zzm<`6z4HrCRFjnx{>7OmLvmO6?9@E@FGiq#9W1QK4wTi2mw;4md+YluXj6YK&3LKS zCp;%<-q2`iDB9FfAcNacC?5QX7-mH5-E?}rQD;zb!upaaF4eXPIUnufuzFU)it>K6 zc!W