cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix incoming mirror PR

Browse Source
This commit is contained in:
Rykka
2020-07-31 01:14:09 -04:00
parent ffbc61e37e
commit e8ebaee3dd
17 changed files with 8 additions and 1337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
code/modules/food/food/snacks.dm
View File

@@ -157,11 +157,7 @@
. = ..()
if(Adjacent(user))
if(coating)
<<<<<<< HEAD
to_chat(user, "<span class='notice'>It's coated in [coating.name]!</span>")
=======
. += "<span class='notice'>It's coated in [coating.name]!</span>"
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
if(bitecount==0)
return .
else if (bitecount==1)
@@ -4532,14 +4528,6 @@
filling_color = "#DB0000"
center_of_mass = list("x"=16, "y"=16)
do_coating_prefix = 0
<<<<<<< HEAD
New()
. = ..()
reagents.add_reagent("protein", 6)
reagents.add_reagent("batter", 1.7)
reagents.add_reagent("oil", 1.5)
bitesize = 2
=======
bitesize = 2
@@ -4548,7 +4536,6 @@
reagents.add_reagent("protein", 6)
reagents.add_reagent("batter", 1.7)
reagents.add_reagent("oil", 1.5)
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
/obj/item/weapon/reagent_containers/food/snacks/jalapeno_poppers
name = "jalapeno popper"
@@ -4573,18 +4560,11 @@
icon = 'icons/obj/food_syn.dmi'
icon_state = "ratburger"
center_of_mass = list("x"=16, "y"=11)
<<<<<<< HEAD
New()
. = ..()
reagents.add_reagent("protein", 4)
bitesize = 2
=======
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/mouseburger/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
/obj/item/weapon/reagent_containers/food/snacks/chickenkatsu
name = "chicken katsu"
@@ -4660,15 +4640,6 @@
nutriment_amt = 25
nutriment_desc = list("fried pizza" = 25)
center_of_mass = list("x"=16, "y"=11)
<<<<<<< HEAD
New()
. = ..()
reagents.add_reagent("batter", 6.5)
coating = reagents.get_reagent("batter")
reagents.add_reagent("oil", 4)
bitesize = 2
=======
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/crunch/Initialize()
@@ -4676,7 +4647,6 @@
reagents.add_reagent("batter", 6.5)
coating = reagents.get_reagent("batter")
reagents.add_reagent("oil", 4)
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
/obj/item/weapon/reagent_containers/food/snacks/pizzacrunchslice
name = "pizza crunch"
@@ -6065,9 +6035,6 @@
/obj/item/weapon/reagent_containers/food/snacks/cosmicbrowniesslice/filled/Initialize()
. = ..()
<<<<<<< HEAD
reagents.add_reagent("protein", 1)
=======
reagents.add_reagent("protein", 1)
/obj/item/weapon/reagent_containers/food/snacks/lasagna
@@ -6081,4 +6048,3 @@
/obj/item/weapon/reagent_containers/food/snacks/lasagna/Initialize()
..()
reagents.add_reagent("protein", 2) //For meaty things.
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking

14
code/modules/food/food/snacks_vr.dm
View File

@@ -42,20 +42,6 @@
/obj/item/weapon/reagent_containers/food/snacks/slice/sushi/filled/filled
filled = TRUE
/obj/item/weapon/reagent_containers/food/snacks/lasagna
name = "lasagna"
desc = "Meaty, tomato-y, and ready to eat-y. Favorite of cats."
icon = 'icons/obj/food_vr.dmi'
icon_state = "lasagna"
nutriment_amt = 5
nutriment_desc = list("tomato" = 4, "meat" = 2)
/obj/item/weapon/reagent_containers/food/snacks/lasagna/Initialize()
..()
reagents.add_reagent("protein", 2) //For meaty things.
/obj/item/weapon/reagent_containers/food/snacks/goulash
name = "goulash"
desc = "Paprika put to good use, finally, in a soup of meat and vegetables."

65
code/modules/food/kitchen/cooking_machines/_appliance.dm
View File

