cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2025-12-09 21:53:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
silicons
2021-02-25 02:29:52 -07:00
parent 10369a482c
commit ac7cb45b28
46 changed files with 271 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
maps/tether/submaps/beach/_beach.dm
View File

@@ -106,15 +106,15 @@
// These are step-teleporters, for map edge transitions
// This top one goes INTO the cave
/obj/effect/step_trigger/teleporter/away_beach_tocave/New()
..()
/obj/effect/step_trigger/teleporter/away_beach_tocave/Initialize(mapload)
. = ..()
teleport_x = src.x // X is horizontal. This is a top of map transition, so you want the same horizontal alignment in the cave as you have on the beach
teleport_y = 2 // 2 is because it's putting you on row 2 of the map to the north
teleport_z = z+1 // The cave is always our Z-level plus 1, because it's loaded after us
// This one goes OUT OF the cave
/obj/effect/step_trigger/teleporter/away_beach_tobeach/New()
..()
/obj/effect/step_trigger/teleporter/away_beach_tobeach/Initialize(mapload)
. = ..()
teleport_x = src.x // Same reason as bove
teleport_y = world.maxy - 1 // This means "1 space from the top of the map"
teleport_z = z-1 // Opposite of 'tocave', beach is always loaded as the map before us
@@ -126,8 +126,8 @@
name = "Water"
icon_state = "water"
/turf/simulated/floor/beach/coastwater/New()
..()
/turf/simulated/floor/beach/coastwater/Initialize(mapload)
. = ..()
add_overlay(image("icon"='icons/misc/beach.dmi',"icon_state"="water","layer"=MOB_LAYER+0.1))
// -- Areas -- //

2
maps/tether/tether_things.dm
View File

@@ -261,7 +261,7 @@ var/global/list/latejoin_tram = list()
/obj/effect/landmark/tram/New()
latejoin_tram += loc // Register this turf as tram latejoin.
latejoin += loc // Also register this turf as fallback latejoin, since we won't have any arrivals shuttle landmarks.
..()
return ..()
/datum/spawnpoint/tram
display_name = "Tram Station"