Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Fixes tram electrocuting law abiding crosswalk users #690

Merged
merged 1 commit into from
Nov 18, 2023
Merged

[MIRROR] Fixes tram electrocuting law abiding crosswalk users #690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/datums/components/energized.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions code/modules/transport/tram/tram_floors.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down