@@ -53,19 +53,10 @@
if (!available_recipes)
available_recipes = new
<<<<<<< HEAD
for (var/type in subtypesof(/datum/recipe))
var/datum/recipe/test = new type
if ((appliancetype & test.appliance))
available_recipes += test
else
qdel(test)
=======
for(var/type in subtypesof(/datum/recipe))
var/datum/recipe/test = type
if((appliancetype & initial(test.appliance)))
available_recipes += new test
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
var/datum/recipe/test = type
if((appliancetype & initial(test.appliance)))
available_recipes += new test
/obj/machinery/appliance/Destroy()
for (var/a in cooking_objs)
@@ -86,11 +77,7 @@
for (var/a in cooking_objs)
var/datum/cooking_item/CI = a
string += "-\a [CI.container.label(null, CI.combine_target)], [report_progress(CI)]</br>"
<<<<<<< HEAD
to_chat(user, string)
=======
return string
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
else
to_chat(user, "<span class='notice>'It is empty.</span>")
@@ -136,22 +123,14 @@
return
if (!user.IsAdvancedToolUser())
<<<<<<< HEAD
to_chat(user, "You lack the dexterity to do that!")
=======
to_chat(user, "<span class='warning'>You lack the dexterity to do that!</span>")
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
return
if (user.stat || user.restrained() || user.incapacitated())
return
if (!Adjacent(user) && !issilicon(user))
<<<<<<< HEAD
to_chat(user, "You can't reach [src] from here.")
=======
to_chat(user, "<span class='warning'>You can't reach [src] from here!</span>")
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
return
if (stat & POWEROFF)//Its turned off
@@ -253,17 +232,10 @@
//This function is overridden by cookers that do stuff with containers
/obj/machinery/appliance/proc/has_space(var/obj/item/I)
<<<<<<< HEAD
if (cooking_objs.len >= max_contents)
return FALSE
else return TRUE
=======
if(cooking_objs.len >= max_contents)
return FALSE
return TRUE
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
/obj/machinery/appliance/attackby(var/obj/item/I, var/mob/user)
if(!cook_type || (stat & (BROKEN)))
@@ -272,18 +244,9 @@
var/result = can_insert(I, user)
if(!result)
<<<<<<< HEAD
if(default_deconstruction_screwdriver(user, I))
return
else if(default_part_replacement(user, I))
return
else
return
=======
if(!(default_deconstruction_screwdriver(user, I)))
default_part_replacement(user, I)
return
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
if(result == 2)
var/obj/item/weapon/grab/G = I
@@ -376,11 +339,7 @@
else if(istype(I, /obj/item/weapon/holder))
var/obj/item/weapon/holder/H = I
if (H.held_mob)
<<<<<<< HEAD
work += ((H.held_mob.mob_size * H.held_mob.size_multiplier) * (H.held_mob.mob_size * H.held_mob.size_multiplier) * 2)+2
=======
work += (H.held_mob.mob_size * H.held_mob.mob_size * 2)+2
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
CI.max_cookwork += work
@@ -406,11 +365,7 @@
for(var/obj/item/weapon/holder/H in CI.container.contents)
var/mob/living/M = H.held_mob
if(M)
<<<<<<< HEAD
M.apply_damage(rand(1,3) * (1/M.size_multiplier), mobdamagetype, pick(BP_ALL))
=======
M.apply_damage(rand(1,3) * (1/M.mob_size), mobdamagetype, pick(BP_ALL)) // Allows special handling for mice/smaller mobs.
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
return TRUE
@@ -612,19 +567,6 @@
var/datum/cooking_item/CI = menuoptions[selection]
eject(CI, user)
update_icon()
<<<<<<< HEAD
return 1
return 0
/obj/machinery/appliance/proc/can_remove_items(var/mob/user)
if (!Adjacent(user))
return 0
if (isanimal(user))
return 0
return 1
=======
return TRUE
return FALSE
@@ -636,7 +578,6 @@
return FALSE
return TRUE
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
/obj/machinery/appliance/proc/eject(var/datum/cooking_item/CI, var/mob/user = null)
var/obj/item/thing

9
code/modules/food/kitchen/cooking_machines/_cooker.dm
View File

@@ -19,21 +19,12 @@
if(.) //no need to duplicate adjacency check
if(!stat)
if (temperature < min_temp)
<<<<<<< HEAD
to_chat(user, "<span class='warning'>\The [src] is still heating up and is too cold to cook anything yet.</span>")
else
to_chat(user, "<span class='notice'>It is running at [round(get_efficiency(), 0.1)]% efficiency!</span>")
to_chat(user, "Temperature: [round(temperature - T0C, 0.1)]C / [round(optimal_temp - T0C, 0.1)]C")
else
to_chat(user, "<span class='warning'>It is switched off.</span>")
=======
. += "<span class='warning'>\The [src] is still heating up and is too cold to cook anything yet.</span>"
else
. += "<span class='notice'>It is running at [round(get_efficiency(), 0.1)]% efficiency!</span>"
. += "Temperature: [round(temperature - T0C, 0.1)]C / [round(optimal_temp - T0C, 0.1)]C"
else
. += "<span class='warning'>It is switched off.</span>"
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
/obj/machinery/appliance/cooker/list_contents(var/mob/user)
if (cooking_objs.len)

