From 7e06927ba7a525e82aed06ef1ecc7e2b3f5c0672 Mon Sep 17 00:00:00 2001 From: Leshana Date: Mon, 23 Mar 2020 15:28:16 -0400 Subject: [PATCH] Fixes for mapped in transit turfs. --- code/game/turfs/space/transit.dm | 44 +++----------------------------- 1 file changed, 4 insertions(+), 40 deletions(-) diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm index 5f19e691f26..02c589e966d 100644 --- a/code/game/turfs/space/transit.dm +++ b/code/game/turfs/space/transit.dm @@ -1,5 +1,4 @@ /turf/space/transit - keep_sprite = TRUE can_build_into_floor = FALSE var/pushdirection // push things that get caught in the transit tile this direction @@ -7,61 +6,26 @@ /turf/space/transit/attackby(obj/O as obj, mob/user as mob) return +/turf/space/transit/Initialize() + . = ..() + toggle_transit(reverse_dir[pushdirection]) + //------------------------ /turf/space/transit/north // moving to the north icon_state = "arrow-north" pushdirection = SOUTH // south because the space tile is scrolling south -/turf/space/transit/north/Initialize() - . = ..() - - var/x_shift = SSskybox.phase_shift_by_x[src.x % (SSskybox.phase_shift_by_x.len - 1) + 1] - var/transit_state = (world.maxy - src.y + x_shift)%15 + 1 - - icon_state = "speedspace_ns_[transit_state]" -//------------------------ - /turf/space/transit/south // moving to the south icon_state = "arrow-south" pushdirection = SOUTH // south because the space tile is scrolling south -/turf/space/transit/south/Initialize() - . = ..() - - var/x_shift = SSskybox.phase_shift_by_x[src.x % (SSskybox.phase_shift_by_x.len - 1) + 1] - var/transit_state = (world.maxy - src.y + x_shift)%15 + 1 - - var/icon/I = new(icon, "speedspace_ns_[transit_state]") - I.Flip(SOUTH) - icon = I -//------------------------ - /turf/space/transit/east // moving to the east icon_state = "arrow-east" pushdirection = WEST -/turf/space/transit/east/Initialize() - . = ..() - - var/y_shift = SSskybox.phase_shift_by_y[src.y % (SSskybox.phase_shift_by_y.len - 1) + 1] - var/transit_state = (world.maxx - src.x + y_shift)%15 + 1 - - icon_state = "speedspace_ew_[transit_state]" -//------------------------ - /turf/space/transit/west // moving to the west icon_state = "arrow-west" pushdirection = WEST -/turf/space/transit/west/Initialize() - . = ..() - - var/y_shift = SSskybox.phase_shift_by_y[src.y % (SSskybox.phase_shift_by_y.len - 1) + 1] - var/transit_state = (world.maxx - src.x + y_shift)%15 + 1 - - var/icon/I = new(icon, "speedspace_ew_[transit_state]") - I.Flip(WEST) - icon = I - //------------------------ \ No newline at end of file