From 8a0262a792fb78bab976f6e3caef89f926429b22 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 16 Apr 2017 06:06:37 -0500 Subject: [PATCH] Fixes Emitters: Quickmerge Edition (#415) --- code/modules/power/singularity/emitter.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 50a24b76ff..697054298d 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -7,7 +7,7 @@ anchored = 0 density = 1 req_access = list(GLOB.access_engine_equip) - + // The following 3 vars are mostly for the prototype var/manual = FALSE var/charge = 0 @@ -199,8 +199,8 @@ /obj/machinery/power/emitter/proc/fire_beam(atom/targeted_atom, mob/user) var/turf/targets_from = get_turf(src) - if(targeted_atom == user|| targeted_atom == targets_from) - return + if(targeted_atom && (targeted_atom == user || targeted_atom == targets_from || targeted_atom == src)) + return var/obj/item/projectile/P = new projectile_type(targets_from) playsound(src.loc, projectile_sound, 50, 1) if(prob(35))