12
code/modules/food/kitchen/cooking_machines/_mixer.dm
View File

@@ -17,11 +17,7 @@ fundamental differences
/obj/machinery/appliance/mixer/examine(var/mob/user)
. = ..()
if(Adjacent(user))
<<<<<<< HEAD
to_chat(user, "<span class='notice'>It is currently set to make a [selected_option]</span>")
=======
. += "<span class='notice'>It is currently set to make a [selected_option]</span>"
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
/obj/machinery/appliance/mixer/Initialize()
. = ..()
@@ -31,11 +27,7 @@ fundamental differences
//Mixers cannot-not do combining mode. So the default option is removed from this. A combine target must be chosen
/obj/machinery/appliance/mixer/choose_output()
<<<<<<< HEAD
set src in oview(1)
=======
set src in view(1)
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
set name = "Choose output"
set category = "Object"
@@ -99,11 +91,7 @@ fundamental differences
/obj/machinery/appliance/mixer/toggle_power()
<<<<<<< HEAD
set src in view()
=======
set src in view(1)
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
set name = "Toggle Power"
set category = "Object"

32
code/modules/food/kitchen/microwave.dm
View File

@@ -268,11 +268,7 @@
return
start()
if(reagents.total_volume==0 && !(locate(/obj) in ((contents - component_parts) - circuit))) //dry run
<<<<<<< HEAD
if(!wzhzhzh(16)) //VOREStation Edit - Quicker Microwaves (Undone during Auroraport, left note in case of reversion, was 5)
=======
if(!wzhzhzh(16))
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
abort()
return
abort()
@@ -283,39 +279,23 @@
if(!recipe)
dirty += 1
if(prob(max(10,dirty*5)))
<<<<<<< HEAD
if(!wzhzhzh(16)) //VOREStation Edit - Quicker Microwaves (Undone during Auroraport, left note in case of reversion, was 2)
abort()
return
muck_start()
wzhzhzh(2) //VOREStation Edit - Quicker Microwaves (Undone during Auroraport, left note in case of reversion, was 2)
=======
if(!wzhzhzh(16))
abort()
return
muck_start()
wzhzhzh(2)
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
muck_finish()
cooked = fail()
cooked.forceMove(src.loc)
else if(has_extra_item())
<<<<<<< HEAD
if(!wzhzhzh(16)) //VOREStation Edit - Quicker Microwaves (Undone during Auroraport, left note in case of reversion, was 2)
=======
if(!wzhzhzh(16))
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
abort()
return
broke()
cooked = fail()
cooked.forceMove(src.loc)
else
<<<<<<< HEAD
if(!wzhzhzh(40)) //VOREStation Edit - Quicker Microwaves (Undone during Auroraport, left note in case of reversion, was 5)
=======
if(!wzhzhzh(40))
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
abort()
return
stop()
@@ -324,11 +304,7 @@
return
//Making multiple copies of a recipe
<<<<<<< HEAD
var/halftime = round(recipe.time*4/10/2) // VOREStation Edit - Quicker Microwaves (Undone during Auroraport, left note in case of reversion, was round(recipe.time/20/2))
=======
var/halftime = round(recipe.time*4/10/2)
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
if(!wzhzhzh(halftime))
abort()
return
@@ -383,11 +359,7 @@
if (stat & (NOPOWER|BROKEN))
return 0
use_power(active_power_usage)
<<<<<<< HEAD
sleep(5) //VOREStation Edit - Quicker Microwaves
=======
sleep(10)
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
return 1
/obj/machinery/microwave/proc/has_extra_item() //- coded to have different microwaves be able to handle different items
@@ -547,11 +519,7 @@
..()
reagents.maximum_volume = 1000
<<<<<<< HEAD
/datum/recipe/splat // We use this to handle cooking micros (or mice, etc) in a microwave. Janky but it works better than snowflake code to handle the same thing.
=======
/datum/recipe/splat // We use this to handle cooking mice or other smaller/similar-size mobs in a microwave. Janky but it works better than snowflake code to handle the same thing.
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
items = list(
/obj/item/weapon/holder
)

95
code/modules/food/recipe.dm
View File

