From 6c89362f6097b642d57a3081ede66110e0dd2fbb Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Sat, 30 Jun 2018 04:36:49 -0400 Subject: [PATCH 1/2] Fixes emitter runtime (#38796) fire() was already handled at 199-204 --- code/modules/power/singularity/emitter.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 670dd0a8e1..9cfca01efa 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -195,7 +195,7 @@ playsound(get_turf(src), projectile_sound, 50, TRUE) if(prob(35)) sparks.start() - P.firer = user? user : src + P.firer = user ? user : src if(last_projectile_params) P.p_x = last_projectile_params[2] P.p_y = last_projectile_params[3] @@ -210,7 +210,6 @@ else fire_delay = rand(minimum_fire_delay,maximum_fire_delay) shot_number = 0 - P.fire() return P /obj/machinery/power/emitter/can_be_unfasten_wrench(mob/user, silent)