From 6578ae1f5cb780cc81abb653a41992a756b4ae5a Mon Sep 17 00:00:00 2001 From: MoreRobustThanYou Date: Mon, 9 Oct 2017 20:00:51 -0400 Subject: [PATCH] Gets rid of spawns in buttons (#31468) * Gets rid of spawns in buttons * Update doorcontrol.dm --- code/modules/assembly/doorcontrol.dm | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/code/modules/assembly/doorcontrol.dm b/code/modules/assembly/doorcontrol.dm index 630dc3d0bc..9a13237619 100644 --- a/code/modules/assembly/doorcontrol.dm +++ b/code/modules/assembly/doorcontrol.dm @@ -13,7 +13,6 @@ if(id) to_chat(user, "Its channel ID is '[id]'.") - /obj/item/device/assembly/control/activate() cooldown = 1 var/openclose @@ -21,13 +20,7 @@ if(M.id == src.id) if(openclose == null) openclose = M.density - spawn(0) - if(M) - if(openclose) - M.open() - else - M.close() - return + INVOKE_ASYNC(M, openclose ? /obj/machinery/door/poddoor.proc/open : /obj/machinery/door/poddoor.proc/close) sleep(10) cooldown = 0 @@ -86,8 +79,7 @@ cooldown = 1 for(var/obj/machinery/door/poddoor/M in GLOB.machines) if (M.id == src.id) - spawn( 0 ) - M.open() + INVOKE_ASYNC(M, /obj/machinery/door/poddoor.proc/open) sleep(10) @@ -99,8 +91,7 @@ for(var/obj/machinery/door/poddoor/M in GLOB.machines) if (M.id == src.id) - spawn( 0 ) - M.close() + INVOKE_ASYNC(M, /obj/machinery/door/poddoor.proc/close) sleep(10) cooldown = 0 @@ -114,8 +105,7 @@ cooldown = 1 for(var/obj/machinery/sparker/M in GLOB.machines) if (M.id == src.id) - spawn( 0 ) - M.ignite() + INVOKE_ASYNC(M, /obj/machinery/sparker.proc/ignite) for(var/obj/machinery/igniter/M in GLOB.machines) if(M.id == src.id) @@ -135,8 +125,7 @@ cooldown = 1 for(var/obj/machinery/flasher/M in GLOB.machines) if(M.id == src.id) - spawn(0) - M.flash() + INVOKE_ASYNC(M, /obj/machinery/flasher.proc/flash) sleep(50) cooldown = 0