@@ -71,34 +71,7 @@
// This is a bitfield, more than one type can be used
// Grill is presently unused and not listed
<<<<<<< HEAD
/datum/recipe/proc/check_reagents(var/datum/reagents/avail_reagents)
if(!reagents || !reagents.len)
return 1
if(!avail_reagents)
return 0
. = 1
for(var/r_r in reagents)
var/aval_r_amnt = avail_reagents.get_reagent_amount(r_r)
if(aval_r_amnt - reagents[r_r] >= 0)
if(aval_r_amnt>reagents[r_r])
. = 0
else
return -1
if((reagents?(reagents.len):(0)) < avail_reagents.reagent_list.len)
return 0
return .
/datum/recipe/proc/check_fruit(var/obj/container)
if (!fruit || !fruit.len)
return 1
. = 1
=======
/datum/recipe/proc/check_reagents(var/datum/reagents/avail_reagents, var/exact = 0)
/datum/recipe/proc/check_reagents(var/datum/reagents/avail_reagents, var/exact = FALSE)
if(!reagents || !reagents.len)
return TRUE
@@ -118,12 +91,11 @@
return FALSE
return .
/datum/recipe/proc/check_fruit(var/obj/container, var/exact = 0)
/datum/recipe/proc/check_fruit(var/obj/container, var/exact = FALSE)
if (!fruit || !fruit.len)
return TRUE
. = TRUE
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
if(fruit && fruit.len)
var/list/checklist = list()
// You should trust Copy().
@@ -135,20 +107,6 @@
checklist[G.seed.kitchen_tag]--
for(var/ktag in checklist)
if(!isnull(checklist[ktag]))
<<<<<<< HEAD
if(checklist[ktag] < 0)
. = 0
else if(checklist[ktag] > 0)
. = -1
break
return .
/datum/recipe/proc/check_items(var/obj/container as obj)
if(!items || !items.len)
return 1
. = 1
=======
if(checklist[ktag] < 0 && exact)
. = FALSE
else if(checklist[ktag] > 0)
@@ -156,12 +114,11 @@
break
return .
/datum/recipe/proc/check_items(var/obj/container as obj, var/exact = 0)
/datum/recipe/proc/check_items(var/obj/container as obj, var/exact = FALSE)
if(!items || !items.len)
return TRUE
. = TRUE
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
if(items && items.len)
var/list/checklist = list()
checklist = items.Copy() // You should really trust Copy
@@ -170,57 +127,25 @@
for(var/obj/O in ((machine.contents - machine.component_parts) - machine.circuit))
if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/grown))
continue // Fruit is handled in check_fruit().
<<<<<<< HEAD
var/found = 0
=======
var/found = FALSE
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
for(var/i = 1; i < checklist.len+1; i++)
var/item_type = checklist[i]
if (istype(O,item_type))
checklist.Cut(i, i+1)
<<<<<<< HEAD
found = 1
break
if(!found)
. = 0
=======
found = TRUE
break
if(!found && exact)
return FALSE
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
else
for(var/obj/O in container.contents)
if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/grown))
continue // Fruit is handled in check_fruit().
<<<<<<< HEAD
var/found = 0
=======
var/found = FALSE
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
for(var/i = 1; i < checklist.len+1; i++)
var/item_type = checklist[i]
if (istype(O,item_type))
if(check_coating(O))
checklist.Cut(i, i+1)
<<<<<<< HEAD
found = 1
break
if (!found)
. = 0
if(checklist.len)
. = -1
return .
//This is called on individual items within the container.
/datum/recipe/proc/check_coating(var/obj/O)
if(!istype(O,/obj/item/weapon/reagent_containers/food/snacks))
return 1//Only snacks can be battered
if (coating == -1)
return 1 //-1 value doesnt care
=======
found = TRUE
break
if (!found && exact)
@@ -236,26 +161,16 @@
if (coating == -1)
return TRUE //-1 value doesnt care
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
var/obj/item/weapon/reagent_containers/food/snacks/S = O
if (!S.coating)
if (!coating)
<<<<<<< HEAD
return 1
return 0
else if (S.coating.type == coating)
return 1
return 0
=======
return TRUE
return FALSE
else if (S.coating.type == coating)
return TRUE
return FALSE
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
//general version
/datum/recipe/proc/make(var/obj/container as obj)
@@ -393,11 +308,7 @@
/proc/select_recipe(var/list/datum/recipe/available_recipes, var/obj/obj as obj, var/exact)
var/list/datum/recipe/possible_recipes = list()
for (var/datum/recipe/recipe in available_recipes)
<<<<<<< HEAD
if((recipe.check_reagents(obj.reagents) < exact) || (recipe.check_items(obj) < exact) || (recipe.check_fruit(obj) < exact))
=======
if(!recipe.check_reagents(obj.reagents, exact) || !recipe.check_items(obj, exact) || !recipe.check_fruit(obj, exact))
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
continue
possible_recipes |= recipe
if (!possible_recipes.len)

