Merge pull request #18729 from coiax/remove-spawn-3

Remove spawn III
This commit is contained in:
oranges
2016-06-21 20:11:08 +12:00
committed by GitHub
39 changed files with 64 additions and 127 deletions
@@ -50,5 +50,4 @@
F.active = 1
F.icon_state = initial(icon_state) + "_active"
playsound(user.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
spawn(15)
F.prime()
addtimer(F, "prime", 15)
+1 -2
View File
@@ -47,8 +47,7 @@
current_target = target
active = 1
current_beam = new(user,current_target,time=6000,beam_icon_state="medbeam",btype=/obj/effect/ebeam/medical)
spawn(0)
current_beam.Start()
addtimer(current_beam, "Start", 0)
feedback_add_details("gun_fired","[src.type]")
@@ -29,8 +29,7 @@
if(C.dna && C.dna.check_mutation(HULK))
C.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
else if(C.status_flags & CANWEAKEN)
spawn(5)
C.do_jitter_animation(jitter)
addtimer(C, "do_jitter_animation", 5, FALSE, jitter)
/obj/item/projectile/energy/electrode/on_range() //to ensure the bolt sparks when it reaches the end of its range if it didn't hit a target yet
var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread
@@ -188,4 +187,4 @@
. = ..()
if(isliving(target))
tesla_zap(src, 3, 10000)
qdel(chain)
qdel(chain)