[MIRROR] Fixes tram electrocuting law abiding crosswalk users [NO GBP…

…] [MDB IGNORE] (#690) * Fixes tram electrocuting law abiding crosswalk users [NO GBP] (#79780) --------- Co-authored-by: SkyratBot <[email protected]> Co-authored-by: lessthanthree <[email protected]>
Fluffy-Frontier · Nov 18, 2023 · 3ef103a · 3ef103a
1 parent cb34646
commit 3ef103a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/code/datums/components/energized.dm b/code/datums/components/energized.dm
@@ -87,11 +87,11 @@
 	// Try to be agnostic about N-S vs E-W movement
 	if(tram.travel_direction & (NORTH|SOUTH))
 		plate_pos = source.y
-		tram_pos = source.y
+		tram_pos = tram_part.y
 		tram_velocity_sign = tram.travel_direction & NORTH ? 1 : -1
 	else
 		plate_pos = source.x
-		tram_pos = source.x
+		tram_pos = tram_part.x
 		tram_velocity_sign = tram.travel_direction & EAST ? 1 : -1
 
 	// How far away are we? negative if already passed.

diff --git a/code/modules/transport/tram/tram_floors.dm b/code/modules/transport/tram/tram_floors.dm
@@ -135,6 +135,9 @@
 			return
 	return ..()
 
+/turf/open/floor/tram/plate/energized/broken
+	broken = TRUE
+
 // Resetting the tram contents to its original state needs the turf to be there
 /turf/open/indestructible/tram
 	name = "tram guideway"