18
code/modules/food/recipes_fryer.dm
View File

@@ -6,10 +6,7 @@
result = /obj/item/weapon/reagent_containers/food/snacks/fries
/datum/recipe/cheesyfries
<<<<<<< HEAD
=======
appliance = FRYER
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
items = list(
/obj/item/weapon/reagent_containers/food/snacks/fries,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
@@ -104,21 +101,11 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/donut/poisonberry
<<<<<<< HEAD
/datum/recipe/jellydonut/slime
appliance = FRYER
reagents = list("slimejelly" = 5, "sugar" = 5)
result = /obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly
/datum/recipe/jellydonut/cherry
appliance = FRYER
=======
/datum/recipe/jellydonut/slime // Subtypes of jellydonut, appliance inheritance applies.
reagents = list("slimejelly" = 5, "sugar" = 5)
result = /obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly
/datum/recipe/jellydonut/cherry // Subtypes of jellydonut, appliance inheritance applies.
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
reagents = list("cherryjelly" = 5, "sugar" = 5)
result = /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly
@@ -170,7 +157,6 @@
)
reagents = list("soysauce" = 5, "batter" = 10)
result = /obj/item/weapon/reagent_containers/food/snacks/sweet_and_sour
<<<<<<< HEAD
/datum/recipe/generalschicken
appliance = FRYER
@@ -190,6 +176,4 @@
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat
)
result = /obj/item/weapon/storage/box/wings //This is kinda like the donut box.
=======
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
result = /obj/item/weapon/storage/box/wings //This is kinda like the donut box.

26
code/modules/food/recipes_microwave.dm
View File

@@ -208,18 +208,11 @@ I said no!
/datum/recipe/amanitajelly
reagents = list("water" = 5, "vodka" = 5, "amatoxin" = 5)
result = /obj/item/weapon/reagent_containers/food/snacks/amanitajelly
<<<<<<< HEAD
make_food(var/obj/container as obj)
. = ..(container)
for(var/obj/item/weapon/reagent_containers/food/snacks/amanitajelly/being_cooked in .)
being_cooked.reagents.del_reagent("amatoxin")
=======
/datum/recipe/amanitajelly/make_food(var/obj/container as obj)
. = ..(container)
for(var/obj/item/weapon/reagent_containers/food/snacks/amanitajelly/being_cooked in .)
being_cooked.reagents.del_reagent("amatoxin")
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
/datum/recipe/meatballsoup
fruit = list("carrot" = 1, "potato" = 1)
@@ -539,21 +532,12 @@ I said no!
fruit = list("potato" = 1, "ambrosia" = 3)
items = list(/obj/item/weapon/reagent_containers/food/snacks/meatball)
result = /obj/item/weapon/reagent_containers/food/snacks/validsalad
<<<<<<< HEAD
make_food(var/obj/container as obj)
. = ..(container)
for (var/obj/item/weapon/reagent_containers/food/snacks/validsalad/being_cooked in .)
being_cooked.reagents.del_reagent("toxin")
=======
/datum/recipe/validsalad/make_food(var/obj/container as obj)
. = ..(container)
for (var/obj/item/weapon/reagent_containers/food/snacks/validsalad/being_cooked in .)
being_cooked.reagents.del_reagent("toxin")
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
/datum/recipe/stuffing
reagents = list("water" = 5, "sodiumchloride" = 1, "blackpepper" = 1)
items = list(
@@ -1027,7 +1011,6 @@ I said no!
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/weapon/reagent_containers/food/snacks/honeytoast
<<<<<<< HEAD
/datum/recipe/donerkebab
fruit = list("tomato" = 1, "cabbage" = 1)
@@ -1039,8 +1022,6 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/donerkebab
=======
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
/datum/recipe/sashimi
reagents = list("soysauce" = 5)
items = list(
@@ -1048,10 +1029,6 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/sashimi
<<<<<<< HEAD
=======
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
/datum/recipe/nugget
reagents = list("flour" = 5)
items = list(
@@ -1335,7 +1312,6 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/bacon
)
result = /obj/item/weapon/reagent_containers/food/snacks/porkbowl
<<<<<<< HEAD
/datum/recipe/sushi
fruit = list("cabbage" = 1)
@@ -1416,5 +1392,3 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/makaroni
=======
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking

3
code/modules/food/recipes_oven.dm
View File

@@ -83,10 +83,7 @@
result = /obj/item/weapon/reagent_containers/food/snacks/flatbread
/datum/recipe/tortilla
<<<<<<< HEAD
=======
appliance = OVEN
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
reagents = list("flour" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough