mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Bugfixes, Feature Tweaks, and Final Touches
Microwave not cooking micros/mice: Fixed Invalid Recipe datum thanks to /microwave prefix: Fixed Fryer earsplittingly loud: Fixed Fryer/Oven continuing to cook even after items removed: Fixed Oven having 'on' icon state when door closed but off: Fixed Appliances not scaling cooking time/damage based on size: Fixed Feature added - Burning Food will set off fire alarms and set off a black cloud of smoke! Overcook time reduced to allow for less margin of error (IE Actively requires you to pay attention) Multiple Microwave bugfixes, including multicooking/etc not working, recipe errors, icon state errors, ejection errors.
This commit is contained in:
@@ -262,6 +262,21 @@ steam.start() -- spawns the effect
|
|||||||
projectiles -= proj
|
projectiles -= proj
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
// Burnt Food Smoke (Specialty for Cooking Failures)
|
||||||
|
/obj/effect/effect/smoke/bad/burntfood
|
||||||
|
color = "#000000"
|
||||||
|
time_to_live = 600
|
||||||
|
|
||||||
|
/obj/effect/effect/smoke/bad/burntfood/process()
|
||||||
|
for(var/mob/living/L in get_turf(src))
|
||||||
|
affect(L)
|
||||||
|
|
||||||
|
/obj/effect/effect/smoke/bad/burntfood/affect(var/mob/living/L) // This stuff is extra-vile.
|
||||||
|
if (!..())
|
||||||
|
return 0
|
||||||
|
if(L.needs_to_breathe())
|
||||||
|
L.emote("cough")
|
||||||
|
|
||||||
/////////////////////////////////////////////
|
/////////////////////////////////////////////
|
||||||
// 'Elemental' smoke
|
// 'Elemental' smoke
|
||||||
/////////////////////////////////////////////
|
/////////////////////////////////////////////
|
||||||
@@ -377,6 +392,9 @@ steam.start() -- spawns the effect
|
|||||||
/datum/effect/effect/system/smoke_spread/bad
|
/datum/effect/effect/system/smoke_spread/bad
|
||||||
smoke_type = /obj/effect/effect/smoke/bad
|
smoke_type = /obj/effect/effect/smoke/bad
|
||||||
|
|
||||||
|
/datum/effect/effect/system/smoke_spread/bad/burntfood
|
||||||
|
smoke_type = /obj/effect/effect/smoke/bad/burntfood
|
||||||
|
|
||||||
/datum/effect/effect/system/smoke_spread/noxious
|
/datum/effect/effect/system/smoke_spread/noxious
|
||||||
smoke_type = /obj/effect/effect/smoke/bad/noxious
|
smoke_type = /obj/effect/effect/smoke/bad/noxious
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
// Chaos cake
|
// Chaos cake
|
||||||
|
|
||||||
/datum/recipe/microwave/chaoscake_layerone
|
/datum/recipe/chaoscake_layerone
|
||||||
reagents = list("flour" = 300,"milk" = 200, "sugar" = 100, "egg" = 30)
|
reagents = list("flour" = 300,"milk" = 200, "sugar" = 100, "egg" = 30)
|
||||||
fruit = list("poisonberries" = 15, "cherries" = 15)
|
fruit = list("poisonberries" = 15, "cherries" = 15)
|
||||||
items = list(
|
items = list(
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
)
|
)
|
||||||
result = /obj/structure/chaoscake
|
result = /obj/structure/chaoscake
|
||||||
|
|
||||||
/datum/recipe/microwave/chaoscake_layertwo
|
/datum/recipe/chaoscake_layertwo
|
||||||
reagents = list("flour" = 300, "milk" = 200, "sugar" = 100, "egg" = 30, )
|
reagents = list("flour" = 300, "milk" = 200, "sugar" = 100, "egg" = 30, )
|
||||||
fruit = list("vanilla" = 15, "banana" = 15)
|
fruit = list("vanilla" = 15, "banana" = 15)
|
||||||
items = list(
|
items = list(
|
||||||
@@ -22,7 +22,7 @@
|
|||||||
)
|
)
|
||||||
result = /obj/item/weapon/chaoscake_layer
|
result = /obj/item/weapon/chaoscake_layer
|
||||||
|
|
||||||
/datum/recipe/microwave/chaoscake_layerthree
|
/datum/recipe/chaoscake_layerthree
|
||||||
reagents = list("flour" = 240, "milk" = 150, "sugar" = 80, "egg" = 24, "deathbell" = 100)
|
reagents = list("flour" = 240, "milk" = 150, "sugar" = 80, "egg" = 24, "deathbell" = 100)
|
||||||
fruit = list("grapes" = 30)
|
fruit = list("grapes" = 30)
|
||||||
items = list(
|
items = list(
|
||||||
@@ -32,7 +32,7 @@
|
|||||||
)
|
)
|
||||||
result = /obj/item/weapon/chaoscake_layer/three
|
result = /obj/item/weapon/chaoscake_layer/three
|
||||||
|
|
||||||
/datum/recipe/microwave/chaoscake_layerfour
|
/datum/recipe/chaoscake_layerfour
|
||||||
reagents = list("flour" = 240, "milk" = 150, "sugar" = 80, "egg" = 24, "milkshake" = 300)
|
reagents = list("flour" = 240, "milk" = 150, "sugar" = 80, "egg" = 24, "milkshake" = 300)
|
||||||
fruit = list("rice" = 30)
|
fruit = list("rice" = 30)
|
||||||
items = list(
|
items = list(
|
||||||
@@ -42,13 +42,13 @@
|
|||||||
)
|
)
|
||||||
result = /obj/item/weapon/chaoscake_layer/four
|
result = /obj/item/weapon/chaoscake_layer/four
|
||||||
|
|
||||||
/datum/recipe/microwave/chaoscake_layerfive
|
/datum/recipe/chaoscake_layerfive
|
||||||
reagents = list("flour" = 180, "milk" = 100, "sugar" = 60, "egg" = 18, "blood" = 300)
|
reagents = list("flour" = 180, "milk" = 100, "sugar" = 60, "egg" = 18, "blood" = 300)
|
||||||
fruit = list("tomato" = 20)
|
fruit = list("tomato" = 20)
|
||||||
items = list() //supposed to be made with lobster, still has to be ported.
|
items = list() //supposed to be made with lobster, still has to be ported.
|
||||||
result = /obj/item/weapon/chaoscake_layer/five
|
result = /obj/item/weapon/chaoscake_layer/five
|
||||||
|
|
||||||
/datum/recipe/microwave/chaoscake_layersix
|
/datum/recipe/chaoscake_layersix
|
||||||
reagents = list("flour" = 180, "milk" = 100, "sugar" = 60, "egg" = 18, "sprinkles" = 10)
|
reagents = list("flour" = 180, "milk" = 100, "sugar" = 60, "egg" = 18, "sprinkles" = 10)
|
||||||
fruit = list("apple" = 30)
|
fruit = list("apple" = 30)
|
||||||
items = list(
|
items = list(
|
||||||
@@ -61,7 +61,7 @@
|
|||||||
)
|
)
|
||||||
result = /obj/item/weapon/chaoscake_layer/six
|
result = /obj/item/weapon/chaoscake_layer/six
|
||||||
|
|
||||||
/datum/recipe/microwave/chaoscake_layerseven
|
/datum/recipe/chaoscake_layerseven
|
||||||
reagents = list("flour" = 120, "milk" = 50, "sugar" = 40, "egg" = 12, "devilskiss" = 200)
|
reagents = list("flour" = 120, "milk" = 50, "sugar" = 40, "egg" = 12, "devilskiss" = 200)
|
||||||
fruit = list("potato" = 10)
|
fruit = list("potato" = 10)
|
||||||
items = list(
|
items = list(
|
||||||
@@ -71,7 +71,7 @@
|
|||||||
)
|
)
|
||||||
result = /obj/item/weapon/chaoscake_layer/seven
|
result = /obj/item/weapon/chaoscake_layer/seven
|
||||||
|
|
||||||
/datum/recipe/microwave/chaoscake_layereight
|
/datum/recipe/chaoscake_layereight
|
||||||
reagents = list("flour" = 120, "milk" = 50, "sugar" = 40, "egg" = 12, "cream" = 200)
|
reagents = list("flour" = 120, "milk" = 50, "sugar" = 40, "egg" = 12, "cream" = 200)
|
||||||
fruit = list("lemon" = 10)
|
fruit = list("lemon" = 10)
|
||||||
items = list(
|
items = list(
|
||||||
@@ -81,7 +81,7 @@
|
|||||||
)
|
)
|
||||||
result = /obj/item/weapon/chaoscake_layer/eight
|
result = /obj/item/weapon/chaoscake_layer/eight
|
||||||
|
|
||||||
/datum/recipe/microwave/chaoscake_layernine
|
/datum/recipe/chaoscake_layernine
|
||||||
reagents = list("water" = 100, "blood" = 100)
|
reagents = list("water" = 100, "blood" = 100)
|
||||||
fruit = list("goldapple" = 50)
|
fruit = list("goldapple" = 50)
|
||||||
items = list()
|
items = list()
|
||||||
|
|||||||
@@ -349,7 +349,7 @@
|
|||||||
else if(istype(I, /obj/item/weapon/holder))
|
else if(istype(I, /obj/item/weapon/holder))
|
||||||
var/obj/item/weapon/holder/H = I
|
var/obj/item/weapon/holder/H = I
|
||||||
if (H.held_mob)
|
if (H.held_mob)
|
||||||
work += (H.held_mob.mob_size * H.held_mob.mob_size * 2)+2
|
work += ((H.held_mob.mob_size * H.held_mob.size_multiplier) * (H.held_mob.mob_size * H.held_mob.size_multiplier) * 2)+2
|
||||||
|
|
||||||
CI.max_cookwork += work
|
CI.max_cookwork += work
|
||||||
|
|
||||||
@@ -368,21 +368,27 @@
|
|||||||
//If cookwork has gone from above to below 0, then this item finished cooking
|
//If cookwork has gone from above to below 0, then this item finished cooking
|
||||||
finish_cooking(CI)
|
finish_cooking(CI)
|
||||||
|
|
||||||
else if (!CI.burned && CI.cookwork > CI.max_cookwork * CI.overcook_mult)
|
else if (!CI.burned && CI.cookwork > min(CI.max_cookwork * CI.overcook_mult, CI.max_cookwork + 30))
|
||||||
burn_food(CI)
|
burn_food(CI)
|
||||||
|
|
||||||
// Gotta hurt.
|
// Gotta hurt.
|
||||||
for(var/obj/item/weapon/holder/H in CI.container.contents)
|
for(var/obj/item/weapon/holder/H in CI.container.contents)
|
||||||
var/mob/living/M = H.held_mob
|
var/mob/living/M = H.held_mob
|
||||||
if(M)
|
if(M)
|
||||||
M.apply_damage(rand(1,3), mobdamagetype, "chest")
|
M.apply_damage(rand(1,3) * (1/M.size_multiplier), mobdamagetype, pick(BP_ALL))
|
||||||
|
|
||||||
return TRUE
|
return TRUE
|
||||||
|
|
||||||
/obj/machinery/appliance/process()
|
/obj/machinery/appliance/process()
|
||||||
if(cooking_power > 0 && cooking)
|
if(cooking_power > 0 && cooking)
|
||||||
for (var/i in cooking_objs)
|
var/all_done_cooking = TRUE
|
||||||
do_cooking_tick(i)
|
for(var/datum/cooking_item/CI in cooking_objs)
|
||||||
|
do_cooking_tick(CI)
|
||||||
|
if(CI.max_cookwork > 0)
|
||||||
|
all_done_cooking = FALSE
|
||||||
|
if(all_done_cooking)
|
||||||
|
cooking = FALSE
|
||||||
|
update_icon()
|
||||||
|
|
||||||
|
|
||||||
/obj/machinery/appliance/proc/finish_cooking(var/datum/cooking_item/CI)
|
/obj/machinery/appliance/proc/finish_cooking(var/datum/cooking_item/CI)
|
||||||
@@ -540,11 +546,17 @@
|
|||||||
|
|
||||||
// Produce nasty smoke.
|
// Produce nasty smoke.
|
||||||
visible_message("<span class='danger'>\The [src] vomits a gout of rancid smoke!</span>")
|
visible_message("<span class='danger'>\The [src] vomits a gout of rancid smoke!</span>")
|
||||||
var/datum/effect/effect/system/smoke_spread/bad/smoke = new /datum/effect/effect/system/smoke_spread/bad
|
var/datum/effect/effect/system/smoke_spread/bad/burntfood/smoke = new /datum/effect/effect/system/smoke_spread/bad/burntfood
|
||||||
|
playsound(src, 'sound/effects/smoke.ogg', 20, 1)
|
||||||
smoke.attach(src)
|
smoke.attach(src)
|
||||||
smoke.set_up(10, 0, get_turf(src), 300)
|
smoke.set_up(10, 0, get_turf(src), 300)
|
||||||
smoke.start()
|
smoke.start()
|
||||||
|
|
||||||
|
// Set off fire alarms!
|
||||||
|
var/obj/machinery/firealarm/FA = locate() in get_area(src)
|
||||||
|
if(FA)
|
||||||
|
FA.alarm()
|
||||||
|
|
||||||
/obj/machinery/appliance/attack_hand(var/mob/user)
|
/obj/machinery/appliance/attack_hand(var/mob/user)
|
||||||
if (cooking_objs.len)
|
if (cooking_objs.len)
|
||||||
if (removal_menu(user))
|
if (removal_menu(user))
|
||||||
@@ -675,7 +687,7 @@
|
|||||||
/datum/cooking_item
|
/datum/cooking_item
|
||||||
var/max_cookwork
|
var/max_cookwork
|
||||||
var/cookwork
|
var/cookwork
|
||||||
var/overcook_mult = 5
|
var/overcook_mult = 3 // How long it takes to overcook. This is max_cookwork x overcook mult. If you're changing this, mind that at 3x, a max_cookwork of 30 becomes 90 ticks for the purpose of burning, and a max_cookwork of 4 only has 12 before burning!
|
||||||
var/result_type = 0
|
var/result_type = 0
|
||||||
var/obj/item/weapon/reagent_containers/cooking_container/container = null
|
var/obj/item/weapon/reagent_containers/cooking_container/container = null
|
||||||
var/combine_target = null
|
var/combine_target = null
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
var/light_x = 0
|
var/light_x = 0
|
||||||
var/light_y = 0
|
var/light_y = 0
|
||||||
cooking_power = 0
|
cooking_power = 0
|
||||||
|
mobdamagetype = BURN
|
||||||
|
|
||||||
/obj/machinery/appliance/cooker/examine(var/mob/user)
|
/obj/machinery/appliance/cooker/examine(var/mob/user)
|
||||||
. = ..()
|
. = ..()
|
||||||
|
|||||||
@@ -218,7 +218,7 @@
|
|||||||
|
|
||||||
user.attack_log += text("\[[time_stamp()]\] <font color='red'>Has [cook_type] \the [victim] ([victim.ckey]) in \a [src]</font>")
|
user.attack_log += text("\[[time_stamp()]\] <font color='red'>Has [cook_type] \the [victim] ([victim.ckey]) in \a [src]</font>")
|
||||||
victim.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been [cook_type] in \a [src] by [user.name] ([user.ckey])</font>")
|
victim.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been [cook_type] in \a [src] by [user.name] ([user.ckey])</font>")
|
||||||
msg_admin_attack("[key_name_admin(user)] [cook_type] \the [victim] ([victim.ckey]) in \a [src]. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)",ckey=key_name(user),ckey_target=key_name(victim))
|
msg_admin_attack("[key_name_admin(user)] [cook_type] \the [victim] ([victim.ckey]) in \a [src]. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
|
||||||
|
|
||||||
//Coat the victim in some oil
|
//Coat the victim in some oil
|
||||||
oil.trans_to(victim, 40)
|
oil.trans_to(victim, 40)
|
||||||
|
|||||||
@@ -39,6 +39,10 @@
|
|||||||
if(!open)
|
if(!open)
|
||||||
if(!stat)
|
if(!stat)
|
||||||
icon_state = "ovenclosed_on"
|
icon_state = "ovenclosed_on"
|
||||||
|
if(cooking == TRUE)
|
||||||
|
icon_state = "ovenclosed_cooking"
|
||||||
|
else
|
||||||
|
icon_state = "ovenclosed_on"
|
||||||
else
|
else
|
||||||
icon_state = "ovenclosed_off"
|
icon_state = "ovenclosed_off"
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
var/circuit_item_capacity = 1 //how many items does the circuit add to max number of items
|
var/circuit_item_capacity = 1 //how many items does the circuit add to max number of items
|
||||||
var/item_level = 0 // items microwave can handle, 0 foodstuff, 1 materials
|
var/item_level = 0 // items microwave can handle, 0 foodstuff, 1 materials
|
||||||
var/global/list/acceptable_items // List of the items you can put in
|
var/global/list/acceptable_items // List of the items you can put in
|
||||||
var/global/list/datum/recipe/microwave/available_recipes // List of the recipes you can use
|
var/global/list/available_recipes // List of the recipes you can use
|
||||||
var/global/list/acceptable_reagents // List of the reagents you can put in
|
var/global/list/acceptable_reagents // List of the reagents you can put in
|
||||||
|
|
||||||
var/global/max_n_of_items = 20
|
var/global/max_n_of_items = 20
|
||||||
@@ -42,15 +42,14 @@
|
|||||||
|
|
||||||
if(!available_recipes)
|
if(!available_recipes)
|
||||||
available_recipes = new
|
available_recipes = new
|
||||||
for (var/type in (typesof(/datum/recipe/microwave)-/datum/recipe/microwave))
|
for(var/T in (typesof(/datum/recipe)-/datum/recipe))
|
||||||
var/datum/recipe/test = new type
|
var/datum/recipe/type = T
|
||||||
if((test.appliance & appliancetype))
|
if((initial(type.appliance) & appliancetype))
|
||||||
available_recipes += test
|
available_recipes += new type
|
||||||
else
|
|
||||||
qdel(test)
|
|
||||||
acceptable_items = new
|
acceptable_items = new
|
||||||
acceptable_reagents = new
|
acceptable_reagents = new
|
||||||
for (var/datum/recipe/microwave/recipe in available_recipes)
|
for (var/datum/recipe/recipe in available_recipes)
|
||||||
for (var/item in recipe.items)
|
for (var/item in recipe.items)
|
||||||
acceptable_items |= item
|
acceptable_items |= item
|
||||||
for (var/reagent in recipe.reagents)
|
for (var/reagent in recipe.reagents)
|
||||||
@@ -266,7 +265,7 @@
|
|||||||
abort()
|
abort()
|
||||||
return
|
return
|
||||||
|
|
||||||
var/datum/recipe/microwave/recipe = select_recipe(available_recipes,src)
|
var/datum/recipe/recipe = select_recipe(available_recipes,src)
|
||||||
var/obj/cooked
|
var/obj/cooked
|
||||||
if(!recipe)
|
if(!recipe)
|
||||||
dirty += 1
|
dirty += 1
|
||||||
@@ -279,7 +278,6 @@
|
|||||||
muck_finish()
|
muck_finish()
|
||||||
cooked = fail()
|
cooked = fail()
|
||||||
cooked.forceMove(src.loc)
|
cooked.forceMove(src.loc)
|
||||||
return
|
|
||||||
else if(has_extra_item())
|
else if(has_extra_item())
|
||||||
if(!wzhzhzh(16)) //VOREStation Edit - Quicker Microwaves (Undone during Auroraport, left note in case of reversion, was 2)
|
if(!wzhzhzh(16)) //VOREStation Edit - Quicker Microwaves (Undone during Auroraport, left note in case of reversion, was 2)
|
||||||
abort()
|
abort()
|
||||||
@@ -287,7 +285,6 @@
|
|||||||
broke()
|
broke()
|
||||||
cooked = fail()
|
cooked = fail()
|
||||||
cooked.forceMove(src.loc)
|
cooked.forceMove(src.loc)
|
||||||
return
|
|
||||||
else
|
else
|
||||||
if(!wzhzhzh(40)) //VOREStation Edit - Quicker Microwaves (Undone during Auroraport, left note in case of reversion, was 5)
|
if(!wzhzhzh(40)) //VOREStation Edit - Quicker Microwaves (Undone during Auroraport, left note in case of reversion, was 5)
|
||||||
abort()
|
abort()
|
||||||
@@ -296,23 +293,20 @@
|
|||||||
cooked = fail()
|
cooked = fail()
|
||||||
cooked.forceMove(src.loc)
|
cooked.forceMove(src.loc)
|
||||||
return
|
return
|
||||||
else
|
|
||||||
|
//Making multiple copies of a recipe
|
||||||
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) // VOREStation Edit - Quicker Microwaves (Undone during Auroraport, left note in case of reversion, was round(recipe.time/20/2))
|
||||||
if(!wzhzhzh(halftime))
|
if(!wzhzhzh(halftime))
|
||||||
abort()
|
abort()
|
||||||
return
|
return
|
||||||
|
recipe.before_cook(src)
|
||||||
if(!wzhzhzh(halftime))
|
if(!wzhzhzh(halftime))
|
||||||
abort()
|
abort()
|
||||||
cooked = fail()
|
cooked = fail()
|
||||||
cooked.forceMove(src.loc)
|
cooked.forceMove(loc)
|
||||||
return
|
recipe.after_cook(src)
|
||||||
cooked = recipe.make_food(src)
|
|
||||||
abort()
|
|
||||||
if(cooked)
|
|
||||||
cooked.forceMove(src.loc)
|
|
||||||
return
|
return
|
||||||
|
|
||||||
//Making multiple copies of a recipe
|
|
||||||
var/result = recipe.result
|
var/result = recipe.result
|
||||||
var/valid = 1
|
var/valid = 1
|
||||||
var/list/cooked_items = list()
|
var/list/cooked_items = list()
|
||||||
@@ -326,10 +320,12 @@
|
|||||||
AM.forceMove(temp)
|
AM.forceMove(temp)
|
||||||
|
|
||||||
valid = 0
|
valid = 0
|
||||||
|
recipe.after_cook(src)
|
||||||
recipe = select_recipe(available_recipes,src)
|
recipe = select_recipe(available_recipes,src)
|
||||||
if(recipe && recipe.result == result)
|
if(recipe && recipe.result == result)
|
||||||
sleep(2)
|
to_chat(world, "multicook [recipe] [recipe?.result], our contents are [json_encode(contents)]")
|
||||||
valid = 1
|
valid = 1
|
||||||
|
sleep(2)
|
||||||
|
|
||||||
for(var/r in cooked_items)
|
for(var/r in cooked_items)
|
||||||
var/atom/movable/R = r
|
var/atom/movable/R = r
|
||||||
@@ -388,6 +384,7 @@
|
|||||||
|
|
||||||
/obj/machinery/microwave/proc/abort()
|
/obj/machinery/microwave/proc/abort()
|
||||||
operating = FALSE // Turn it off again aferwards
|
operating = FALSE // Turn it off again aferwards
|
||||||
|
if(icon_state == "mw1")
|
||||||
icon_state = "mw"
|
icon_state = "mw"
|
||||||
updateUsrDialog()
|
updateUsrDialog()
|
||||||
soundloop.stop()
|
soundloop.stop()
|
||||||
@@ -395,6 +392,7 @@
|
|||||||
/obj/machinery/microwave/proc/stop()
|
/obj/machinery/microwave/proc/stop()
|
||||||
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
|
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
|
||||||
operating = FALSE // Turn it off again aferwards
|
operating = FALSE // Turn it off again aferwards
|
||||||
|
if(icon_state == "mw1")
|
||||||
icon_state = "mw"
|
icon_state = "mw"
|
||||||
updateUsrDialog()
|
updateUsrDialog()
|
||||||
soundloop.stop()
|
soundloop.stop()
|
||||||
@@ -444,6 +442,10 @@
|
|||||||
var/id = O.reagents.get_master_reagent_id()
|
var/id = O.reagents.get_master_reagent_id()
|
||||||
if(id)
|
if(id)
|
||||||
amount+=O.reagents.get_reagent_amount(id)
|
amount+=O.reagents.get_reagent_amount(id)
|
||||||
|
if(istype(O, /obj/item/weapon/holder))
|
||||||
|
var/obj/item/weapon/holder/H = O
|
||||||
|
if(H.held_mob)
|
||||||
|
qdel(H.held_mob)
|
||||||
qdel(O)
|
qdel(O)
|
||||||
src.reagents.clear_reagents()
|
src.reagents.clear_reagents()
|
||||||
ffuu.reagents.add_reagent("carbon", amount)
|
ffuu.reagents.add_reagent("carbon", amount)
|
||||||
@@ -479,9 +481,13 @@
|
|||||||
if(!do_after(usr, 1 SECONDS, target = src))
|
if(!do_after(usr, 1 SECONDS, target = src))
|
||||||
return
|
return
|
||||||
|
|
||||||
|
if(operating)
|
||||||
|
to_chat(usr, "<span class='warning'>You can't do that, [src] door is locked!</span>")
|
||||||
|
return
|
||||||
|
|
||||||
usr.visible_message(
|
usr.visible_message(
|
||||||
"<span class='notice'>[usr] opened [src] and has taken out [english_list(contents)].</span>" ,
|
"<span class='notice'>[usr] opened [src] and has taken out [english_list(((contents-component_parts)-circuit))].</span>" ,
|
||||||
"<span class='notice'>You have opened [src] and taken out [english_list(contents)].</span>"
|
"<span class='notice'>You have opened [src] and taken out [english_list(((contents-component_parts)-circuit))].</span>"
|
||||||
)
|
)
|
||||||
dispose()
|
dispose()
|
||||||
|
|
||||||
@@ -504,3 +510,32 @@
|
|||||||
/obj/machinery/microwave/advanced/Initialize()
|
/obj/machinery/microwave/advanced/Initialize()
|
||||||
..()
|
..()
|
||||||
reagents.maximum_volume = 1000
|
reagents.maximum_volume = 1000
|
||||||
|
|
||||||
|
/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.
|
||||||
|
items = list(
|
||||||
|
/obj/item/weapon/holder
|
||||||
|
)
|
||||||
|
result = /obj/effect/decal/cleanable/blood/gibs
|
||||||
|
|
||||||
|
/datum/recipe/splat/before_cook(obj/container)
|
||||||
|
if(istype(container, /obj/machinery/microwave))
|
||||||
|
var/obj/machinery/microwave/M = container
|
||||||
|
M.muck_start()
|
||||||
|
playsound(container.loc, 'sound/items/drop/flesh.ogg', 100, 1)
|
||||||
|
. = ..()
|
||||||
|
|
||||||
|
/datum/recipe/splat/make_food(obj/container)
|
||||||
|
for(var/obj/item/weapon/holder/H in container)
|
||||||
|
if(H.held_mob)
|
||||||
|
to_chat(H.held_mob, "<span class='danger'>You hear an earsplitting humming and your head aches!</span>")
|
||||||
|
qdel(H.held_mob)
|
||||||
|
H.held_mob = null
|
||||||
|
qdel(H)
|
||||||
|
|
||||||
|
. = ..()
|
||||||
|
|
||||||
|
/datum/recipe/splat/after_cook(obj/container)
|
||||||
|
if(istype(container, /obj/machinery/microwave))
|
||||||
|
var/obj/machinery/microwave/M = container
|
||||||
|
M.muck_finish()
|
||||||
|
. = ..()
|
||||||
@@ -319,3 +319,10 @@
|
|||||||
else //okay, let's select the most complicated recipe
|
else //okay, let's select the most complicated recipe
|
||||||
sortTim(possible_recipes, /proc/cmp_recipe_complexity_dsc)
|
sortTim(possible_recipes, /proc/cmp_recipe_complexity_dsc)
|
||||||
return possible_recipes[1]
|
return possible_recipes[1]
|
||||||
|
|
||||||
|
// Both of these are just placeholders to allow special behavior for mob holders, but you can do other things in here later if you feel like it.
|
||||||
|
/datum/recipe/proc/before_cook(obj/container) // Called Before the Microwave starts delays and cooking stuff
|
||||||
|
|
||||||
|
|
||||||
|
/datum/recipe/proc/after_cook(obj/container) // Called When the Microwave is finished.
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
qdel(CR)
|
qdel(CR)
|
||||||
|
|
||||||
//////////////////////// FOOD
|
//////////////////////// FOOD
|
||||||
var/list/food_recipes = typesof(/datum/recipe/microwave) - /datum/recipe/microwave
|
var/list/food_recipes = typesof(/datum/recipe) - /datum/recipe
|
||||||
//Build a useful list
|
//Build a useful list
|
||||||
for(var/Rp in food_recipes)
|
for(var/Rp in food_recipes)
|
||||||
//Lists don't work with datum-stealing no-instance initial() so we have to.
|
//Lists don't work with datum-stealing no-instance initial() so we have to.
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
/datum/recipe/microwave/unique_name
|
/datum/recipe/unique_name
|
||||||
fruit = list("example_fruit1" = 1, "example_fruit2" = 2)
|
fruit = list("example_fruit1" = 1, "example_fruit2" = 2)
|
||||||
reagents = list("example_reagent1" = 10, "example_reagent2" = 5)
|
reagents = list("example_reagent1" = 10, "example_reagent2" = 5)
|
||||||
items = list(
|
items = list(
|
||||||
@@ -9,23 +9,23 @@
|
|||||||
result = /obj/item/weapon/reagent_containers/food/snacks/path_to_some_food
|
result = /obj/item/weapon/reagent_containers/food/snacks/path_to_some_food
|
||||||
*/
|
*/
|
||||||
// All of this shit needs to be gone through and reorganized into different recipes per machine - Rykka 7/16/2020
|
// All of this shit needs to be gone through and reorganized into different recipes per machine - Rykka 7/16/2020
|
||||||
/datum/recipe/microwave/jellydonut
|
/datum/recipe/jellydonut
|
||||||
items = list(
|
items = list(
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/doughslice)
|
/obj/item/weapon/reagent_containers/food/snacks/doughslice)
|
||||||
|
|
||||||
/datum/recipe/microwave/jellydonut/slime
|
/datum/recipe/jellydonut/slime
|
||||||
items = list(
|
items = list(
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/doughslice)
|
/obj/item/weapon/reagent_containers/food/snacks/doughslice)
|
||||||
|
|
||||||
/datum/recipe/microwave/jellydonut/cherry
|
/datum/recipe/jellydonut/cherry
|
||||||
items = list(
|
items = list(
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/doughslice)
|
/obj/item/weapon/reagent_containers/food/snacks/doughslice)
|
||||||
|
|
||||||
/datum/recipe/microwave/donut
|
/datum/recipe/donut
|
||||||
items = list(
|
items = list(
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/doughslice)
|
/obj/item/weapon/reagent_containers/food/snacks/doughslice)
|
||||||
|
|
||||||
/datum/recipe/microwave/sushi
|
/datum/recipe/sushi
|
||||||
fruit = list("cabbage" = 1)
|
fruit = list("cabbage" = 1)
|
||||||
reagents = list("rice" = 20)
|
reagents = list("rice" = 20)
|
||||||
items = list(
|
items = list(
|
||||||
@@ -35,7 +35,7 @@
|
|||||||
)
|
)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/sushi
|
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/sushi
|
||||||
|
|
||||||
/datum/recipe/microwave/lasagna
|
/datum/recipe/lasagna
|
||||||
fruit = list("tomato" = 2, "eggplant" = 1)
|
fruit = list("tomato" = 2, "eggplant" = 1)
|
||||||
items = list(
|
items = list(
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/cutlet,
|
/obj/item/weapon/reagent_containers/food/snacks/cutlet,
|
||||||
@@ -45,7 +45,7 @@
|
|||||||
)
|
)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/lasagna
|
result = /obj/item/weapon/reagent_containers/food/snacks/lasagna
|
||||||
|
|
||||||
/datum/recipe/microwave/goulash
|
/datum/recipe/goulash
|
||||||
fruit = list("tomato" = 1)
|
fruit = list("tomato" = 1)
|
||||||
items = list(
|
items = list(
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/cutlet,
|
/obj/item/weapon/reagent_containers/food/snacks/cutlet,
|
||||||
@@ -53,7 +53,7 @@
|
|||||||
)
|
)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/goulash
|
result = /obj/item/weapon/reagent_containers/food/snacks/goulash
|
||||||
|
|
||||||
/datum/recipe/microwave/donerkebab
|
/datum/recipe/donerkebab
|
||||||
fruit = list("tomato" = 1, "cabbage" = 1)
|
fruit = list("tomato" = 1, "cabbage" = 1)
|
||||||
reagents = list("sodiumchloride" = 1)
|
reagents = list("sodiumchloride" = 1)
|
||||||
items = list(
|
items = list(
|
||||||
@@ -62,21 +62,21 @@
|
|||||||
)
|
)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/donerkebab
|
result = /obj/item/weapon/reagent_containers/food/snacks/donerkebab
|
||||||
|
|
||||||
/datum/recipe/microwave/roastbeef
|
/datum/recipe/roastbeef
|
||||||
fruit = list("carrot" = 2, "potato" = 2)
|
fruit = list("carrot" = 2, "potato" = 2)
|
||||||
items = list(
|
items = list(
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/meat
|
/obj/item/weapon/reagent_containers/food/snacks/meat
|
||||||
)
|
)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/roastbeef
|
result = /obj/item/weapon/reagent_containers/food/snacks/roastbeef
|
||||||
|
|
||||||
/datum/recipe/microwave/reishicup
|
/datum/recipe/reishicup
|
||||||
reagents = list("psilocybin" = 3, "sugar" = 3)
|
reagents = list("psilocybin" = 3, "sugar" = 3)
|
||||||
items = list(
|
items = list(
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar
|
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar
|
||||||
)
|
)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/reishicup
|
result = /obj/item/weapon/reagent_containers/food/snacks/reishicup
|
||||||
|
|
||||||
/datum/recipe/microwave/chickenwings
|
/datum/recipe/chickenwings
|
||||||
reagents = list("capsaicin" = 5, "flour" = 10)
|
reagents = list("capsaicin" = 5, "flour" = 10)
|
||||||
items = list(
|
items = list(
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/meat,
|
/obj/item/weapon/reagent_containers/food/snacks/meat,
|
||||||
@@ -86,7 +86,7 @@
|
|||||||
)
|
)
|
||||||
result = /obj/item/weapon/storage/box/wings //This is kinda like the donut box.
|
result = /obj/item/weapon/storage/box/wings //This is kinda like the donut box.
|
||||||
|
|
||||||
/datum/recipe/microwave/hotandsoursoup
|
/datum/recipe/hotandsoursoup
|
||||||
fruit = list("cabbage" = 1, "mushroom" = 1)
|
fruit = list("cabbage" = 1, "mushroom" = 1)
|
||||||
reagents = list("sodiumchloride" = 2, "blackpepper" = 2, "water" = 10)
|
reagents = list("sodiumchloride" = 2, "blackpepper" = 2, "water" = 10)
|
||||||
items = list(
|
items = list(
|
||||||
@@ -94,7 +94,7 @@
|
|||||||
)
|
)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/hotandsoursoup
|
result = /obj/item/weapon/reagent_containers/food/snacks/hotandsoursoup
|
||||||
|
|
||||||
/datum/recipe/microwave/kitsuneudon
|
/datum/recipe/kitsuneudon
|
||||||
reagents = list("egg" = 3)
|
reagents = list("egg" = 3)
|
||||||
items = list(
|
items = list(
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/spagetti,
|
/obj/item/weapon/reagent_containers/food/snacks/spagetti,
|
||||||
@@ -102,7 +102,7 @@
|
|||||||
)
|
)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/kitsuneudon
|
result = /obj/item/weapon/reagent_containers/food/snacks/kitsuneudon
|
||||||
|
|
||||||
/datum/recipe/microwave/generalschicken
|
/datum/recipe/generalschicken
|
||||||
reagents = list("capsaicin" = 2, "sugar" = 2, "flour" = 10)
|
reagents = list("capsaicin" = 2, "sugar" = 2, "flour" = 10)
|
||||||
items = list(
|
items = list(
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/meat,
|
/obj/item/weapon/reagent_containers/food/snacks/meat,
|
||||||
@@ -110,40 +110,40 @@
|
|||||||
)
|
)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/generalschicken
|
result = /obj/item/weapon/reagent_containers/food/snacks/generalschicken
|
||||||
|
|
||||||
/datum/recipe/microwave/chocroizegg
|
/datum/recipe/chocroizegg
|
||||||
items = list(
|
items = list(
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
|
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/egg/roiz
|
/obj/item/weapon/reagent_containers/food/snacks/egg/roiz
|
||||||
)
|
)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/chocolateegg/roiz
|
result = /obj/item/weapon/reagent_containers/food/snacks/chocolateegg/roiz
|
||||||
|
|
||||||
/datum/recipe/microwave/friedroizegg
|
/datum/recipe/friedroizegg
|
||||||
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
|
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
|
||||||
items = list(
|
items = list(
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/egg/roiz
|
/obj/item/weapon/reagent_containers/food/snacks/egg/roiz
|
||||||
)
|
)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/friedegg/roiz
|
result = /obj/item/weapon/reagent_containers/food/snacks/friedegg/roiz
|
||||||
|
|
||||||
/datum/recipe/microwave/boiledroizegg
|
/datum/recipe/boiledroizegg
|
||||||
reagents = list("water" = 5)
|
reagents = list("water" = 5)
|
||||||
items = list(
|
items = list(
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/egg/roiz
|
/obj/item/weapon/reagent_containers/food/snacks/egg/roiz
|
||||||
)
|
)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/boiledegg/roiz
|
result = /obj/item/weapon/reagent_containers/food/snacks/boiledegg/roiz
|
||||||
|
|
||||||
/datum/recipe/microwave/pillbugball
|
/datum/recipe/pillbugball
|
||||||
reagents = list("carbon" = 5)
|
reagents = list("carbon" = 5)
|
||||||
items = list(
|
items = list(
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat
|
/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat
|
||||||
)
|
)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/bugball
|
result = /obj/item/weapon/reagent_containers/food/snacks/bugball
|
||||||
|
|
||||||
/datum/recipe/microwave/mammi
|
/datum/recipe/mammi
|
||||||
fruit = list("orange" = 1)
|
fruit = list("orange" = 1)
|
||||||
reagents = list("water" = 10, "flour" = 10, "milk" = 5, "sodiumchloride" = 1)
|
reagents = list("water" = 10, "flour" = 10, "milk" = 5, "sodiumchloride" = 1)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/mammi
|
result = /obj/item/weapon/reagent_containers/food/snacks/mammi
|
||||||
|
|
||||||
/datum/recipe/microwave/makaroni
|
/datum/recipe/makaroni
|
||||||
reagents = list("flour" = 15, "milk" = 5)
|
reagents = list("flour" = 15, "milk" = 5)
|
||||||
items = list(
|
items = list(
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat,
|
/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat,
|
||||||
@@ -153,34 +153,34 @@
|
|||||||
)
|
)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/makaroni
|
result = /obj/item/weapon/reagent_containers/food/snacks/makaroni
|
||||||
|
|
||||||
/datum/recipe/microwave/lobster
|
/datum/recipe/lobster
|
||||||
fruit = list("lemon" = 1, "cabbage" = 1)
|
fruit = list("lemon" = 1, "cabbage" = 1)
|
||||||
items = list(
|
items = list(
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/lobster
|
/obj/item/weapon/reagent_containers/food/snacks/lobster
|
||||||
)
|
)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/lobstercooked
|
result = /obj/item/weapon/reagent_containers/food/snacks/lobstercooked
|
||||||
|
|
||||||
/datum/recipe/microwave/cuttlefish
|
/datum/recipe/cuttlefish
|
||||||
items = list(
|
items = list(
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/cuttlefish
|
/obj/item/weapon/reagent_containers/food/snacks/cuttlefish
|
||||||
)
|
)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/cuttlefishcooked
|
result = /obj/item/weapon/reagent_containers/food/snacks/cuttlefishcooked
|
||||||
|
|
||||||
/datum/recipe/microwave/monkfish
|
/datum/recipe/monkfish
|
||||||
fruit = list("chili" = 1, "onion" = 1)
|
fruit = list("chili" = 1, "onion" = 1)
|
||||||
items = list(
|
items = list(
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/monkfishfillet
|
/obj/item/weapon/reagent_containers/food/snacks/monkfishfillet
|
||||||
)
|
)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/monkfishcooked
|
result = /obj/item/weapon/reagent_containers/food/snacks/monkfishcooked
|
||||||
|
|
||||||
/datum/recipe/microwave/sharksteak
|
/datum/recipe/sharksteak
|
||||||
reagents = list("blackpepper"= 1, "sodiumchloride" = 1)
|
reagents = list("blackpepper"= 1, "sodiumchloride" = 1)
|
||||||
items = list(
|
items = list(
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sharkmeat
|
/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sharkmeat
|
||||||
)
|
)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/sharkmeatcooked
|
result = /obj/item/weapon/reagent_containers/food/snacks/sharkmeatcooked
|
||||||
|
|
||||||
/datum/recipe/microwave/sharkdip
|
/datum/recipe/sharkdip
|
||||||
reagents = list("sodiumchloride" = 1)
|
reagents = list("sodiumchloride" = 1)
|
||||||
fruit = list("chili" = 1)
|
fruit = list("chili" = 1)
|
||||||
items = list(
|
items = list(
|
||||||
@@ -188,7 +188,7 @@
|
|||||||
)
|
)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/sharkmeatdip
|
result = /obj/item/weapon/reagent_containers/food/snacks/sharkmeatdip
|
||||||
|
|
||||||
/datum/recipe/microwave/sharkcubes
|
/datum/recipe/sharkcubes
|
||||||
reagents = list("soysauce" = 5, "sodiumchloride" = 1)
|
reagents = list("soysauce" = 5, "sodiumchloride" = 1)
|
||||||
fruit = list("potato" = 1)
|
fruit = list("potato" = 1)
|
||||||
items = list(
|
items = list(
|
||||||
@@ -197,28 +197,28 @@
|
|||||||
result = /obj/item/weapon/reagent_containers/food/snacks/sharkmeatcubes
|
result = /obj/item/weapon/reagent_containers/food/snacks/sharkmeatcubes
|
||||||
|
|
||||||
/*
|
/*
|
||||||
/datum/recipe/microwave/margheritapizzacargo
|
/datum/recipe/margheritapizzacargo
|
||||||
reagents = list()
|
reagents = list()
|
||||||
items = list(
|
items = list(
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/pizza/margfrozen
|
/obj/item/weapon/reagent_containers/food/snacks/pizza/margfrozen
|
||||||
)
|
)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margcargo
|
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margcargo
|
||||||
|
|
||||||
/datum/recipe/microwave/mushroompizzacargo
|
/datum/recipe/mushroompizzacargo
|
||||||
reagents = list()
|
reagents = list()
|
||||||
items = list(
|
items = list(
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/pizza/mushfrozen
|
/obj/item/weapon/reagent_containers/food/snacks/pizza/mushfrozen
|
||||||
)
|
)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushcargo
|
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushcargo
|
||||||
|
|
||||||
/datum/recipe/microwave/meatpizzacargo
|
/datum/recipe/meatpizzacargo
|
||||||
reagents = list()
|
reagents = list()
|
||||||
items = list(
|
items = list(
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/pizza/meatfrozen
|
/obj/item/weapon/reagent_containers/food/snacks/pizza/meatfrozen
|
||||||
)
|
)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatcargo
|
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatcargo
|
||||||
|
|
||||||
/datum/recipe/microwave/vegtablepizzacargo
|
/datum/recipe/vegtablepizzacargo
|
||||||
reagents = list()
|
reagents = list()
|
||||||
items = list(
|
items = list(
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/pizza/vegfrozen
|
/obj/item/weapon/reagent_containers/food/snacks/pizza/vegfrozen
|
||||||
@@ -228,12 +228,12 @@
|
|||||||
|
|
||||||
//// food cubes
|
//// food cubes
|
||||||
|
|
||||||
/datum/recipe/microwave/foodcubes
|
/datum/recipe/foodcubes
|
||||||
reagents = list("enzyme" = 20, "virusfood" = 5, "nutriment" = 15, "protein" = 15) // labor intensive
|
reagents = list("enzyme" = 20, "virusfood" = 5, "nutriment" = 15, "protein" = 15) // labor intensive
|
||||||
items = list()
|
items = list()
|
||||||
result = /obj/item/weapon/storage/box/wings/tray
|
result = /obj/item/weapon/storage/box/wings/tray
|
||||||
|
|
||||||
/datum/recipe/microwave/honeybun
|
/datum/recipe/honeybun
|
||||||
reagents = list("milk" = 5, "egg" = 3,"honey" = 5)
|
reagents = list("milk" = 5, "egg" = 3,"honey" = 5)
|
||||||
items = list(
|
items = list(
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/dough
|
/obj/item/weapon/reagent_containers/food/snacks/dough
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user