diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 9a94074d943..a8ce5c38383 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -792,18 +792,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/lobby) -"aoV" = ( -/obj/effect/turf_decal/stripes/white/line, -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 - }, -/turf/open/floor/vault{ - base_icon_state = "tram"; - desc = "The linear induction plate that powers the tram."; - icon_state = "tram"; - name = "linear induction plate" - }, -/area/station/hallway/primary/tram/right) "aoY" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrigleft"; @@ -948,6 +936,11 @@ /obj/structure/cable/layer3, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/aisat_interior) +"asv" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/left) "asw" = ( /obj/machinery/computer/monitor{ dir = 8 @@ -1066,20 +1059,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit) -"awt" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/white/line, -/turf/open/floor/vault{ - base_icon_state = "tram"; - desc = "The linear induction plate that powers the tram."; - icon_state = "tram"; - name = "linear induction plate" - }, -/area/station/hallway/primary/tram/center) "awB" = ( /obj/machinery/camera{ c_tag = "Security - Interrogation Main"; @@ -1185,6 +1164,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/aisat_interior) +"ayQ" = ( +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/right) "ayW" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -1282,6 +1268,14 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"aBv" = ( +/obj/structure/industrial_lift/tram{ + icon_state = "plating" + }, +/obj/structure/grille/tram, +/obj/structure/window/reinforced/shuttle/tram, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/center) "aBM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/chair{ @@ -2120,14 +2114,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"aUk" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/holosign/barrier/atmos/tram, -/obj/machinery/camera/directional/south{ - c_tag = "Hallway - Eastern Tram Bridge 2" - }, -/turf/open/floor/vault, -/area/station/hallway/primary/tram/right) "aUA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -2178,16 +2164,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/construction/engineering) -"aVp" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Science - Genetics Pen"; - network = list("ss13","rd") - }, -/turf/open/floor/grass, -/area/station/science/genetics) "aVE" = ( /obj/machinery/rnd/server/master, /turf/open/floor/circuit/telecomms/server, @@ -2476,6 +2452,13 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/hallway) +"bdr" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/center) "bdz" = ( /obj/structure/railing/corner{ dir = 1 @@ -3361,18 +3344,6 @@ /obj/structure/railing, /turf/open/floor/plating, /area/station/maintenance/tram/right) -"bsU" = ( -/obj/structure/industrial_lift/tram{ - icon_state = "titanium" - }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/vault{ - base_icon_state = "tram"; - desc = "The linear induction plate that powers the tram."; - icon_state = "tram"; - name = "linear induction plate" - }, -/area/station/hallway/primary/tram/center) "btw" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -3600,6 +3571,15 @@ }, /turf/open/floor/iron/grimy, /area/station/service/library/lounge) +"bwZ" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/center) "bxh" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /obj/effect/turf_decal/trimline/neutral/filled/warning, @@ -3996,6 +3976,12 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/hallway) +"bDm" = ( +/obj/structure/fluff/tram_rail/floor{ + dir = 1 + }, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/center) "bDo" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -4154,6 +4140,23 @@ "bFq" = ( /turf/closed/wall, /area/station/medical/psychology) +"bFw" = ( +/obj/structure/table/glass, +/obj/item/storage/box/monkeycubes{ + pixel_x = -7; + pixel_y = 7 + }, +/obj/machinery/camera{ + c_tag = "Science - Genetics"; + dir = 9; + network = list("ss13","rd") + }, +/obj/item/infuser_book{ + pixel_x = 5; + pixel_y = 3 + }, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "bFF" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -4395,12 +4398,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/security/prison/work) -"bKq" = ( -/obj/structure/fluff/tram_rail/floor{ - dir = 1 - }, -/turf/open/floor/glass/reinforced, -/area/station/hallway/primary/tram/left) "bKt" = ( /turf/open/floor/engine, /area/station/engineering/supermatter) @@ -4455,18 +4452,6 @@ /obj/effect/mapping_helpers/airlock/access/all/science/rd, /turf/open/floor/iron/dark, /area/station/science/server) -"bLb" = ( -/obj/structure/industrial_lift/tram{ - icon_state = "titanium" - }, -/obj/effect/landmark/lift_id, -/turf/open/floor/vault{ - base_icon_state = "tram"; - desc = "The linear induction plate that powers the tram."; - icon_state = "tram"; - name = "linear induction plate" - }, -/area/station/hallway/primary/tram/center) "bLe" = ( /turf/open/floor/carpet, /area/station/service/library) @@ -5387,6 +5372,12 @@ }, /turf/open/floor/iron/white, /area/station/security/execution/education) +"cam" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/grass, +/area/station/science/genetics) "caw" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -5946,15 +5937,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/tram/left) -"cit" = ( -/obj/effect/turf_decal/siding/thinplating{ - dir = 4 - }, -/obj/structure/fluff/tram_rail/floor, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/left) "ciA" = ( /obj/structure/ladder, /obj/effect/decal/cleanable/dirt, @@ -6113,14 +6095,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) -"clb" = ( -/turf/open/floor/vault{ - base_icon_state = "tram"; - desc = "The linear induction plate that powers the tram."; - icon_state = "tram"; - name = "linear induction plate" - }, -/area/station/hallway/primary/tram/left) "cli" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 @@ -7789,12 +7763,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/hallway/secondary/construction/engineering) -"cNb" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/holosign/barrier/atmos/tram, -/obj/structure/fluff/tram_rail/floor, -/turf/open/floor/vault, -/area/station/hallway/primary/tram/left) "cNl" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -8155,14 +8123,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"cTE" = ( -/obj/effect/turf_decal/siding/thinplating{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/center) "cTT" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, @@ -8684,15 +8644,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"ddJ" = ( -/obj/effect/turf_decal/siding/thinplating{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/fluff/tram_rail/floor, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/center) "ddP" = ( /obj/effect/spawner/structure/window, /obj/structure/cable, @@ -9180,12 +9131,21 @@ /obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/plating, /area/station/hallway/primary/tram/center) +"dns" = ( +/obj/structure/holosign/barrier/atmos/tram, +/obj/effect/landmark/event_spawn, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/center) "dnB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, /turf/open/floor/wood, /area/station/commons/dorms) +"dnD" = ( +/obj/structure/fluff/tram_rail/floor, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/center) "dnE" = ( /obj/machinery/telecomms/server/presets/service, /turf/open/floor/iron/dark/telecomms, @@ -9655,14 +9615,6 @@ }, /turf/open/floor/plating/airless, /area/station/science/ordnance/bomb) -"duv" = ( -/obj/item/radio/intercom/directional/east, -/obj/machinery/requests_console/directional/south{ - department = "Genetics"; - name = "Genetics Requests Console" - }, -/turf/open/floor/iron/dark, -/area/station/science/genetics) "duB" = ( /turf/closed/wall/r_wall, /area/station/security/prison/garden) @@ -10108,14 +10060,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit) -"dBd" = ( -/obj/effect/turf_decal/siding/thinplating{ - dir = 4 - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/left) "dBj" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -10159,20 +10103,6 @@ /obj/machinery/destination_sign/indicator, /turf/closed/wall, /area/station/hallway/primary/tram/right) -"dCg" = ( -/obj/effect/turf_decal/caution/stand_clear/white{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/white/line{ - dir = 8 - }, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - icon_state = "tram2"; - name = "tram platform" - }, -/area/station/hallway/primary/tram/right) "dCh" = ( /turf/closed/wall/r_wall, /area/station/maintenance/solars/port/aft) @@ -10317,6 +10247,13 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) +"dEo" = ( +/obj/effect/turf_decal/trimline/white/tram{ + dir = 1 + }, +/obj/machinery/crossing_signal/southwest, +/turf/open/floor/iron, +/area/station/hallway/primary/tram/right) "dEv" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/security/armory) @@ -11306,22 +11243,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/security/prison/workout) -"dYL" = ( -/obj/effect/landmark/tram/middle_part, -/obj/machinery/computer/tram_controls{ - icon_keyboard = null; - icon_state = "tram_controls" - }, -/obj/structure/industrial_lift/tram{ - icon_state = "titanium" - }, -/turf/open/floor/vault{ - base_icon_state = "tram"; - desc = "The linear induction plate that powers the tram."; - icon_state = "tram"; - name = "linear induction plate" - }, -/area/station/hallway/primary/tram/center) "dYT" = ( /obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt, @@ -11566,8 +11487,8 @@ /turf/open/floor/carpet, /area/station/service/theater) "ech" = ( -/obj/machinery/dna_infuser, -/turf/open/floor/iron/dark, +/obj/structure/window/reinforced/spawner/west, +/turf/open/floor/grass, /area/station/science/genetics) "eci" = ( /obj/structure/table/wood, @@ -12676,16 +12597,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) -"eyX" = ( -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/machinery/door/window/left/directional/west{ - name = "Monkey Pen"; - req_access = list("genetics") - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/grass, -/area/station/science/genetics) "ezs" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 8 @@ -12727,6 +12638,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"ezQ" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/fluff/tram_rail/floor{ + dir = 1 + }, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/right) "ezX" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -12844,11 +12762,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/cargo/lobby) -"eBO" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/holosign/barrier/atmos/tram, -/turf/open/floor/vault, -/area/station/hallway/primary/tram/right) "eCp" = ( /obj/machinery/computer/secure_data, /obj/structure/sign/clock/directional/north, @@ -13149,9 +13062,15 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"eGt" = ( -/turf/open/floor/glass/reinforced, -/area/station/hallway/primary/tram/right) +"eGA" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/center) "eGS" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor, @@ -13373,6 +13292,25 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/plating, /area/station/maintenance/central/greater) +"eMv" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/left) +"eMH" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/caution/stand_clear/white{ + dir = 8 + }, +/turf/open/floor/noslip/tram_platform, +/area/station/hallway/primary/tram/left) "eMV" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, @@ -13680,16 +13618,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark, /area/station/security/interrogation) -"eRM" = ( -/obj/effect/turf_decal/siding/thinplating{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/fluff/tram_rail/floor{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/right) "eRU" = ( /obj/structure/table/wood, /obj/machinery/firealarm/directional/north, @@ -14204,6 +14132,11 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/carpet, /area/station/cargo/miningdock) +"fbM" = ( +/obj/structure/holosign/barrier/atmos/tram, +/obj/effect/landmark/event_spawn, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/left) "fcs" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -16055,11 +15988,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) -"fMb" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/holosign/barrier/atmos/tram, -/turf/open/floor/vault, -/area/station/hallway/primary/tram/center) "fMm" = ( /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 @@ -17349,17 +17277,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/cafeteria, /area/station/security/prison) -"glq" = ( -/obj/structure/industrial_lift/tram{ - icon_state = "titanium" - }, -/turf/open/floor/vault{ - base_icon_state = "tram"; - desc = "The linear induction plate that powers the tram."; - icon_state = "tram"; - name = "linear induction plate" - }, -/area/station/hallway/primary/tram/center) "glw" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, @@ -18919,10 +18836,6 @@ }, /turf/open/floor/plating, /area/station/security/warden) -"gNN" = ( -/obj/effect/landmark/start/hangover, -/turf/open/floor/glass/reinforced, -/area/station/hallway/primary/tram/center) "gNS" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -19415,13 +19328,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, /area/station/commons/dorms) -"gVA" = ( -/obj/effect/turf_decal/trimline/white/tram{ - dir = 1 - }, -/obj/machinery/crossing_signal/southwest, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/center) "gVD" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 @@ -20281,6 +20187,12 @@ /obj/machinery/newscaster/directional/north, /turf/open/floor/wood/large, /area/station/service/library) +"hnT" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/grass, +/area/station/science/genetics) "hnW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -20698,9 +20610,6 @@ dir = 1 }, /area/station/hallway/secondary/service) -"hyg" = ( -/turf/open/floor/glass/reinforced, -/area/station/hallway/primary/tram/center) "hyE" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -20940,16 +20849,6 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/iron/checker, /area/station/commons/lounge) -"hCV" = ( -/obj/structure/holosign/barrier/atmos/tram, -/obj/effect/landmark/event_spawn, -/turf/open/floor/vault{ - base_icon_state = "tram"; - desc = "The linear induction plate that powers the tram."; - icon_state = "tram"; - name = "linear induction plate" - }, -/area/station/hallway/primary/tram/right) "hCW" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -21290,20 +21189,6 @@ }, /turf/open/floor/engine/cult, /area/station/service/library) -"hIq" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/white/line, -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 - }, -/turf/open/floor/vault{ - base_icon_state = "tram"; - desc = "The linear induction plate that powers the tram."; - icon_state = "tram"; - name = "linear induction plate" - }, -/area/station/hallway/primary/tram/center) "hID" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 8 @@ -22270,14 +22155,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor, /area/station/maintenance/central/greater) -"iaK" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/holosign/barrier/atmos/tram, -/obj/machinery/camera/directional/south{ - c_tag = "Hallway - Western Tram Bridge 1" - }, -/turf/open/floor/vault, -/area/station/hallway/primary/tram/left) "iaT" = ( /obj/structure/cable, /turf/open/floor/iron/dark, @@ -22361,6 +22238,9 @@ "icx" = ( /turf/open/floor/circuit/green, /area/station/science/robotics/mechbay) +"icF" = ( +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/center) "icL" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 10 @@ -23107,6 +22987,16 @@ }, /turf/open/floor/plating, /area/station/science/server) +"irc" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/center) "ird" = ( /obj/structure/railing/corner, /obj/effect/turf_decal/siding/thinplating{ @@ -23767,6 +23657,12 @@ }, /turf/open/floor/iron/freezer, /area/station/commons/toilet) +"iCz" = ( +/obj/structure/fluff/tram_rail/floor, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/left) "iCA" = ( /obj/structure/fluff{ desc = "What, you think the water just magically soaks into the metallic flooring?"; @@ -23847,6 +23743,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/maintenance/port/central) +"iDt" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/right) "iDv" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron, @@ -24247,6 +24153,10 @@ /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron/dark, /area/station/cargo/miningdock/oresilo) +"iMR" = ( +/obj/structure/fluff/tram_rail/floor, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/left) "iNg" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -24555,17 +24465,6 @@ }, /turf/open/floor/iron/checker, /area/station/commons/lounge) -"iTr" = ( -/obj/effect/turf_decal/siding/thinplating{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/fluff/tram_rail/floor{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/center) "iTt" = ( /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 1 @@ -24653,15 +24552,6 @@ }, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"iUd" = ( -/obj/effect/turf_decal/siding/thinplating{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/fluff/tram_rail/floor, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/center) "iUh" = ( /turf/closed/wall, /area/station/security/warden) @@ -24982,6 +24872,17 @@ }, /turf/open/floor/iron, /area/station/science/lab) +"iZG" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/structure/fluff/tram_rail/floor, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/right) "iZM" = ( /obj/structure/chair{ dir = 4 @@ -25003,6 +24904,19 @@ }, /turf/open/floor/iron/white, /area/station/science/ordnance) +"jar" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/structure/fluff/tram_rail/floor{ + dir = 1 + }, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/center) "jay" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/window/reinforced, @@ -26632,6 +26546,10 @@ }, /turf/open/floor/catwalk_floor, /area/station/maintenance/starboard/greater) +"jGX" = ( +/obj/structure/fluff/tram_rail/floor, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/right) "jGZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /obj/machinery/door/poddoor/preopen{ @@ -26786,6 +26704,14 @@ }, /turf/open/floor/iron/checker, /area/station/commons/lounge) +"jJM" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/fluff/tram_rail/floor{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/center) "jJO" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -26910,8 +26836,9 @@ /turf/open/floor/iron/freezer, /area/station/security/prison) "jLF" = ( -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/window/reinforced/spawner/west, +/obj/structure/flora/bush/leavy/style_random, +/obj/structure/flora/tree/palm/style_random, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/grass, /area/station/science/genetics) "jLI" = ( @@ -27602,8 +27529,13 @@ /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai) "jYx" = ( -/obj/structure/flora/bush/sunny/style_random, -/obj/structure/window/reinforced/spawner/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Science - Genetics Pen"; + network = list("ss13","rd") + }, /turf/open/floor/grass, /area/station/science/genetics) "jYy" = ( @@ -28529,18 +28461,6 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"koe" = ( -/obj/effect/turf_decal/stripes/white/line, -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 - }, -/turf/open/floor/vault{ - base_icon_state = "tram"; - desc = "The linear induction plate that powers the tram."; - icon_state = "tram"; - name = "linear induction plate" - }, -/area/station/hallway/primary/tram/center) "koh" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -28905,6 +28825,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/evidence) +"kvz" = ( +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/right) "kvH" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -29406,10 +29329,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/tram/mid) -"kDz" = ( -/obj/structure/fluff/tram_rail/floor, -/turf/open/floor/glass/reinforced, -/area/station/hallway/primary/tram/center) "kDF" = ( /obj/structure/closet/wardrobe/miner, /obj/effect/turf_decal/tile/brown/fourcorners, @@ -30694,6 +30613,11 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/evidence) +"kYX" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/center) "kYZ" = ( /obj/machinery/airalarm/server{ dir = 4; @@ -30704,6 +30628,10 @@ }, /turf/open/floor/circuit/telecomms/mainframe, /area/station/tcommsat/server) +"kZb" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/right) "kZh" = ( /turf/open/floor/eighties/red, /area/station/commons/fitness/recreation/entertainment) @@ -30767,14 +30695,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"lav" = ( -/obj/effect/turf_decal/siding/thinplating{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/center) "laz" = ( /obj/machinery/light/directional/east, /turf/open/floor/iron/dark, @@ -32197,12 +32117,23 @@ /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/iron/dark, /area/station/service/chapel) +"lzb" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/structure/fluff/tram_rail/floor, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/left) "lzo" = ( /obj/machinery/door/window/left/directional/south, /turf/open/floor/grass, /area/station/service/hydroponics) "lzu" = ( -/obj/structure/window/reinforced/spawner/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/grass, /area/station/science/genetics) "lzD" = ( @@ -33338,12 +33269,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/evidence) -"lWY" = ( -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/grass, -/area/station/science/genetics) "lXi" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -33407,10 +33332,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/grimy, /area/station/service/library/lounge) -"lYo" = ( -/obj/structure/fluff/tram_rail/floor, -/turf/open/floor/glass/reinforced, -/area/station/hallway/primary/tram/left) "lYr" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -35164,19 +35085,6 @@ /obj/effect/landmark/start/hangover/closet, /turf/open/floor/iron, /area/station/maintenance/tram/right) -"mDI" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/white/line, -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 - }, -/turf/open/floor/vault{ - base_icon_state = "tram"; - desc = "The linear induction plate that powers the tram."; - icon_state = "tram"; - name = "linear induction plate" - }, -/area/station/hallway/primary/tram/right) "mDS" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ dir = 5 @@ -36319,6 +36227,13 @@ /obj/effect/turf_decal/weather/snow, /turf/open/floor/iron/kitchen_coldroom, /area/station/service/kitchen/coldroom) +"mXp" = ( +/obj/structure/industrial_lift/tram{ + icon_state = "titanium" + }, +/obj/effect/landmark/lift_id, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/center) "mXu" = ( /obj/structure/sign/warning/vacuum{ pixel_y = -32 @@ -37310,6 +37225,13 @@ }, /turf/open/floor/iron/white, /area/station/science/robotics/lab) +"nnF" = ( +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/center) "nnG" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -37440,6 +37362,19 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/tram/left) +"npL" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/structure/fluff/tram_rail/floor{ + dir = 1 + }, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/right) "npM" = ( /obj/structure/disposaloutlet, /obj/structure/disposalpipe/trunk{ @@ -37946,15 +37881,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/tram/mid) -"nzs" = ( -/obj/effect/landmark/tram/right_part, -/turf/open/floor/vault{ - base_icon_state = "tram"; - desc = "The linear induction plate that powers the tram."; - icon_state = "tram"; - name = "linear induction plate" - }, -/area/station/hallway/primary/tram/right) "nzz" = ( /obj/effect/turf_decal/trimline/red/filled/line, /turf/open/floor/iron/showroomfloor, @@ -38409,9 +38335,6 @@ /obj/machinery/newscaster/directional/north, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"nJX" = ( -/turf/open/floor/glass/reinforced, -/area/station/hallway/primary/tram/left) "nKb" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -38867,14 +38790,6 @@ /obj/effect/mapping_helpers/mail_sorting/service/theater, /turf/open/floor/iron/checker, /area/station/commons/lounge) -"nTT" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/holosign/barrier/atmos/tram, -/obj/structure/fluff/tram_rail/floor{ - dir = 1 - }, -/turf/open/floor/vault, -/area/station/hallway/primary/tram/left) "nUb" = ( /obj/structure/ladder, /obj/effect/decal/cleanable/dirt, @@ -39247,6 +39162,9 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"obb" = ( +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/center) "obp" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 4 @@ -39459,6 +39377,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/grimy, /area/station/ai_monitored/command/nuke_storage) +"ody" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/machinery/camera/directional/south{ + c_tag = "Hallway - Eastern Tram Bridge 2" + }, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/right) "odF" = ( /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/dark, @@ -39582,6 +39513,10 @@ /obj/structure/table/wood, /turf/open/floor/wood/tile, /area/station/service/chapel) +"ogy" = ( +/obj/machinery/dna_infuser, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "ogY" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 6 @@ -39667,23 +39602,6 @@ }, /turf/open/floor/iron, /area/station/security/prison) -"oii" = ( -/obj/structure/table/glass, -/obj/item/storage/box/monkeycubes{ - pixel_x = -7; - pixel_y = 7 - }, -/obj/machinery/camera{ - c_tag = "Science - Genetics"; - dir = 9; - network = list("ss13","rd") - }, -/obj/item/infuser_book{ - pixel_x = 5; - pixel_y = 3 - }, -/turf/open/floor/iron/dark, -/area/station/science/genetics) "oij" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 6 @@ -40004,6 +39922,17 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/lobby) +"oph" = ( +/obj/effect/landmark/tram/middle_part, +/obj/machinery/computer/tram_controls{ + icon_keyboard = null; + icon_state = "tram_controls" + }, +/obj/structure/industrial_lift/tram{ + icon_state = "titanium" + }, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/center) "opr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -40336,20 +40265,6 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) -"ovn" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/white/line, -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 - }, -/turf/open/floor/vault{ - base_icon_state = "tram"; - desc = "The linear induction plate that powers the tram."; - icon_state = "tram"; - name = "linear induction plate" - }, -/area/station/hallway/primary/tram/left) "ovL" = ( /turf/open/floor/iron, /area/station/hallway/secondary/service) @@ -40995,6 +40910,10 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/construction/engineering) +"oJj" = ( +/obj/structure/flora/tree/palm/style_random, +/turf/open/floor/grass, +/area/station/science/genetics) "oJu" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/table/glass, @@ -41159,15 +41078,6 @@ }, /turf/open/floor/glass/reinforced, /area/station/security/brig) -"oNa" = ( -/obj/effect/landmark/tram/left_part, -/turf/open/floor/vault{ - base_icon_state = "tram"; - desc = "The linear induction plate that powers the tram."; - icon_state = "tram"; - name = "linear induction plate" - }, -/area/station/hallway/primary/tram/left) "oNb" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 1 @@ -41449,6 +41359,14 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/exit) +"oSW" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/right) "oTa" = ( /obj/structure/railing{ dir = 9 @@ -41689,10 +41607,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/aisat_interior) -"oWO" = ( -/obj/structure/flora/tree/palm/style_random, -/turf/open/floor/grass, -/area/station/science/genetics) "oXe" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -42416,12 +42330,6 @@ /obj/effect/landmark/navigate_destination/med, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"pkP" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/holosign/barrier/atmos/tram, -/obj/structure/fluff/tram_rail/floor, -/turf/open/floor/vault, -/area/station/hallway/primary/tram/right) "plI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -42672,22 +42580,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/checkpoint/science) -"ppC" = ( -/obj/effect/turf_decal/siding/thinplating{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/fluff/tram_rail/floor{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/center) -"ppG" = ( -/obj/effect/turf_decal/trimline/white/tram, -/obj/machinery/crossing_signal/northwest, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/center) "ppM" = ( /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/grille, @@ -43545,9 +43437,13 @@ /turf/open/floor/iron, /area/station/engineering/engine_smes) "pCF" = ( -/obj/structure/flora/bush/leavy/style_random, -/obj/structure/flora/tree/palm/style_random, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/machinery/door/window/left/directional/west{ + name = "Monkey Pen"; + req_access = list("genetics") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/grass, /area/station/science/genetics) "pCI" = ( @@ -44153,6 +44049,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/checkpoint/supply) +"pOk" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/machinery/camera/directional/south{ + c_tag = "Hallway - Western Tram Bridge 1" + }, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/left) "pOo" = ( /obj/structure/table, /obj/structure/cable, @@ -44163,6 +44072,10 @@ /obj/machinery/light/floor, /turf/open/floor/iron, /area/station/security/prison) +"pOx" = ( +/obj/effect/landmark/start/hangover, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/center) "pOy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt, @@ -44483,14 +44396,6 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"pVA" = ( -/obj/effect/turf_decal/siding/thinplating{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/fluff/tram_rail/floor, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/right) "pVJ" = ( /obj/machinery/seed_extractor, /obj/effect/turf_decal/tile/green/fourcorners, @@ -44705,14 +44610,6 @@ }, /turf/open/floor/carpet, /area/station/cargo/miningdock) -"pYU" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/holosign/barrier/atmos/tram, -/obj/machinery/camera/directional/south{ - c_tag = "Hallway - Eastern Tram Bridge 1" - }, -/turf/open/floor/vault, -/area/station/hallway/primary/tram/center) "pYW" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 4 @@ -44763,14 +44660,6 @@ }, /turf/open/floor/iron/checker, /area/station/commons/lounge) -"pZG" = ( -/turf/open/floor/vault{ - base_icon_state = "tram"; - desc = "The linear induction plate that powers the tram."; - icon_state = "tram"; - name = "linear induction plate" - }, -/area/station/hallway/primary/tram/right) "pZU" = ( /obj/structure/rack, /obj/item/clothing/under/color/blue, @@ -45215,6 +45104,12 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/dorms) +"qia" = ( +/obj/structure/industrial_lift/tram{ + icon_state = "titanium" + }, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/center) "qif" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -45547,6 +45442,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/grimy, /area/station/service/lawoffice) +"qoE" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/left) "qoX" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 6 @@ -46104,12 +46008,6 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/wood, /area/station/service/bar/backroom) -"qwJ" = ( -/obj/structure/fluff/tram_rail/floor{ - dir = 1 - }, -/turf/open/floor/glass/reinforced, -/area/station/hallway/primary/tram/right) "qwQ" = ( /obj/effect/turf_decal/trimline/yellow/warning{ dir = 1 @@ -47881,14 +47779,6 @@ "rbP" = ( /turf/closed/wall, /area/station/security/execution/education) -"rbZ" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/holosign/barrier/atmos/tram, -/obj/structure/fluff/tram_rail/floor{ - dir = 1 - }, -/turf/open/floor/vault, -/area/station/hallway/primary/tram/right) "rcg" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/structure/cable, @@ -48118,6 +48008,11 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/main) +"rhW" = ( +/obj/effect/turf_decal/trimline/white/tram, +/obj/machinery/crossing_signal/northwest, +/turf/open/floor/iron, +/area/station/hallway/primary/tram/center) "rib" = ( /obj/structure/fluff/tram_rail/anchor{ dir = 1 @@ -48569,16 +48464,6 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/iron/white, /area/station/service/kitchen) -"rqd" = ( -/obj/structure/holosign/barrier/atmos/tram, -/obj/effect/landmark/event_spawn, -/turf/open/floor/vault{ - base_icon_state = "tram"; - desc = "The linear induction plate that powers the tram."; - icon_state = "tram"; - name = "linear induction plate" - }, -/area/station/hallway/primary/tram/center) "rqi" = ( /obj/structure/table/wood, /obj/structure/window/reinforced{ @@ -48865,6 +48750,14 @@ "rvr" = ( /turf/closed/wall/r_wall, /area/station/science/ordnance/burnchamber) +"rvu" = ( +/obj/item/radio/intercom/directional/east, +/obj/machinery/requests_console/directional/south{ + department = "Genetics"; + name = "Genetics Requests Console" + }, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "rvD" = ( /obj/machinery/camera/directional/west{ c_tag = "Hallway - Service Wing Right Stairway" @@ -49509,13 +49402,6 @@ "rGi" = ( /turf/open/floor/iron/dark, /area/station/service/chapel/office) -"rGj" = ( -/obj/structure/table/glass, -/obj/item/storage/box/monkeycubes{ - pixel_x = -5 - }, -/turf/open/floor/iron/dark, -/area/station/science/genetics) "rGx" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -50171,6 +50057,19 @@ }, /turf/open/floor/catwalk_floor, /area/station/hallway/primary/tram/center) +"rPi" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/machinery/camera/directional/south{ + c_tag = "Hallway - Eastern Tram Bridge 1" + }, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/center) "rPj" = ( /obj/effect/turf_decal/box/white{ color = "#9FED58" @@ -50318,19 +50217,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/closed/wall/r_wall, /area/station/maintenance/disposal/incinerator) -"rRz" = ( -/obj/effect/turf_decal/stripes/white/line, -/obj/effect/turf_decal/stripes/white/line, -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 - }, -/turf/open/floor/vault{ - base_icon_state = "tram"; - desc = "The linear induction plate that powers the tram."; - icon_state = "tram"; - name = "linear induction plate" - }, -/area/station/hallway/primary/tram/left) "rRD" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 @@ -51149,13 +51035,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/port/central) -"siW" = ( -/obj/effect/turf_decal/trimline/white/tram{ - dir = 1 - }, -/obj/machinery/crossing_signal/southwest, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/right) "sjc" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; @@ -51163,6 +51042,13 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"sjd" = ( +/obj/structure/industrial_lift/tram{ + icon_state = "titanium" + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/center) "sjf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -52274,20 +52160,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/entrance, /turf/open/floor/iron, /area/station/security/brig) -"sHA" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 4 - }, -/obj/effect/turf_decal/caution/stand_clear/white{ - dir = 8 - }, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - icon_state = "tram2"; - name = "tram platform" - }, -/area/station/hallway/primary/tram/left) "sHH" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/ce) @@ -52383,6 +52255,19 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/security/checkpoint/science) +"sIX" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/machinery/camera/directional/south{ + c_tag = "Hallway - Western Tram Bridge 2" + }, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/center) "sJg" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -52470,6 +52355,13 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) +"sKS" = ( +/obj/structure/table/glass, +/obj/item/storage/box/monkeycubes{ + pixel_x = -5 + }, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "sLf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -52883,6 +52775,9 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/tcommsat/computer) +"sRW" = ( +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/right) "sRZ" = ( /turf/closed/wall/r_wall, /area/station/science/lobby) @@ -53556,6 +53451,9 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/exit) +"tep" = ( +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/left) "tey" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -53837,10 +53735,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"tli" = ( -/obj/structure/fluff/tram_rail/floor, -/turf/open/floor/glass/reinforced, -/area/station/hallway/primary/tram/right) "tln" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -54490,6 +54384,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/miningdock) +"ttS" = ( +/obj/effect/turf_decal/trimline/white/tram{ + dir = 1 + }, +/obj/machinery/crossing_signal/southwest, +/turf/open/floor/iron, +/area/station/hallway/primary/tram/center) "tug" = ( /obj/structure/lattice, /obj/machinery/atmospherics/components/unary/passive_vent{ @@ -54506,10 +54407,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload_foyer) -"tuv" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/grass, -/area/station/science/genetics) "tuC" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering{ @@ -55500,12 +55397,6 @@ }, /turf/open/floor/iron/checker, /area/station/commons/lounge) -"tPx" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/holosign/barrier/atmos/tram, -/obj/structure/fluff/tram_rail/floor, -/turf/open/floor/vault, -/area/station/hallway/primary/tram/center) "tPE" = ( /turf/closed/wall, /area/station/hallway/secondary/entry) @@ -56288,20 +56179,19 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/break_room) -"ueW" = ( -/obj/structure/holosign/barrier/atmos/tram, -/obj/effect/landmark/event_spawn, -/turf/open/floor/vault{ - base_icon_state = "tram"; - desc = "The linear induction plate that powers the tram."; - icon_state = "tram"; - name = "linear induction plate" - }, -/area/station/hallway/primary/tram/left) "ueZ" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/open/floor/engine/co2, /area/station/engineering/atmos) +"uff" = ( +/obj/effect/turf_decal/caution/stand_clear/white{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/turf/open/floor/noslip/tram_platform, +/area/station/hallway/primary/tram/right) "ufj" = ( /obj/machinery/computer/upload/borg{ dir = 8 @@ -56501,14 +56391,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/carpet, /area/station/commons/vacant_room/office) -"uhD" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/holosign/barrier/atmos/tram, -/obj/machinery/camera/directional/south{ - c_tag = "Hallway - Western Tram Bridge 2" - }, -/turf/open/floor/vault, -/area/station/hallway/primary/tram/center) "uhP" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -56584,6 +56466,12 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/dark, /area/station/maintenance/radshelter/civil) +"uji" = ( +/obj/structure/fluff/tram_rail/floor{ + dir = 1 + }, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/right) "ujn" = ( /obj/machinery/door/airlock{ name = "Unisex Restrooms" @@ -56774,12 +56662,6 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron, /area/station/security/office) -"umQ" = ( -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/mob/living/carbon/human/species/monkey, -/turf/open/floor/grass, -/area/station/science/genetics) "umS" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -57519,6 +57401,9 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"uAL" = ( +/turf/open/floor/iron/dark, +/area/station/science/genetics) "uAP" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -57716,17 +57601,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/tram/left) -"uFp" = ( -/obj/effect/turf_decal/siding/thinplating{ - dir = 4 - }, -/obj/structure/fluff/tram_rail/floor{ - dir = 1 - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/left) "uFr" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -57917,6 +57791,14 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/command/bridge) +"uIC" = ( +/obj/structure/fluff/tram_rail/floor{ + dir = 1 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/left) "uIO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -58653,6 +58535,19 @@ /obj/item/storage/backpack/duffelbag/med/surgery, /turf/open/floor/iron/white, /area/station/medical/surgery/fore) +"uWq" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/structure/fluff/tram_rail/floor{ + dir = 1 + }, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/left) "uWr" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/railing, @@ -58770,6 +58665,11 @@ }, /turf/open/floor/carpet, /area/station/service/chapel/monastery) +"uZg" = ( +/obj/structure/holosign/barrier/atmos/tram, +/obj/effect/landmark/event_spawn, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/right) "uZn" = ( /obj/effect/turf_decal/siding/wideplating{ dir = 5 @@ -60092,13 +59992,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/tram/left) -"vxv" = ( -/obj/effect/turf_decal/siding/thinplating{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/right) "vxH" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/red/filled/line, @@ -60403,11 +60296,6 @@ "vCZ" = ( /turf/closed/wall, /area/station/service/chapel/monastery) -"vDi" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/holosign/barrier/atmos/tram, -/turf/open/floor/vault, -/area/station/hallway/primary/tram/left) "vDG" = ( /obj/structure/filingcabinet/chestdrawer{ pixel_y = 2 @@ -60433,6 +60321,10 @@ /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron, /area/station/engineering/atmos) +"vEa" = ( +/obj/effect/landmark/tram/right_part, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/right) "vEe" = ( /obj/structure/window/reinforced/spawner, /obj/machinery/chem_heater/withbuffer, @@ -60485,6 +60377,17 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +"vFg" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/structure/fluff/tram_rail/floor, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/center) "vFp" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 5 @@ -60535,6 +60438,11 @@ }, /turf/open/floor/engine/n2o, /area/station/engineering/atmos) +"vFV" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/window/reinforced/spawner/west, +/turf/open/floor/grass, +/area/station/science/genetics) "vGA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -60671,6 +60579,12 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"vJU" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/fluff/tram_rail/floor, +/obj/structure/cable, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/center) "vKb" = ( /obj/structure/lattice, /obj/machinery/camera/motion{ @@ -61457,12 +61371,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/cargo/office) -"vYw" = ( -/obj/structure/fluff/tram_rail/floor{ - dir = 1 - }, -/turf/open/floor/glass/reinforced, -/area/station/hallway/primary/tram/center) "vYx" = ( /obj/item/radio/intercom/directional/east, /obj/effect/turf_decal/trimline/red/filled/corner, @@ -61729,14 +61637,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"wdB" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/holosign/barrier/atmos/tram, -/obj/structure/fluff/tram_rail/floor{ - dir = 1 - }, -/turf/open/floor/vault, -/area/station/hallway/primary/tram/center) "wdG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, @@ -62026,6 +61926,10 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"wjR" = ( +/obj/effect/landmark/tram/left_part, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/left) "wjT" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 9 @@ -62132,18 +62036,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"wmb" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/white/line, -/turf/open/floor/vault{ - base_icon_state = "tram"; - desc = "The linear induction plate that powers the tram."; - icon_state = "tram"; - name = "linear induction plate" - }, -/area/station/hallway/primary/tram/center) "wml" = ( /obj/structure/chair/stool/directional/south, /turf/open/floor/carpet, @@ -62316,6 +62208,9 @@ "wpK" = ( /turf/closed/wall, /area/station/science/lobby) +"wpP" = ( +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/left) "wqu" = ( /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/dark, @@ -62771,19 +62666,6 @@ }, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) -"wyA" = ( -/obj/structure/industrial_lift/tram{ - icon_state = "plating" - }, -/obj/structure/grille/tram, -/obj/structure/window/reinforced/shuttle/tram, -/turf/open/floor/vault{ - base_icon_state = "tram"; - desc = "The linear induction plate that powers the tram."; - icon_state = "tram"; - name = "linear induction plate" - }, -/area/station/hallway/primary/tram/center) "wyH" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -63021,6 +62903,11 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron, /area/station/engineering/main) +"wCR" = ( +/obj/effect/turf_decal/trimline/white/tram, +/obj/machinery/crossing_signal/northwest, +/turf/open/floor/iron, +/area/station/hallway/primary/tram/right) "wDa" = ( /turf/open/floor/iron/white, /area/station/security/medical) @@ -63751,6 +63638,11 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"wQO" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/fluff/tram_rail/floor, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/right) "wQP" = ( /turf/closed/wall, /area/station/maintenance/starboard/lesser) @@ -63950,11 +63842,6 @@ /obj/machinery/light/small/directional/north, /turf/open/misc/asteroid/airless, /area/lavaland/surface) -"wVd" = ( -/obj/effect/turf_decal/trimline/white/tram, -/obj/machinery/crossing_signal/northwest, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/right) "wVj" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 @@ -63976,6 +63863,12 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"wVw" = ( +/obj/structure/fluff/tram_rail/floor{ + dir = 1 + }, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/left) "wVE" = ( /obj/effect/turf_decal/trimline/yellow/warning, /obj/effect/decal/cleanable/dirt, @@ -64024,6 +63917,14 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"wWn" = ( +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/left) "wWo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -64830,14 +64731,6 @@ /obj/machinery/component_printer, /turf/open/floor/iron/white, /area/station/science/explab) -"xgS" = ( -/turf/open/floor/vault{ - base_icon_state = "tram"; - desc = "The linear induction plate that powers the tram."; - icon_state = "tram"; - name = "linear induction plate" - }, -/area/station/hallway/primary/tram/center) "xhd" = ( /obj/machinery/airalarm/directional/north, /obj/structure/rack, @@ -66083,7 +65976,9 @@ /turf/open/floor/plating, /area/station/security/processing) "xGA" = ( -/turf/open/floor/iron/dark, +/obj/structure/flora/bush/sunny/style_random, +/obj/structure/window/reinforced/spawner/west, +/turf/open/floor/grass, /area/station/science/genetics) "xGX" = ( /obj/effect/turf_decal/siding/thinplating/corner{ @@ -151691,7 +151586,7 @@ iuD kXR cFs nzh -sHA +eMH dIB cFs uab @@ -151948,7 +151843,7 @@ iuD kXR cFs lNP -clb +wpP vVY cFs uab @@ -152205,7 +152100,7 @@ aed agX cFs lNP -clb +wpP vVY cFs cfW @@ -152462,7 +152357,7 @@ mUw yiM cFs lNP -clb +wpP vVY cFs yiM @@ -152719,7 +152614,7 @@ kTD uVP cFs bEt -clb +wpP rib cFs ncN @@ -152976,7 +152871,7 @@ qwg ncN cFs lNP -clb +wpP vVY cFs ncN @@ -153233,7 +153128,7 @@ uQI aII cFs lNP -oNa +wjR vVY cFs aMD @@ -153490,7 +153385,7 @@ qwg ncN cFs lNP -clb +wpP vVY cFs ncN @@ -153747,7 +153642,7 @@ qwg ncN cFs bEt -clb +wpP rib cFs emP @@ -154004,7 +153899,7 @@ mwP yiM cFs lNP -clb +wpP vVY cFs yiM @@ -154261,7 +154156,7 @@ coK cSJ cFs lNP -clb +wpP vVY cFs npG @@ -154518,7 +154413,7 @@ iuD kXR cFs lNP -clb +wpP vVY cFs uab @@ -154775,7 +154670,7 @@ iuD kXR cFs lNP -clb +wpP vVY cFs uab @@ -155030,11 +154925,11 @@ gNS dpo hLJ wpk -nJX -lYo -rRz -bKq -nJX +tep +iMR +wWn +wVw +tep fVp lNW mAP @@ -155287,11 +155182,11 @@ yiM jUu xwC eNO -dBd -cit -ovn -uFp -dBd +asv +iCz +qoE +uIC +asv eOr aKp sTs @@ -155546,7 +155441,7 @@ yiM yiM cFs lNP -clb +wpP vVY cFs yiM @@ -155803,7 +155698,7 @@ ikn yiM cFs lNP -clb +wpP vVY cFs yiM @@ -156060,7 +155955,7 @@ tkv yiM cFs bEt -clb +wpP rib cFs yiM @@ -156317,7 +156212,7 @@ yiM yiM cFs lNP -clb +wpP vVY cFs yiM @@ -156574,7 +156469,7 @@ wPH yiM cFs lNP -clb +wpP vVY cFs yiM @@ -156831,7 +156726,7 @@ qBH yiM cFs lNP -clb +wpP vVY cFs yiM @@ -157088,7 +156983,7 @@ yiM yiM cFs lNP -clb +wpP vVY cFs yiM @@ -157345,7 +157240,7 @@ yiM tAq cFs lNP -clb +wpP vVY cFs jYK @@ -157602,7 +157497,7 @@ klT cFs cFs lNP -clb +wpP vVY cFs cFs @@ -157859,7 +157754,7 @@ klT cFs cFs bEt -clb +wpP rib cFs cFs @@ -158116,7 +158011,7 @@ klT cFs cFs lNP -clb +wpP vVY cFs cFs @@ -158373,7 +158268,7 @@ klT cFs cFs lNP -clb +wpP vVY cFs cFs @@ -158630,7 +158525,7 @@ yiM tAq cFs lNP -clb +wpP vVY cFs jYK @@ -158884,13 +158779,13 @@ dDG dDG dOi klT -vDi -vDi -cNb -ueW -nTT -vDi -iaK +eMv +eMv +lzb +fbM +uWq +eMv +pOk klT aRN dDG @@ -159141,13 +159036,13 @@ dDG dDG dOi klT -nJX -nJX -lYo -clb -bKq -nJX -nJX +tep +tep +iMR +wpP +wVw +tep +tep klT aRN dDG @@ -159398,13 +159293,13 @@ dDG dDG dOi pdW -gNN -hyg -kDz -xgS -vYw -hyg -hyg +pOx +icF +dnD +obb +bDm +icF +icF pdW aRN dDG @@ -159655,13 +159550,13 @@ cuX dDG dOi pdW -fMb -fMb -tPx -rqd -fMb -fMb -uhD +irc +irc +vFg +dns +irc +irc +sIX pdW aRN dDG @@ -159915,7 +159810,7 @@ izU uCm eSz tCl -xgS +obb wvE eSz poh @@ -160172,7 +160067,7 @@ pdW eSz eSz tCl -xgS +obb wvE eSz eSz @@ -160429,7 +160324,7 @@ pdW eSz eSz leJ -xgS +obb fpQ eSz eSz @@ -160686,7 +160581,7 @@ pdW eSz eSz tCl -xgS +obb wvE eSz eSz @@ -160943,7 +160838,7 @@ pdW eSz eSz tCl -xgS +obb wvE eSz eSz @@ -161200,7 +161095,7 @@ izU uCm eSz tCl -xgS +obb wvE eSz poh @@ -161457,7 +161352,7 @@ izU izU eSz tCl -xgS +obb wvE eSz izU @@ -161714,7 +161609,7 @@ mXu izU eSz tCl -xgS +obb wvE eSz izU @@ -161971,7 +161866,7 @@ mtE izU eSz tCl -xgS +obb wvE eSz izU @@ -162228,7 +162123,7 @@ izU izU eSz tCl -xgS +obb wvE eSz izU @@ -162485,7 +162380,7 @@ seG izU eSz leJ -xgS +obb fpQ eSz izU @@ -162742,7 +162637,7 @@ uoH izU eSz tCl -xgS +obb wvE eSz izU @@ -162999,7 +162894,7 @@ izU izU eSz tCl -xgS +obb wvE eSz izU @@ -163254,11 +163149,11 @@ eSz kQF tGW jJw -lav -iUd -awt -ppC -lav +kYX +vJU +eGA +jJM +kYX hke lNj dVP @@ -163510,13 +163405,13 @@ eSz eSz wYe aEM -ppG -hyg -kDz -wmb -vYw -hyg -gVA +rhW +icF +dnD +bdr +bDm +icF +ttS npC dTr xzq @@ -163770,7 +163665,7 @@ aEM cRU eSz tCl -xgS +obb wvE eSz lyv @@ -164027,7 +163922,7 @@ aEM cRU cmw xXi -wyA +aBv xDg cmw lyv @@ -164284,7 +164179,7 @@ wHs gej nbS hQn -glq +qia jcZ nbS sqz @@ -164541,7 +164436,7 @@ bqI izU cEt cPS -glq +qia jcZ cEt izU @@ -164798,7 +164693,7 @@ bip dtC liQ rPU -glq +qia biX ucQ wFw @@ -165055,7 +164950,7 @@ bip wFw cQq rPU -bLb +mXp biX mRi pZm @@ -165312,7 +165207,7 @@ vjl fld cEt kpB -dYL +oph iJU cEt jEO @@ -165569,7 +165464,7 @@ bip wFw liQ rPU -bsU +sjd biX ucQ wFw @@ -165826,7 +165721,7 @@ bip wFw cQq rPU -glq +qia biX mRi pWK @@ -166083,7 +165978,7 @@ kBX izU cEt cPS -glq +qia xof cEt izU @@ -166340,7 +166235,7 @@ waf odj nbS qDb -glq +qia tpa nbS kXK @@ -166597,7 +166492,7 @@ dUC cRU cmw xXi -wyA +aBv spf cmw lyv @@ -166854,7 +166749,7 @@ pdi bQX eSz tCl -xgS +obb wvE eSz lyv @@ -167109,11 +167004,11 @@ eSz wCn loz lhM -hyg -kDz -koe -vYw -hyg +icF +dnD +nnF +bDm +icF mzX ris vMl @@ -167366,11 +167261,11 @@ eSz rMA fmf bxy -cTE -ddJ -hIq -iTr -cTE +kYX +vJU +bwZ +jJM +kYX ipd vbL gMZ @@ -167625,7 +167520,7 @@ izU izU eSz tCl -xgS +obb wvE eSz izU @@ -167882,7 +167777,7 @@ mSn izU eSz tCl -xgS +obb wvE eSz izU @@ -168139,7 +168034,7 @@ seG izU eSz leJ -xgS +obb fpQ eSz izU @@ -168396,7 +168291,7 @@ izU izU eSz tCl -xgS +obb wvE eSz izU @@ -168653,7 +168548,7 @@ mtE izU eSz tCl -xgS +obb wvE eSz izU @@ -168910,7 +168805,7 @@ mva izU eSz tCl -xgS +obb wvE eSz izU @@ -169167,7 +169062,7 @@ izU izU eSz tCl -xgS +obb wvE eSz izU @@ -169424,7 +169319,7 @@ izU uCm eSz tCl -xgS +obb wvE eSz poh @@ -169681,7 +169576,7 @@ pdW eSz eSz tCl -xgS +obb wvE eSz eSz @@ -169938,7 +169833,7 @@ pdW eSz eSz leJ -xgS +obb fpQ eSz eSz @@ -170195,7 +170090,7 @@ pdW eSz eSz tCl -xgS +obb wvE eSz eSz @@ -170452,7 +170347,7 @@ pdW eSz eSz tCl -xgS +obb wvE eSz eSz @@ -170709,7 +170604,7 @@ izU uCm eSz tCl -xgS +obb wvE eSz poh @@ -170963,13 +170858,13 @@ dhe dDG dOi pdW -fMb -fMb -tPx -rqd -wdB -fMb -pYU +irc +irc +vFg +dns +jar +irc +rPi pdW aRN dDG @@ -171220,13 +171115,13 @@ dhe dDG dOi pdW -hyg -hyg -kDz -xgS -vYw -hyg -gNN +icF +icF +dnD +obb +bDm +icF +pOx pdW aRN dDG @@ -171477,13 +171372,13 @@ dhe dDG dOi pev -eGt -eGt -tli -pZG -qwJ -eGt -eGt +kvz +kvz +jGX +sRW +uji +kvz +kvz pev aRN dDG @@ -171734,13 +171629,13 @@ dhe dDG dOi pev -eBO -eBO -pkP -hCV -rbZ -eBO -aUk +iDt +iDt +iZG +uZg +npL +iDt +ody pev aRN dDG @@ -171994,7 +171889,7 @@ bMb qgo brm iOd -pZG +sRW vPi brm dIo @@ -172251,7 +172146,7 @@ pev brm brm iOd -pZG +sRW vPi brm brm @@ -172508,7 +172403,7 @@ pev brm brm iOd -pZG +sRW vPi brm brm @@ -172765,7 +172660,7 @@ pev brm brm puY -pZG +sRW bTT brm brm @@ -173022,7 +172917,7 @@ pev brm brm iOd -pZG +sRW vPi brm brm @@ -173279,7 +173174,7 @@ bMb qgo brm iOd -pZG +sRW vPi brm dIo @@ -173536,7 +173431,7 @@ bMb bMb brm iOd -pZG +sRW vPi brm bMb @@ -173793,7 +173688,7 @@ vMB bMb brm iOd -pZG +sRW vPi brm bMb @@ -174050,7 +173945,7 @@ hFF bMb brm iOd -pZG +sRW vPi brm bMb @@ -174307,7 +174202,7 @@ bMb bMb brm iOd -pZG +sRW vPi brm bMb @@ -174564,7 +174459,7 @@ cEC bMb brm puY -pZG +sRW bTT brm bMb @@ -174821,7 +174716,7 @@ ciF bMb brm iOd -pZG +sRW vPi brm bMb @@ -175078,7 +174973,7 @@ bMb bMb brm iOd -pZG +sRW vPi brm bMb @@ -175333,11 +175228,11 @@ wkz xHd xPU nXJ -vxv -pVA -mDI -eRM -vxv +kZb +wQO +oSW +ezQ +kZb qsl aNP czl @@ -175589,13 +175484,13 @@ whL vUE kkz eLe -wVd -eGt -tli -aoV -qwJ -eGt -siW +wCR +kvz +jGX +ayQ +uji +kvz +dEo kie xas uxN @@ -175849,7 +175744,7 @@ eLe era brm iOd -pZG +sRW vPi brm kGR @@ -176106,7 +176001,7 @@ eLe era brm iOd -pZG +sRW vPi brm kGR @@ -176363,7 +176258,7 @@ lGp kIT brm iOd -pZG +sRW vPi brm gGi @@ -176620,7 +176515,7 @@ mXX bMb brm iOd -pZG +sRW vPi brm bMb @@ -176877,7 +176772,7 @@ wqX jlA brm puY -pZG +sRW bTT brm sFq @@ -177134,7 +177029,7 @@ koh sFq brm iOd -pZG +sRW vPi brm sFq @@ -177391,7 +177286,7 @@ jvd dCf brm iOd -nzs +vEa vPi brm nwQ @@ -177648,7 +177543,7 @@ lHZ sFq brm iOd -pZG +sRW vPi brm sFq @@ -177905,7 +177800,7 @@ lHZ sFq brm puY -pZG +sRW bTT brm swb @@ -178162,7 +178057,7 @@ gKM bMb brm iOd -pZG +sRW vPi brm bMb @@ -178419,7 +178314,7 @@ sPC hYb brm iOd -pZG +sRW vPi brm krO @@ -178676,7 +178571,7 @@ eFy era brm iOd -pZG +sRW vPi brm kGR @@ -178933,7 +178828,7 @@ ycY era brm mWR -dCg +uff qQX brm kGR @@ -180497,13 +180392,13 @@ wMn bKU iqZ hvJ -oii +bFw nzE bHS hQf vme ioo -rGj +sKS xNT etm sQi @@ -180754,13 +180649,13 @@ aVE pLf btO hvJ -ech -xGA +ogy +uAL bHS hQf vme -xGA -duv +uAL +rvu xNT pQd pQd @@ -181012,11 +180907,11 @@ fND mnv hvJ xNT -jLF -lzu -eyX -lzu -jYx +vFV +ech +pCF +ech +xGA xNT xNT pQd @@ -181269,11 +181164,11 @@ hvJ hvJ hvJ xNT -pCF -tuv -lWY -umQ -aVp +jLF +lzu +cam +hnT +jYx xNT dhe pQd @@ -181529,7 +181424,7 @@ vTP bhp tpN vTP -oWO +oJj bPf vTP dhe diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index f3a78ae88fd..fd93e4c9105 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -97,7 +97,6 @@ #define SPACE_LAYER 1.8 //#define TURF_LAYER 2 //For easy recordkeeping; this is a byond define. Most floors (FLOOR_PLANE) and walls (GAME_PLANE) use this. -#define OPENSPACE_LAYER 600 //Openspace layer over all turfs // GAME_PLANE layers #define CULT_OVERLAY_LAYER 2.01 @@ -113,6 +112,9 @@ #define DISPOSAL_PIPE_LAYER 2.3 #define GAS_PIPE_HIDDEN_LAYER 2.35 //layer = initial(layer) + piping_layer / 1000 in atmospherics/update_icon() to determine order of pipe overlap #define WIRE_LAYER 2.4 +#define TRAM_XING_LAYER 2.41 +#define TRAM_RAIL_LAYER 2.42 +#define TRAM_FLOOR_LAYER 2.43 #define WIRE_BRIDGE_LAYER 2.44 #define WIRE_TERMINAL_LAYER 2.45 #define GAS_SCRUBBER_LAYER 2.46 diff --git a/code/datums/elements/turf_transparency.dm b/code/datums/elements/turf_transparency.dm index f191309e789..87b6f4d6734 100644 --- a/code/datums/elements/turf_transparency.dm +++ b/code/datums/elements/turf_transparency.dm @@ -181,8 +181,6 @@ GLOBAL_LIST_EMPTY(pillars_by_z) var/turf/our_turf = target - our_turf.layer = OPENSPACE_LAYER - RegisterSignal(target, COMSIG_TURF_MULTIZ_DEL, PROC_REF(on_multiz_turf_del)) RegisterSignal(target, COMSIG_TURF_MULTIZ_NEW, PROC_REF(on_multiz_turf_new)) diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm index 84a26cfc127..88e53fc14b4 100644 --- a/code/game/objects/structures/fluff.dm +++ b/code/game/objects/structures/fluff.dm @@ -273,8 +273,8 @@ desc = "Great for trams, not so great for skating." icon = 'icons/obj/tram_rails.dmi' icon_state = "rail" - layer = ABOVE_OPEN_TURF_LAYER - plane = FLOOR_PLANE + layer = TRAM_RAIL_LAYER + plane = GAME_PLANE deconstructible = TRUE /obj/structure/fluff/tram_rail/floor diff --git a/code/game/turfs/open/floor/misc_floor.dm b/code/game/turfs/open/floor/misc_floor.dm index a08af3da60a..864d114b959 100644 --- a/code/game/turfs/open/floor/misc_floor.dm +++ b/code/game/turfs/open/floor/misc_floor.dm @@ -110,6 +110,18 @@ floor_tile = /obj/item/stack/tile/noslip slowdown = -0.3 +/turf/open/floor/noslip/tram_plate + name = "linear induction plate" + desc = "The linear induction plate that powers the tram." + icon_state = "tram_plate" + base_icon_state = "tram_plate" + +/turf/open/floor/noslip/tram_platform + name = "tram platform" + desc = "A sturdy looking tram platform." + icon_state = "tram_platform" + base_icon_state = "tram_platform" + /turf/open/floor/noslip/setup_broken_states() return list("noslip-damaged1","noslip-damaged2","noslip-damaged3") diff --git a/code/modules/industrial_lift/industrial_lift.dm b/code/modules/industrial_lift/industrial_lift.dm index 425b45a84d5..17a1a4dc2de 100644 --- a/code/modules/industrial_lift/industrial_lift.dm +++ b/code/modules/industrial_lift/industrial_lift.dm @@ -780,6 +780,8 @@ GLOBAL_LIST_EMPTY(lifts) desc = "A tram for tramversing the station." icon = 'icons/turf/floors.dmi' icon_state = "titanium_yellow" + layer = TRAM_FLOOR_LAYER + plane = GAME_PLANE base_icon_state = null smoothing_flags = NONE smoothing_groups = null diff --git a/code/modules/industrial_lift/tram_override_objects.dm b/code/modules/industrial_lift/tram_override_objects.dm index 4332654d56c..182585bfc5d 100644 --- a/code/modules/industrial_lift/tram_override_objects.dm +++ b/code/modules/industrial_lift/tram_override_objects.dm @@ -8,6 +8,7 @@ * it will make the tram more expensive to move and we dont want that because we dont want to return to the days where * the tram took a third of the tick per movement when its just carrying its default mapped in objects */ + /obj/structure/grille/tram/Initialize(mapload) . = ..() RemoveElement(/datum/element/atmos_sensitive, mapload) @@ -18,10 +19,15 @@ . = ..() RemoveElement(/datum/element/atmos_sensitive, mapload) -/obj/machinery/power/shuttle_engine/propulsion/tram - //if this has opacity, then every movement of the tram causes lighting updates - //DO NOT put something on the tram roundstart that has opacity, it WILL overload SSlighting - opacity = FALSE +/turf/open/floor/glass/reinforced/tram/Initialize(mapload) + . = ..() + RemoveElement(/datum/element/atmos_sensitive, mapload) + +/turf/open/floor/glass/reinforced/tram + name = "tram bridge" + desc = "It shakes a bit when you step, but lets you cross between sides quickly!" + plane = GAME_PLANE + layer = TRAM_XING_LAYER /obj/machinery/door/window/tram icon = 'icons/obj/doors/tramdoor.dmi' diff --git a/icons/obj/tram_rails.dmi b/icons/obj/tram_rails.dmi index 0e37634ca9b..359fc5f7838 100644 Binary files a/icons/obj/tram_rails.dmi and b/icons/obj/tram_rails.dmi differ diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index 024c3917161..fb41634708b 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