From 3ef103a253edeab6a78e9fd48b5e6aecf7686cc3 Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com> Date: Sat, 18 Nov 2023 23:29:34 +0300 Subject: [PATCH] [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 <59378654+SkyratBot@users.noreply.github.com> Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com> --- code/datums/components/energized.dm | 4 ++-- code/modules/transport/tram/tram_floors.dm | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/datums/components/energized.dm b/code/datums/components/energized.dm index f70e661336a..90066ecd97e 100644 --- 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 index 2afb59f9b4a..08888ea1608 100644 --- 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"