Merge pull request tgstation#25679 from Cyberboss/FixATurret

Fixes a runtime with portaturrets
SanicIII · Apr 2, 2017 · 7430d16 · 7430d16
2 parents 3f54c33 + 8f0a8e4
commit 7430d16
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm
@@ -311,9 +311,11 @@
 		if(prob(30))
 			spark_system.start()
 		if(on && !attacked && !emagged)
-			attacked = 1
-			spawn(60)
-				attacked = 0
+			attacked = TRUE
+			addtimer(CALLBACK(src, .proc/reset_attacked), 60)
+
+/obj/machinery/porta_turret/proc/reset_attacked()
+	attacked = FALSE
 
 /obj/machinery/porta_turret/deconstruct(disassembled = TRUE)
 	qdel(src)
@@ -911,4 +913,4 @@
 			if(istype(P, /obj/item/projectile/beam/lasertag/bluetag))
 				on = 0
 				spawn(100)
-					on = 1
+					on = 1