From e6888213de45f75578a98e1c100b87cc9714e047 Mon Sep 17 00:00:00 2001 From: Cerebulon Date: Fri, 11 Jan 2019 09:24:41 +0000 Subject: [PATCH] Fixes infinite microwave sound when recipe fails --- code/modules/food/kitchen/microwave.dm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm index 1fbd66286b..0eb0683ba8 100644 --- a/code/modules/food/kitchen/microwave.dm +++ b/code/modules/food/kitchen/microwave.dm @@ -249,7 +249,7 @@ if (!wzhzhzh(10)) abort() return - stop() + abort() return var/datum/recipe/recipe = select_recipe(available_recipes,src) @@ -278,7 +278,7 @@ if (!wzhzhzh(10)) abort() return - stop() + abort() cooked = fail() cooked.loc = src.loc return @@ -293,7 +293,7 @@ cooked.loc = src.loc return cooked = recipe.make_food(src) - stop() + abort() if(cooked) cooked.loc = src.loc return @@ -328,9 +328,6 @@ updateUsrDialog() soundloop.stop() -/obj/machinery/microwave/proc/stop() - abort() - /obj/machinery/microwave/proc/dispose() for (var/obj/O in ((contents-component_parts)-circuit)) O.loc = src.loc @@ -345,13 +342,14 @@ src.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.flags = null //So you can't add condiments src.icon_state = "mwbloody" // Make it look dirty too src.operating = 0 // Turn it off again aferwards src.updateUsrDialog() + soundloop.stop() + /obj/machinery/microwave/proc/broke() var/datum/effect/effect/system/spark_spread/s = new @@ -363,6 +361,7 @@ src.flags = null //So you can't add condiments src.operating = 0 // Turn it off again aferwards src.updateUsrDialog() + soundloop.stop() /obj/machinery/microwave/proc/fail() var/obj/item/weapon/reagent_containers/food/snacks/badrecipe/ffuu = new(src)