Merge pull request #9220 from VOREStation/upstream-merge-7702

[MIRROR] Tesla ball and containment field shock fixes

code/modules/power/singularity/containment_field.dm

@@ -12,11 +12,19 @@
 	light_range = 4
 	var/obj/machinery/field_generator/FG1 = null
 	var/obj/machinery/field_generator/FG2 = null
+	var/list/shockdirs
 	var/hasShocked = 0 //Used to add a delay between shocks. In some cases this used to crash servers by spawning hundreds of sparks every second.
 
 /obj/machinery/containment_field/Initialize()
+	. = ..()
+	shockdirs = list(turn(dir,90),turn(dir,-90))
 	sense_proximity(callback = .HasProximity)
 
+/obj/machinery/containment_field/set_dir(new_dir)
+	. = ..()
+	if(.)
+		shockdirs = list(turn(dir,90),turn(dir,-90))
+
 /obj/machinery/containment_field/Destroy()
 	unsense_proximity(callback = .HasProximity)
 	if(FG1 && !FG1.clean_up)
@@ -36,11 +44,17 @@
 /obj/machinery/containment_field/ex_act(severity)
 	return 0
 
+/obj/machinery/containment_field/Crossed(mob/living/L)
+	if(!istype(L) || L.incorporeal_move)
+		return
+	shock(L)
+
 /obj/machinery/containment_field/HasProximity(turf/T, atom/movable/AM, old_loc)
-	if(istype(AM,/mob/living/silicon) && prob(40))
+	if(!istype(AM, /mob/living) || AM:incorporeal_move)
-		shock(AM)
+		return 0
-		return 1
+	if(!(get_dir(src,AM) in shockdirs))
-	if(istype(AM,/mob/living/carbon) && prob(50))
+		return 0
+	if(issilicon(AM) ? prob(40) : prob(50))
 		shock(AM)
 		return 1
 	return 0

code/modules/power/singularity/field_generator.dm

@@ -285,11 +285,10 @@ field_generator power level display
 		var/field_dir = get_dir(T,get_step(G.loc, NSEW))
 		T = get_step(T, NSEW)
 		if(!locate(/obj/machinery/containment_field) in T)
-			var/obj/machinery/containment_field/CF = new/obj/machinery/containment_field()
+			var/obj/machinery/containment_field/CF = new/obj/machinery/containment_field(T)
 			CF.set_master(src,G)
 			fields += CF
 			G.fields += CF
-			CF.loc = T
 			CF.set_dir(field_dir)
 	var/listcheck = 0
 	for(var/obj/machinery/field_generator/FG in connected_gens)

code/modules/power/tesla/energy_ball.dm

@@ -87,7 +87,7 @@
 			forceMove(T)
 			set_dir(move_dir)
 			for(var/mob/living/carbon/C in loc)
-				dust_mobs(C)
+				dust_mob(C)
 			sleep(1) // So movement is smooth
 
 /obj/singularity/energy_ball/proc/handle_energy()
@@ -129,12 +129,15 @@
 
 	EB.orbit(src, orbitsize, pick(FALSE, TRUE), rand(10, 25), pick(3, 4, 5, 6, 36))
 
+/obj/singularity/energy_ball/attack_hand(mob/user)
+	dust_mob(user)
+	return 1
 
 /obj/singularity/energy_ball/Bump(atom/A)
-	dust_mobs(A)
+	dust_mob(A)
 
 /obj/singularity/energy_ball/Bumped(atom/movable/AM)
-	dust_mobs(AM)
+	dust_mob(AM)
 
 /obj/singularity/energy_ball/orbit(obj/singularity/energy_ball/target)
 	if (istype(target))
@@ -153,19 +156,11 @@
 		qdel(src)
 
 
-/obj/singularity/energy_ball/proc/dust_mobs(atom/A)
+/obj/singularity/energy_ball/proc/dust_mob(mob/living/L)
-	if(isliving(A))
+	if(!istype(L) || L.incorporeal_move)
-		var/mob/living/L = A
-		if(L.incorporeal_move)
-			return
-	if(!iscarbon(A))
 		return
-	for(var/obj/machinery/power/grounding_rod/GR in orange(src, 2))
+	// L.dust() - Changing to do fatal elecrocution instead
-		if(GR.anchored)
+	L.electrocute_act(500, src, def_zone = BP_TORSO)
-			return
-	var/mob/living/carbon/C = A
-	// C.dust() - Changing to do fatal elecrocution instead
-	C.electrocute_act(500, src, def_zone = BP_TORSO)
 
 /proc/tesla_zap(atom/source, zap_range = 3, power, explosive = FALSE, stun_mobs = TRUE)
 	if(!source) // Some mobs and maybe some objects delete themselves when they die.