Merge pull request #5987 from Citadel-Station-13/upstream-merge-36437

[MIRROR] Tesla coils and grounding rods actually shock buckled mobs.
2018-03-17 23:54:50 +00:00
parent a9f8c70d62 a8bbe89d93
commit 79db79f630
2 changed files with 13 additions and 1 deletions
@@ -87,6 +87,7 @@
 		if(istype(linked_techweb))
 			linked_techweb.research_points += min(power_produced, 1)
 		addtimer(CALLBACK(src, .proc/reset_shocked), 10)
+		tesla_buckle_check(power)
 	else
 		..()

@@ -100,6 +101,7 @@
 	add_load(power)
 	playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5)
 	tesla_zap(src, 10, power/(coeff/2))
+	tesla_buckle_check(power/(coeff/2))

 // Tesla R&D researcher
 /obj/machinery/power/tesla_coil/research
@@ -120,6 +122,7 @@
 		if(istype(linked_techweb))
 			linked_techweb.research_points += min(power_produced, 3) // 4 coils makes ~720/m bonus for R&D, 
 		addtimer(CALLBACK(src, .proc/reset_shocked), 10)
+		tesla_buckle_check(power)
 	else
 		..()

@@ -179,5 +182,6 @@
 /obj/machinery/power/grounding_rod/tesla_act(var/power)
 	if(anchored && !panel_open)
 		flick("grounding_rodhit", src)
+		tesla_buckle_check(power)
 	else
-		..()
+		..()