From 4a12d8c1db294f940123b5eb5ba5ea5afc7701b0 Mon Sep 17 00:00:00 2001
From: CHOMPStation2StaffMirrorBot
 <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com>
Date: Thu, 18 Sep 2025 17:21:22 -0700
Subject: [PATCH] [MIRROR] Maglev track tweaks (#11697)

Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
---
 maps/common/common_things.dm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/maps/common/common_things.dm b/maps/common/common_things.dm
index 56e717d757..1fc3a005c6 100644
--- a/maps/common/common_things.dm
+++ b/maps/common/common_things.dm
@@ -101,15 +101,19 @@
 
 // Walking on maglev tracks will shock you! Horray!
 /turf/simulated/floor/maglev/Entered(var/atom/movable/AM, var/atom/old_loc)
-	if(isliving(AM) && !(AM.is_incorporeal()) && prob(50))
-		track_zap(AM)
+	if(!isliving(AM) || prob(50))
+		return
+	if(locate(/obj/structure/catwalk) in src) // safe to walk over as a bridge!
+		return
+	track_zap(AM)
 
 /turf/simulated/floor/maglev/attack_hand(var/mob/user)
 	if(prob(75))
 		track_zap(user)
 
 /turf/simulated/floor/maglev/proc/track_zap(var/mob/living/user)
-	if (!istype(user)) return
+	if(!istype(user) || user.is_incorporeal())
+		return
 	if (electrocute_mob(user, shock_area, src))
 		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
 		s.set_up(5, 1, src)