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

Merge pull request #7283 from Citadel-Station-13/upstream-merge-38796

Browse Source 
[MIRROR] Fixes emitter runtime
This commit is contained in:
LetterJay
2018-07-01 09:39:43 -05:00
committed by GitHub
parent af5a250ce4 f2676b1c75
commit ee0bef443e
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/emitter.dm
+1 -2
View File
@@ -195,7 +195,7 @@
playsound(get_turf(src), projectile_sound, 50, TRUE) playsound(get_turf(src), projectile_sound, 50, TRUE)
if(prob(35)) if(prob(35))
sparks.start() sparks.start()
P.firer = user? user : src P.firer = user ? user : src
if(last_projectile_params) if(last_projectile_params)
P.p_x = last_projectile_params[2] P.p_x = last_projectile_params[2]
P.p_y = last_projectile_params[3] P.p_y = last_projectile_params[3]
@@ -210,7 +210,6 @@
else else
fire_delay = rand(minimum_fire_delay,maximum_fire_delay) fire_delay = rand(minimum_fire_delay,maximum_fire_delay)
shot_number = 0 shot_number = 0
P.fire()
return P return P
/obj/machinery/power/emitter/can_be_unfasten_wrench(mob/user, silent) /obj/machinery/power/emitter/can_be_unfasten_wrench(mob/user, silent)