From 88a089dae6232da242efe0dc01ce67e7eda60567 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Fri, 3 Mar 2017 09:26:13 -0500 Subject: [PATCH] Fixes syndibeacons using the wrong processor (#24612) --- code/game/machinery/syndicatebeacon.dm | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index dcba62d5532..3782e619916 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -27,8 +27,6 @@ singulo.target = src icon_state = "[icontype]1" active = 1 - machines |= src - START_PROCESSING(SSobj, src) if(user) user << "You activate the beacon." @@ -84,18 +82,18 @@ //stealth direct power usage /obj/machinery/power/singularity_beacon/process() if(!active) - return PROCESS_KILL + return + + if(surplus() > 1500) + add_load(1500) + if(cooldown <= world.time) + cooldown = world.time + 100 + for(var/obj/singularity/singulo in singularities) + if(singulo.z == z) + say("The [singulo] is now [get_dist(src,singulo)] standard lengths away to the [dir2text(get_dir(src,singulo))]") else - if(surplus() > 1500) - add_load(1500) - if(cooldown <= world.time) - cooldown = world.time + 100 - for(var/obj/singularity/singulo in singularities) - if(singulo.z == z) - say("The [singulo] is now [get_dist(src,singulo)] standard lengths away to the [dir2text(get_dir(src,singulo))]") - else - Deactivate() - say("Insufficient charge detected - powering down") + Deactivate() + say("Insufficient charge detected - powering down") /obj/machinery/power/singularity_beacon/syndicate