shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes Emitters: Quickmerge Edition (#415)

Browse Source
This commit is contained in:
CitadelStationBot
2017-04-16 06:06:37 -05:00
committed by TalkingCactus
parent abd7f2b348
commit 8a0262a792
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/power/singularity/emitter.dm
View File

@@ -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))