From a24aa5a5672cb4088735e1a3fccba087a7544367 Mon Sep 17 00:00:00 2001 From: Zandario Date: Mon, 24 Aug 2020 21:54:19 -0500 Subject: [PATCH] The Finale Misshun Cumplete --- .../NSV_Triumph/triumph-02-deck2.dmm | 232 +- .../NSV_Triumph/triumph-03-deck3.dmm | 17 +- .../NSV_Triumph/triumph-04-deck4.dmm | 520 ++-- .../NSV_Triumph/triumph-05-flagship.dmm | 343 +-- _maps/map_files/Tether/tether-10-colony.dmm | 132 +- code/__DEFINES/color.dm | 37 + code/__DEFINES/misc.dm | 421 +-- code/__DEFINES/misc_vr.dm | 48 - code/__HELPERS/global_lists.dm | 4 +- code/game/area/Space Station 13 areas_vr.dm | 23 +- code/modules/maps/tg/reader.dm | 6 + code/modules/mob/gender.dm | 111 +- code/modules/mob/gender_vr.dm | 14 - code/modules/overmap/overmap_object.dm | 3 + .../submaps/odin5a-desert/odin5a-beach.dmm | 1 - maps/endeavor/submaps/odin5a-desert/odin5a.dm | 8 - maps/nsv_triumph/submaps/gateway/carpfarm.dm | 10 +- .../submaps/gateway/listeningpost.dm | 10 +- maps/nsv_triumph/submaps/gateway/snowfield.dm | 10 +- maps/nsv_triumph/submaps/poi_d/Class-D.dmm | 25 +- .../submaps/rogue_mines/rogue_mine1.dmm | 106 +- .../submaps/rogue_mines/rogue_mine2.dmm | 106 +- .../submaps/rogue_mines/rogue_mine3.dmm | 106 +- .../submaps/rogue_mines/rogue_mine4.dmm | 106 +- .../nsv_triumph/submaps/space/debrisfield.dmm | 1 - maps/nsv_triumph/submaps/triumph_misc.dmm | 810 +++--- maps/nsv_triumph/submaps/triumph_ships.dmm | 2570 +++++++++-------- maps/nsv_triumph/triumph.dm | 2 +- ...{triumph_sectors.dm => triumph_overmap.dm} | 10 +- maps/nsv_triumph/triumph_phoronlock.dm | 5 +- maps/nsv_triumph/triumph_shuttle_defs.dm | 220 +- maps/tether/submaps/aerostat/_aerostat.dm | 4 +- maps/tether/submaps/aerostat/aerostat.dmm | 34 +- maps/tether/submaps/aerostat/surface.dmm | 2 +- maps/tether/submaps/alienship/_alienship.dm | 8 - maps/tether/submaps/alienship/alienship.dmm | 14 +- maps/tether/submaps/backup/tether_ships.dmm | 2 +- maps/tether/submaps/beach/beach.dmm | 6 +- .../submaps/rogue_mines/rogue_mine1.dmm | 102 +- .../submaps/rogue_mines/rogue_mine2.dmm | 102 +- .../submaps/rogue_mines/rogue_mine3.dmm | 102 +- .../submaps/rogue_mines/rogue_mine4.dmm | 102 +- maps/tether/submaps/space/debrisfield.dmm | 426 +-- maps/tether/submaps/tether_misc.dmm | 742 ++--- maps/tether/submaps/tether_ships.dmm | 99 +- maps/tether/tether_shuttle_defs.dm | 13 +- .../maps/tether/submaps/tether_ships.dmm | 2 +- vorestation.dme | 2 - 48 files changed, 3956 insertions(+), 3823 deletions(-) delete mode 100644 code/__DEFINES/misc_vr.dm delete mode 100644 code/modules/mob/gender_vr.dm rename maps/nsv_triumph/{triumph_sectors.dm => triumph_overmap.dm} (77%) diff --git a/_maps/map_files/NSV_Triumph/triumph-02-deck2.dmm b/_maps/map_files/NSV_Triumph/triumph-02-deck2.dmm index 8b06c27a3f5..e603ed00ee6 100644 --- a/_maps/map_files/NSV_Triumph/triumph-02-deck2.dmm +++ b/_maps/map_files/NSV_Triumph/triumph-02-deck2.dmm @@ -426,7 +426,7 @@ /area/hydroponics) "br" = ( /turf/simulated/shuttle/wall/voidcraft/green, -/area/shuttle/belter/station) +/area/shuttle/belter) "bs" = ( /obj/machinery/camera/network/civilian, /obj/effect/floor_decal/techfloor{ @@ -619,7 +619,7 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/shuttle/belter/station) +/area/shuttle/belter) "ci" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/borderfloor, @@ -1635,7 +1635,7 @@ "fm" = ( /obj/machinery/recharge_station, /turf/simulated/floor/tiled/steel, -/area/shuttle/belter/station) +/area/shuttle/belter) "fn" = ( /obj/structure/table/woodentable, /turf/simulated/floor/carpet/bcarpet, @@ -2151,7 +2151,7 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate, /turf/simulated/floor/tiled/steel, -/area/shuttle/belter/station) +/area/shuttle/belter) "gF" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -2996,11 +2996,6 @@ /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/maintenance/cargo) -"jk" = ( -/turf/space, -/area/supply/station{ - dynamic_lighting = 0 - }) "jl" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -3826,7 +3821,7 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/ore_box, /turf/simulated/floor/tiled/steel, -/area/shuttle/belter/station) +/area/shuttle/belter) "lR" = ( /obj/machinery/mineral/output, /obj/machinery/conveyor{ @@ -4003,7 +3998,7 @@ "mu" = ( /obj/structure/bed/chair/shuttle, /turf/simulated/floor/tiled/steel, -/area/shuttle/belter/station) +/area/shuttle/belter) "mv" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -4523,7 +4518,7 @@ dir = 4 }, /turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/belter/station) +/area/shuttle/belter) "nS" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -6326,7 +6321,7 @@ "tP" = ( /obj/structure/closet/walllocker/emerglocker/north, /turf/simulated/floor/tiled/steel, -/area/shuttle/belter/station) +/area/shuttle/belter) "tQ" = ( /obj/machinery/door/firedoor/glass/hidden/steel, /obj/machinery/station_map{ @@ -6432,7 +6427,7 @@ "ud" = ( /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/steel, -/area/shuttle/belter/station) +/area/shuttle/belter) "ue" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -6720,11 +6715,15 @@ /turf/simulated/floor/tiled, /area/triumph/surfacebase/mining_main/refinery) "uY" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/space; + base_turf = /turf/space; + docking_controller = "supply_shuttle"; + landmark_tag = "supply_dock"; + name = "NSV Triumph Cargo Dock" + }, /turf/space, -/area/supply/station{ - base_turf = /turf/simulated/floor/airless; - dynamic_lighting = 0 - }) +/area/space) "uZ" = ( /obj/structure/cable/green{ d1 = 4; @@ -7232,7 +7231,7 @@ /area/crew_quarters/coffee_shop) "wZ" = ( /turf/simulated/floor/tiled/steel, -/area/shuttle/belter/station) +/area/shuttle/belter) "xa" = ( /obj/structure/table/marble, /obj/machinery/door/firedoor/glass/hidden/steel, @@ -7291,7 +7290,7 @@ }, /obj/structure/fans/tiny, /turf/simulated/floor/tiled/steel/airless, -/area/shuttle/belter/station) +/area/shuttle/belter) "xi" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -7834,7 +7833,7 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/shuttle/belter/station) +/area/shuttle/belter) "yX" = ( /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -9020,7 +9019,7 @@ pixel_y = -31 }, /turf/simulated/floor/tiled/steel, -/area/shuttle/belter/station) +/area/shuttle/belter) "CY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -9974,7 +9973,7 @@ /obj/machinery/recharge_station, /obj/machinery/light, /turf/simulated/floor/tiled/steel, -/area/shuttle/belter/station) +/area/shuttle/belter) "Gi" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Solar Farm - SMES 1" @@ -11352,7 +11351,7 @@ }, /obj/structure/bed/chair/shuttle, /turf/simulated/floor/tiled/steel, -/area/shuttle/belter/station) +/area/shuttle/belter) "KD" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -11638,7 +11637,7 @@ dir = 8 }, /turf/simulated/floor/tiled/steel/airless, -/area/shuttle/belter/station) +/area/shuttle/belter) "LP" = ( /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) @@ -12715,7 +12714,7 @@ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/shuttle/belter/station) +/area/shuttle/belter) "PM" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 5 @@ -15407,6 +15406,19 @@ /obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_9) +"XQ" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 4 + }, +/obj/effect/shuttle_landmark{ + base_area = /area/space; + base_turf = /turf/space; + docking_controller = "belter_docking"; + landmark_tag = "belter_station"; + name = "NSV Triumph - Belter Shuttle" + }, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/belter) "XV" = ( /obj/item/radio/intercom{ dir = 8; @@ -15909,7 +15921,7 @@ /obj/item/clothing/suit/space/void/mining, /obj/item/tank/emergency/oxygen/double, /turf/simulated/floor/tiled/steel, -/area/shuttle/belter/station) +/area/shuttle/belter) "ZI" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_mining, @@ -23875,7 +23887,7 @@ vH ii ii nR -nR +XQ nR ii ii @@ -28269,17 +28281,17 @@ ii ii Ed ii -jk -jk -uY -uY -uY -uY -uY -uY -jk -jk -jk +ii +ii +ii +ii +ii +ii +ii +ii +ii +ii +ii ii Rj aC @@ -28411,18 +28423,18 @@ ii ii rC ii -jk -jk -uY -uY -uY -uY -uY -uY -jk -jk -jk -jk +ii +ii +ii +ii +ii +ii +ii +ii +ii +ii +ii +ii Rj aC Ne @@ -28553,18 +28565,18 @@ ii ii rC ii -jk -jk -jk -jk -jk -jk -jk -jk -jk -jk -jk -jk +ii +ii +ii +ii +ii +ii +ii +ii +ii +ii +ii +ii Rj uv dD @@ -28695,18 +28707,18 @@ ii ii rC ii -jk -jk -jk -jk -jk -jk -jk -jk -jk -jk -jk -jk +ii +ii +ii +ii +ii +ii +ii +ii +ii +ii +ii +uY Rj aC mR @@ -28837,18 +28849,18 @@ ii ii rC ii -jk -jk -jk -jk -jk -jk -jk -jk -jk -jk -jk -jk +ii +ii +ii +ii +ii +ii +ii +ii +ii +ii +ii +ii Rj oG dD @@ -28979,18 +28991,18 @@ ii ii Ed ii -jk -jk -jk -jk -jk -jk -jk -jk -jk -jk -jk -jk +ii +ii +ii +ii +ii +ii +ii +ii +ii +ii +ii +ii Rj RX Bj @@ -29121,17 +29133,17 @@ ii ii Ed ii -jk -jk -jk -jk -jk -jk -jk -jk -jk -jk -jk +ii +ii +ii +ii +ii +ii +ii +ii +ii +ii +ii ii Rj Rj diff --git a/_maps/map_files/NSV_Triumph/triumph-03-deck3.dmm b/_maps/map_files/NSV_Triumph/triumph-03-deck3.dmm index ec3aace0d23..3ecbba0291d 100644 --- a/_maps/map_files/NSV_Triumph/triumph-03-deck3.dmm +++ b/_maps/map_files/NSV_Triumph/triumph-03-deck3.dmm @@ -2066,6 +2066,21 @@ }, /turf/simulated/floor/tiled/white, /area/medical/first_aid_station) +"ey" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8 + }, +/obj/effect/shuttle_landmark/transit{ + base_area = /area/space; + base_turf = /turf/simulated/floor/airless/ceiling; + docking_controller = "large_escape_pod_1"; + landmark_tag = "escapepod1_station"; + name = "NSV Triumph - Escapepod 1" + }, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/large_escape_pod1/station{ + base_turf = /turf/simulated/mineral/floor/vacuum + }) "ez" = ( /obj/effect/floor_decal/techfloor{ dir = 9 @@ -35471,7 +35486,7 @@ Ty KG ch uZ -uZ +ey uZ ch ch diff --git a/_maps/map_files/NSV_Triumph/triumph-04-deck4.dmm b/_maps/map_files/NSV_Triumph/triumph-04-deck4.dmm index 91698026522..854d969de1e 100644 --- a/_maps/map_files/NSV_Triumph/triumph-04-deck4.dmm +++ b/_maps/map_files/NSV_Triumph/triumph-04-deck4.dmm @@ -974,12 +974,6 @@ /obj/effect/floor_decal/corner/red/bordercorner, /turf/simulated/floor/tiled, /area/security/security_cell_hallway) -"aSd" = ( -/obj/machinery/computer/ship/helm{ - dir = 4 - }, -/turf/simulated/shuttle/floor/black, -/area/shuttle/excursion/cockpit) "aSO" = ( /turf/simulated/wall/r_wall, /area/maintenance/security_starboard) @@ -2472,10 +2466,6 @@ /obj/effect/floor_decal/corner/brown/border, /turf/simulated/floor/tiled, /area/triumph/station/pathfinder_office) -"bZy" = ( -/obj/machinery/computer/ship/engines, -/turf/simulated/shuttle/floor/black, -/area/shuttle/excursion/cockpit) "bZM" = ( /obj/structure/cable{ d1 = 1; @@ -10548,9 +10538,6 @@ gps_tag = "SHUTTLE"; name = "shuttle beacon" }, -/obj/machinery/computer/shuttle_control/explore/excursion{ - dir = 4 - }, /turf/simulated/shuttle/floor/black, /area/shuttle/excursion/cockpit) "iwY" = ( @@ -13830,10 +13817,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/security/security_equiptment_storage) -"loF" = ( -/obj/machinery/computer/ship/sensors, -/turf/simulated/shuttle/floor/black, -/area/shuttle/excursion/cockpit) "loH" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -16934,9 +16917,7 @@ dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/escape/station{ - base_turf = /turf/simulated/floor/tiled/techfloor/grid - }) +/area/triumph/surfacebase/tram) "nDv" = ( /obj/machinery/door/firedoor/glass/hidden/steel, /obj/effect/floor_decal/borderfloor{ @@ -21945,10 +21926,17 @@ /turf/simulated/floor/tiled/dark, /area/hallway/secondary/civilian_hallway_mid) "rkA" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/shuttle_landmark{ + base_area = /area/triumph/surfacebase/tram; + base_turf = /turf/simulated/floor/tiled/techfloor/grid; + landmark_tag = "escape_triumph"; + name = "Escape Shuttle Triumph" + }, /turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/escape/station{ - base_turf = /turf/simulated/floor/tiled/techfloor/grid - }) +/area/triumph/surfacebase/tram) "rkC" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -32609,13 +32597,13 @@ iWU uqj lCU lCU -rkA -rkA -rkA -rkA -rkA -rkA -rkA +lCU +lCU +lCU +lCU +lCU +lCU +lCU lCU lCU xtF @@ -32751,13 +32739,13 @@ iWU lCU lCU lCU -rkA -rkA -rkA -rkA -rkA -rkA -rkA +lCU +lCU +lCU +lCU +lCU +lCU +lCU lCU lCU lCU @@ -32884,7 +32872,7 @@ xsI hYe sKx iwU -aSd +sKx sKx hYe xsI @@ -32893,13 +32881,13 @@ iWU lCU lCU lCU -rkA -rkA -rkA -rkA -rkA -rkA -rkA +lCU +lCU +lCU +lCU +lCU +lCU +lCU lCU lCU lCU @@ -33024,7 +33012,7 @@ xsI xsI xsI hYe -loF +sKx sKx sKx reI @@ -33033,17 +33021,17 @@ oJL mAF iWU lCU -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU riB iWU dff @@ -33166,7 +33154,7 @@ xsI xsI xsI hYe -bZy +sKx sKx sKx kJf @@ -33175,17 +33163,17 @@ xsI mAF iWU sHT -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU lCU iWU dff @@ -33317,17 +33305,17 @@ xsI mAF iWU lCU -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU lCU iWU dff @@ -33459,17 +33447,17 @@ xsI mAF iWU lCU -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU lCU iWU dff @@ -33601,17 +33589,17 @@ xsI mAF iWU lCU -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU lCU iWU dff @@ -33743,17 +33731,17 @@ uKG mAF iWU lCU -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU lCU iWU dff @@ -33885,17 +33873,17 @@ oJL mAF iWU uqj -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU xtF iWU dff @@ -34027,17 +34015,17 @@ xsI mAF iWU lCU -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU lCU iWU dff @@ -34169,17 +34157,17 @@ xsI mAF iWU lCU -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU lCU iWU dff @@ -34311,17 +34299,17 @@ xsI mAF iWU sHT -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU lCU iWU dff @@ -34453,17 +34441,17 @@ xsI mAF iWU lCU -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU lCU iWU dff @@ -34595,17 +34583,17 @@ xsI mAF iWU lCU -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU riB iWU dff @@ -34737,17 +34725,17 @@ xsI mAF iWU lCU -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU lCU iWU dff @@ -34879,17 +34867,17 @@ xsI mAF iWU lCU -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU xtF iWU dff @@ -35021,17 +35009,17 @@ xsI mAF iWU uqj -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU lCU iWU dff @@ -35163,17 +35151,17 @@ uKG mAF iWU lCU -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU lCU iWU dff @@ -35305,17 +35293,17 @@ xsI mAF iWU lCU -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU lCU iWU dff @@ -35447,17 +35435,17 @@ xsI mAF iWU sHT -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU lCU iWU dff @@ -35589,17 +35577,17 @@ oJL mAF iWU lCU -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA -rkA +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU +lCU lCU iWU dff @@ -35733,13 +35721,13 @@ iWU lCU lCU lCU -rkA -rkA -nCz -nCz +lCU +lCU nCz rkA -rkA +nCz +lCU +lCU lCU lCU riB @@ -49088,7 +49076,7 @@ duy duy duy duy -nIK +jJF nIK pkc clY @@ -49227,8 +49215,8 @@ wVS cjJ duy duy -dff -nIK +ahN +duy nIK nIK nIK @@ -49370,7 +49358,7 @@ iWz duy duy nIK -nIK +duy nIK nIK nIK @@ -49511,7 +49499,7 @@ vde vde duy duy -jJF +nIK nIK nIK nIK diff --git a/_maps/map_files/NSV_Triumph/triumph-05-flagship.dmm b/_maps/map_files/NSV_Triumph/triumph-05-flagship.dmm index 5f6b96ffc94..05206a644eb 100644 --- a/_maps/map_files/NSV_Triumph/triumph-05-flagship.dmm +++ b/_maps/map_files/NSV_Triumph/triumph-05-flagship.dmm @@ -12,16 +12,12 @@ }, /turf/unsimulated/floor/shuttle_ceiling, /turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/specops/centcom{ - base_turf = /turf/unsimulated/floor/shuttle_ceiling - }) +/area/shuttle/specialops) "af" = ( /turf/simulated/shuttle/wall/dark{ join_group = "shuttle_ert" }, -/area/shuttle/specops/centcom{ - base_turf = /turf/unsimulated/floor/shuttle_ceiling - }) +/area/shuttle/specialops) "ag" = ( /turf/unsimulated/floor/shuttle_ceiling, /area/centcom/specops) @@ -34,9 +30,7 @@ }, /turf/unsimulated/floor/shuttle_ceiling, /turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/specops/centcom{ - base_turf = /turf/unsimulated/floor/shuttle_ceiling - }) +/area/shuttle/specialops) "aj" = ( /obj/structure/shuttle/engine/heater{ dir = 8 @@ -45,9 +39,7 @@ dir = 4 }, /turf/simulated/shuttle/plating/airless, -/area/shuttle/specops/centcom{ - base_turf = /turf/unsimulated/floor/shuttle_ceiling - }) +/area/shuttle/specialops) "ak" = ( /obj/machinery/computer/security/telescreen{ desc = ""; @@ -59,17 +51,13 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/shuttle/specops/centcom{ - base_turf = /turf/unsimulated/floor/shuttle_ceiling - }) +/area/shuttle/specialops) "al" = ( /obj/structure/bed/chair, /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/shuttle/specops/centcom{ - base_turf = /turf/unsimulated/floor/shuttle_ceiling - }) +/area/shuttle/specialops) "am" = ( /obj/machinery/recharger/wallcharger{ pixel_x = 4; @@ -79,9 +67,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/shuttle/specops/centcom{ - base_turf = /turf/unsimulated/floor/shuttle_ceiling - }) +/area/shuttle/specialops) "an" = ( /obj/machinery/recharger/wallcharger{ pixel_x = 4; @@ -99,17 +85,13 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/shuttle/specops/centcom{ - base_turf = /turf/unsimulated/floor/shuttle_ceiling - }) +/area/shuttle/specialops) "ao" = ( /turf/simulated/shuttle/wall/dark{ hard_corner = 1; join_group = "shuttle_ert" }, -/area/shuttle/specops/centcom{ - base_turf = /turf/unsimulated/floor/shuttle_ceiling - }) +/area/shuttle/specialops) "ap" = ( /obj/structure/window/reinforced{ dir = 1 @@ -321,16 +303,12 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/shuttle/specops/centcom{ - base_turf = /turf/unsimulated/floor/shuttle_ceiling - }) +/area/shuttle/specialops) "aC" = ( /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/shuttle/specops/centcom{ - base_turf = /turf/unsimulated/floor/shuttle_ceiling - }) +/area/shuttle/specialops) "aD" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; @@ -342,9 +320,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/shuttle/specops/centcom{ - base_turf = /turf/unsimulated/floor/shuttle_ceiling - }) +/area/shuttle/specialops) "aE" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1380; @@ -354,9 +330,7 @@ name = "Forward Docking Hatch" }, /turf/simulated/shuttle/plating, -/area/shuttle/specops/centcom{ - base_turf = /turf/unsimulated/floor/shuttle_ceiling - }) +/area/shuttle/specialops) "aF" = ( /obj/structure/table/rack, /obj/item/ammo_casing/rocket, @@ -518,9 +492,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/shuttle/specops/centcom{ - base_turf = /turf/unsimulated/floor/shuttle_ceiling - }) +/area/shuttle/specialops) "aR" = ( /obj/machinery/computer/prisoner{ name = "Implant Management" @@ -528,9 +500,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/shuttle/specops/centcom{ - base_turf = /turf/unsimulated/floor/shuttle_ceiling - }) +/area/shuttle/specialops) "aS" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; @@ -542,9 +512,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/shuttle/specops/centcom{ - base_turf = /turf/unsimulated/floor/shuttle_ceiling - }) +/area/shuttle/specialops) "aT" = ( /obj/structure/bed/chair{ dir = 1 @@ -552,9 +520,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/shuttle/specops/centcom{ - base_turf = /turf/unsimulated/floor/shuttle_ceiling - }) +/area/shuttle/specialops) "aU" = ( /obj/structure/bed/chair{ dir = 1 @@ -565,9 +531,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/shuttle/specops/centcom{ - base_turf = /turf/unsimulated/floor/shuttle_ceiling - }) +/area/shuttle/specialops) "aV" = ( /obj/structure/table/rack, /obj/item/gun/energy/pulse_rifle, @@ -745,9 +709,7 @@ }, /turf/unsimulated/floor/shuttle_ceiling, /turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/specops/centcom{ - base_turf = /turf/unsimulated/floor/shuttle_ceiling - }) +/area/shuttle/specialops) "bi" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1380; @@ -759,9 +721,7 @@ /turf/unsimulated/floor{ icon_state = "dark" }, -/area/shuttle/specops/centcom{ - base_turf = /turf/unsimulated/floor/shuttle_ceiling - }) +/area/shuttle/specialops) "bj" = ( /obj/structure/table/rack, /obj/item/clothing/gloves/swat{ @@ -5058,11 +5018,11 @@ dir = 9 }, /turf/unsimulated/floor/steel, -/area/shuttle/large_escape_pod1/centcom) +/area/centcom/evac) "jw" = ( /obj/effect/floor_decal/rust/part_rusted3, /turf/unsimulated/floor/steel, -/area/shuttle/large_escape_pod1/centcom) +/area/centcom/evac) "jz" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ dir = 8 @@ -5205,7 +5165,7 @@ "jJ" = ( /obj/effect/floor_decal/rust/mono_rusted3, /turf/unsimulated/floor/steel, -/area/shuttle/large_escape_pod1/centcom) +/area/centcom/evac) "jK" = ( /turf/unsimulated/wall, /area/centcom/medical) @@ -5224,7 +5184,7 @@ dir = 8 }, /turf/unsimulated/floor/steel, -/area/shuttle/large_escape_pod1/centcom) +/area/centcom/evac) "jO" = ( /obj/machinery/computer/arcade, /obj/effect/floor_decal/borderfloorwhite{ @@ -9547,7 +9507,7 @@ }, /obj/structure/fans/tiny, /turf/simulated/floor, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "rG" = ( /obj/effect/floor_decal/corner_steel_grid/diagonal, /obj/effect/floor_decal/corner_steel_grid/diagonal{ @@ -9933,11 +9893,11 @@ "sB" = ( /obj/machinery/vending/cigarette, /turf/simulated/shuttle/floor/darkred, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "sC" = ( /obj/structure/bed/chair/shuttle, /turf/simulated/shuttle/floor/black, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "sF" = ( /obj/structure/bed/chair{ dir = 8 @@ -10119,19 +10079,19 @@ dir = 1 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "sX" = ( /obj/item/bedsheet/medical, /obj/structure/bed/padded, /turf/simulated/shuttle/floor, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "sY" = ( /obj/machinery/optable, /obj/machinery/oxygen_pump/anesthetic{ pixel_y = 29 }, /turf/simulated/shuttle/floor, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "sZ" = ( /obj/structure/table/glass, /obj/item/storage/box/cups, @@ -10470,7 +10430,7 @@ }, /obj/machinery/vending/medical, /turf/simulated/shuttle/floor, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "tD" = ( /obj/structure/table/glass, /obj/item/roller, @@ -10748,7 +10708,7 @@ /area/centcom/bathroom) "um" = ( /turf/simulated/shuttle/floor, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "uo" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-22" @@ -11100,7 +11060,7 @@ /area/centcom/living) "vc" = ( /turf/simulated/shuttle/floor/black, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "vd" = ( /obj/machinery/door/firedoor, /obj/machinery/door/blast/regular{ @@ -11753,7 +11713,7 @@ /area/centcom/security) "wf" = ( /turf/simulated/shuttle/floor/darkred, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "wh" = ( /obj/machinery/computer/card{ dir = 4 @@ -12051,13 +12011,13 @@ /area/centcom/security) "wC" = ( /turf/simulated/shuttle/wall/voidcraft/blue, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "wD" = ( /obj/structure/shuttle/engine/propulsion{ dir = 4 }, /turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "wE" = ( /obj/machinery/computer/secure_data{ dir = 4 @@ -12327,13 +12287,13 @@ dir = 1 }, /turf/simulated/shuttle/floor, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "xa" = ( /obj/structure/bed/chair/shuttle{ dir = 8 }, /turf/simulated/shuttle/floor, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "xb" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 10 @@ -16299,12 +16259,6 @@ icon_state = "white" }, /area/centcom/medical) -"Et" = ( -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 10 - }, -/turf/unsimulated/floor/steel, -/area/shuttle/large_escape_pod1/centcom) "Ez" = ( /obj/structure/table/reinforced, /obj/item/cell/hyper, @@ -16326,27 +16280,17 @@ "EH" = ( /obj/structure/bed/chair/shuttle, /turf/simulated/shuttle/floor/darkred, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "EZ" = ( /obj/machinery/vending/fitness, /turf/simulated/shuttle/floor/darkred, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "FF" = ( /obj/structure/bed/chair/shuttle{ dir = 8 }, /turf/simulated/shuttle/floor/white, -/area/shuttle/escape/centcom) -"FI" = ( -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 9 - }, -/turf/unsimulated/floor/steel, -/area/shuttle/large_escape_pod1/centcom) -"Gf" = ( -/obj/effect/floor_decal/rust, -/turf/unsimulated/floor/steel, -/area/shuttle/large_escape_pod1/centcom) +/area/centcom/shuttle) "Gp" = ( /obj/structure/grille, /obj/structure/window/reinforced, @@ -16357,33 +16301,33 @@ }, /obj/structure/fans/tiny, /turf/simulated/floor, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "Gr" = ( /obj/machinery/light{ dir = 1 }, /turf/simulated/shuttle/floor/white, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "GA" = ( /turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "GG" = ( /obj/structure/bed/chair/shuttle{ dir = 1 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "GH" = ( /obj/machinery/door/airlock/security{ id_tag = "front"; name = "Security" }, /turf/simulated/shuttle/floor/darkred, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "GR" = ( /obj/structure/bed/chair/shuttle, /turf/simulated/shuttle/floor/white, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "He" = ( /obj/structure/window/reinforced{ dir = 8 @@ -16396,35 +16340,26 @@ /obj/structure/grille, /obj/structure/fans/tiny, /turf/simulated/floor, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "Hr" = ( /obj/structure/bed/chair/shuttle{ dir = 1 }, /obj/structure/window/reinforced, /turf/simulated/shuttle/floor/black, -/area/shuttle/escape/centcom) -"HL" = ( -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 8 - }, -/turf/unsimulated/floor/steel, -/area/shuttle/large_escape_pod1/centcom) +/area/centcom/shuttle) "IA" = ( /obj/structure/bed/chair/shuttle{ dir = 1 }, /turf/simulated/shuttle/floor/white, -/area/shuttle/escape/centcom) -"Jl" = ( -/turf/unsimulated/floor/steel, -/area/shuttle/large_escape_pod1/centcom) +/area/centcom/shuttle) "Jv" = ( /obj/machinery/light{ dir = 4 }, /turf/simulated/shuttle/floor/white, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "JC" = ( /obj/machinery/power/thermoregulator, /turf/unsimulated/floor{ @@ -16440,7 +16375,7 @@ "Lf" = ( /obj/machinery/vending/cola, /turf/simulated/shuttle/floor/darkred, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "MG" = ( /obj/structure/window/reinforced{ dir = 8 @@ -16453,14 +16388,10 @@ }, /obj/structure/fans/tiny, /turf/simulated/floor, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "MJ" = ( /turf/simulated/shuttle/floor/white, -/area/shuttle/escape/centcom) -"MV" = ( -/obj/effect/floor_decal/corner_steel_grid/diagonal, -/turf/unsimulated/floor/steel, -/area/shuttle/large_escape_pod1/centcom) +/area/centcom/shuttle) "Nt" = ( /obj/structure/reagent_dispensers/watertank, /turf/unsimulated/floor{ @@ -16472,8 +16403,14 @@ /obj/machinery/door/airlock/glass_external{ req_one_access = null }, +/obj/effect/shuttle_landmark{ + base_area = /area/centcom/terminal; + base_turf = /turf/unsimulated/floor/techfloor_grid; + landmark_tag = "escape_cc"; + name = "Escape Shuttle Centcom" + }, /turf/simulated/shuttle/floor/white, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "OD" = ( /obj/machinery/power/port_gen/pacman, /turf/unsimulated/floor{ @@ -16483,18 +16420,18 @@ "OM" = ( /obj/machinery/vending/snack, /turf/simulated/shuttle/floor/darkred, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "Pb" = ( /obj/structure/table/steel, /obj/item/defib_kit, /turf/simulated/shuttle/floor, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "Qd" = ( /obj/machinery/computer/communications{ dir = 4 }, /turf/simulated/shuttle/floor/white, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "Qr" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 4 @@ -16502,8 +16439,14 @@ /obj/structure/railing{ dir = 8 }, +/obj/effect/shuttle_landmark{ + base_area = /area/centcom/evac; + base_turf = /turf/unsimulated/floor/steel; + landmark_tag = "escapepod1_cc"; + name = "Centcom - Escape Pod 1" + }, /turf/unsimulated/floor/steel, -/area/shuttle/large_escape_pod1/centcom) +/area/centcom/evac) "Rc" = ( /obj/structure/table/glass, /obj/item/defib_kit/compact/loaded, @@ -16527,11 +16470,11 @@ req_one_access = null }, /turf/simulated/shuttle/floor/black, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "Td" = ( /obj/machinery/door/airlock/command, /turf/simulated/shuttle/floor/white, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "TZ" = ( /obj/machinery/light{ dir = 1 @@ -16540,20 +16483,20 @@ dir = 8 }, /turf/simulated/shuttle/floor/darkred, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "Ue" = ( /obj/structure/bed/chair/shuttle{ dir = 8 }, /turf/simulated/shuttle/floor/darkred, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "Uh" = ( /obj/machinery/door/airlock/medical{ name = "Shuttle Medbay"; req_access = list(45) }, /turf/simulated/shuttle/floor, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "UC" = ( /obj/structure/table/steel_reinforced, /obj/item/stack/cable_coil, @@ -16572,7 +16515,11 @@ }, /obj/structure/fans/tiny, /turf/simulated/shuttle/floor/black, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) +"VU" = ( +/obj/machinery/light, +/turf/simulated/shuttle/floor/black, +/area/centcom/shuttle) "Xa" = ( /obj/machinery/space_heater, /turf/unsimulated/floor{ @@ -16585,7 +16532,7 @@ dir = 1 }, /turf/simulated/shuttle/floor/darkred, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) "XA" = ( /obj/structure/table/steel_reinforced, /obj/item/smes_coil, @@ -16605,7 +16552,7 @@ /obj/item/storage/firstaid/clotting, /obj/item/storage/firstaid/clotting, /turf/simulated/shuttle/floor, -/area/shuttle/escape/centcom) +/area/centcom/shuttle) (1,1,1) = {" hP @@ -19799,9 +19746,9 @@ gX iE jk gX +gX Qr -Qr -Qr +gX gX li lF @@ -19941,10 +19888,10 @@ nm iF jl jv -Jl -Jl -Jl -Jl +nm +nm +nm +nm lj lF iQ @@ -20083,10 +20030,10 @@ nm iG jm jw -Jl -Gf -Gf -Jl +nm +iR +iR +nm lj lF iQ @@ -20224,11 +20171,11 @@ nm nm iH jn -Jl +nm jJ -Jl -Jl -Jl +nm +nm +nm lj lF iQ @@ -20366,11 +20313,11 @@ nm nm iI jo -Jl -Jl -Jl -Jl -MV +nm +nm +nm +nm +kP lj lF iQ @@ -20508,11 +20455,11 @@ nm nm iJ jp -Jl -Gf -Jl -Jl -Jl +nm +iR +nm +nm +nm lk lF iQ @@ -20650,11 +20597,11 @@ nm nm iK jq -Jl -Jl -Jl -Jl -Jl +nm +nm +nm +nm +nm lj lF iQ @@ -20792,11 +20739,11 @@ nm nm iL jr -Gf -Jl -Jl -Jl -Jl +iR +nm +nm +nm +nm lj lF iQ @@ -20934,11 +20881,11 @@ nm nm iM js -Jl -Jl -MV -Jl -Gf +nm +nm +kP +nm +iR ll lF iQ @@ -21076,11 +21023,11 @@ kP nm iN jt -Jl -Jl -Jl -Jl -Jl +nm +nm +nm +nm +nm lj lF iQ @@ -21218,11 +21165,11 @@ nm nm iO ju -Jl -Gf -Jl -Jl -Jl +nm +iR +nm +nm +nm lj lF iQ @@ -21360,11 +21307,11 @@ iR nm iF ju -Jl -Jl -Jl -Jl -MV +nm +nm +nm +nm +kP lj lF iQ @@ -21389,7 +21336,7 @@ wC GA vc vc -vc +VU wC wC wC @@ -21502,11 +21449,11 @@ iR iz iP hb -Et -Jl -Jl -Jl -FI +ha +nm +nm +nm +iz lm lF iQ @@ -21645,9 +21592,9 @@ iA nm nm jz -HL +hu jN -HL +hu iP ln lF diff --git a/_maps/map_files/Tether/tether-10-colony.dmm b/_maps/map_files/Tether/tether-10-colony.dmm index d5b9b2c8bc5..e3ecf872862 100644 --- a/_maps/map_files/Tether/tether-10-colony.dmm +++ b/_maps/map_files/Tether/tether-10-colony.dmm @@ -5086,26 +5086,18 @@ dir = 9 }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/shuttle/large_escape_pod1/centcom{ - base_turf = /turf/simulated/floor/tiled/steel_dirty/virgo3b - }) +/area/centcom/evac) "jw" = ( /obj/effect/floor_decal/rust/part_rusted3, /turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/shuttle/large_escape_pod1/centcom{ - base_turf = /turf/simulated/floor/tiled/steel_dirty/virgo3b - }) +/area/centcom/evac) "jx" = ( /turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/shuttle/large_escape_pod1/centcom{ - base_turf = /turf/simulated/floor/tiled/steel_dirty/virgo3b - }) +/area/centcom/evac) "jy" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/shuttle/large_escape_pod1/centcom{ - base_turf = /turf/simulated/floor/tiled/steel_dirty/virgo3b - }) +/area/centcom/evac) "jz" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ dir = 8 @@ -5248,9 +5240,7 @@ "jJ" = ( /obj/effect/floor_decal/rust/mono_rusted3, /turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/shuttle/large_escape_pod1/centcom{ - base_turf = /turf/simulated/floor/tiled/steel_dirty/virgo3b - }) +/area/centcom/evac) "jK" = ( /turf/unsimulated/wall, /area/centcom/medical) @@ -5266,9 +5256,7 @@ "jM" = ( /obj/effect/floor_decal/corner_steel_grid/diagonal, /turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/shuttle/large_escape_pod1/centcom{ - base_turf = /turf/simulated/floor/tiled/steel_dirty/virgo3b - }) +/area/centcom/evac) "jN" = ( /obj/effect/floor_decal/sign/dock/two, /obj/effect/floor_decal/industrial/warning/dust{ @@ -9831,16 +9819,12 @@ /area/centcom/security) "si" = ( /turf/simulated/shuttle/wall, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "sj" = ( /obj/structure/grille, /obj/structure/shuttle/window, /turf/simulated/shuttle/plating, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "sk" = ( /obj/structure/table/woodentable{ dir = 5 @@ -9994,9 +9978,7 @@ /area/centcom/security) "sB" = ( /turf/simulated/shuttle/wall/hard_corner, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "sC" = ( /obj/structure/closet/hydrant{ pixel_x = -30 @@ -10012,24 +9994,18 @@ /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "sD" = ( /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "sE" = ( /obj/structure/bed/chair/shuttle, /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "sF" = ( /obj/structure/bed/chair{ dir = 8 @@ -10223,17 +10199,13 @@ /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "sX" = ( /obj/structure/table/standard, /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "sY" = ( /obj/machinery/status_display{ pixel_y = 30 @@ -10245,9 +10217,7 @@ /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "sZ" = ( /obj/structure/table/glass, /obj/item/storage/box/cups, @@ -10429,9 +10399,7 @@ /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "tm" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -10607,9 +10575,7 @@ name = "Shuttle Hatch" }, /turf/simulated/shuttle/floor/yellow, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "tC" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1380; @@ -10619,9 +10585,7 @@ name = "Shuttle Hatch" }, /turf/simulated/shuttle/floor/yellow, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "tD" = ( /obj/structure/table/glass, /obj/item/roller, @@ -10844,9 +10808,7 @@ /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "ub" = ( /obj/structure/bed/chair/shuttle, /obj/structure/closet/walllocker/emerglocker{ @@ -10855,9 +10817,7 @@ /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "uc" = ( /obj/effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor/steel, @@ -10925,18 +10885,14 @@ /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "un" = ( /obj/structure/table/standard, /obj/random/maintenance/clean, /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "uo" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-22" @@ -11175,9 +11131,7 @@ "uP" = ( /obj/structure/sign/nanotrasen, /turf/simulated/shuttle/wall, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "uQ" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 @@ -11298,18 +11252,14 @@ /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "vc" = ( /obj/structure/table/standard, /obj/random/plushie, /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "vd" = ( /obj/machinery/door/firedoor, /obj/machinery/door/blast/regular{ @@ -11412,9 +11362,7 @@ /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "vl" = ( /obj/structure/bed/chair/shuttle{ dir = 1 @@ -11425,9 +11373,7 @@ /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "vm" = ( /turf/unsimulated/wall, /area/centcom/security{ @@ -11990,17 +11936,13 @@ /obj/structure/grille, /obj/structure/shuttle/window, /turf/simulated/shuttle/floor/white, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "wg" = ( /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "wh" = ( /obj/machinery/computer/card{ dir = 4 @@ -12304,18 +12246,14 @@ /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "wD" = ( /obj/effect/floor_decal/industrial/outline/blue, /obj/machinery/light, /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "wE" = ( /obj/machinery/computer/secure_data{ dir = 4 @@ -12585,9 +12523,7 @@ /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "xa" = ( /obj/structure/bed/chair/shuttle{ dir = 1 @@ -12596,9 +12532,7 @@ /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, -/area/shuttle/escape/centcom{ - base_turf = /turf/unsimulated/floor/techfloor_grid - }) +/area/centcom/evac) "xb" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 10 diff --git a/code/__DEFINES/color.dm b/code/__DEFINES/color.dm index 6f5fe428eee..5ab6ea85f60 100644 --- a/code/__DEFINES/color.dm +++ b/code/__DEFINES/color.dm @@ -1,3 +1,38 @@ + +// General colors +#define COLOR_WHITE "#FFFFFF" +#define COLOR_SILVER "#C0C0C0" +#define COLOR_GRAY "#808080" +#define COLOR_BLACK "#000000" +#define COLOR_RED_LIGHT "#FF3333" +#define COLOR_RED "#FF0000" +#define COLOR_MAROON "#800000" +#define COLOR_DARK_ORANGE "#B95A00" +#define COLOR_ORANGE "#FF9900" +#define COLOR_YELLOW "#FFFF00" +#define COLOR_OLIVE "#808000" +#define COLOR_LIME "#00FF00" +#define COLOR_GREEN "#008000" +#define COLOR_CYAN "#00FFFF" +#define COLOR_TEAL "#008080" +#define COLOR_BLUE "#0000FF" +#define COLOR_NAVY "#000080" +#define COLOR_PINK "#FF00FF" +#define COLOR_PURPLE "#800080" +#define COLOR_LUMINOL "#66FFFF" +#define COLOR_BEIGE "#CEB689" +#define COLOR_BLUE_GRAY "#6A97B0" +#define COLOR_BROWN "#B19664" +#define COLOR_DARK_BROWN "#917448" +#define COLOR_GREEN_GRAY "#8DAF6A" +#define COLOR_RED_GRAY "#AA5F61" +#define COLOR_PALE_BLUE_GRAY "#8BBBD5" +#define COLOR_PALE_GREEN_GRAY "#AED18B" +#define COLOR_PALE_RED_GRAY "#CC9090" +#define COLOR_PALE_PURPLE_GRAY "#BDA2BA" +#define COLOR_PURPLE_GRAY "#A2819E" +#define COLOR_DEEP_SKY_BLUE "#00e1ff" + // Color defines used by the assembly detailer. #define COLOR_ASSEMBLY_BLACK "#545454" #define COLOR_ASSEMBLY_BGRAY "#9497AB" @@ -15,4 +50,6 @@ #define COLOR_ASSEMBLY_BLUE "#38559E" #define COLOR_ASSEMBLY_PURPLE "#6F6192" #define COLOR_ASSEMBLY_HOT_PINK "#FF69B4" + +// Misc Colors #define COLOR_ASTEROID_ROCK "#735555" diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index cf984ee0188..d4ac8f53c93 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -12,170 +12,164 @@ /// world.icon_size #define PIXELS 32 -//These get to go at the top, because they're special +// These get to go at the top, because they're special //You can use these defines to get the typepath of the currently running proc/verb (yes procs + verbs are objects) /* eg: /mob/living/carbon/human/death() - to_chat(world, THIS_PROC_TYPE_STR) //You can only output the string versions + to_chat(world, THIS_PROC_TYPE_STR) // You can only output the string versions Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a string with () (eg: the _WITH_ARGS defines) to make it look nicer) */ #define THIS_PROC_TYPE ..... -#define THIS_PROC_TYPE_STR "[THIS_PROC_TYPE]" //Because you can only obtain a string of THIS_PROC_TYPE using "[]", and it's nice to just +/+= strings +#define THIS_PROC_TYPE_STR "[THIS_PROC_TYPE]" // Because you can only obtain a string of THIS_PROC_TYPE using "[]", and it's nice to just +/+= strings #define THIS_PROC_TYPE_STR_WITH_ARGS "[THIS_PROC_TYPE]([args.Join(",")])" -#define THIS_PROC_TYPE_WEIRD ...... //This one is WEIRD, in some cases (When used in certain defines? (eg: ASSERT)) THIS_PROC_TYPE will fail to work, but THIS_PROC_TYPE_WEIRD will work instead +#define THIS_PROC_TYPE_WEIRD ...... // This one is WEIRD, in some cases (When used in certain defines? (eg: ASSERT)) THIS_PROC_TYPE will fail to work, but THIS_PROC_TYPE_WEIRD will work instead + //define THIS_PROC_TYPE_WEIRD_STR "[THIS_PROC_TYPE_WEIRD]" //Included for completeness //define THIS_PROC_TYPE_WEIRD_STR_WITH_ARGS "[THIS_PROC_TYPE_WEIRD]([args.Join(",")])" //Ditto -#define NOT_IMPLEMENTED "NOT_IMPLEMENTED" +#define NOT_IMPLEMENTED "NOT_IMPLEMENTED" // Turf-only flags. -#define NOJAUNT 1 // This is used in literally one place, turf.dm, to block ethereal jaunt. +#define NOJAUNT 1 // This is used in literally one place, turf.dm, to block ethereal jaunt. -#define TRANSITIONEDGE 1 // Distance from edge to move to another z-level. +#define TRANSITIONEDGE 1 // Distance from edge to move to another z-level. // Invisibility constants. These should only be used for TRUE invisibility, AKA nothing living players touch -#define INVISIBILITY_LIGHTING 20 -#define INVISIBILITY_LEVEL_ONE 35 -#define INVISIBILITY_LEVEL_TWO 45 -#define INVISIBILITY_OBSERVER 60 -#define INVISIBILITY_EYE 61 +#define INVISIBILITY_LIGHTING 20 +#define INVISIBILITY_LEVEL_ONE 35 +#define INVISIBILITY_LEVEL_TWO 45 +#define INVISIBILITY_OBSERVER 60 +#define INVISIBILITY_EYE 61 -#define SEE_INVISIBLE_LIVING 25 -#define SEE_INVISIBLE_NOLIGHTING 15 -#define SEE_INVISIBLE_LEVEL_ONE 35 -#define SEE_INVISIBLE_LEVEL_TWO 45 -#define SEE_INVISIBLE_CULT 60 -#define SEE_INVISIBLE_OBSERVER 61 +#define SEE_INVISIBLE_LIVING 25 +#define SEE_INVISIBLE_NOLIGHTING 15 +#define SEE_INVISIBLE_LEVEL_ONE 35 +#define SEE_INVISIBLE_LEVEL_TWO 45 +#define SEE_INVISIBLE_CULT 60 +#define SEE_INVISIBLE_OBSERVER 61 -#define SEE_INVISIBLE_MINIMUM 5 -#define INVISIBILITY_MAXIMUM 100 +#define SEE_INVISIBLE_MINIMUM 5 +#define INVISIBILITY_MAXIMUM 100 // Pseudo-Invis, like Ninja, Ling, Etc. -#define EFFECTIVE_INVIS 50 // Below this, can't be examined, may as well be invisible to the game +#define EFFECTIVE_INVIS 50 // Below this, can't be examined, may as well be invisible to the game // For the client FPS pref and anywhere else #define MAX_CLIENT_FPS 200 // Some arbitrary defines to be used by self-pruning global lists. (see master_controller) -#define PROCESS_KILL 26 // Used to trigger removal from a processing list. -#define MAX_GEAR_COST 15 // Used in chargen for accessory loadout limit. +#define PROCESS_KILL 26 // Used to trigger removal from a processing list. +#define MAX_GEAR_COST 15 // Used in chargen for accessory loadout limit. + // For secHUDs and medHUDs and variants. The number is the location of the image on the list hud_list of humans. -#define HEALTH_HUD 1 // A simple line rounding the mob's number health. -#define STATUS_HUD 2 // Alive, dead, diseased, etc. -#define ID_HUD 3 // The job asigned to your ID. -#define WANTED_HUD 4 // Wanted, released, paroled, security status. -#define IMPLOYAL_HUD 5 // Loyality implant. -#define IMPCHEM_HUD 6 // Chemical implant. -#define IMPTRACK_HUD 7 // Tracking implant. -#define SPECIALROLE_HUD 8 // AntagHUD image. -#define STATUS_HUD_OOC 9 // STATUS_HUD without virus DB check for someone being ill. -#define LIFE_HUD 10 // STATUS_HUD that only reports dead or alive -#define TOTAL_HUDS 10 // Total number of HUDs. Like body layers, and other things, it comes up sometimes. - -//some colors -#define COLOR_WHITE "#FFFFFF" -#define COLOR_SILVER "#C0C0C0" -#define COLOR_GRAY "#808080" -#define COLOR_BLACK "#000000" -#define COLOR_RED "#FF0000" -#define COLOR_MAROON "#800000" -#define COLOR_YELLOW "#FFFF00" -#define COLOR_OLIVE "#808000" -#define COLOR_LIME "#00FF00" -#define COLOR_GREEN "#008000" -#define COLOR_CYAN "#00FFFF" -#define COLOR_TEAL "#008080" -#define COLOR_BLUE "#0000FF" -#define COLOR_NAVY "#000080" -#define COLOR_PINK "#FF00FF" -#define COLOR_PURPLE "#800080" -#define COLOR_ORANGE "#FF9900" -#define COLOR_LUMINOL "#66FFFF" -#define COLOR_BEIGE "#CEB689" -#define COLOR_BLUE_GRAY "#6A97B0" -#define COLOR_BROWN "#B19664" -#define COLOR_DARK_BROWN "#917448" -#define COLOR_DARK_ORANGE "#B95A00" -#define COLOR_GREEN_GRAY "#8DAF6A" -#define COLOR_RED_GRAY "#AA5F61" -#define COLOR_PALE_BLUE_GRAY "#8BBBD5" -#define COLOR_PALE_GREEN_GRAY "#AED18B" -#define COLOR_PALE_RED_GRAY "#CC9090" -#define COLOR_PALE_PURPLE_GRAY "#BDA2BA" -#define COLOR_PURPLE_GRAY "#A2819E" -#define COLOR_RED_LIGHT "#FF3333" -#define COLOR_DEEP_SKY_BLUE "#00e1ff" - +#define HEALTH_HUD 1 // A simple line rounding the mob's number health. +#define STATUS_HUD 2 // Alive, dead, diseased, etc. +#define ID_HUD 3 // The job asigned to your ID. +#define WANTED_HUD 4 // Wanted, released, paroled, security status. +#define IMPLOYAL_HUD 5 // Loyality implant. +#define IMPCHEM_HUD 6 // Chemical implant. +#define IMPTRACK_HUD 7 // Tracking implant. +#define SPECIALROLE_HUD 8 // AntagHUD image. +#define STATUS_HUD_OOC 9 // STATUS_HUD without virus DB check for someone being ill. +#define LIFE_HUD 10 // STATUS_HUD that only reports dead or alive +// Because of omnihud having overlapping issues, we have extra ones. +#define BACKUP_HUD 11 // HUD for showing whether or not they have a backup implant. +#define STATUS_R_HUD 12 // HUD for showing the same STATUS_HUD info on the right side, but not for 'boring' statuses (transparent icons) +#define HEALTH_VR_HUD 13 // HUD with blank 100% bar so it's hidden most of the time. +#define VANTAG_HUD 14 // HUD for showing being-an-antag-target prefs +// Total number of HUDs. Like body layers, and other things, it comes up sometimes. +#define TOTAL_HUDS 14 // Shuttles. // These define the time taken for the shuttle to get to the space station, and the time before it leaves again. -#define SHUTTLE_PREPTIME 300 // 5 minutes = 300 seconds - after this time, the shuttle departs centcom and cannot be recalled. -#define SHUTTLE_LEAVETIME 180 // 3 minutes = 180 seconds - the duration for which the shuttle will wait at the station after arriving. -#define SHUTTLE_TRANSIT_DURATION 300 // 5 minutes = 300 seconds - how long it takes for the shuttle to get to the station. -#define SHUTTLE_TRANSIT_DURATION_RETURN 120 // 2 minutes = 120 seconds - for some reason it takes less time to come back, go figure. +#define SHUTTLE_PREPTIME 300 // 5 minutes = 300 seconds - after this time, the shuttle departs centcom and cannot be recalled. +#define SHUTTLE_LEAVETIME 180 // 3 minutes = 180 seconds - the duration for which the shuttle will wait at the station after arriving. +#define SHUTTLE_TRANSIT_DURATION 300 // 5 minutes = 300 seconds - how long it takes for the shuttle to get to the station. +#define SHUTTLE_TRANSIT_DURATION_RETURN 120 // 2 minutes = 120 seconds - for some reason it takes less time to come back, go figure. // Shuttle moving status. -#define SHUTTLE_IDLE 0 -#define SHUTTLE_WARMUP 1 -#define SHUTTLE_INTRANSIT 2 +#define SHUTTLE_IDLE 0 +#define SHUTTLE_WARMUP 1 +#define SHUTTLE_INTRANSIT 2 // Sound defines for shuttles. -#define HYPERSPACE_WARMUP 0 -#define HYPERSPACE_PROGRESS 1 -#define HYPERSPACE_END 2 +#define HYPERSPACE_WARMUP 0 +#define HYPERSPACE_PROGRESS 1 +#define HYPERSPACE_END 2 // Ferry shuttle processing status. -#define IDLE_STATE 0 -#define WAIT_LAUNCH 1 -#define FORCE_LAUNCH 2 -#define WAIT_ARRIVE 3 -#define WAIT_FINISH 4 -#define DO_AUTOPILOT 5 +#define IDLE_STATE 0 +#define WAIT_LAUNCH 1 +#define FORCE_LAUNCH 2 +#define WAIT_ARRIVE 3 +#define WAIT_FINISH 4 +#define DO_AUTOPILOT 5 + +// Shuttle madness! +#define SHUTTLE_CRASHED 3 // Yup that can happen now + +#define BLUE_SHIELDED 2 // Shield from bluespace teleportation (telescience) + + +// Bluespace shelter deploy checks +#define SHELTER_DEPLOY_ALLOWED "allowed" +#define SHELTER_DEPLOY_BAD_TURFS "bad turfs" +#define SHELTER_DEPLOY_BAD_AREA "bad area" +#define SHELTER_DEPLOY_ANCHORED_OBJECTS "anchored objects" + // Setting this much higher than 1024 could allow spammers to DOS the server easily. -#define MAX_MESSAGE_LEN 2048 //VOREStation Edit - I'm not sure about "easily". It can be a little longer. -#define MAX_PAPER_MESSAGE_LEN 6144 -#define MAX_BOOK_MESSAGE_LEN 24576 -#define MAX_RECORD_LENGTH 24576 -#define MAX_LNAME_LEN 64 -#define MAX_NAME_LEN 52 -#define MAX_TEXTFILE_LENGTH 128000 // 512GQ file +#define MAX_MESSAGE_LEN 2048 // I'm not sure about "easily". It can be a little longer. // Famous last words. +#define MAX_PAPER_MESSAGE_LEN 6144 +#define MAX_BOOK_MESSAGE_LEN 24576 +#define MAX_RECORD_LENGTH 24576 +#define MAX_LNAME_LEN 64 +#define MAX_NAME_LEN 52 +#define MAX_TEXTFILE_LENGTH 128000 // 512GQ file // Event defines. -#define EVENT_LEVEL_MUNDANE 1 -#define EVENT_LEVEL_MODERATE 2 -#define EVENT_LEVEL_MAJOR 3 +#define EVENT_LEVEL_MUNDANE 1 +#define EVENT_LEVEL_MODERATE 2 +#define EVENT_LEVEL_MAJOR 3 -//General-purpose life speed define for plants. -#define HYDRO_SPEED_MULTIPLIER 1 +// General-purpose life speed define for plants. +#define HYDRO_SPEED_MULTIPLIER 1 + +#define ANNOUNCER_NAME "Facility PA" #define DEFAULT_JOB_TYPE /datum/job/assistant -//Area flags, possibly more to come -#define RAD_SHIELDED 1 //shielded from radiation, clearly +//Assistant/Visitor/Whatever +#define USELESS_JOB "Visitor" + +#define ECO_MODIFIER 10 + +// Area flags, possibly more to come +#define RAD_SHIELDED 1 // Shielded from radiation, clearly // Convoluted setup so defines can be supplied by Bay12 main server compile script. // Should still work fine for people jamming the icons into their repo. #ifndef CUSTOM_ITEM_OBJ -#define CUSTOM_ITEM_OBJ 'icons/obj/custom_items_obj.dmi' +#define CUSTOM_ITEM_OBJ 'icons/obj/custom_items_obj.dmi' #endif #ifndef CUSTOM_ITEM_MOB -#define CUSTOM_ITEM_MOB 'icons/mob/custom_items_mob.dmi' +#define CUSTOM_ITEM_MOB 'icons/mob/custom_items_mob.dmi' #endif #ifndef CUSTOM_ITEM_SYNTH -#define CUSTOM_ITEM_SYNTH 'icons/mob/custom_synthetic.dmi' +#define CUSTOM_ITEM_SYNTH 'icons/mob/custom_synthetic.dmi' #endif -#define WALL_CAN_OPEN 1 -#define WALL_OPENING 2 +#define WALL_CAN_OPEN 1 +#define WALL_OPENING 2 -#define DEFAULT_TABLE_MATERIAL "plastic" -#define DEFAULT_WALL_MATERIAL "steel" +#define DEFAULT_TABLE_MATERIAL "plastic" +#define DEFAULT_WALL_MATERIAL "steel" +// TODO - Standarize this, some mats don't have these. - Zandario #define MAT_IRON "iron" #define MAT_MARBLE "marble" #define MAT_STEEL "steel" @@ -183,7 +177,7 @@ Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a s #define MAT_GLASS "glass" #define MAT_SILVER "silver" #define MAT_GOLD "gold" -#define MAT_URANIUM "uranium" //Did it +#define MAT_URANIUM "uranium" #define MAT_TITANIUM "titanium" #define MAT_PHORON "phoron" #define MAT_DIAMOND "diamond" @@ -207,65 +201,73 @@ Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a s #define MAT_METALHYDROGEN "mhydrogen" #define MAT_OSMIUM "osmium" -#define SHARD_SHARD "shard" -#define SHARD_SHRAPNEL "shrapnel" -#define SHARD_STONE_PIECE "piece" -#define SHARD_SPLINTER "splinters" -#define SHARD_NONE "" +#define SHARD_SHARD "shard" +#define SHARD_SHRAPNEL "shrapnel" +#define SHARD_STONE_PIECE "piece" +#define SHARD_SPLINTER "splinters" +#define SHARD_NONE "" -#define MATERIAL_UNMELTABLE 0x1 -#define MATERIAL_BRITTLE 0x2 -#define MATERIAL_PADDING 0x4 +#define MATERIAL_UNMELTABLE 0x1 +#define MATERIAL_BRITTLE 0x2 +#define MATERIAL_PADDING 0x4 -#define TABLE_BRITTLE_MATERIAL_MULTIPLIER 4 // Amount table damage is multiplied by if it is made of a brittle material (e.g. glass) +#define TABLE_BRITTLE_MATERIAL_MULTIPLIER 4 // Amount table damage is multiplied by if it is made of a brittle material (e.g. glass) -#define BOMBCAP_DVSTN_RADIUS (max_explosion_range/4) -#define BOMBCAP_HEAVY_RADIUS (max_explosion_range/2) -#define BOMBCAP_LIGHT_RADIUS max_explosion_range -#define BOMBCAP_FLASH_RADIUS (max_explosion_range*1.5) - // NTNet module-configuration values. Do not change these. If you need to add another use larger number (5..6..7 etc) -#define NTNET_SOFTWAREDOWNLOAD 1 // Downloads of software from NTNet -#define NTNET_PEERTOPEER 2 // P2P transfers of files between devices -#define NTNET_COMMUNICATION 3 // Communication (messaging) -#define NTNET_SYSTEMCONTROL 4 // Control of various systems, RCon, air alarm control, etc. +#define BOMBCAP_DVSTN_RADIUS (max_explosion_range/4) +#define BOMBCAP_HEAVY_RADIUS (max_explosion_range/2) +#define BOMBCAP_LIGHT_RADIUS max_explosion_range +#define BOMBCAP_FLASH_RADIUS (max_explosion_range*1.5) + // NTNet module-configuration values. Do not change these. If you need to add another use larger number (5..6..7 etc) +#define NTNET_SOFTWAREDOWNLOAD 1 // Downloads of software from NTNet +#define NTNET_PEERTOPEER 2 // P2P transfers of files between devices +#define NTNET_COMMUNICATION 3 // Communication (messaging) +#define NTNET_SYSTEMCONTROL 4 // Control of various systems, RCon, air alarm control, etc. // NTNet transfer speeds, used when downloading/uploading a file/program. -#define NTNETSPEED_LOWSIGNAL 0.25 // GQ/s transfer speed when the device is wirelessly connected and on Low signal -#define NTNETSPEED_HIGHSIGNAL 0.5 // GQ/s transfer speed when the device is wirelessly connected and on High signal -#define NTNETSPEED_ETHERNET 1.0 // GQ/s transfer speed when the device is using wired connection -#define NTNETSPEED_DOS_AMPLIFICATION 5 // Multiplier for Denial of Service program. Resulting load on NTNet relay is this multiplied by NTNETSPEED of the device +#define NTNETSPEED_LOWSIGNAL 0.25 // GQ/s transfer speed when the device is wirelessly connected and on Low signal +#define NTNETSPEED_HIGHSIGNAL 0.5 // GQ/s transfer speed when the device is wirelessly connected and on High signal +#define NTNETSPEED_ETHERNET 1.0 // GQ/s transfer speed when the device is using wired connection +#define NTNETSPEED_DOS_AMPLIFICATION 5 // Multiplier for Denial of Service program. Resulting load on NTNet relay is this multiplied by NTNETSPEED of the device // Program bitflags -#define PROGRAM_ALL 15 -#define PROGRAM_CONSOLE 1 -#define PROGRAM_LAPTOP 2 -#define PROGRAM_TABLET 4 -#define PROGRAM_TELESCREEN 8 +#define PROGRAM_ALL 15 +#define PROGRAM_CONSOLE 1 +#define PROGRAM_LAPTOP 2 +#define PROGRAM_TABLET 4 +#define PROGRAM_TELESCREEN 8 -#define PROGRAM_STATE_KILLED 0 -#define PROGRAM_STATE_BACKGROUND 1 -#define PROGRAM_STATE_ACTIVE 2 +#define PROGRAM_STATE_KILLED 0 +#define PROGRAM_STATE_BACKGROUND 1 +#define PROGRAM_STATE_ACTIVE 2 // Caps for NTNet logging. Less than 10 would make logging useless anyway, more than 500 may make the log browser too laggy. Defaults to 100 unless user changes it. -#define MAX_NTNET_LOGS 500 -#define MIN_NTNET_LOGS 10 +#define MAX_NTNET_LOGS 500 +#define MIN_NTNET_LOGS 10 // Special return values from bullet_act(). Positive return values are already used to indicate the blocked level of the projectile. -#define PROJECTILE_CONTINUE -1 //if the projectile should continue flying after calling bullet_act() -#define PROJECTILE_FORCE_MISS -2 //if the projectile should treat the attack as a miss (suppresses attack and admin logs) - only applies to mobs. +#define PROJECTILE_CONTINUE -1 // If the projectile should continue flying after calling bullet_act() +#define PROJECTILE_FORCE_MISS -2 // If the projectile should treat the attack as a miss (suppresses attack and admin logs) - only applies to mobs. // Vending stuff -#define CAT_NORMAL 1 -#define CAT_HIDDEN 2 -#define CAT_COIN 4 +#define CAT_NORMAL 1 +#define CAT_HIDDEN 2 +#define CAT_COIN 4 -//Antag Faction Visbility + +// Antag Faction Visbility #define ANTAG_HIDDEN "Hidden" #define ANTAG_SHARED "Shared" #define ANTAG_KNOWN "Known" +// Take a guess what the V stands for +#define VANTAG_NONE "hudblank" +#define VANTAG_VORE "vantag_vore" +#define VANTAG_KIDNAP "vantag_kidnap" +#define VANTAG_KILL "vantag_kill" + + // Job groups #define ROLE_COMMAND "command" #define ROLE_SECURITY "security" @@ -280,46 +282,46 @@ Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a s // Canonical spellings of TSCs, so typos never have to happen again due to human error. #define TSC_NT "NanoTrasen" -#define TSC_HEPH "Hephaestus" // Because everyone misspells it +#define TSC_HEPH "Hephaestus" // Because everyone misspells it #define TSC_VM "Vey Med" #define TSC_ZH "Zeng-Hu" #define TSC_WT "Ward-Takahashi" #define TSC_BC "Bishop Cybernetics" #define TSC_MORPH "Morpheus" -#define TSC_XION "Xion" // Not really needed but consistancy I guess. +#define TSC_XION "Xion" // Not really needed but consistancy I guess. #define TSC_GIL "Gilthari" #define MIDNIGHT_ROLLOVER 864000 //number of deciseconds in a day -#define WORLD_ICON_SIZE 32 //Needed for the R-UST port +#define WORLD_ICON_SIZE 32 // Needed for the R-UST port #define PIXEL_MULTIPLIER WORLD_ICON_SIZE/32 //Needed for the R-UST port #define MAX_CLIENT_VIEW 34 // Maximum effective value of client.view (According to DM references) // Maploader bounds indices -#define MAP_MINX 1 -#define MAP_MINY 2 -#define MAP_MINZ 3 -#define MAP_MAXX 4 -#define MAP_MAXY 5 -#define MAP_MAXZ 6 +#define MAP_MINX 1 +#define MAP_MINY 2 +#define MAP_MINZ 3 +#define MAP_MAXX 4 +#define MAP_MAXY 5 +#define MAP_MAXZ 6 // /atom/proc/use_check flags -#define USE_ALLOW_NONLIVING 1 -#define USE_ALLOW_NON_ADV_TOOL_USR 2 -#define USE_ALLOW_DEAD 4 -#define USE_ALLOW_INCAPACITATED 8 -#define USE_ALLOW_NON_ADJACENT 16 -#define USE_FORCE_SRC_IN_USER 32 -#define USE_DISALLOW_SILICONS 64 +#define USE_ALLOW_NONLIVING 1 +#define USE_ALLOW_NON_ADV_TOOL_USR 2 +#define USE_ALLOW_DEAD 4 +#define USE_ALLOW_INCAPACITATED 8 +#define USE_ALLOW_NON_ADJACENT 16 +#define USE_FORCE_SRC_IN_USER 32 +#define USE_DISALLOW_SILICONS 64 -#define USE_SUCCESS 0 -#define USE_FAIL_NON_ADJACENT 1 -#define USE_FAIL_NONLIVING 2 -#define USE_FAIL_NON_ADV_TOOL_USR 3 -#define USE_FAIL_DEAD 4 -#define USE_FAIL_INCAPACITATED 5 -#define USE_FAIL_NOT_IN_USER 6 -#define USE_FAIL_IS_SILICON 7 +#define USE_SUCCESS 0 +#define USE_FAIL_NON_ADJACENT 1 +#define USE_FAIL_NONLIVING 2 +#define USE_FAIL_NON_ADV_TOOL_USR 3 +#define USE_FAIL_DEAD 4 +#define USE_FAIL_INCAPACITATED 5 +#define USE_FAIL_NOT_IN_USER 6 +#define USE_FAIL_IS_SILICON 7 // This creates a consistant definition for creating global lists, automatically inserting objects into it when they are created, and removing them when deleted. // It is very good for removing the 'in world' junk that exists in the codebase painlessly. @@ -340,19 +342,20 @@ GLOBAL_LIST_EMPTY(##LIST_NAME);\ }\ -//'Normal'ness v v v -//Various types of colorblindness R2R R2G R2B G2R G2G G2B B2R B2G B2B -#define MATRIX_Monochromia list(0.33, 0.33, 0.33, 0.59, 0.59, 0.59, 0.11, 0.11, 0.11) -#define MATRIX_Protanopia list(0.57, 0.43, 0, 0.56, 0.44, 0, 0, 0.24, 0.76) -#define MATRIX_Protanomaly list(0.82, 0.18, 0, 0.33, 0.67, 0, 0, 0.13, 0.88) -#define MATRIX_Deuteranopia list(0.63, 0.38, 0, 0.70, 0.30, 0, 0, 0.30, 0.70) -#define MATRIX_Deuteranomaly list(0.80, 0.20, 0, 0.26, 0.74, 0, 0, 0.14, 0.86) -#define MATRIX_Tritanopia list(0.95, 0.05, 0, 0, 0.43, 0.57, 0, 0.48, 0.53) -#define MATRIX_Tritanomaly list(0.97, 0.03, 0, 0, 0.73, 0.27, 0, 0.18, 0.82) -#define MATRIX_Achromatopsia list(0.30, 0.59, 0.11, 0.30, 0.59, 0.11, 0.30, 0.59, 0.11) -#define MATRIX_Achromatomaly list(0.62, 0.32, 0.06, 0.16, 0.78, 0.06, 0.16, 0.32, 0.52) -#define MATRIX_Vulp_Colorblind list(0.50, 0.40, 0.10, 0.50, 0.40, 0.10, 0, 0.20, 0.80) -#define MATRIX_Taj_Colorblind list(0.40, 0.20, 0.40, 0.40, 0.60, 0, 0.20, 0.20, 0.60) +// 'Normal'ness v v v +// Various types of colorblindness R2R R2G R2B G2R G2G G2B B2R B2G B2B +#define MATRIX_Monochromia list(0.33, 0.33, 0.33, 0.59, 0.59, 0.59, 0.11, 0.11, 0.11) +#define MATRIX_Protanopia list(0.57, 0.43, 0, 0.56, 0.44, 0, 0, 0.24, 0.76) +#define MATRIX_Protanomaly list(0.82, 0.18, 0, 0.33, 0.67, 0, 0, 0.13, 0.88) +#define MATRIX_Deuteranopia list(0.63, 0.38, 0, 0.70, 0.30, 0, 0, 0.30, 0.70) +#define MATRIX_Deuteranomaly list(0.80, 0.20, 0, 0.26, 0.74, 0, 0, 0.14, 0.86) +#define MATRIX_Tritanopia list(0.95, 0.05, 0, 0, 0.43, 0.57, 0, 0.48, 0.53) +#define MATRIX_Tritanomaly list(0.97, 0.03, 0, 0, 0.73, 0.27, 0, 0.18, 0.82) +#define MATRIX_Achromatopsia list(0.30, 0.59, 0.11, 0.30, 0.59, 0.11, 0.30, 0.59, 0.11) +#define MATRIX_Achromatomaly list(0.62, 0.32, 0.06, 0.16, 0.78, 0.06, 0.16, 0.32, 0.52) +#define MATRIX_Vulp_Colorblind list(0.50, 0.40, 0.10, 0.50, 0.40, 0.10, 0, 0.20, 0.80) +#define MATRIX_Taj_Colorblind list(0.40, 0.20, 0.40, 0.40, 0.60, 0, 0.20, 0.20, 0.60) + // Tool substitution defines #define IS_SCREWDRIVER "screwdriver" @@ -378,25 +381,49 @@ GLOBAL_LIST_EMPTY(##LIST_NAME);\ #define RCD_SHEETS_PER_MATTER_UNIT 4 // Each physical material sheet is worth four matter units. #define RCD_MAX_CAPACITY 30 * RCD_SHEETS_PER_MATTER_UNIT -//Preference save/load cooldown. This is in deciseconds. -#define PREF_SAVELOAD_COOLDOWN 2 //Should be sufficiently hard to achieve without a broken mouse or autoclicker while still fulfilling its intended goal. + +// Preference save/load cooldown. This is in deciseconds. +#define PREF_SAVELOAD_COOLDOWN 2 // Should be sufficiently hard to achieve without a broken mouse or autoclicker while still fulfilling its intended goal. + + // Radiation 'levels'. Used for the geiger counter, for visuals and sound. They are in different files so this goes here. -#define RAD_LEVEL_LOW 0.5 // Around the level at which radiation starts to become harmful -#define RAD_LEVEL_MODERATE 5 -#define RAD_LEVEL_HIGH 25 -#define RAD_LEVEL_VERY_HIGH 75 +#define RAD_LEVEL_LOW 0.5 // Around the level at which radiation starts to become harmful +#define RAD_LEVEL_MODERATE 5 +#define RAD_LEVEL_HIGH 25 +#define RAD_LEVEL_VERY_HIGH 75 #define CLIENT_FROM_VAR(I) (ismob(I) ? I:client : (istype(I, /client) ? I : (istype(I, /datum/mind) ? I:current?:client : null))) -#define RADIATION_THRESHOLD_CUTOFF 0.1 // Radiation will not affect a tile when below this value. +#define RADIATION_THRESHOLD_CUTOFF 0.1 // Radiation will not affect a tile when below this value. -#define PR_ANNOUNCEMENTS_PER_ROUND 5 + +#define PR_ANNOUNCEMENTS_PER_ROUND 5 //https://secure.byond.com/docs/ref/info.html#/atom/var/mouse_opacity -#define MOUSE_OPACITY_TRANSPARENT 0 -#define MOUSE_OPACITY_ICON 1 -#define MOUSE_OPACITY_OPAQUE 2 +#define MOUSE_OPACITY_TRANSPARENT 0 +#define MOUSE_OPACITY_ICON 1 +#define MOUSE_OPACITY_OPAQUE 2 -/// Embed chance unset for embed_chance var on /obj/item. -#define EMBED_CHANCE_UNSET -1337 -/// No hitsound define -#define HITSOUND_UNSET "UNSET" +// Embed chance unset for embed_chance var on /obj/item. +#define EMBED_CHANCE_UNSET -1337 + + +// No hitsound define +#define HITSOUND_UNSET "UNSET" + + +// Herm Gender // Snowflake Global that throws a fit +#define HERM "herm" + +// For custom species +#define STARTING_SPECIES_POINTS 1 +#define MAX_SPECIES_TRAITS 5 + +// Xenochimera thing mostly +#define REVIVING_NOW -1 +#define REVIVING_DONE 0 +#define REVIVING_READY 1 + +// Resleeving Mind Record Status +#define MR_NORMAL 0 +#define MR_UNSURE 1 +#define MR_DEAD 2 diff --git a/code/__DEFINES/misc_vr.dm b/code/__DEFINES/misc_vr.dm deleted file mode 100644 index 23910771f02..00000000000 --- a/code/__DEFINES/misc_vr.dm +++ /dev/null @@ -1,48 +0,0 @@ -#define ECO_MODIFIER 10 - -// Because of omnihud having overlapping issues, we have extra ones. -#define BACKUP_HUD 11 // HUD for showing whether or not they have a backup implant. -#define STATUS_R_HUD 12 // HUD for showing the same STATUS_HUD info on the right side, but not for 'boring' statuses (transparent icons) -#define HEALTH_VR_HUD 13 // HUD with blank 100% bar so it's hidden most of the time. -#define VANTAG_HUD 14 // HUD for showing being-an-antag-target prefs - -#undef TOTAL_HUDS //Undo theirs. -#define TOTAL_HUDS 14 // Total number of HUDs. - -#define VANTAG_NONE "hudblank" -#define VANTAG_VORE "vantag_vore" -#define VANTAG_KIDNAP "vantag_kidnap" -#define VANTAG_KILL "vantag_kill" - -#define ANNOUNCER_NAME "Facility PA" - -//For custom species -#define STARTING_SPECIES_POINTS 1 -#define MAX_SPECIES_TRAITS 5 - -// Xenochimera thing mostly -#define REVIVING_NOW -1 -#define REVIVING_DONE 0 -#define REVIVING_READY 1 - -// Resleeving Mind Record Status -#define MR_NORMAL 0 -#define MR_UNSURE 1 -#define MR_DEAD 2 - -//Shuttle madness! -#define SHUTTLE_CRASHED 3 // Yup that can happen now - -#define BLUE_SHIELDED 2 // Shield from bluespace teleportation (telescience) - -//Assistant/Visitor/Whatever -#define USELESS_JOB "Visitor" - -//Herm Gender -#define HERM "herm" - -// Bluespace shelter deploy checks -#define SHELTER_DEPLOY_ALLOWED "allowed" -#define SHELTER_DEPLOY_BAD_TURFS "bad turfs" -#define SHELTER_DEPLOY_BAD_AREA "bad area" -#define SHELTER_DEPLOY_ANCHORED_OBJECTS "anchored objects" diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index b00cdba4128..3bd45e3a7d1 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -18,8 +18,8 @@ var/global/list/side_effects = list() //list of all medical sideeffects types var/global/list/mechas_list = list() //list of all mechs. Used by hostile mobs target tracking. var/global/list/joblist = list() //list of all jobstypes, minus borg and AI -#define all_genders_define_list list(MALE,FEMALE,PLURAL,NEUTER,HERM) //VOREStaton Edit -#define all_genders_text_list list("Male","Female","Plural","Neuter","Herm") //VOREStation Edit +#define all_genders_define_list list(MALE,FEMALE,PLURAL,NEUTER,HERM) +#define all_genders_text_list list("Male","Female","Plural","Neuter","Herm") var/list/mannequins_ diff --git a/code/game/area/Space Station 13 areas_vr.dm b/code/game/area/Space Station 13 areas_vr.dm index df3602923b8..caedfba610b 100644 --- a/code/game/area/Space Station 13 areas_vr.dm +++ b/code/game/area/Space Station 13 areas_vr.dm @@ -74,24 +74,9 @@ name = "Old Construction Site (AM)" icon_state = "shuttle2" -/area/shuttle/belter/station - name = "Belter Shuttle Landed" +/area/shuttle/belter + name = "Belter Shuttle" icon_state = "shuttle2" - base_turf = /turf/simulated/floor/tiled/asteroid_steel/airless - -/area/shuttle/belter/belt //Don't use this one, use a subtype - name = "Belter Shuttle Holding Position" - icon_state = "shuttle2" - -//Placeholders -/area/shuttle/belter/belt/zone1 -/area/shuttle/belter/belt/zone2 -/area/shuttle/belter/belt/zone3 -/area/shuttle/belter/belt/zone4 - -/area/shuttle/belter/transit - name = "Belter Shuttle Warp" - icon_state = "shuttle" //Rouguelike Mining /area/asteroid/rogue @@ -102,22 +87,18 @@ /area/asteroid/rogue/zone1 name = "Asteroid Belt Zone 1" icon_state = "red2" - shuttle_area = /area/shuttle/belter/belt/zone1 /area/asteroid/rogue/zone2 name = "Asteroid Belt Zone 2" icon_state = "blue2" - shuttle_area = /area/shuttle/belter/belt/zone2 /area/asteroid/rogue/zone3 name = "Asteroid Belt Zone 3" icon_state = "blue2" - shuttle_area = /area/shuttle/belter/belt/zone3 /area/asteroid/rogue/zone4 name = "Asteroid Belt Zone 4" icon_state = "red2" - shuttle_area = /area/shuttle/belter/belt/zone4 /area/medical/resleeving name = "Resleeving Lab" diff --git a/code/modules/maps/tg/reader.dm b/code/modules/maps/tg/reader.dm index 788e60af62f..2ab4d83ff8d 100644 --- a/code/modules/maps/tg/reader.dm +++ b/code/modules/maps/tg/reader.dm @@ -25,6 +25,12 @@ * */ /dmm_suite/load_map(dmm_file as file, x_offset as num, y_offset as num, z_offset as num, cropMap as num, measureOnly as num, no_changeturf as num, orientation as num) + + dmmRegex = new/regex({""(\[a-zA-Z]+)" = \\(((?:.|\n)*?)\\)\n(?!\t)|\\((\\d+),(\\d+),(\\d+)\\) = \\{"(\[a-zA-Z\n]*)"\\}"}, "g") + trimQuotesRegex = new/regex({"^\[\\s\n]+"?|"?\[\\s\n]+$|^"|"$"}, "g") + trimRegex = new/regex("^\[\\s\n]+|\[\\s\n]+$", "g") + modelCache = list() + //How I wish for RAII if(!measureOnly) Master.StartLoadingMap() diff --git a/code/modules/mob/gender.dm b/code/modules/mob/gender.dm index 0e9bf244b58..a5516ba497d 100644 --- a/code/modules/mob/gender.dm +++ b/code/modules/mob/gender.dm @@ -8,61 +8,76 @@ return 1 /datum/gender - var/key = "plural" + var/key = "plural" - var/He = "They" - var/he = "they" - var/His = "Their" - var/his = "their" - var/him = "them" - var/has = "have" - var/is = "are" - var/does = "do" - var/himself = "themselves" - var/s = "" - var/hes = "they're" + var/He = "They" + var/he = "they" + var/His = "Their" + var/his = "their" + var/him = "them" + var/has = "have" + var/is = "are" + var/does = "do" + var/himself = "themselves" + var/s = "" + var/hes = "they're" /datum/gender/male - key = "male" + key = "male" - He = "He" - he = "he" - His = "His" - his = "his" - him = "him" - has = "has" - is = "is" - does = "does" - himself = "himself" - s = "s" - hes = "he's" + He = "He" + he = "he" + His = "His" + his = "his" + him = "him" + has = "has" + is = "is" + does = "does" + himself = "himself" + s = "s" + hes = "he's" /datum/gender/female - key = "female" + key = "female" - He = "She" - he = "she" - His = "Her" - his = "her" - him = "her" - has = "has" - is = "is" - does = "does" - himself = "herself" - s = "s" - hes = "she's" + He = "She" + he = "she" + His = "Her" + his = "her" + him = "her" + has = "has" + is = "is" + does = "does" + himself = "herself" + s = "s" + hes = "she's" /datum/gender/neuter - key = "neuter" + key = "neuter" - He = "It" - he = "it" - His = "Its" - his = "its" - him = "it" - has = "has" - is = "is" - does = "does" - himself = "itself" - s = "s" - hes = "it's" + He = "It" + he = "it" + His = "Its" + his = "its" + him = "it" + has = "has" + is = "is" + does = "does" + himself = "itself" + s = "s" + hes = "it's" + +/datum/gender/herm + key = "herm" + + He = "Shi" + he = "shi" + His = "Hir" + his = "hir" + him = "hir" + has = "has" + is = "is" + does = "does" + himself = "hirself" + s = "s" + hes = "shi's" diff --git a/code/modules/mob/gender_vr.dm b/code/modules/mob/gender_vr.dm deleted file mode 100644 index 8312458d088..00000000000 --- a/code/modules/mob/gender_vr.dm +++ /dev/null @@ -1,14 +0,0 @@ -/datum/gender/herm - key = "herm" - - He = "Shi" - he = "shi" - His = "Hir" - his = "hir" - him = "hir" - has = "has" - is = "is" - does = "does" - himself = "hirself" - s = "s" - hes = "shi's" \ No newline at end of file diff --git a/code/modules/overmap/overmap_object.dm b/code/modules/overmap/overmap_object.dm index bbdbc66c32d..507a496b248 100644 --- a/code/modules/overmap/overmap_object.dm +++ b/code/modules/overmap/overmap_object.dm @@ -40,3 +40,6 @@ SSskybox.rebuild_skyboxes(other.map_z) for(var/obj/effect/overmap/visitable/O in loc) SSskybox.rebuild_skyboxes(O.map_z) + +/obj/effect/overmap/update_icon() + filters = filter(type="drop_shadow", color = color + "F0", size = 2, offset = 1,x = 0, y = 0) diff --git a/maps/endeavor/submaps/odin5a-desert/odin5a-beach.dmm b/maps/endeavor/submaps/odin5a-desert/odin5a-beach.dmm index c7e9c98f511..8f6d72b31a8 100644 --- a/maps/endeavor/submaps/odin5a-desert/odin5a-beach.dmm +++ b/maps/endeavor/submaps/odin5a-desert/odin5a-beach.dmm @@ -139,7 +139,6 @@ /turf/simulated/floor/beach/coastwater/odin5a, /area/endeavor_away/beach/water) "D" = ( -/obj/shuttle_connector/beach, /turf/simulated/floor/beach/sand/odin5a, /area/endeavor_away/beach/coast) "E" = ( diff --git a/maps/endeavor/submaps/odin5a-desert/odin5a.dm b/maps/endeavor/submaps/odin5a-desert/odin5a.dm index e236401db30..3f655ae0342 100644 --- a/maps/endeavor/submaps/odin5a-desert/odin5a.dm +++ b/maps/endeavor/submaps/odin5a-desert/odin5a.dm @@ -60,14 +60,6 @@ // -- Objs -- // -//This is a special type of object which will build our shuttle paths, only if this map loads -//You do need to place this object on the map somewhere. -/obj/shuttle_connector/beach - name = "shuttle connector - beach" - shuttle_name = "Excursion Shuttle" - //This list needs to be in the correct order, and start with the one that connects to the rest of the shuttle 'network' - destinations = list(/datum/shuttle_destination/excursion/odin5a_orbit, /datum/shuttle_destination/excursion/beach) - //This object simply performs any map setup that needs to happen on our map if it loads. //As with the above, you do need to place this object on the map somewhere. /obj/away_mission_init/beachcave diff --git a/maps/nsv_triumph/submaps/gateway/carpfarm.dm b/maps/nsv_triumph/submaps/gateway/carpfarm.dm index a8210035a85..5fdf09f55de 100644 --- a/maps/nsv_triumph/submaps/gateway/carpfarm.dm +++ b/maps/nsv_triumph/submaps/gateway/carpfarm.dm @@ -1,9 +1,11 @@ /obj/effect/overmap/visitable/sector/carpfarm - name = "Unknown Facility" - desc = "Seems to be a carp farm of some sort." + scanner_name = "Carp-Infested Outpost" + scanner_desc = @{"[i]Registration[/i]: UNKNOWN +[i]Class[/i]: Installation +[i]Transponder[/i]: None Detected +[b]Notice[/b]: Many spaceborne lifesigns detected"} icon_state = "object" - known = FALSE - initial_generic_waypoints = list("triumph_excursion_carpfarm") + initial_generic_waypoints = list("tether_excursion_carpfarm") /area/awaymission/carpfarm icon_state = "blank" diff --git a/maps/nsv_triumph/submaps/gateway/listeningpost.dm b/maps/nsv_triumph/submaps/gateway/listeningpost.dm index 14a9a5d0b34..9110013d4ce 100644 --- a/maps/nsv_triumph/submaps/gateway/listeningpost.dm +++ b/maps/nsv_triumph/submaps/gateway/listeningpost.dm @@ -1,9 +1,11 @@ /obj/effect/overmap/visitable/sector/listeningpost - name = "Unknown Facility" - desc = "High levels of radio frequency emissions." + scanner_name = "Strange Asteroid" + scanner_desc = @{"[i]Registration[/i]: UNKNOWN +[i]Class[/i]: Installation +[i]Transponder[/i]: None Detected +[b]Notice[/b]: Emitting encrypted radio-frequency traffic"} icon_state = "object" - known = FALSE - initial_generic_waypoints = list("triumph_excursion_listeningpost") + initial_generic_waypoints = list("tether_excursion_listeningpost") /obj/item/paper/listneningpost/mission name = "\improper Operation: Watchtower" diff --git a/maps/nsv_triumph/submaps/gateway/snowfield.dm b/maps/nsv_triumph/submaps/gateway/snowfield.dm index ef615c88229..3cc7cd9c8f9 100644 --- a/maps/nsv_triumph/submaps/gateway/snowfield.dm +++ b/maps/nsv_triumph/submaps/gateway/snowfield.dm @@ -1,9 +1,11 @@ /obj/effect/overmap/visitable/sector/snowfield - name = "Unknown Facility" - desc = "Wet, boring, and cold." + scanner_name = "Snowy Field" + scanner_desc = @{"[i]Stellar Body[/i]: UNKNOWN +[i]Class[/i]: M-Class Planetoid +[i]Habitability[/i]: Moderate (Low Temperature) +[b]Notice[/b]: Very cold atmosphere, minimal life signs detected"} icon_state = "globe" - known = FALSE - initial_generic_waypoints = list("triumph_excursion_snowfield") + initial_generic_waypoints = list("tether_excursion_snowfield") // -- Areas -- // diff --git a/maps/nsv_triumph/submaps/poi_d/Class-D.dmm b/maps/nsv_triumph/submaps/poi_d/Class-D.dmm index 4dd285b5b7c..271119abd4b 100644 --- a/maps/nsv_triumph/submaps/poi_d/Class-D.dmm +++ b/maps/nsv_triumph/submaps/poi_d/Class-D.dmm @@ -9,8 +9,7 @@ "A" = (/obj/triumph_away_spawner/D/alien_easy,/turf/simulated/mineral/floor/vacuum,/area/triumph_away/poi_d/unexplored) "E" = (/turf/simulated/mineral/floor/vacuum,/area/triumph_away/poi_d/explored) "H" = (/turf/simulated/mineral/vacuum,/area/triumph_away/poi_d/explored) -"I" = (/obj/shuttle_connector/poi_d,/turf/simulated/mineral/floor/vacuum,/area/triumph_away/poi_d/explored) -"J" = (/turf/simulated/mineral/floor/vacuum,/area/shuttle/excursion/poi_d) +"J" = (/obj/effect/shuttle_landmark{base_area = /area/triumph_away/poi_d/unexplored; base_turf = /turf/simulated/mineral/floor/vacuum; docking_controller = null; landmark_tag = "poid_main"; name = "Uknown Planet"},/turf/simulated/mineral/floor/vacuum,/area/triumph_away/poi_d/explored) "K" = (/turf/simulated/mineral,/area/triumph_away/poi_d/unexplored) "N" = (/obj/triumph_away_spawner/D/drone_spawner,/turf/simulated/mineral/floor/vacuum,/area/triumph_away/poi_d/unexplored) "R" = (/turf/simulated/mineral/floor/vacuum,/area/triumph_away/poi_d/unexplored) @@ -136,18 +135,18 @@ ccZZZZZZZRRRZZZZZZZZZZZZZZRRRZZZZZZZZZZZZZZRRRRRRHHHHHHEEEEEEEEEEEEEEEEEEEHHEHHH ccZZZZZZZRRRZZZZZZZZZZZZZZZRRZZZZZZZZZZZZZRRRRRZZHHHHHHEEEEEEEEEEEEEEEEEEEEEEHHHHHZZZRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRZZZZZcc ccZZZZZZZRRRZZZZZZZZZZZZZZZRRRZZZZZZZZZZZRRRRZZZZHHHHHEEEEEEEEEEEEEEEEEEEEEEEEEHHHRZZRRRRZZZRRRRfRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRZZZZZcc ccZZZZZZZZRRRZZZZZZZZZZZZZZZRRRZZZZZZZZZRRRZZZZZZHHHEEEEEEEEEEEEEEEEEEEEEEEEEEEHHHZZZRRRRRZZRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRZZRRRZZZZZZcc -ccZZZZZZZZRRRRZZZZZZZZZZZZZZZRRZZZZZRRRRRRZZZZZZZHHHEEEEEEEEEEJJJJJJJJJJJJJJEEEHHEZRZZRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRZZZZZZcc -ccZZZZZZZZZRRRRZZZZZZZZZZZZRRRRRRRRARRRRRRZZZZZZZHHHEEEEEEEEEEJJJJJJJJJJJJJJEEEHHERZZZRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRZZZZZZZcc -ccZZZZZZZZZRRRRRZZZZZZZRRRRRRRRRRRRRZZZZRRZZZZZZZHHEEEEEEEEEEEJJJJJJJJJJJJJJEEEHHERZRZZRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRZZZZZZZZcc -ccZZZZZZZZZZRRRRRRRRRRRRRRRRRRRRZZZZZZZZRRZZZZZZZHHHEEEEEEEEEJJJJJJJJJJJJJJJEEEHHERZZZRRRRRRRRRRRRZRRRRRRRRRRRRRRRRRRZZZRRRRRRRRRRZZZZZZZZcc -ccZZZZZZZZZZZRRARRRRRRRRRRRRZZZZZZZZZZZZZRRZZZZZZHHHEEJJJJJJJJJJJJJJJJJJEEEEEEEHHHZRZZZRRRRRRRRRRRZZRRRRRRRRZZRRRRRRZZRRRRfRZRRRRZZZZZZZZZcc -ccZZZZZZZZZZZRRRRZZRZZZRZZZZZZZZZZZZZZZZZRRRRZZZZHHEEEJJJJJJJJJJJJJJJJJJEEEEEkEHHHZZZRZZRRRRRRRRRRRRZZRRRRRRZZZRRRRRRRRRRRRRRRRRZZZZZZZZZZcc -ccZZZZZZZZZZZZRRRZZZZZZZZZZZZZZZZZZZZZZZZRRRRZZZZHHHEEJJJJJJJJJJJJJJJJJJJJJJEEEHHHZZRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRZZZZZZZZZZZcc -ccZZZZZZZZZZZZRRRZZZZZZZZZZZZZZZZZZZZZZZZZRRRZZZZHHHEEJJJJJJJJJJJJJJJJJJJJJJEEEHHHZZZRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRZZZZZZZZZZZZcc -ccZZZZZZZZZZZZZRRRZZZZZZZZZZZZZZZZZZZZZZZZZRRZZZZHHHEEJJJJJJJJJJJJJJJJJJJJJJEEEHHHZZZRRRRRRRRZRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRZZZZZZZZZZZZZZcc -ccZZZZZZZZZZZZZRRRRRZZZZZZZZZZZZZZZZZZZZZZZRRZZZZHHHEEJJJJJJJJJJJJJJJJJJJJJJEEEHHHZZZRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRZRRRRZZZZZZZZZZZZZZZcc +ccZZZZZZZZRRRRZZZZZZZZZZZZZZZRRZZZZZRRRRRRZZZZZZZHHHEEEEEEEEEEEEEEEEEEEEEEEEEEEHHEZRZZRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRZZZZZZcc +ccZZZZZZZZZRRRRZZZZZZZZZZZZRRRRRRRRARRRRRRZZZZZZZHHHEEEEEEEEEEEEEEEEEEEEEEEEEEEHHERZZZRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRZZZZZZZcc +ccZZZZZZZZZRRRRRZZZZZZZRRRRRRRRRRRRRZZZZRRZZZZZZZHHEEEEEEEEEEEEEEEEJEEEEEEEEEEEHHERZRZZRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRZZZZZZZZcc +ccZZZZZZZZZZRRRRRRRRRRRRRRRRRRRRZZZZZZZZRRZZZZZZZHHHEEEEEEEEEEEEEEEEEEEEEEEEEEEHHERZZZRRRRRRRRRRRRZRRRRRRRRRRRRRRRRRRZZZRRRRRRRRRRZZZZZZZZcc +ccZZZZZZZZZZZRRARRRRRRRRRRRRZZZZZZZZZZZZZRRZZZZZZHHHEEEEEEEEEEEEEEEEEEEEEEEEEEEHHHZRZZZRRRRRRRRRRRZZRRRRRRRRZZRRRRRRZZRRRRfRZRRRRZZZZZZZZZcc +ccZZZZZZZZZZZRRRRZZRZZZRZZZZZZZZZZZZZZZZZRRRRZZZZHHEEEEEEEEEEEEEEEEEEEEEEEEEEkEHHHZZZRZZRRRRRRRRRRRRZZRRRRRRZZZRRRRRRRRRRRRRRRRRZZZZZZZZZZcc +ccZZZZZZZZZZZZRRRZZZZZZZZZZZZZZZZZZZZZZZZRRRRZZZZHHHEEEEEEEEEEEEEEEEEEEEEEEEEEEHHHZZRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRZZZZZZZZZZZcc +ccZZZZZZZZZZZZRRRZZZZZZZZZZZZZZZZZZZZZZZZZRRRZZZZHHHEEEEEEEEEEEEEEEEEEEEEEEEEEEHHHZZZRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRZZZZZZZZZZZZcc +ccZZZZZZZZZZZZZRRRZZZZZZZZZZZZZZZZZZZZZZZZZRRZZZZHHHEEEEEEEEEEEEEEEEEEEEEEEEEEEHHHZZZRRRRRRRRZRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRZZZZZZZZZZZZZZcc +ccZZZZZZZZZZZZZRRRRRZZZZZZZZZZZZZZZZZZZZZZZRRZZZZHHHEEEEEEEEEEEEEEEEEEEEEEEEEEEHHHZZZRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRZRRRRZZZZZZZZZZZZZZZcc ccZZZZZZZZZZZZZZRRRRZZZZZZZZZZZZZZZZZZZZZZZZRZZZZHHHEEEEEEEEEEEEEEEEEEEEEEEEEEHHHHZRRRZZZZRRRRRRRRRRZRRRRRRRRRRRRRRRRRRRRRZZZZZZZZZZZZZZZZcc -ccZZZZZZZZZZZZZZZRRRRRRRZZZZZZZZZZZZZZZZZZZZRRZZZHHHHEEEEEIEEEEEEEEEEEEEEEEEEEHHHHZRRRZZZZZRRRRRRRRRZRRRRRRRRRRRRZRRRRRRRZZZZZZZZZZZZZZZZZcc +ccZZZZZZZZZZZZZZZRRRRRRRZZZZZZZZZZZZZZZZZZZZRRZZZHHHHEEEEEEEEEEEEEEEEEEEEEEEEEHHHHZRRRZZZZZRRRRRRRRRZRRRRRRRRRRRRZRRRRRRRZZZZZZZZZZZZZZZZZcc ccZZZZZZZZZZZZZZZZRRRRRRRRRRRRRRRZZZZZZZZZZZRRRZZHHHHEEEEEEEEEEEEEEEEEEEEEEEEEHHHHRRRRZZZZZZZRRRRRRRRRRRRRZZRRRRRRRRRRRZZZZZZZZZZZZZZZZZZZcc ccZZZZZZZZZZZZZZZZZZZRRRRRRRRRRRRRRZZZZZZZZZRRRRZHHHHHHHEEEEEEEEEEEEEEEEHEEEEHHHEERRZZZZZZZZZZZZRRRRRRRRRRRRRRRRRRRRRRZZZZZZZZZZZZZZZZZZZZcc ccZZZZZZZZZZZZZZZZZZZZZZZZZRRRRRRRRRRRRRRRRRRRRRREHHHHHHHHEEEEEEEEEEEEEEHHHHHHHEEERZZZZZZZZZZZZZZZRRRRRRRRRNRRRRRRRRZZZZZZZZZZZZZZZZZZZZZZcc diff --git a/maps/nsv_triumph/submaps/rogue_mines/rogue_mine1.dmm b/maps/nsv_triumph/submaps/rogue_mines/rogue_mine1.dmm index 5fac5837732..a65fb8c1663 100644 --- a/maps/nsv_triumph/submaps/rogue_mines/rogue_mine1.dmm +++ b/maps/nsv_triumph/submaps/rogue_mines/rogue_mine1.dmm @@ -7,8 +7,14 @@ /turf/space, /area/asteroid/rogue/zone1) "c" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/asteroid/rogue/zone1; + base_turf = /turf/space; + landmark_tag = "belter_zone1"; + name = "Belter Shuttle - Zone 1" + }, /turf/space, -/area/shuttle/belter/belt/zone1) +/area/asteroid/rogue/zone1) "d" = ( /obj/effect/step_trigger/teleporter/roguemine_loop/west, /turf/space, @@ -9469,11 +9475,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -9611,11 +9617,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -9753,11 +9759,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -9895,11 +9901,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10037,11 +10043,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10179,11 +10185,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10321,11 +10327,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10463,11 +10469,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10605,11 +10611,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10748,9 +10754,9 @@ a a a a -c -c -c +a +a +a a a a @@ -11034,7 +11040,7 @@ a a a a -a +c a a a diff --git a/maps/nsv_triumph/submaps/rogue_mines/rogue_mine2.dmm b/maps/nsv_triumph/submaps/rogue_mines/rogue_mine2.dmm index 7bd81b8a28b..4866869ea2a 100644 --- a/maps/nsv_triumph/submaps/rogue_mines/rogue_mine2.dmm +++ b/maps/nsv_triumph/submaps/rogue_mines/rogue_mine2.dmm @@ -7,8 +7,14 @@ /turf/space, /area/asteroid/rogue/zone2) "c" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/asteroid/rogue/zone2; + base_turf = /turf/space; + landmark_tag = "belter_zone2"; + name = "Belter Shuttle - Zone 2" + }, /turf/space, -/area/shuttle/belter/belt/zone2) +/area/asteroid/rogue/zone2) "d" = ( /obj/effect/step_trigger/teleporter/roguemine_loop/west, /turf/space, @@ -9469,11 +9475,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -9611,11 +9617,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -9753,11 +9759,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -9895,11 +9901,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10037,11 +10043,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10179,11 +10185,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10321,11 +10327,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10463,11 +10469,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10605,11 +10611,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10748,9 +10754,9 @@ a a a a -c -c -c +a +a +a a a a @@ -11034,7 +11040,7 @@ a a a a -a +c a a a diff --git a/maps/nsv_triumph/submaps/rogue_mines/rogue_mine3.dmm b/maps/nsv_triumph/submaps/rogue_mines/rogue_mine3.dmm index 0032a1ba995..7f8a5eecf5d 100644 --- a/maps/nsv_triumph/submaps/rogue_mines/rogue_mine3.dmm +++ b/maps/nsv_triumph/submaps/rogue_mines/rogue_mine3.dmm @@ -7,8 +7,14 @@ /turf/space, /area/asteroid/rogue/zone3) "c" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/asteroid/rogue/zone3; + base_turf = /turf/space; + landmark_tag = "belter_zone3"; + name = "Belter Shuttle - Zone 3" + }, /turf/space, -/area/shuttle/belter/belt/zone3) +/area/asteroid/rogue/zone3) "d" = ( /obj/effect/step_trigger/teleporter/roguemine_loop/west, /turf/space, @@ -9469,11 +9475,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -9611,11 +9617,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -9753,11 +9759,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -9895,11 +9901,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10037,11 +10043,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10179,11 +10185,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10321,11 +10327,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10463,11 +10469,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10605,11 +10611,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10748,9 +10754,9 @@ a a a a -c -c -c +a +a +a a a a @@ -11034,7 +11040,7 @@ a a a a -a +c a a a diff --git a/maps/nsv_triumph/submaps/rogue_mines/rogue_mine4.dmm b/maps/nsv_triumph/submaps/rogue_mines/rogue_mine4.dmm index 4a37a540abd..17b9d921e39 100644 --- a/maps/nsv_triumph/submaps/rogue_mines/rogue_mine4.dmm +++ b/maps/nsv_triumph/submaps/rogue_mines/rogue_mine4.dmm @@ -7,8 +7,14 @@ /turf/space, /area/asteroid/rogue/zone4) "c" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/asteroid/rogue/zone4; + base_turf = /turf/space; + landmark_tag = "belter_zone4"; + name = "Belter Shuttle - Zone 4" + }, /turf/space, -/area/shuttle/belter/belt/zone4) +/area/asteroid/rogue/zone4) "d" = ( /obj/effect/step_trigger/teleporter/roguemine_loop/west, /turf/space, @@ -9469,11 +9475,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -9611,11 +9617,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -9753,11 +9759,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -9895,11 +9901,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10037,11 +10043,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10179,11 +10185,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10321,11 +10327,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10463,11 +10469,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10605,11 +10611,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10748,9 +10754,9 @@ a a a a -c -c -c +a +a +a a a a @@ -11034,7 +11040,7 @@ a a a a -a +c a a a diff --git a/maps/nsv_triumph/submaps/space/debrisfield.dmm b/maps/nsv_triumph/submaps/space/debrisfield.dmm index 25ca0dc71ae..22a30abf086 100644 --- a/maps/nsv_triumph/submaps/space/debrisfield.dmm +++ b/maps/nsv_triumph/submaps/space/debrisfield.dmm @@ -9,7 +9,6 @@ /turf/space, /area/shuttle/excursion/debrisfield) "W" = ( -/obj/shuttle_connector/debrisfield, /turf/space, /area/triumph_away/debrisfield/explored) "X" = ( diff --git a/maps/nsv_triumph/submaps/triumph_misc.dmm b/maps/nsv_triumph/submaps/triumph_misc.dmm index d21abddf78d..c7c9eb99b54 100644 --- a/maps/nsv_triumph/submaps/triumph_misc.dmm +++ b/maps/nsv_triumph/submaps/triumph_misc.dmm @@ -7,14 +7,14 @@ /turf/simulated/shuttle/plating/airless/carry{ dir = 1 }, -/area/supply/dock) +/area/shuttle/supply) "ab" = ( /obj/structure/shuttle/engine/propulsion, /turf/space, /turf/simulated/shuttle/plating/airless/carry{ dir = 1 }, -/area/supply/dock) +/area/shuttle/supply) "ac" = ( /obj/structure/shuttle/engine/propulsion{ icon_state = "burst_r" @@ -23,7 +23,7 @@ /turf/simulated/shuttle/plating/airless/carry{ dir = 1 }, -/area/supply/dock) +/area/shuttle/supply) "aj" = ( /turf/space, /turf/space, @@ -145,7 +145,7 @@ /area/space) "bc" = ( /turf/simulated/shuttle/wall, -/area/supply/dock) +/area/shuttle/supply) "bd" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/holofloor/desert, @@ -191,7 +191,7 @@ /area/holodeck/source_emptycourt) "bn" = ( /turf/simulated/shuttle/floor, -/area/supply/dock) +/area/shuttle/supply) "bo" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood/corner, @@ -274,13 +274,13 @@ dir = 8 }, /turf/simulated/shuttle/floor, -/area/supply/dock) +/area/shuttle/supply) "bz" = ( /obj/machinery/light{ dir = 4 }, /turf/simulated/shuttle/floor, -/area/supply/dock) +/area/shuttle/supply) "bA" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood, @@ -427,14 +427,14 @@ id = "QMLoad2" }, /turf/simulated/shuttle/plating, -/area/supply/dock) +/area/shuttle/supply) "bR" = ( /obj/machinery/conveyor{ dir = 4; id = "QMLoad2" }, /turf/simulated/shuttle/floor, -/area/supply/dock) +/area/shuttle/supply) "bS" = ( /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/desert, @@ -552,7 +552,7 @@ name = "Shuttle Hatch" }, /turf/simulated/shuttle/floor, -/area/supply/dock) +/area/shuttle/supply) "ct" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -613,7 +613,7 @@ tag_door = "supply_shuttle_hatch" }, /turf/simulated/shuttle/floor, -/area/supply/dock) +/area/shuttle/supply) "cP" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood{ @@ -716,14 +716,7 @@ id = "QMLoad" }, /turf/simulated/shuttle/plating, -/area/supply/dock) -"di" = ( -/obj/machinery/conveyor{ - dir = 4; - id = "QMLoad" - }, -/turf/simulated/shuttle/floor, -/area/supply/dock) +/area/shuttle/supply) "dj" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -883,7 +876,7 @@ dir = 1 }, /turf/simulated/floor/airless, -/area/supply/dock) +/area/shuttle/supply) "dF" = ( /turf/simulated/floor/holofloor/space, /area/holodeck/source_space) @@ -1754,16 +1747,29 @@ }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/holodorm/source_boxing) +"mD" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "QMLoad" + }, +/turf/simulated/shuttle/floor, +/area/shuttle/supply) "oP" = ( /turf/space/transit/east, -/area/centcom/ferry) +/area/space) "oT" = ( /obj/effect/step_trigger/lost_in_space, /turf/space/transit/east, -/area/centcom/ferry) +/area/space) "oW" = ( +/obj/effect/shuttle_landmark/transit{ + base_area = /area/space; + base_turf = /turf/space/transit/east; + landmark_tag = "escape_transit"; + name = "Escape Shuttle Transit" + }, /turf/space/transit/east, -/area/shuttle/escape/transit) +/area/space) "uc" = ( /turf/unsimulated/wall, /area/centcom/suppy) @@ -1792,6 +1798,24 @@ icon_state = "dark" }, /area/centcom/suppy) +"zT" = ( +/obj/effect/step_trigger/teleporter/random, +/obj/effect/step_trigger/teleporter/random, +/turf/space, +/area/space) +"Bb" = ( +/obj/structure/shuttle/engine/propulsion, +/obj/effect/shuttle_landmark{ + base_area = /area/space; + base_turf = /turf/space; + landmark_tag = "supply_cc"; + name = "Centcom Supply Depot" + }, +/turf/space, +/turf/simulated/shuttle/plating/airless/carry{ + dir = 1 + }, +/area/shuttle/supply) "Fb" = ( /turf/unsimulated/map/edge, /area/overmap) @@ -1943,34 +1967,34 @@ Fb "} (2,1,1) = {" ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +zT +aq +aq ap ap ap @@ -2085,7 +2109,7 @@ Fb "} (3,1,1) = {" ap -ap +aq oP oP oP @@ -2112,7 +2136,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -2227,7 +2251,7 @@ Fb "} (4,1,1) = {" ap -ap +aq oP oP oP @@ -2254,7 +2278,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -2369,7 +2393,7 @@ Fb "} (5,1,1) = {" ap -ap +aq oP oP oP @@ -2396,7 +2420,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -2511,7 +2535,7 @@ Fb "} (6,1,1) = {" ap -ap +aq oP oP oP @@ -2538,7 +2562,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -2653,7 +2677,7 @@ Fb "} (7,1,1) = {" ap -ap +aq oP oP oP @@ -2680,7 +2704,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -2795,7 +2819,7 @@ Fb "} (8,1,1) = {" ap -ap +aq oP oP oP @@ -2822,7 +2846,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -2937,7 +2961,7 @@ Fb "} (9,1,1) = {" ap -ap +aq oP oP oP @@ -2964,7 +2988,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -3079,7 +3103,7 @@ Fb "} (10,1,1) = {" ap -ap +aq oP oP oP @@ -3090,13 +3114,13 @@ oP oP oP oT -oW -oW -oW -oW -oW -oW -oW +oP +oP +oP +oP +oP +oP +oP oT oP oP @@ -3106,7 +3130,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -3221,7 +3245,7 @@ Fb "} (11,1,1) = {" ap -ap +aq oP oP oP @@ -3232,13 +3256,13 @@ oP oP oP oT -oW -oW -oW -oW -oW -oW -oW +oP +oP +oP +oP +oP +oP +oP oT oP oP @@ -3248,7 +3272,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -3363,7 +3387,7 @@ Fb "} (12,1,1) = {" ap -ap +aq oP oP oP @@ -3374,13 +3398,13 @@ oP oT oT oT -oW -oW -oW -oW -oW -oW -oW +oP +oP +oP +oP +oP +oP +oP oT oT oT @@ -3390,7 +3414,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -3505,7 +3529,7 @@ Fb "} (13,1,1) = {" ap -ap +aq oP oP oP @@ -3514,17 +3538,17 @@ oP oP oP oT -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP oT oP oP @@ -3532,7 +3556,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -3647,7 +3671,7 @@ Fb "} (14,1,1) = {" ap -ap +aq oP oP oP @@ -3656,17 +3680,17 @@ oP oP oP oT -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP oT oP oP @@ -3674,7 +3698,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -3789,7 +3813,7 @@ Fb "} (15,1,1) = {" ap -ap +aq oP oP oP @@ -3798,17 +3822,17 @@ oP oP oP oT -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP oT oP oP @@ -3816,7 +3840,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -3931,7 +3955,7 @@ Fb "} (16,1,1) = {" ap -ap +aq oP oP oP @@ -3940,17 +3964,17 @@ oP oP oP oT -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP oT oP oP @@ -3958,7 +3982,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -4073,7 +4097,7 @@ Fb "} (17,1,1) = {" ap -ap +aq oP oP oP @@ -4082,17 +4106,17 @@ oP oP oP oT -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP oT oP oP @@ -4100,7 +4124,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -4215,7 +4239,7 @@ Fb "} (18,1,1) = {" ap -ap +aq oP oP oP @@ -4224,17 +4248,17 @@ oP oP oP oT -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP oT oP oP @@ -4242,7 +4266,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -4357,7 +4381,7 @@ Fb "} (19,1,1) = {" ap -ap +aq oP oP oP @@ -4366,17 +4390,17 @@ oP oP oP oT -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP oT oP oP @@ -4384,7 +4408,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -4499,7 +4523,7 @@ Fb "} (20,1,1) = {" ap -ap +aq oP oP oP @@ -4508,17 +4532,17 @@ oP oP oP oT -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP oT oP oP @@ -4526,7 +4550,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -4641,7 +4665,7 @@ Fb "} (21,1,1) = {" ap -ap +aq oP oP oP @@ -4650,17 +4674,17 @@ oP oP oP oT -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP oT oP oP @@ -4668,7 +4692,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -4783,7 +4807,7 @@ Fb "} (22,1,1) = {" ap -ap +aq oP oP oP @@ -4792,17 +4816,17 @@ oP oP oP oT -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP oT oP oP @@ -4810,7 +4834,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -4925,7 +4949,7 @@ Fb "} (23,1,1) = {" ap -ap +aq oP oP oP @@ -4934,17 +4958,17 @@ oP oP oP oT -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP oT oP oP @@ -4952,7 +4976,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -5067,7 +5091,7 @@ Fb "} (24,1,1) = {" ap -ap +aq oP oP oP @@ -5076,17 +5100,17 @@ oP oP oP oT -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP oT oP oP @@ -5094,7 +5118,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -5209,7 +5233,7 @@ Fb "} (25,1,1) = {" ap -ap +aq oP oP oP @@ -5218,17 +5242,17 @@ oP oP oP oT -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP oT oP oP @@ -5236,7 +5260,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -5351,7 +5375,7 @@ Fb "} (26,1,1) = {" ap -ap +aq oP oP oP @@ -5360,17 +5384,17 @@ oP oP oP oT -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP oT oP oP @@ -5378,7 +5402,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -5493,7 +5517,7 @@ Fb "} (27,1,1) = {" ap -ap +aq oP oP oP @@ -5502,17 +5526,17 @@ oP oP oP oT -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP oT oP oP @@ -5520,7 +5544,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -5635,7 +5659,7 @@ Fb "} (28,1,1) = {" ap -ap +aq oP oP oP @@ -5644,17 +5668,17 @@ oP oP oP oT -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP oT oP oP @@ -5662,7 +5686,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -5777,7 +5801,7 @@ Fb "} (29,1,1) = {" ap -ap +aq oP oP oP @@ -5786,17 +5810,17 @@ oP oP oP oT -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP oT oP oP @@ -5804,7 +5828,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -5919,7 +5943,7 @@ Fb "} (30,1,1) = {" ap -ap +aq oP oP oP @@ -5928,17 +5952,17 @@ oP oP oP oT -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP oT oP oP @@ -5946,7 +5970,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -6061,7 +6085,7 @@ Fb "} (31,1,1) = {" ap -ap +aq oP oP oP @@ -6070,17 +6094,17 @@ oP oP oP oT -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW -oW +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP +oP oT oP oP @@ -6088,7 +6112,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -6203,7 +6227,7 @@ Fb "} (32,1,1) = {" ap -ap +aq oP oP oP @@ -6214,13 +6238,13 @@ oP oT oT oT +oP +oP +oP oW -oW -oW -oW -oW -oW -oW +oP +oP +oP oT oT oT @@ -6230,7 +6254,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -6345,7 +6369,7 @@ Fb "} (33,1,1) = {" ap -ap +aq oP oP oP @@ -6372,7 +6396,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -6487,7 +6511,7 @@ Fb "} (34,1,1) = {" ap -ap +aq oP oP oP @@ -6514,7 +6538,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -6629,7 +6653,7 @@ Fb "} (35,1,1) = {" ap -ap +aq oP oP oP @@ -6656,7 +6680,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -6771,7 +6795,7 @@ Fb "} (36,1,1) = {" ap -ap +aq oP oP oP @@ -6798,7 +6822,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -6913,7 +6937,7 @@ Fb "} (37,1,1) = {" ap -ap +aq oP oP oP @@ -6940,7 +6964,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -7055,7 +7079,7 @@ Fb "} (38,1,1) = {" ap -ap +aq oP oP oP @@ -7082,7 +7106,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -7197,7 +7221,7 @@ Fb "} (39,1,1) = {" ap -ap +aq oP oP oP @@ -7224,7 +7248,7 @@ oP oP oP oP -ap +aq ap ap ap @@ -7339,34 +7363,34 @@ Fb "} (40,1,1) = {" ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +zT +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq +aq ap ap ap @@ -9619,7 +9643,7 @@ bR bn cO bn -di +mD by bc bc @@ -9761,7 +9785,7 @@ bR bn bn bn -di +mD bn bn dE @@ -9903,11 +9927,11 @@ bR bn bn bn -di +mD bn bn dE -ab +Bb ap aq ap diff --git a/maps/nsv_triumph/submaps/triumph_ships.dmm b/maps/nsv_triumph/submaps/triumph_ships.dmm index a6a5c748f5a..075a60e2652 100644 --- a/maps/nsv_triumph/submaps/triumph_ships.dmm +++ b/maps/nsv_triumph/submaps/triumph_ships.dmm @@ -359,11 +359,23 @@ /turf/space/transit/east, /area/space) "hG" = ( +/obj/effect/shuttle_landmark/transit{ + base_area = /area/space; + base_turf = /turf/space/transit/east; + landmark_tag = "belter_transit"; + name = "Belter Transit" + }, /turf/space/transit/east, -/area/shuttle/belter/transit) +/area/space) "ij" = ( +/obj/effect/shuttle_landmark/transit{ + base_area = /area/space; + base_turf = /turf/space/sandyscroll; + landmark_tag = "tether_excursion_transit_sand"; + name = "Excursion Sandy Transit" + }, /turf/space/sandyscroll, -/area/shuttle/excursion/sand_moving) +/area/space) "mL" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -385,20 +397,46 @@ /turf/space/sandyscroll, /area/space) "Fj" = ( +/obj/effect/shuttle_landmark/transit{ + base_area = /area/space; + base_turf = /turf/space; + docking_controller = null; + landmark_tag = "tether_excursion_transit_space"; + name = "Excursion Transit Space" + }, /turf/space/transit/east, -/area/shuttle/excursion/space_moving) +/area/space) "Gy" = ( +/obj/effect/shuttle_landmark/transit{ + base_area = /area/space; + base_turf = /turf/space; + docking_controller = null; + landmark_tag = "tether_excursion_space"; + name = "Excursion Space" + }, /turf/space, -/area/shuttle/excursion/space) +/area/space) "Kv" = ( /turf/space/sandyscroll, /area/space) "Mg" = ( +/obj/effect/shuttle_landmark/transit{ + base_area = /area/space; + base_turf = /turf/space/bluespace; + landmark_tag = "tether_excursion_bluespace"; + name = "Excursion Bluespace Transit" + }, /turf/space/bluespace, /area/space) "Mt" = ( +/obj/effect/shuttle_landmark/transit{ + base_area = /area/space; + base_turf = /turf/space/transit/east; + landmark_tag = "escapepod1_transit"; + name = "Escapepod 1 Transit" + }, /turf/space/transit/west, -/area/shuttle/large_escape_pod1/transit) +/area/space) "My" = ( /obj/effect/step_trigger/lost_in_space/shuttle, /turf/space/transit/east, @@ -409,7 +447,7 @@ /area/space) "Us" = ( /turf/space/bluespace, -/area/shuttle/excursion/bluespace) +/area/space) "UH" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -635,29 +673,29 @@ Kv Kv Kv dJ -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us dJ gT gT @@ -777,29 +815,29 @@ DW DW DW dJ -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us dJ My My @@ -919,29 +957,29 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us dJ My gT @@ -1061,29 +1099,29 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us dJ My gT @@ -1203,10 +1241,10 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb Pb Pb @@ -1223,9 +1261,9 @@ Pb Pb Pb Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -1345,29 +1383,29 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -1487,29 +1525,29 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -1616,12 +1654,12 @@ Kv Kv Kv Kv -ij -ij -ij -ij -ij -ij +Kv +Kv +Kv +Kv +Kv +Kv fo Kv Kv @@ -1629,29 +1667,29 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg -Mg -Mg -Mg -Mg Us Us Us Us Us Us -Mg -Mg +Us +Us +Us +Us +Us +Us +Us +Us Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -1664,12 +1702,12 @@ gT gT gT gT -Fj -Fj -Fj -Fj -Fj -Fj +gT +gT +gT +gT +gT +gT UH gT gT @@ -1758,12 +1796,12 @@ Kv Kv Kv Kv -ij -ij -ij -ij -ij -ij +Kv +Kv +Kv +Kv +Kv +Kv fo Kv Kv @@ -1771,29 +1809,29 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg -Mg -Mg -Mg -Mg Us Us Us Us Us Us -Mg -Mg +Us +Us +Us +Us +Us +Us +Us +Us Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -1806,12 +1844,12 @@ gT gT gT gT -Fj -Fj -Fj -Fj -Fj -Fj +gT +gT +gT +gT +gT +gT UH gT gT @@ -1830,12 +1868,12 @@ aa aa aa aa -Gy -Gy -Gy -Gy -Gy -Gy +aa +aa +aa +aa +aa +aa aa aa aa @@ -1900,12 +1938,12 @@ Kv Kv Kv Kv -ij -ij -ij -ij -ij -ij +Kv +Kv +Kv +Kv +Kv +Kv fo Kv Kv @@ -1913,29 +1951,29 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg -Mg -Mg -Mg -Mg Us Us Us Us Us Us -Mg -Mg +Us +Us +Us +Us +Us +Us +Us +Us Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -1948,12 +1986,12 @@ gT gT gT gT -Fj -Fj -Fj -Fj -Fj -Fj +gT +gT +gT +gT +gT +gT UH gT gT @@ -1972,12 +2010,12 @@ aa aa aa aa -Gy -Gy -Gy -Gy -Gy -Gy +aa +aa +aa +aa +aa +aa aa aa aa @@ -2042,12 +2080,12 @@ Kv Kv Kv Kv -ij -ij -ij -ij -ij -ij +Kv +Kv +Kv +Kv +Kv +Kv fo Kv Kv @@ -2055,29 +2093,29 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg -Mg -Mg -Mg -Mg Us Us Us Us Us Us -Mg -Mg +Us +Us +Us +Us +Us +Us +Us +Us Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -2090,12 +2128,12 @@ gT gT gT gT -Fj -Fj -Fj -Fj -Fj -Fj +gT +gT +gT +gT +gT +gT UH gT gT @@ -2114,12 +2152,12 @@ aa aa aa aa -Gy -Gy -Gy -Gy -Gy -Gy +aa +aa +aa +aa +aa +aa aa aa aa @@ -2184,12 +2222,12 @@ Kv Kv Kv Kv -ij -ij -ij -ij -ij -ij +Kv +Kv +Kv +Kv +Kv +Kv fo Kv Kv @@ -2197,29 +2235,29 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg -Mg -Mg -Mg -Mg Us Us Us Us Us Us -Mg -Mg +Us +Us +Us +Us +Us +Us +Us +Us Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -2232,12 +2270,12 @@ gT gT gT gT -Fj -Fj -Fj -Fj -Fj -Fj +gT +gT +gT +gT +gT +gT UH gT gT @@ -2256,12 +2294,12 @@ aa aa aa aa -Gy -Gy -Gy -Gy -Gy -Gy +aa +aa +aa +aa +aa +aa aa aa aa @@ -2326,12 +2364,12 @@ Kv Kv Kv Kv -ij -ij -ij -ij -ij -ij +Kv +Kv +Kv +Kv +Kv +Kv fo Kv Kv @@ -2339,29 +2377,29 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg -Mg -Mg -Mg -Mg Us Us Us Us Us Us -Mg -Mg +Us +Us +Us +Us +Us +Us +Us +Us Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -2374,12 +2412,12 @@ gT gT gT gT -Fj -Fj -Fj -Fj -Fj -Fj +gT +gT +gT +gT +gT +gT UH gT gT @@ -2398,12 +2436,12 @@ aa aa aa aa -Gy -Gy -Gy -Gy -Gy -Gy +aa +aa +aa +aa +aa +aa aa aa aa @@ -2468,12 +2506,12 @@ Kv Kv Kv Kv -ij -ij -ij -ij -ij -ij +Kv +Kv +Kv +Kv +Kv +Kv fo Kv Kv @@ -2481,29 +2519,29 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg -Mg -Mg -Mg -Mg Us Us Us Us Us Us -Mg -Mg +Us +Us +Us +Us +Us +Us +Us +Us Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -2516,12 +2554,12 @@ gT gT gT gT -Fj -Fj -Fj -Fj -Fj -Fj +gT +gT +gT +gT +gT +gT UH gT gT @@ -2540,12 +2578,12 @@ aa aa aa aa -Gy -Gy -Gy -Gy -Gy -Gy +aa +aa +aa +aa +aa +aa aa aa aa @@ -2609,13 +2647,13 @@ fo Kv Kv Kv -ij -ij -ij -ij -ij -ij -ij +Kv +Kv +Kv +Kv +Kv +Kv +Kv fo Kv Kv @@ -2623,16 +2661,11 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg -Mg -Mg -Mg Us Us Us @@ -2640,12 +2673,17 @@ Us Us Us Us -Mg -Mg +Us +Us +Us +Us +Us +Us +Us Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -2657,13 +2695,13 @@ UH gT gT gT -Fj -Fj -Fj -Fj -Fj -Fj -Fj +gT +gT +gT +gT +gT +gT +gT UH gT gT @@ -2682,12 +2720,12 @@ aa aa aa aa -Gy -Gy -Gy -Gy -Gy -Gy +aa +aa +aa +aa +aa +aa aa aa aa @@ -2748,16 +2786,16 @@ Kv Kv Kv fo -ij -ij -ij -ij -ij -ij -ij -ij -ij -ij +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv fo Kv Kv @@ -2765,13 +2803,11 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg Us Us Us @@ -2782,12 +2818,14 @@ Us Us Us Us -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -2796,16 +2834,16 @@ gT gT gT UH -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj +gT +gT +gT +gT +gT +gT +gT +gT +gT +gT UH gT gT @@ -2823,13 +2861,13 @@ aa aa aa aa -Gy -Gy -Gy -Gy -Gy -Gy -Gy +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -2890,16 +2928,16 @@ Kv Kv Kv fo -ij -ij -ij -ij -ij -ij -ij -ij -ij -ij +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv fo Kv Kv @@ -2907,13 +2945,11 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg Us Us Us @@ -2924,12 +2960,14 @@ Us Us Us Us -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -2938,16 +2976,16 @@ gT gT gT UH -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj +gT +gT +gT +gT +gT +gT +gT +gT +gT +gT UH gT gT @@ -2962,16 +3000,16 @@ aa aa aa aa -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -3032,16 +3070,16 @@ Kv Kv Kv fo -ij -ij -ij -ij -ij -ij -ij -ij -ij -ij +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv fo Kv Kv @@ -3049,13 +3087,11 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg Us Us Us @@ -3066,12 +3102,14 @@ Us Us Us Us -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -3080,16 +3118,16 @@ gT gT gT UH -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj +gT +gT +gT +gT +gT +gT +gT +gT +gT +gT UH gT gT @@ -3104,16 +3142,16 @@ aa aa aa aa -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -3174,16 +3212,16 @@ Kv Kv Kv fo -ij -ij -ij -ij -ij -ij -ij -ij -ij -ij +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv fo Kv Kv @@ -3191,13 +3229,11 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg Us Us Us @@ -3208,12 +3244,14 @@ Us Us Us Us -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -3222,16 +3260,16 @@ gT gT gT UH -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj +gT +gT +gT +gT +gT +gT +gT +gT +gT +gT UH gT gT @@ -3246,16 +3284,16 @@ aa aa aa aa -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -3316,16 +3354,16 @@ Kv Kv Kv fo +Kv ij -ij -ij -ij -ij -ij -ij -ij -ij -ij +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv fo Kv Kv @@ -3333,12 +3371,14 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg +Us +Us +Us Mg Us Us @@ -3350,12 +3390,10 @@ Us Us Us Us -Mg -Mg Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -3364,16 +3402,16 @@ gT gT gT UH +gT Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj +gT +gT +gT +gT +gT +gT +gT +gT UH gT gT @@ -3388,16 +3426,16 @@ aa aa aa aa -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -3458,16 +3496,16 @@ Kv Kv Kv fo -ij -ij -ij -ij -ij -ij -ij -ij -ij -ij +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv fo Kv Kv @@ -3475,13 +3513,11 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg Us Us Us @@ -3492,12 +3528,14 @@ Us Us Us Us -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -3506,16 +3544,16 @@ gT gT gT UH -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj +gT +gT +gT +gT +gT +gT +gT +gT +gT +gT UH gT gT @@ -3530,16 +3568,16 @@ aa aa aa aa +aa Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -3600,16 +3638,16 @@ Kv Kv Kv fo -ij -ij -ij -ij -ij -ij -ij -ij -ij -ij +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv fo Kv Kv @@ -3617,13 +3655,11 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg Us Us Us @@ -3634,12 +3670,14 @@ Us Us Us Us -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -3648,16 +3686,16 @@ gT gT gT UH -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj +gT +gT +gT +gT +gT +gT +gT +gT +gT +gT UH gT gT @@ -3672,16 +3710,16 @@ aa aa aa aa -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -3742,16 +3780,16 @@ Kv Kv Kv fo -ij -ij -ij -ij -ij -ij -ij -ij -ij -ij +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv fo Kv Kv @@ -3759,13 +3797,11 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg Us Us Us @@ -3776,12 +3812,14 @@ Us Us Us Us -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -3790,16 +3828,16 @@ gT gT gT UH -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj +gT +gT +gT +gT +gT +gT +gT +gT +gT +gT UH gT gT @@ -3814,16 +3852,16 @@ aa aa aa aa -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -3884,16 +3922,16 @@ Kv Kv Kv fo -ij -ij -ij -ij -ij -ij -ij -ij -ij -ij +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv fo Kv Kv @@ -3901,13 +3939,11 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg Us Us Us @@ -3918,12 +3954,14 @@ Us Us Us Us -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -3932,16 +3970,16 @@ gT gT gT UH -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj +gT +gT +gT +gT +gT +gT +gT +gT +gT +gT UH gT gT @@ -3956,16 +3994,16 @@ aa aa aa aa -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -4026,16 +4064,16 @@ Kv Kv Kv fo -ij -ij -ij -ij -ij -ij -ij -ij -ij -ij +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv fo Kv Kv @@ -4043,13 +4081,11 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg Us Us Us @@ -4060,12 +4096,14 @@ Us Us Us Us -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -4074,16 +4112,16 @@ gT gT gT UH -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj -Fj +gT +gT +gT +gT +gT +gT +gT +gT +gT +gT UH gT gT @@ -4098,16 +4136,16 @@ aa aa aa aa -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -4168,16 +4206,16 @@ Kv Kv Kv fo -ij -ij -ij -ij Kv Kv -ij -ij -ij -ij +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv fo Kv Kv @@ -4185,29 +4223,29 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg Us Us Us Us -Mg -Mg Us Us Us Us -Mg -Mg +Us +Us +Us +Us +Us +Us Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -4216,16 +4254,16 @@ gT gT gT UH -Fj -Fj -Fj -Fj gT gT -Fj -Fj -Fj -Fj +gT +gT +gT +gT +gT +gT +gT +gT UH gT gT @@ -4240,16 +4278,16 @@ aa aa aa aa -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy -Gy +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -4310,16 +4348,16 @@ Kv Kv Kv fo -ij -ij -ij -ij Kv Kv -ij -ij -ij -ij +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv fo Kv Kv @@ -4327,29 +4365,29 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg Us Us Us Us -Mg -Mg Us Us Us Us -Mg -Mg +Us +Us +Us +Us +Us +Us Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -4358,16 +4396,16 @@ gT gT gT UH -Fj -Fj -Fj -Fj gT gT -Fj -Fj -Fj -Fj +gT +gT +gT +gT +gT +gT +gT +gT UH gT gT @@ -4382,16 +4420,16 @@ aa aa aa aa -Gy -Gy -Gy -Gy aa aa -Gy -Gy -Gy -Gy +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -4452,16 +4490,16 @@ Kv Kv Kv fo -ij -ij -ij -ij Kv Kv -ij -ij -ij -ij +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv fo Kv Kv @@ -4469,29 +4507,29 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg Us Us Us Us -Mg -Mg Us Us Us Us -Mg -Mg +Us +Us +Us +Us +Us +Us Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -4500,16 +4538,16 @@ gT gT gT UH -Fj -Fj -Fj -Fj gT gT -Fj -Fj -Fj -Fj +gT +gT +gT +gT +gT +gT +gT +gT UH gT gT @@ -4524,16 +4562,16 @@ aa aa aa aa -Gy -Gy -Gy -Gy aa aa -Gy -Gy -Gy -Gy +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -4594,16 +4632,16 @@ Kv Kv Kv fo -ij -ij -ij -ij Kv Kv -ij -ij -ij -ij +Kv +Kv +Kv +Kv +Kv +Kv +Kv +Kv fo Kv Kv @@ -4611,29 +4649,29 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg Us Us Us Us -Mg -Mg Us Us Us Us -Mg -Mg +Us +Us +Us +Us +Us +Us Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -4642,16 +4680,16 @@ gT gT gT UH -Fj -Fj -Fj -Fj gT gT -Fj -Fj -Fj -Fj +gT +gT +gT +gT +gT +gT +gT +gT UH gT gT @@ -4666,16 +4704,16 @@ aa aa aa aa -Gy -Gy -Gy -Gy aa aa -Gy -Gy -Gy -Gy +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -4753,29 +4791,29 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -4808,16 +4846,16 @@ aa aa aa aa -Gy -Gy -Gy -Gy aa aa -Gy -Gy -Gy -Gy +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -4895,29 +4933,29 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -5037,10 +5075,10 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg +Us +Us +Us +Us Pb Pb Pb @@ -5057,9 +5095,9 @@ Pb Pb Pb Pb -Mg -Mg -Mg +Us +Us +Us dJ My gT @@ -5179,29 +5217,29 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us dJ My gT @@ -5321,29 +5359,29 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us dJ My gT @@ -5463,29 +5501,29 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us dJ My gT @@ -5605,29 +5643,29 @@ Kv Kv DW dJ -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us dJ My gT @@ -5747,29 +5785,29 @@ DW DW DW dJ -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us dJ My My @@ -5889,29 +5927,29 @@ Kv Kv Kv dJ -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg -Mg +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us +Us dJ gT gT @@ -9753,9 +9791,9 @@ AP AP mL AP +AP Mt -Mt -Mt +AP AP mL AP @@ -9894,11 +9932,11 @@ AP AP AP mL -Mt -Mt -Mt -Mt -Mt +AP +AP +AP +AP +AP mL AP AP @@ -10036,11 +10074,11 @@ AP AP AP mL -Mt -Mt -Mt -Mt -Mt +AP +AP +AP +AP +AP mL AP AP @@ -10178,11 +10216,11 @@ AP AP AP mL -Mt -Mt -Mt -Mt -Mt +AP +AP +AP +AP +AP mL AP AP @@ -10320,11 +10358,11 @@ AP AP AP mL -Mt -Mt -Mt -Mt -Mt +AP +AP +AP +AP +AP mL AP AP @@ -10462,11 +10500,11 @@ AP AP AP mL -Mt -Mt -Mt -Mt -Mt +AP +AP +AP +AP +AP mL AP AP @@ -10604,11 +10642,11 @@ AP AP AP mL -Mt -Mt -Mt -Mt -Mt +AP +AP +AP +AP +AP mL AP AP @@ -10629,11 +10667,11 @@ gT gT gT UH -hG -hG -hG -hG -hG +gT +gT +gT +gT +gT UH gT gT @@ -10746,11 +10784,11 @@ AP AP AP mL -Mt -Mt -Mt -Mt -Mt +AP +AP +AP +AP +AP mL AP AP @@ -10771,11 +10809,11 @@ gT gT gT UH -hG -hG -hG -hG -hG +gT +gT +gT +gT +gT UH gT gT @@ -10888,11 +10926,11 @@ AP AP AP mL -Mt -Mt -Mt -Mt -Mt +AP +AP +AP +AP +AP mL AP AP @@ -10913,11 +10951,11 @@ gT gT gT UH -hG -hG -hG -hG -hG +gT +gT +gT +gT +gT UH gT gT @@ -11030,11 +11068,11 @@ AP AP AP mL -Mt -Mt -Mt -Mt -Mt +AP +AP +AP +AP +AP mL AP AP @@ -11055,11 +11093,11 @@ gT gT gT UH -hG -hG -hG -hG -hG +gT +gT +gT +gT +gT UH gT gT @@ -11172,11 +11210,11 @@ AP AP AP mL -Mt -Mt -Mt -Mt -Mt +AP +AP +AP +AP +AP mL AP AP @@ -11197,11 +11235,11 @@ gT gT gT UH -hG -hG -hG -hG -hG +gT +gT +gT +gT +gT UH gT gT @@ -11314,11 +11352,11 @@ AP AP AP mL -Mt -Mt -Mt -Mt -Mt +AP +AP +AP +AP +AP mL AP AP @@ -11339,11 +11377,11 @@ gT gT gT UH -hG -hG -hG -hG -hG +gT +gT +gT +gT +gT UH gT gT @@ -11456,11 +11494,11 @@ AP AP AP mL -Mt -Mt -Mt -Mt -Mt +AP +AP +AP +AP +AP mL AP AP @@ -11481,11 +11519,11 @@ gT gT gT UH -hG -hG -hG -hG -hG +gT +gT +gT +gT +gT UH gT gT @@ -11599,9 +11637,9 @@ AP AP mL AP -Mt -Mt -Mt +AP +AP +AP AP mL AP @@ -11623,11 +11661,11 @@ gT gT gT UH -hG -hG -hG -hG -hG +gT +gT +gT +gT +gT UH gT gT @@ -11765,11 +11803,11 @@ gT gT gT UH -hG -hG -hG -hG -hG +gT +gT +gT +gT +gT UH gT gT @@ -11908,9 +11946,9 @@ gT gT UH gT +gT hG -hG -hG +gT gT UH gT diff --git a/maps/nsv_triumph/triumph.dm b/maps/nsv_triumph/triumph.dm index d9f6a34380d..f7f777617c5 100644 --- a/maps/nsv_triumph/triumph.dm +++ b/maps/nsv_triumph/triumph.dm @@ -9,7 +9,7 @@ #include "triumph_shuttle_defs.dm" #include "triumph_shuttles.dm" #include "triumph_telecomms.dm" - #include "triumph_sectors.dm" + #include "triumph_overmap.dm" #include "../../_maps/map_files/NSV_Triumph/triumph-01-deck1.dmm" #include "../../_maps/map_files/NSV_Triumph/triumph-02-deck2.dmm" diff --git a/maps/nsv_triumph/triumph_sectors.dm b/maps/nsv_triumph/triumph_overmap.dm similarity index 77% rename from maps/nsv_triumph/triumph_sectors.dm rename to maps/nsv_triumph/triumph_overmap.dm index 005f74755d6..92463c4902d 100644 --- a/maps/nsv_triumph/triumph_sectors.dm +++ b/maps/nsv_triumph/triumph_overmap.dm @@ -1,19 +1,19 @@ -// This is where Overmap stuff itself is defined - /obj/effect/overmap/visitable/ship/triumph name = "NSV Triumph" // Name of the location on the overmap. desc = "The Triumph is one of the many ships that is a part of the NDV Marksmans Fleet in this sector" + scanner_desc = @{"[i]Registration[/i]: NSV Triumph [i]Class[/i]: Science Vessel [i]Transponder[/i]: Transmitting (CIV), NanoTrasen IFF [b]Notice[/b]: NanoTrasen Vessel, authorized personnel only"} + icon_state = "ship" vessel_mass = 100000 burn_delay = 2 SECONDS - fore_dir = WEST // Which direction is the ship/map facing. + fore_dir = EAST // Which direction the ship/z-level is facing. It will move dust particles from that direction when moving. base = TRUE // Honestly unsure what this does but it seems the main sector or "Map" we're at has this so here it stays - start_x = 10 // The X Value of where the Navpoint is on the Overmap - start_y = 10 // The Y Value of where the Navpoint is on the Overmap + start_x = 4 + start_y = 5 // The waypoints that are avaliable once you are at this Navpoint initial_generic_waypoints = list("nav_shared_space", "nav_capitalship_docking1", "nav_capitalship_docking2") diff --git a/maps/nsv_triumph/triumph_phoronlock.dm b/maps/nsv_triumph/triumph_phoronlock.dm index fa793c5a858..4fea283c632 100644 --- a/maps/nsv_triumph/triumph_phoronlock.dm +++ b/maps/nsv_triumph/triumph_phoronlock.dm @@ -146,12 +146,9 @@ obj/machinery/airlock_sensor/phoron/airlock_exterior ui.set_auto_update(1) /obj/machinery/embedded_controller/radio/airlock/phoron/Topic(href, href_list) - if(..()) + if((. = ..())) return - usr.set_machine(src) - src.add_fingerprint(usr) - var/clean = 0 switch(href_list["command"]) //anti-HTML-hacking checks if("cycle_ext") diff --git a/maps/nsv_triumph/triumph_shuttle_defs.dm b/maps/nsv_triumph/triumph_shuttle_defs.dm index 7a434283edf..1b2338031a5 100644 --- a/maps/nsv_triumph/triumph_shuttle_defs.dm +++ b/maps/nsv_triumph/triumph_shuttle_defs.dm @@ -3,27 +3,23 @@ /datum/shuttle/autodock/ferry/emergency/escape name = "Escape" location = FERRY_LOCATION_OFFSITE + shuttle_area = /area/centcom/shuttle warmup_time = 10 landmark_offsite = "escape_cc" - landmark_station = "escape_station" + landmark_station = "escape_triumph" landmark_transition = "escape_transit" - //docking_controller_tag = "escape_shuttle" - //dock_target_station = "escape_dock" - //dock_target_offsite = "centcom_dock" move_time = SHUTTLE_TRANSIT_DURATION_RETURN ////////////////////////////////////////////////////////////// - /datum/shuttle/autodock/ferry/escape_pod/large_escape_pod1 name = "Large Escape Pod 1" location = FERRY_LOCATION_STATION - warmup_time = 3 + shuttle_area = /area/shuttle/large_escape_pod1 + warmup_time = 0 landmark_station = "escapepod1_station" landmark_offsite = "escapepod1_cc" landmark_transition = "escapepod1_transit" docking_controller_tag = "large_escape_pod_1" - //dock_target_station = "large_escape_pod_1_berth" - //dock_target_offsite = "large_escape_pod_1_recovery" move_time = SHUTTLE_TRANSIT_DURATION_RETURN ////////////////////////////////////////////////////////////// @@ -34,116 +30,145 @@ shuttle_area = /area/shuttle/supply warmup_time = 10 landmark_offsite = "supply_cc" - landmark_station = "supply_station" + landmark_station = "supply_dock" docking_controller_tag = "supply_shuttle" - //dock_target_station = "cargo_bay" flags = SHUTTLE_FLAGS_PROCESS|SHUTTLE_FLAGS_SUPPLY ////////////////////////////////////////////////////////////// // TODO - Zandario/Enzo - Get these compatible // Trade Ship - -/datum/shuttle/autodock/ferry/trade +/* +/datum/shuttle/autodock/multi/trade name = "Trade" - location = FERRY_LOCATION_OFFSITE + current_location = "cc_trade_dock" shuttle_area = /area/shuttle/trade - warmup_time = 10 //want some warmup time so people can cancel. - landmark_offsite = "trade_cc" - landmark_station = "trade_station" docking_controller_tag = "trade_shuttle" - //dock_target_station = "trade_shuttle_dock_airlock" - //dock_target_offsite = "trade_shuttle_bay" - -////////////////////////////////////////////////////////////// - -// Triumph Shuttle -/datum/shuttle/autodock/ferry/triumph_backup - name = "Triumph Backup" - location = FERRY_LOCATION_OFFSITE // Locations are reversed for Shuttle "Tram" - warmup_time = 5 - move_time = 45 - landmark_offsite = "triumph_backup_low" - landmark_station = "triumph_backup_high" - landmark_transition = "triumph_backup_transit" - shuttle_area = /area/shuttle/triumph - //crash_areas = list(/area/shuttle/triumph/crash1, /area/shuttle/triumph/crash2) - docking_controller_tag = "triumph_shuttle" - //dock_target_station = "triumph_dock_airlock" - //dock_target_offsite = "triumph_pad_airlock" - -////////////////////////////////////////////////////////////// -// Antag Space "Proto Shuttle" Shuttle - -/datum/shuttle/autodock/multi/protoshuttle - name = "Proto" - warmup_time = 8 - move_time = 60 - current_location = "antag_space_base" - shuttle_area = /area/shuttle/antag_space - landmark_transition = "antag_space_transit" + warmup_time = 10 // Want some warmup time so people can cancel. destination_tags = list( - "antag_space_nearby", - "antag_space_docks" - //"Nearby" = /area/shuttle/antag_space/north, - //"Docks" = /area/shuttle/antag_space/docks + "cc_trade_dock", + "nav_capitalship_docking1", + "nav_capitalship_docking2" ) - docking_controller_tag = "antag_space_shuttle" - //destination_dock_targets = list("Home Base" = "antag_space_dock") - -////////////////////////////////////////////////////////////// -// Antag Surface "Land Crawler" Shuttle -/datum/shuttle/autodock/multi/landcrawler - name = "Land Crawler" - warmup_time = 8 - move_time = 60 - current_location = "antag_ground_base" - shuttle_area = /area/shuttle/antag_ground - landmark_transition = "antag_ground_transit" - destination_tags = list( - "antag_ground_solars", - "antag_ground_mining" - //"Solar Array" = /area/shuttle/antag_ground/solars, - //"Mining Outpost" = /area/shuttle/antag_ground/mining - ) - docking_controller_tag = "antag_ground_shuttle" ////////////////////////////////////////////////////////////// // Mercenary Shuttle -/* /datum/shuttle/autodock/multi/mercenary name = "Mercenary" warmup_time = 8 move_time = 60 current_location = "merc_base" shuttle_area = /area/shuttle/mercenary - destination_tags = list( + destinations = list( "merc_base", - "merc_tether_solars", - "merc_tether_dock" + "aerostat_south", + "beach_e", + "beach_nw", + "tether_solars_ne", + "tether_solars_sw", + "tether_mine_nw", + "tether_space_NE", + "tether_space_SE", + "tether_space_SW", + "tether_dockarm_d2l" // End of right docking arm ) docking_controller_tag = "merc_shuttle" announcer = "Automated Traffic Control" - -/datum/shuttle/autodock/multi/mercenary/New() arrival_message = "Attention. An unregistered vessel is approaching Virgo-3B." departure_message = "Attention. A unregistered vessel is now leaving Virgo-3B." - ..() -*/ + + ////////////////////////////////////////////////////////////// -// ERT Shuttle... Obviously. -/* -/datum/shuttle/autodock/multi/specops/ert - name = "Special Operations" - location = FERRY_LOCATION_STATION - warmup_time = 10 - area_offsite = /area/shuttle/specops/station // Centcom is the home station, the Exodus is offsite - area_station = /area/shuttle/specops/centcom - docking_controller_tag = "specops_shuttle_port" - docking_controller_tag_station = "specops_shuttle_port" - docking_controller_tag_offsite = "specops_shuttle_fore" - dock_target_station = "specops_centcom_dock" - dock_target_offsite = "specops_dock_airlock" +// Ninja Shuttle +/datum/shuttle/autodock/multi/ninja + name = "Ninja" + warmup_time = 8 + move_time = 60 + can_cloak = TRUE + cloaked = TRUE + current_location = "ninja_base" + landmark_transition = "ninja_transit" + shuttle_area = /area/shuttle/ninja + destinations = list( + "ninja_base", + "aerostat_northeast", + "beach_e", + "beach_nw", + "tether_solars_ne", + "tether_solars_sw", + "tether_mine_nw", + "tether_space_NE", + "tether_space_SE", + "tether_space_SW", + "tether_dockarm_d1a3" // Inside of left dockarm + ) + docking_controller_tag = "ninja_shuttle" + announcer = "Automated Traffic Control" + arrival_message = "Attention. An unregistered vessel is approaching Virgo-3B." + departure_message = "Attention. A unregistered vessel is now leaving Virgo-3B." + +////////////////////////////////////////////////////////////// +// Skipjack +/datum/shuttle/autodock/multi/heist + name = "Skipjack" + warmup_time = 8 + move_time = 60 + can_cloak = TRUE + cloaked = TRUE + current_location = "skipjack_base" + landmark_transition = "skipjack_transit" + shuttle_area = /area/shuttle/skipjack + destinations = list( + "skipjack_base", + "aerostat_south", + "beach_e", + "beach_nw", + "tether_solars_ne", + "tether_solars_sw", + "tether_mine_nw", + "tether_space_NE", + "tether_space_SE", + "tether_space_SW", + "tether_dockarm_d1l" // End of left dockarm + ) + //docking_controller_tag = ??? doesn't have one? + destination_dock_targets = list( + "Mercenary base" = "merc_base", + "Tether spaceport" = "nuke_shuttle_dock_airlock", + ) + announcer = "Automated Traffic Control" + + arrival_message = "Attention. An unregistered vessel is approaching Virgo-3B." + departure_message = "Attention. A unregistered vessel is now leaving Virgo-3B." + +////////////////////////////////////////////////////////////// +// ERT Shuttle +/datum/shuttle/autodock/multi/specialops + name = "NDV Phantom" + can_cloak = TRUE + cloaked = FALSE + warmup_time = 8 + move_time = 60 + current_location = "specops_base" + landmark_transition = "specops_transit" + shuttle_area = /area/shuttle/specialops + destination_tags = list( + "specops_base", + "aerostat_northwest", + "beach_e", + "beach_nw", + "tether_solars_ne", + "tether_solars_sw", + "tether_mine_nw", + "tether_space_NE", + "tether_space_SE", + "tether_space_SW", + "tether_dockarm_d2a2" // Top of right docking arm + ) + docking_controller_tag = "specops_shuttle_hatch" + announcer = "Automated Traffic Control" + arrival_message = "Attention. An NT support vessel is approaching Virgo-3B." + departure_message = "Attention. A NT support vessel is now leaving Virgo-3B." */ ////////////////////////////////////////////////////////////// // RogueMiner "Belter: Shuttle @@ -159,26 +184,23 @@ landmark_offsite = "belter_zone1" landmark_transition = "belter_transit" docking_controller_tag = "belter_docking" - //dock_target_station = "belter_nodocking" //Fake tags to prevent the shuttle from opening doors. - //dock_target_offsite = "belter_nodocking" /datum/shuttle/autodock/ferry/belter/New() - move_time = move_time + rand(-5 SECONDS, 5 SECONDS) + move_time = move_time + rand(-10 SECONDS, 20 SECONDS) //50sec max, 20sec min. ..() ////////////////////////////////////////////////////////////// // CC Lewdship shuttle -// DISABLED - cruiser has been removed entirely // For now~ ;) +// DISABLED - cruiser has been removed entirely /* /datum/shuttle/autodock/ferry/cruiser_shuttle name = "Cruiser Shuttle" location = 1 warmup_time = 10 //want some warmup time so people can cancel. - landmark_station = "cruiser_station" - landmark_offsite = "cruiser_cc" - landmark_transition = "cruiser_transit" + area_offsite = /area/shuttle/cruiser/cruiser + area_station = /area/shuttle/cruiser/station docking_controller_tag = "cruiser_shuttle" - //dock_target_station = "d1a1_dock" - //dock_target_offsite = "cruiser_shuttle_bay" + dock_target_station = "d1a1_dock" + dock_target_offsite = "cruiser_shuttle_bay" */ diff --git a/maps/tether/submaps/aerostat/_aerostat.dm b/maps/tether/submaps/aerostat/_aerostat.dm index ba47b5af7cb..a49b12b6c7b 100644 --- a/maps/tether/submaps/aerostat/_aerostat.dm +++ b/maps/tether/submaps/aerostat/_aerostat.dm @@ -25,7 +25,7 @@ rare_val = 0.1 /datum/random_map/noise/ore/virgo2/check_map_sanity() - return 1 //Totally random, but probably beneficial. + return 1 // Totally random, but probably beneficial. // -- Objs -- // @@ -137,7 +137,7 @@ VIRGO2_TURF_CREATE(/turf/simulated/mineral/floor/ignore_mapgen) name = "\improper Aerostat Shuttle - Surface" base_turf = /turf/simulated/floor/plating/virgo2 -//The aerostat itself +// The aerostat itself /area/tether_away/aerostat name = "\improper Away Mission - Aerostat Outside" icon_state = "away" diff --git a/maps/tether/submaps/aerostat/aerostat.dmm b/maps/tether/submaps/aerostat/aerostat.dmm index b1add68cc13..f6bd94c20d4 100644 --- a/maps/tether/submaps/aerostat/aerostat.dmm +++ b/maps/tether/submaps/aerostat/aerostat.dmm @@ -466,7 +466,7 @@ /area/tether_away/aerostat/solars) "bd" = ( /turf/simulated/shuttle/wall, -/area/shuttle/aerostat/docked) +/area/shuttle/aerostat) "be" = ( /turf/simulated/floor/plating/virgo2, /area/tether_away/aerostat/inside) @@ -477,11 +477,11 @@ /area/tether_away/aerostat/inside) "bg" = ( /turf/simulated/shuttle/floor/yellow, -/area/shuttle/aerostat/docked) +/area/shuttle/aerostat) "bh" = ( /obj/machinery/door/airlock/external, /turf/simulated/shuttle/floor/yellow, -/area/shuttle/aerostat/docked) +/area/shuttle/aerostat) "bi" = ( /obj/effect/floor_decal/industrial/warning/dust/corner, /turf/simulated/floor/plating/virgo2, @@ -535,7 +535,7 @@ dir = 4 }, /turf/simulated/shuttle/floor/yellow, -/area/shuttle/aerostat/docked) +/area/shuttle/aerostat) "bs" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ dir = 1 @@ -633,11 +633,11 @@ dir = 8 }, /turf/simulated/shuttle/floor/yellow, -/area/shuttle/aerostat/docked) +/area/shuttle/aerostat) "bI" = ( /obj/structure/closet/emcloset, /turf/simulated/shuttle/floor/yellow, -/area/shuttle/aerostat/docked) +/area/shuttle/aerostat) "bJ" = ( /obj/structure/table/standard, /obj/random/cargopod, @@ -778,7 +778,6 @@ /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 }, -/obj/shuttle_connector/aerostat, /obj/effect/floor_decal/rust, /turf/simulated/floor/plating/virgo2, /area/tether_away/aerostat/inside) @@ -808,14 +807,20 @@ dir = 1 }, /turf/simulated/shuttle/floor/yellow, -/area/shuttle/aerostat/docked) +/area/shuttle/aerostat) "ck" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/tether_away/aerostat; + base_turf = /turf/unsimulated/floor/sky/virgo2_sky; + landmark_tag = "nav_excursion_aerostat"; + name = "Excursion Aerostat" + }, /turf/unsimulated/floor/sky/virgo2_sky, -/area/shuttle/excursion/away_aerostat) +/area/tether_away/aerostat) "cl" = ( /obj/machinery/light, /turf/simulated/shuttle/floor/yellow, -/area/shuttle/aerostat/docked) +/area/shuttle/aerostat) "cm" = ( /obj/structure/cable/heavyduty{ icon_state = "1-8" @@ -1654,6 +1659,15 @@ /obj/random/action_figure, /turf/simulated/floor/tiled/techfloor/virgo2, /area/tether_away/aerostat/inside) +"pd" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/tether_away/aerostat; + base_turf = /turf/unsimulated/floor/sky/virgo2_sky; + landmark_tag = "aerostat_up"; + name = "Remmi Aerostat" + }, +/turf/simulated/shuttle/floor/yellow, +/area/shuttle/aerostat) "tZ" = ( /obj/structure/table/standard, /obj/random/powercell, diff --git a/maps/tether/submaps/aerostat/surface.dmm b/maps/tether/submaps/aerostat/surface.dmm index ac5d6167d5d..99bea91969c 100644 --- a/maps/tether/submaps/aerostat/surface.dmm +++ b/maps/tether/submaps/aerostat/surface.dmm @@ -43,7 +43,7 @@ /obj/effect/shuttle_landmark{ base_area = /area/tether_away/aerostat/surface/explored; base_turf = /turf/simulated/floor/tiled/techfloor/virgo2; - landmark_tag = "aerostat_surface"; + landmark_tag = "aerostat_down"; name = "Virgo 2 Surface" }, /turf/simulated/floor/tiled/techfloor/virgo2, diff --git a/maps/tether/submaps/alienship/_alienship.dm b/maps/tether/submaps/alienship/_alienship.dm index b488f0a872d..848ecec7c2d 100644 --- a/maps/tether/submaps/alienship/_alienship.dm +++ b/maps/tether/submaps/alienship/_alienship.dm @@ -105,14 +105,6 @@ // -- Areas -- // -/area/shuttle/excursion/away_alienship - name = "\improper Excursion Shuttle - Alien Ship" - base_turf = /turf/simulated/shuttle/floor/alienplating - var/did_entry = FALSE - var/list/teleport_to - var/area/dump_area - var/obj/shuttle_connector/shuttle_friend - /area/shuttle/excursion/away_alienship/Initialize() . = ..() dump_area = locate(/area/tether_away/alienship/equip_dump) diff --git a/maps/tether/submaps/alienship/alienship.dmm b/maps/tether/submaps/alienship/alienship.dmm index dd90c9e0f71..c8dfe319ce7 100644 --- a/maps/tether/submaps/alienship/alienship.dmm +++ b/maps/tether/submaps/alienship/alienship.dmm @@ -22,8 +22,14 @@ /turf/simulated/shuttle/wall/alien/hard_corner, /area/tether_away/alienship) "ah" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/tether_away/alienship; + base_turf = /turf/simulated/shuttle/floor/alienplating; + landmark_tag = "nav_excursion_alienship"; + name = "Excursion Alienship" + }, /turf/simulated/shuttle/floor/alienplating, -/area/shuttle/excursion/away_alienship) +/area/tether_away/alienship/equip_dump) "ai" = ( /obj/machinery/door/airlock/alien/locked, /turf/simulated/shuttle/floor/alienplating, @@ -562,6 +568,12 @@ /obj/item/trash/liquidfood, /turf/simulated/shuttle/floor/alien, /area/tether_away/alienship) +"wE" = ( +/turf/simulated/shuttle/wall/alien, +/area/tether_away/alienship/equip_dump) +"Bk" = ( +/turf/simulated/shuttle/floor/alien, +/area/tether_away/alienship/equip_dump) "Rx" = ( /obj/item/reagent_containers/food/snacks/liquidfood, /turf/simulated/shuttle/floor/alien, diff --git a/maps/tether/submaps/backup/tether_ships.dmm b/maps/tether/submaps/backup/tether_ships.dmm index d07caac6ebf..f9f84ed0ecb 100644 --- a/maps/tether/submaps/backup/tether_ships.dmm +++ b/maps/tether/submaps/backup/tether_ships.dmm @@ -41,7 +41,7 @@ /area/space) "fg" = ( /turf/space/bluespace, -/area/shuttle/excursion/bluespace) +/area/space) "gO" = ( /obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, /turf/simulated/sky/virgo3b/south, diff --git a/maps/tether/submaps/beach/beach.dmm b/maps/tether/submaps/beach/beach.dmm index c468fefc1b4..3442bd01844 100644 --- a/maps/tether/submaps/beach/beach.dmm +++ b/maps/tether/submaps/beach/beach.dmm @@ -311,7 +311,7 @@ /obj/effect/shuttle_landmark{ base_area = /area/tether_away/beach/jungle; base_turf = /turf/simulated/floor/beach/sand/desert; - landmark_tag = "beach_c"; + landmark_tag = "nav_beach_c"; name = "Virgo 4 Beach (Center)" }, /turf/simulated/floor/beach/sand/desert, @@ -342,7 +342,7 @@ /obj/effect/shuttle_landmark{ base_area = /area/tether_away/beach/jungle; base_turf = /turf/simulated/floor/beach/sand/desert; - landmark_tag = "beach_nw"; + landmark_tag = "nav_beach_nw"; name = "Virgo 4 Beach (NW)" }, /turf/simulated/floor/beach/sand/desert, @@ -351,7 +351,7 @@ /obj/effect/shuttle_landmark{ base_area = /area/tether_away/beach/jungle; base_turf = /turf/simulated/floor/beach/sand/desert; - landmark_tag = "beach_e"; + landmark_tag = "nav_beach_e"; name = "Virgo 4 Beach (E)" }, /turf/simulated/floor/beach/sand/desert, diff --git a/maps/tether/submaps/rogue_mines/rogue_mine1.dmm b/maps/tether/submaps/rogue_mines/rogue_mine1.dmm index 1ce093186c1..3a5e8d9f93e 100644 --- a/maps/tether/submaps/rogue_mines/rogue_mine1.dmm +++ b/maps/tether/submaps/rogue_mines/rogue_mine1.dmm @@ -7,8 +7,14 @@ /turf/space, /area/asteroid/rogue/zone1) "c" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/asteroid/rogue/zone1; + base_turf = /turf/space; + landmark_tag = "belter_zone1"; + name = "Belter Area" + }, /turf/space, -/area/shuttle/belter/belt/zone1) +/area/asteroid/rogue/zone1) "d" = ( /obj/effect/step_trigger/teleporter/roguemine_loop/west, /turf/space, @@ -9469,11 +9475,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -9611,11 +9617,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -9753,11 +9759,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -9895,11 +9901,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10037,11 +10043,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10179,11 +10185,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10321,11 +10327,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10463,11 +10469,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10605,11 +10611,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10749,8 +10755,8 @@ a a a c -c -c +a +a a a a diff --git a/maps/tether/submaps/rogue_mines/rogue_mine2.dmm b/maps/tether/submaps/rogue_mines/rogue_mine2.dmm index 3d0402c8036..887cd4a6748 100644 --- a/maps/tether/submaps/rogue_mines/rogue_mine2.dmm +++ b/maps/tether/submaps/rogue_mines/rogue_mine2.dmm @@ -7,8 +7,14 @@ /turf/space, /area/asteroid/rogue/zone2) "c" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/asteroid/rogue/zone2; + base_turf = /turf/space; + landmark_tag = "belter_zone2"; + name = "Belter Area" + }, /turf/space, -/area/shuttle/belter/belt/zone2) +/area/asteroid/rogue/zone2) "d" = ( /obj/effect/step_trigger/teleporter/roguemine_loop/west, /turf/space, @@ -9469,11 +9475,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -9611,11 +9617,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -9753,11 +9759,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -9895,11 +9901,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10037,11 +10043,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10179,11 +10185,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10321,11 +10327,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10463,11 +10469,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10605,11 +10611,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10749,8 +10755,8 @@ a a a c -c -c +a +a a a a diff --git a/maps/tether/submaps/rogue_mines/rogue_mine3.dmm b/maps/tether/submaps/rogue_mines/rogue_mine3.dmm index 790da165cc4..95f3921c18e 100644 --- a/maps/tether/submaps/rogue_mines/rogue_mine3.dmm +++ b/maps/tether/submaps/rogue_mines/rogue_mine3.dmm @@ -7,8 +7,14 @@ /turf/space, /area/asteroid/rogue/zone3) "c" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/asteroid/rogue/zone3; + base_turf = /turf/space; + landmark_tag = "belter_zone3"; + name = "Belter Area" + }, /turf/space, -/area/shuttle/belter/belt/zone3) +/area/asteroid/rogue/zone3) "d" = ( /obj/effect/step_trigger/teleporter/roguemine_loop/west, /turf/space, @@ -9469,11 +9475,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -9611,11 +9617,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -9753,11 +9759,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -9895,11 +9901,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10037,11 +10043,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10179,11 +10185,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10321,11 +10327,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10463,11 +10469,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10605,11 +10611,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10749,8 +10755,8 @@ a a a c -c -c +a +a a a a diff --git a/maps/tether/submaps/rogue_mines/rogue_mine4.dmm b/maps/tether/submaps/rogue_mines/rogue_mine4.dmm index dd602825479..9c94d65c164 100644 --- a/maps/tether/submaps/rogue_mines/rogue_mine4.dmm +++ b/maps/tether/submaps/rogue_mines/rogue_mine4.dmm @@ -7,8 +7,14 @@ /turf/space, /area/asteroid/rogue/zone4) "c" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/asteroid/rogue/zone4; + base_turf = /turf/space; + landmark_tag = "belter_zone4"; + name = "Belter Area" + }, /turf/space, -/area/shuttle/belter/belt/zone4) +/area/asteroid/rogue/zone4) "d" = ( /obj/effect/step_trigger/teleporter/roguemine_loop/west, /turf/space, @@ -9469,11 +9475,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -9611,11 +9617,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -9753,11 +9759,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -9895,11 +9901,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10037,11 +10043,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10179,11 +10185,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10321,11 +10327,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10463,11 +10469,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10605,11 +10611,11 @@ a a a a -c -c -c -c -c +a +a +a +a +a a a a @@ -10749,8 +10755,8 @@ a a a c -c -c +a +a a a a diff --git a/maps/tether/submaps/space/debrisfield.dmm b/maps/tether/submaps/space/debrisfield.dmm index 73948dbb8eb..bebabc6aaa2 100644 --- a/maps/tether/submaps/space/debrisfield.dmm +++ b/maps/tether/submaps/space/debrisfield.dmm @@ -14,8 +14,14 @@ /turf/space, /area/tether_away/debrisfield/explored) "f" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/tether_away/debrisfield/explored; + base_turf = /turf/space; + landmark_tag = "tether_excursion_debrisfield"; + name = "Excursion Debrisfield" + }, /turf/space, -/area/shuttle/excursion/debrisfield) +/area/tether_away/debrisfield/explored) "g" = ( /obj/effect/step_trigger/teleporter/debrisfield_loop/east, /turf/space, @@ -8623,10 +8629,10 @@ b b b b -f -f -f -f +b +b +b +b b b b @@ -8755,21 +8761,21 @@ b b b b -f -f -f -f -f -f -f -f -f -f -f -f -f -f -f +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b b b b @@ -8897,21 +8903,21 @@ b b b b -f -f -f -f -f -f -f -f -f -f -f -f -f -f -f +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b b b b @@ -9038,22 +9044,22 @@ b b b b -f -f -f -f -f -f -f -f -f -f -f -f -f -f -f -f +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b b b b @@ -9180,21 +9186,21 @@ b b b b -f -f -f -f -f -f -f -f -f -f -f -f -f -f -f +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b b b b @@ -9321,22 +9327,22 @@ a b b b -f -f -f -f -f -f -f -f -f -f -f -f -f -f -f -f +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b b b b @@ -9463,22 +9469,22 @@ a b b b -f -f -f -f -f -f -f -f -f -f -f -f -f -f -f -f +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b b b b @@ -9605,22 +9611,22 @@ a b b b -f -f -f -f -f -f -f -f -f -f -f -f -f -f -f -f +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b b b c @@ -9747,22 +9753,22 @@ a b b b -f -f -f -f -f -f -f -f -f -f -f -f -f -f -f -f +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b b b b @@ -9889,22 +9895,22 @@ a b b b -f -f -f -f -f -f -f -f -f -f -f -f -f -f -f -f +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b b b b @@ -10032,21 +10038,21 @@ b b b b -f -f -f -f -f -f -f -f -f -f -f -f -f -f -f +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b b b b @@ -10174,22 +10180,22 @@ b b b b -f -f -f -f -f -f -f -f -f -f -f -f -f -f -f -f +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b b b b @@ -10318,20 +10324,20 @@ b b b f -f -f -f -f -f -f -f -f -f -f -f -f -f -f +b +b +b +b +b +b +b +b +b +b +b +b +b +b b b b @@ -10459,21 +10465,21 @@ b b b b -f -f -f -f -f -f -f -f -f -f -f -f -f -f -f +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b b b b @@ -10608,13 +10614,13 @@ b b b b -f -f b b b -f -f +b +b +b +b b b b diff --git a/maps/tether/submaps/tether_misc.dmm b/maps/tether/submaps/tether_misc.dmm index d7a692c45b5..300075c4f47 100644 --- a/maps/tether/submaps/tether_misc.dmm +++ b/maps/tether/submaps/tether_misc.dmm @@ -7,14 +7,14 @@ /turf/simulated/shuttle/plating/airless/carry{ dir = 1 }, -/area/supply/dock) +/area/shuttle/supply) "ab" = ( /obj/structure/shuttle/engine/propulsion, /turf/space, /turf/simulated/shuttle/plating/airless/carry{ dir = 1 }, -/area/supply/dock) +/area/shuttle/supply) "ac" = ( /obj/structure/shuttle/engine/propulsion{ icon_state = "burst_r" @@ -23,7 +23,7 @@ /turf/simulated/shuttle/plating/airless/carry{ dir = 1 }, -/area/supply/dock) +/area/shuttle/supply) "ad" = ( /obj/structure/shuttle/engine/propulsion{ dir = 4; @@ -31,14 +31,14 @@ }, /turf/space, /turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "ae" = ( /obj/structure/shuttle/engine/propulsion{ dir = 4 }, /turf/space, /turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "af" = ( /obj/structure/shuttle/engine/propulsion{ dir = 4; @@ -46,7 +46,7 @@ }, /turf/space, /turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "ag" = ( /obj/machinery/power/emitter/gyrotron/anchored{ desc = "It is a heavy duty pulse laser emitter."; @@ -55,7 +55,7 @@ }, /turf/space, /turf/simulated/shuttle/plating/airless/carry, -/area/syndicate_station/start) +/area/shuttle/mercenary) "ah" = ( /obj/structure/shuttle/engine/propulsion{ dir = 4; @@ -63,14 +63,14 @@ }, /turf/space, /turf/simulated/shuttle/plating/airless/carry, -/area/syndicate_station/start) +/area/shuttle/mercenary) "ai" = ( /obj/structure/shuttle/engine/propulsion{ dir = 4 }, /turf/space, /turf/simulated/shuttle/plating/airless/carry, -/area/syndicate_station/start) +/area/shuttle/mercenary) "aj" = ( /obj/structure/shuttle/engine/propulsion{ dir = 4; @@ -78,7 +78,7 @@ }, /turf/space, /turf/simulated/shuttle/plating/airless/carry, -/area/syndicate_station/start) +/area/shuttle/mercenary) "ak" = ( /obj/machinery/fitness/heavy/lifter, /obj/effect/floor_decal/steeldecal/steel_decals10{ @@ -108,7 +108,7 @@ tag_door = "trade_shuttle_hatch" }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "an" = ( /obj/structure/table/rack, /obj/effect/floor_decal/corner/red{ @@ -274,7 +274,7 @@ /area/space) "aC" = ( /turf/simulated/shuttle/wall/dark, -/area/syndicate_station/start) +/area/shuttle/mercenary) "aD" = ( /obj/structure/bed/padded, /obj/item/bedsheet/hos, @@ -304,7 +304,7 @@ opacity = 0 }, /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "aF" = ( /obj/structure/table/glass, /turf/unsimulated/floor{ @@ -326,7 +326,7 @@ opacity = 0 }, /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "aH" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; @@ -342,7 +342,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "aI" = ( /obj/structure/window/reinforced{ dir = 4 @@ -446,7 +446,7 @@ /area/space) "bc" = ( /turf/simulated/shuttle/wall, -/area/supply/dock) +/area/shuttle/supply) "bd" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/holofloor/desert, @@ -492,7 +492,7 @@ /area/holodeck/source_emptycourt) "bn" = ( /turf/simulated/shuttle/floor, -/area/supply/dock) +/area/shuttle/supply) "bo" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood/corner, @@ -575,13 +575,13 @@ dir = 8 }, /turf/simulated/shuttle/floor, -/area/supply/dock) +/area/shuttle/supply) "bz" = ( /obj/machinery/light{ dir = 4 }, /turf/simulated/shuttle/floor, -/area/supply/dock) +/area/shuttle/supply) "bA" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood, @@ -728,14 +728,14 @@ id = "QMLoad2" }, /turf/simulated/shuttle/plating, -/area/supply/dock) +/area/shuttle/supply) "bR" = ( /obj/machinery/conveyor{ dir = 4; id = "QMLoad2" }, /turf/simulated/shuttle/floor, -/area/supply/dock) +/area/shuttle/supply) "bS" = ( /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/desert, @@ -866,7 +866,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "ch" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -874,7 +874,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "ci" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -882,7 +882,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_dred" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "cj" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; @@ -892,7 +892,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "ck" = ( /obj/machinery/light{ dir = 8 @@ -901,7 +901,7 @@ dir = 8 }, /turf/simulated/shuttle/floor/white, -/area/syndicate_station/start) +/area/shuttle/mercenary) "cl" = ( /obj/structure/table/standard, /obj/structure/closet/secure_closet/medical_wall{ @@ -922,21 +922,21 @@ }, /obj/item/reagent_containers/syringe, /turf/simulated/shuttle/floor/white, -/area/syndicate_station/start) +/area/shuttle/mercenary) "cm" = ( /obj/machinery/sleep_console, /turf/simulated/shuttle/floor/white, -/area/syndicate_station/start) +/area/shuttle/mercenary) "cn" = ( /obj/machinery/body_scanconsole, /turf/simulated/shuttle/floor/white, -/area/syndicate_station/start) +/area/shuttle/mercenary) "co" = ( /obj/machinery/bodyscanner{ dir = 8 }, /turf/simulated/shuttle/floor/white, -/area/syndicate_station/start) +/area/shuttle/mercenary) "cp" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; @@ -949,13 +949,13 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "cq" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible, /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "cr" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -963,7 +963,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "cs" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1380; @@ -973,7 +973,7 @@ name = "Shuttle Hatch" }, /turf/simulated/shuttle/floor, -/area/supply/dock) +/area/shuttle/supply) "ct" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -1034,12 +1034,12 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_white" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "cD" = ( /turf/simulated/shuttle/floor{ icon_state = "floor_white" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "cE" = ( /obj/machinery/vending/medical{ density = 0; @@ -1047,20 +1047,20 @@ req_access = null }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "cF" = ( /obj/machinery/atmospherics/pipe/tank/air{ dir = 4; start_pressure = 740.5 }, /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "cG" = ( /obj/structure/table/standard, /obj/item/stack/cable_coil/black, /obj/item/storage/toolbox/syndicate, /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "cH" = ( /obj/structure/bed/padded, /obj/item/bedsheet/hos, @@ -1078,10 +1078,10 @@ req_access = list(150) }, /turf/simulated/shuttle/wall/dark, -/area/syndicate_station/start) +/area/shuttle/mercenary) "cJ" = ( /turf/simulated/shuttle/wall/dark/hard_corner, -/area/syndicate_station/start) +/area/shuttle/mercenary) "cK" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1331; @@ -1100,7 +1100,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_dred" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "cL" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -1109,7 +1109,7 @@ }, /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "cM" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1331; @@ -1120,7 +1120,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_dred" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "cN" = ( /obj/structure/bed/chair/comfy/black{ dir = 4 @@ -1128,7 +1128,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "cO" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; @@ -1138,7 +1138,7 @@ tag_door = "supply_shuttle_hatch" }, /turf/simulated/shuttle/floor, -/area/supply/dock) +/area/shuttle/supply) "cP" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood{ @@ -1194,21 +1194,21 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "cW" = ( /obj/structure/table/glass, /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "cX" = ( /obj/machinery/vending/boozeomat, /turf/simulated/shuttle/wall/dark, -/area/syndicate_station/start) +/area/shuttle/mercenary) "cY" = ( /obj/machinery/vending/food, /turf/simulated/shuttle/wall/dark, -/area/syndicate_station/start) +/area/shuttle/mercenary) "cZ" = ( /obj/structure/table/standard, /obj/item/reagent_containers/blood/OMinus, @@ -1222,7 +1222,7 @@ syndie = 1 }, /turf/simulated/shuttle/floor/white, -/area/syndicate_station/start) +/area/shuttle/mercenary) "da" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood/corner{ @@ -1266,7 +1266,7 @@ /area/holodeck/source_emptycourt) "dg" = ( /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "dh" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1380; @@ -1280,14 +1280,14 @@ id = "QMLoad" }, /turf/simulated/shuttle/plating, -/area/supply/dock) +/area/shuttle/supply) "di" = ( /obj/machinery/conveyor{ dir = 4; id = "QMLoad" }, /turf/simulated/shuttle/floor, -/area/supply/dock) +/area/shuttle/supply) "dj" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -1469,7 +1469,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_dred" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "dD" = ( /obj/machinery/computer/shuttle_control/multi/tether_antag_ground, /turf/simulated/shuttle/floor/darkred, @@ -1482,7 +1482,7 @@ dir = 1 }, /turf/simulated/floor/airless, -/area/supply/dock) +/area/shuttle/supply) "dF" = ( /turf/simulated/floor/holofloor/space, /area/holodeck/source_space) @@ -1721,12 +1721,12 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "ey" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "ez" = ( /obj/structure/closet/secure_closet/medical_wall{ pixel_y = 32; @@ -1748,7 +1748,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "eA" = ( /obj/structure/bed/chair/comfy/black{ dir = 1 @@ -1756,13 +1756,13 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "eB" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/structure/sign/nosmoking_1, /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "eC" = ( /obj/structure/window/reinforced{ dir = 1 @@ -1776,7 +1776,7 @@ dir = 8 }, /turf/simulated/shuttle/floor, -/area/syndicate_station/start) +/area/shuttle/mercenary) "eD" = ( /obj/machinery/light{ dir = 8 @@ -1784,7 +1784,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "eE" = ( /obj/machinery/door/window{ dir = 1; @@ -1792,17 +1792,17 @@ req_access = list(150) }, /turf/simulated/shuttle/floor, -/area/syndicate_station/start) +/area/shuttle/mercenary) "eF" = ( /obj/structure/sign/department/operational, /turf/simulated/shuttle/wall/dark, -/area/syndicate_station/start) +/area/shuttle/mercenary) "eH" = ( /obj/structure/window/reinforced{ dir = 8 }, /turf/simulated/shuttle/floor, -/area/syndicate_station/start) +/area/shuttle/mercenary) "eI" = ( /obj/structure/sink{ dir = 4; @@ -1820,7 +1820,7 @@ /obj/item/reagent_containers/glass/bottle/stoxin, /obj/item/reagent_containers/glass/bottle/stoxin, /turf/simulated/shuttle/floor, -/area/syndicate_station/start) +/area/shuttle/mercenary) "eJ" = ( /obj/structure/flora/tree/dead, /turf/simulated/floor/holofloor/snow, @@ -1864,7 +1864,7 @@ /area/holodeck/source_boxingcourt) "eS" = ( /turf/simulated/shuttle/floor, -/area/syndicate_station/start) +/area/shuttle/mercenary) "eT" = ( /obj/structure/flora/grass/green, /turf/simulated/floor/holofloor/snow, @@ -1992,7 +1992,7 @@ dir = 4 }, /turf/simulated/shuttle/plating/airless, -/area/syndicate_station/start) +/area/shuttle/mercenary) "fm" = ( /obj/item/radio/intercom{ desc = "Talk through this. Evilly"; @@ -2006,7 +2006,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "fn" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -2085,7 +2085,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "fz" = ( /obj/effect/floor_decal/corner/green{ dir = 9 @@ -2129,7 +2129,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "fG" = ( /obj/structure/flora/grass/brown, /turf/simulated/floor/holofloor/snow, @@ -2466,20 +2466,20 @@ /obj/item/storage/firstaid/regular, /obj/structure/table/reinforced, /turf/simulated/shuttle/floor/white, -/area/syndicate_station/start) +/area/shuttle/mercenary) "gG" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/structure/sign/department/medbay, /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "gH" = ( /obj/machinery/iv_drip, /obj/structure/window/reinforced{ dir = 8 }, /turf/simulated/shuttle/floor, -/area/syndicate_station/start) +/area/shuttle/mercenary) "gI" = ( /obj/item/roller, /obj/item/roller, @@ -2487,7 +2487,7 @@ /obj/structure/table/reinforced, /obj/item/bodybag/cryobag, /turf/simulated/shuttle/floor/white, -/area/syndicate_station/start) +/area/shuttle/mercenary) "gJ" = ( /obj/item/radio/intercom{ desc = "Talk through this. Evilly"; @@ -2506,11 +2506,11 @@ }, /obj/item/stack/medical/advanced/bruise_pack, /turf/simulated/shuttle/floor, -/area/syndicate_station/start) +/area/shuttle/mercenary) "gK" = ( /obj/machinery/optable, /turf/simulated/shuttle/floor, -/area/syndicate_station/start) +/area/shuttle/mercenary) "gL" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -2526,7 +2526,7 @@ opacity = 0 }, /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "gM" = ( /obj/structure/table/rack, /obj/item/ammo_magazine/m380, @@ -2539,7 +2539,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "gN" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/holofloor/desert, @@ -2606,7 +2606,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "gZ" = ( /obj/machinery/vending/cigarette{ name = "hacked cigarette machine"; @@ -2616,7 +2616,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "ha" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -2629,7 +2629,7 @@ opacity = 0 }, /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "hb" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -2648,7 +2648,7 @@ opacity = 0 }, /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "hc" = ( /obj/structure/table/steel_reinforced, /obj/machinery/button/remote/blast_door{ @@ -2659,11 +2659,11 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "hd" = ( /obj/structure/sign/department/bridge, /turf/simulated/shuttle/wall/dark/hard_corner, -/area/syndicate_station/start) +/area/shuttle/mercenary) "he" = ( /obj/machinery/light{ dir = 8 @@ -2671,13 +2671,13 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_white" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "hf" = ( /obj/structure/bed/chair, /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "hg" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/landmark{ @@ -2787,7 +2787,7 @@ }, /obj/item/surgical/surgicaldrill, /turf/simulated/shuttle/floor, -/area/syndicate_station/start) +/area/shuttle/mercenary) "ht" = ( /obj/structure/toilet{ dir = 4 @@ -2827,7 +2827,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "hx" = ( /turf/simulated/floor/holofloor/wood, /area/holodeck/holodorm/source_seating) @@ -3006,13 +3006,13 @@ /obj/structure/window/reinforced/full, /obj/structure/sign/department/telecoms, /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "hV" = ( /obj/structure/closet, /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "hW" = ( /obj/structure/closet, /obj/item/reagent_containers/food/snacks/liquidfood, @@ -3022,7 +3022,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "hX" = ( /obj/item/radio/intercom{ desc = "Talk through this. Evilly"; @@ -3036,7 +3036,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "hY" = ( /obj/machinery/computer/shuttle_control/multi/syndicate{ dir = 4 @@ -3044,7 +3044,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "hZ" = ( /turf/simulated/shuttle/floor/darkred, /area/shuttle/antag_ground/base{ @@ -3131,7 +3131,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "ii" = ( /obj/machinery/computer/security/nuclear{ dir = 4; @@ -3140,7 +3140,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "ij" = ( /obj/machinery/computer/shuttle_control/multi/tether_antag_space, /turf/simulated/shuttle/floor/darkred, @@ -3163,7 +3163,7 @@ opacity = 0 }, /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "il" = ( /obj/structure/table/steel_reinforced, /obj/machinery/button/remote/blast_door{ @@ -3173,7 +3173,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "im" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; @@ -3239,7 +3239,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "is" = ( /obj/item/radio/intercom{ desc = "Talk through this. Evilly"; @@ -3255,7 +3255,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "it" = ( /obj/structure/bed/chair{ dir = 1 @@ -3263,7 +3263,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "iu" = ( /obj/structure/bed/chair{ dir = 8 @@ -3288,19 +3288,19 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "iw" = ( /obj/machinery/teleport/station, /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "ix" = ( /obj/structure/frame/computer, /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "iy" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1380; @@ -3320,7 +3320,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "iB" = ( /obj/machinery/vending/snack{ name = "hacked Getmore Chocolate Corp"; @@ -3329,10 +3329,10 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "iC" = ( /turf/simulated/shuttle/wall/dark/hard_corner, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "iD" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1380; @@ -3343,21 +3343,21 @@ req_one_access = null }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "iE" = ( /turf/simulated/shuttle/wall/dark, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "iF" = ( /obj/machinery/washing_machine, /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "iG" = ( /turf/simulated/shuttle/floor{ icon_state = "floor_black" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "iH" = ( /turf/simulated/shuttle/floor/darkred, /area/shuttle/antag_space/base{ @@ -3380,7 +3380,7 @@ dir = 8 }, /turf/simulated/shuttle/plating, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "iJ" = ( /obj/structure/window/reinforced, /obj/machinery/door/blast/shutters{ @@ -3395,7 +3395,7 @@ dir = 1 }, /turf/simulated/shuttle/plating, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "iK" = ( /obj/structure/window/reinforced, /obj/machinery/door/blast/shutters{ @@ -3413,7 +3413,7 @@ dir = 4 }, /turf/simulated/shuttle/plating, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "iL" = ( /obj/machinery/recharger/wallcharger{ pixel_x = 5; @@ -3422,19 +3422,19 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_black" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "iM" = ( /obj/machinery/light/small{ dir = 4 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "iN" = ( /obj/structure/shuttle/engine/heater{ dir = 4 }, /turf/simulated/shuttle/plating/airless, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "iP" = ( /obj/machinery/light{ dir = 4 @@ -3478,7 +3478,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_black" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "iQ" = ( /obj/machinery/door/airlock/silver{ name = "Toilet" @@ -3486,7 +3486,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_white" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "iR" = ( /obj/structure/bed/chair/comfy/black{ dir = 8 @@ -3497,7 +3497,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "iS" = ( /obj/structure/closet{ icon_closed = "cabinet_closed"; @@ -3505,48 +3505,48 @@ icon_state = "cabinet_closed" }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "iT" = ( /obj/structure/bed/padded, /obj/item/bedsheet/rd, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "iU" = ( /obj/structure/table/standard, /obj/machinery/chemical_dispenser/bar_alc/full, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "iV" = ( /obj/structure/table/standard, /obj/machinery/microwave, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "iW" = ( /obj/machinery/light{ dir = 1 }, /turf/simulated/floor/carpet, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "iX" = ( /obj/structure/bed/chair, /turf/simulated/floor/carpet, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "iY" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-22" }, /turf/simulated/floor/carpet, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "iZ" = ( /obj/machinery/sleep_console, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "ja" = ( /obj/machinery/sleeper{ dir = 4 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jc" = ( /obj/structure/mirror{ pixel_y = 28 @@ -3558,7 +3558,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_white" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "jd" = ( /obj/machinery/door/airlock/centcom{ name = "Equipment Storage"; @@ -3567,7 +3567,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_dred" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "je" = ( /obj/structure/window/reinforced{ dir = 4 @@ -3588,56 +3588,56 @@ dir = 8 }, /turf/simulated/shuttle/plating, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jf" = ( /obj/machinery/newscaster{ pixel_y = 32 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jg" = ( /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jh" = ( /obj/machinery/door/airlock/silver{ name = "Sleeping" }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "ji" = ( /turf/simulated/floor/carpet, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jj" = ( /obj/structure/table/standard, /obj/item/storage/box/donkpockets, /turf/simulated/floor/carpet, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jk" = ( /obj/structure/bed/chair{ dir = 8 }, /turf/simulated/floor/carpet, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jl" = ( /obj/machinery/atm{ pixel_x = -32 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jm" = ( /obj/machinery/suit_cycler/syndicate, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jn" = ( /obj/machinery/bodyscanner{ dir = 8 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jo" = ( /obj/machinery/body_scanconsole, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jp" = ( /obj/item/storage/firstaid/regular{ pixel_x = -2; @@ -3681,13 +3681,13 @@ pixel_y = 32 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jq" = ( /obj/machinery/light{ dir = 4 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jr" = ( /obj/structure/bed/chair{ dir = 1 @@ -3706,7 +3706,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_black" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "jt" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -3715,7 +3715,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_white" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "ju" = ( /obj/structure/window/reinforced{ dir = 4 @@ -3734,11 +3734,11 @@ dir = 8 }, /turf/simulated/shuttle/plating, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jv" = ( /obj/structure/closet/wardrobe/pjs, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jw" = ( /obj/item/paper_bin{ pixel_x = -3; @@ -3750,7 +3750,7 @@ /obj/machinery/light, /obj/structure/table/glass, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jx" = ( /obj/structure/bed/padded, /obj/item/bedsheet/hos, @@ -3758,37 +3758,37 @@ pixel_y = -32 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jy" = ( /obj/structure/bed/chair{ dir = 4 }, /turf/simulated/floor/carpet, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jz" = ( /obj/structure/table/standard, /obj/item/storage/box/glasses/square, /turf/simulated/floor/carpet, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jA" = ( /obj/structure/table/steel_reinforced, /obj/item/inflatable_duck, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jB" = ( /obj/structure/table/steel_reinforced, /obj/item/stack/material/mhydrogen, /obj/item/stack/material/diamond, /obj/item/stack/material/sandstone, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jC" = ( /obj/structure/table/steel_reinforced, /obj/item/rig/internalaffairs, /obj/item/clothing/head/helmet/space/void/wizard, /obj/item/clothing/suit/space/void/wizard, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jD" = ( /obj/structure/table/steel_reinforced, /obj/random/tool, @@ -3797,14 +3797,14 @@ /obj/random/tool, /obj/random/tool, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jE" = ( /obj/structure/table/steel_reinforced, /obj/random/toolbox, /obj/random/toolbox, /obj/random/toolbox, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jF" = ( /obj/structure/window/reinforced{ dir = 8 @@ -3817,17 +3817,17 @@ dir = 4 }, /turf/simulated/shuttle/plating, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jG" = ( /obj/vehicle/train/engine, /obj/machinery/light{ dir = 8 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jH" = ( /turf/simulated/shuttle/floor/darkred, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jI" = ( /obj/machinery/door/airlock/glass_medical{ name = "Medical Bay"; @@ -3835,11 +3835,11 @@ req_one_access = newlist() }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jJ" = ( /obj/machinery/optable, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jL" = ( /obj/machinery/vending/coffee{ name = "hacked Hot Drinks machine"; @@ -3851,13 +3851,13 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "jM" = ( /obj/structure/closet/walllocker/emerglocker{ pixel_y = -32 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jN" = ( /obj/machinery/button/remote/blast_door{ id = "tradestarshutters"; @@ -3866,7 +3866,7 @@ req_access = list(160) }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jO" = ( /obj/structure/table/steel_reinforced, /obj/random/firstaid, @@ -3874,25 +3874,25 @@ /obj/random/firstaid, /obj/random/firstaid, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jP" = ( /obj/effect/floor_decal/industrial/warning{ dir = 9 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jQ" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jR" = ( /obj/effect/floor_decal/industrial/warning{ dir = 5 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jS" = ( /obj/structure/table/steel_reinforced, /obj/random/tech_supply, @@ -3903,7 +3903,7 @@ /obj/random/tech_supply, /obj/item/weldpack, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jT" = ( /obj/structure/window/reinforced{ dir = 8 @@ -3913,19 +3913,19 @@ dir = 4 }, /turf/simulated/shuttle/plating, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jU" = ( /obj/vehicle/train/trolley, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jV" = ( /obj/machinery/light, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jW" = ( /obj/structure/closet/wardrobe/captain, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jX" = ( /obj/machinery/door/airlock/silver{ name = "Restroom" @@ -3936,13 +3936,13 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_white" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "jY" = ( /obj/machinery/door/airlock/multi_tile/glass{ req_access = list(160) }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "jZ" = ( /obj/structure/table/steel_reinforced, /obj/random/medical, @@ -3951,14 +3951,14 @@ /obj/random/medical, /obj/structure/window/reinforced, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "ka" = ( /obj/machinery/door/window/southleft{ name = "Cargo Hold"; req_access = list(160) }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kb" = ( /obj/structure/table/steel_reinforced, /obj/item/coin/uranium, @@ -3970,14 +3970,14 @@ /obj/item/coin/diamond, /obj/structure/window/reinforced, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kc" = ( /obj/machinery/door/window/southright{ name = "Cargo Hold"; req_access = list(160) }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kd" = ( /obj/structure/table/steel_reinforced, /obj/item/cell/high, @@ -3986,7 +3986,7 @@ /obj/item/cell/potato, /obj/structure/window/reinforced, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "ke" = ( /obj/structure/window/reinforced{ dir = 8 @@ -3997,7 +3997,7 @@ dir = 4 }, /turf/simulated/shuttle/plating, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kf" = ( /obj/structure/table/standard, /obj/item/clothing/gloves/sterile/latex, @@ -4026,11 +4026,11 @@ pixel_y = 3 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kg" = ( /obj/machinery/iv_drip, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kh" = ( /obj/machinery/door/blast/shutters{ density = 0; @@ -4048,7 +4048,7 @@ dir = 1 }, /turf/simulated/shuttle/plating, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "ki" = ( /obj/machinery/door/blast/shutters{ density = 0; @@ -4066,25 +4066,25 @@ dir = 1 }, /turf/simulated/shuttle/plating, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kj" = ( /obj/machinery/vending/coffee, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kk" = ( /obj/machinery/light{ dir = 1 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kl" = ( /obj/machinery/door/airlock/multi_tile/glass, /turf/simulated/shuttle/floor/darkred, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "km" = ( /obj/structure/closet/crate/secure/weapon, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kn" = ( /obj/structure/table/steel_reinforced, /obj/item/paper_bin{ @@ -4095,21 +4095,21 @@ pixel_y = 4 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "ko" = ( /obj/structure/table/steel_reinforced, /obj/machinery/newscaster{ pixel_x = 32 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kp" = ( /obj/structure/toilet, /obj/machinery/light/small{ dir = 1 }, /turf/simulated/shuttle/floor/white, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kq" = ( /obj/structure/sink{ dir = 8; @@ -4118,27 +4118,27 @@ }, /obj/machinery/light/small, /turf/simulated/shuttle/floor/white, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kr" = ( /obj/structure/mirror{ pixel_y = 28 }, /turf/simulated/shuttle/floor/white, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "ks" = ( /obj/structure/curtain/open/shower, /obj/machinery/shower{ pixel_y = 3 }, /turf/simulated/shuttle/floor/white, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kt" = ( /obj/machinery/vending/snack{ name = "hacked Getmore Chocolate Corp"; prices = list() }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "ku" = ( /obj/structure/window/reinforced, /obj/structure/grille, @@ -4152,13 +4152,13 @@ dir = 8 }, /turf/simulated/shuttle/plating, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kv" = ( /obj/machinery/light{ dir = 8 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kw" = ( /obj/machinery/door/blast/shutters{ density = 0; @@ -4179,11 +4179,11 @@ dir = 1 }, /turf/simulated/shuttle/plating, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kx" = ( /obj/structure/frame/computer, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "ky" = ( /obj/machinery/light{ dir = 4 @@ -4195,23 +4195,23 @@ }, /mob/living/simple_mob/animal/passive/dog/tamaskan/Spice, /turf/simulated/shuttle/floor/darkred, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kz" = ( /obj/machinery/door/airlock/silver{ name = "Toilet" }, /turf/simulated/shuttle/floor/white, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kA" = ( /obj/machinery/door/airlock/silver{ name = "Restroom" }, /turf/simulated/shuttle/floor/white, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kB" = ( /obj/structure/undies_wardrobe, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kC" = ( /obj/machinery/vending/cigarette{ name = "Cigarette machine"; @@ -4219,28 +4219,28 @@ products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kD" = ( /obj/effect/floor_decal/industrial/warning{ dir = 9 }, /obj/structure/largecrate/animal/cat, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kE" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 }, /obj/structure/largecrate/animal/cow, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kF" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 }, /obj/structure/closet/crate/freezer/rations, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kG" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/warning{ @@ -4251,28 +4251,28 @@ /obj/item/kit/paint/ripley/flames_red, /obj/item/kit/paint/ripley, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kH" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 }, /obj/structure/closet/crate/secure/loot, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kI" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 }, /obj/structure/largecrate/hoverpod, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kJ" = ( /obj/effect/floor_decal/industrial/warning{ dir = 5 }, /obj/mecha/working/ripley/mining, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kK" = ( /obj/machinery/door/window/westright{ name = "Storefront"; @@ -4288,13 +4288,13 @@ opacity = 0 }, /turf/simulated/shuttle/floor/darkred, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kL" = ( /obj/structure/bed/chair/office/dark{ dir = 8 }, /turf/simulated/shuttle/floor/darkred, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kM" = ( /obj/machinery/door/blast/shutters{ density = 0; @@ -4313,7 +4313,7 @@ dir = 8 }, /turf/simulated/shuttle/plating, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kN" = ( /obj/machinery/computer/shuttle_control{ name = "Beruang control console"; @@ -4321,13 +4321,13 @@ shuttle_tag = "Trade" }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kO" = ( /obj/structure/bed/chair{ dir = 8 }, /turf/simulated/shuttle/floor/darkred, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kP" = ( /obj/machinery/door/airlock/command{ name = "Bridge"; @@ -4335,30 +4335,30 @@ req_one_access = newlist() }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kQ" = ( /obj/structure/noticeboard{ pixel_y = 32 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kR" = ( /obj/effect/floor_decal/industrial/warning{ dir = 10 }, /obj/structure/largecrate/animal/corgi, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kS" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/largecrate/animal/corgi, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kT" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/closet/crate/internals, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kU" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/warning, @@ -4368,24 +4368,24 @@ /obj/item/kit/paint/durand/phazon, /obj/item/kit/paint/durand/seraph, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kV" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/closet/crate/secure/loot, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kW" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/largecrate/hoverpod, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kX" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 }, /obj/mecha/working/ripley/firefighter, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kY" = ( /obj/machinery/door/window/westleft{ name = "Storefront"; @@ -4402,11 +4402,11 @@ }, /obj/structure/table/marble, /turf/simulated/shuttle/floor/darkred, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "kZ" = ( /obj/machinery/computer/arcade/battle, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "la" = ( /obj/structure/table/steel_reinforced, /obj/machinery/button/remote/blast_door{ @@ -4421,7 +4421,7 @@ pixel_y = 8 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lb" = ( /obj/machinery/vending/assist{ contraband = null; @@ -4429,7 +4429,7 @@ products = list(/obj/item/assembly/prox_sensor = 5, /obj/item/assembly/signaler = 4, /obj/item/assembly/infra = 4, /obj/item/assembly/prox_sensor = 4, /obj/item/handcuffs = 8, /obj/item/flash = 4, /obj/item/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4) }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lc" = ( /obj/structure/closet{ name = "custodial" @@ -4438,11 +4438,11 @@ /obj/item/reagent_containers/glass/bucket, /obj/item/mop, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "ld" = ( /obj/machinery/vending/sovietsoda, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "le" = ( /obj/machinery/light, /obj/structure/table/standard, @@ -4451,27 +4451,27 @@ color = "#0000FF" }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lf" = ( /obj/structure/sign/poster{ pixel_y = -32 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lg" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 2; req_access = list(160) }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lh" = ( /obj/machinery/door/window/westleft{ name = "Storefront"; req_access = list(160) }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "li" = ( /obj/machinery/button/remote/blast_door{ id = "trade"; @@ -4479,7 +4479,7 @@ pixel_y = -26 }, /turf/simulated/shuttle/floor/darkred, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lj" = ( /obj/machinery/door/blast/shutters{ density = 0; @@ -4498,7 +4498,7 @@ dir = 1 }, /turf/simulated/shuttle/plating, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lk" = ( /obj/machinery/door/blast/shutters{ density = 0; @@ -4517,22 +4517,22 @@ dir = 1 }, /turf/simulated/shuttle/plating, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "ll" = ( /obj/machinery/vending/boozeomat{ req_access = null }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lm" = ( /obj/structure/table/standard, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "ln" = ( /obj/structure/table/standard, /obj/item/storage/toolbox/mechanical, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lo" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -4556,14 +4556,14 @@ /obj/item/contraband/poster, /obj/item/contraband/poster, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lq" = ( /obj/machinery/door/window/northleft{ name = "Cargo Hold"; req_access = list(160) }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lr" = ( /obj/structure/table/steel_reinforced, /obj/random/plushie, @@ -4575,14 +4575,14 @@ dir = 1 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "ls" = ( /obj/machinery/door/window/northright{ name = "Cargo Hold"; req_access = list(160) }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lt" = ( /obj/structure/table/steel_reinforced, /obj/item/clothing/gloves/black, @@ -4601,19 +4601,19 @@ dir = 1 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lu" = ( /obj/machinery/atmospherics/pipe/tank/air{ start_pressure = 740.5 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lv" = ( /obj/structure/closet/walllocker/emerglocker{ pixel_y = 32 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lw" = ( /obj/machinery/autolathe{ desc = "Your typical Autolathe. It appears to have much more options than your regular one, however..."; @@ -4621,7 +4621,7 @@ name = "Unlocked Autolathe" }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lx" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -4642,7 +4642,7 @@ req_access = list(160) }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lz" = ( /obj/structure/table/steel_reinforced, /obj/random/contraband, @@ -4653,23 +4653,23 @@ /obj/random/contraband, /obj/item/bikehorn, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lA" = ( /obj/effect/floor_decal/industrial/warning{ dir = 10 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lB" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lC" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lD" = ( /obj/structure/table/steel_reinforced, /obj/item/clothing/head/bearpelt, @@ -4702,13 +4702,13 @@ /obj/item/clothing/head/plaguedoctorhat, /obj/item/clothing/head/xenos, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lE" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/machinery/meter, /obj/structure/largecrate/animal/cat, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lF" = ( /obj/machinery/door/airlock/glass_engineering{ name = "Engineering"; @@ -4716,7 +4716,7 @@ req_one_access = newlist() }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lG" = ( /obj/structure/window/reinforced{ dir = 4 @@ -4737,7 +4737,7 @@ dir = 1 }, /turf/simulated/shuttle/plating, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lH" = ( /obj/machinery/vending/medical{ density = 0; @@ -4747,26 +4747,26 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_white" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "lI" = ( /obj/machinery/light{ dir = 1 }, /obj/structure/bookcase, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lJ" = ( /obj/structure/bed/chair/comfy/black, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lK" = ( /obj/structure/bed/chair/office/dark, /turf/simulated/floor/carpet, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lL" = ( /obj/machinery/photocopier, /turf/simulated/floor/carpet, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lM" = ( /obj/structure/table/steel_reinforced, /obj/random/action_figure, @@ -4776,7 +4776,7 @@ /obj/random/action_figure, /obj/random/action_figure, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lN" = ( /obj/structure/table/steel_reinforced, /obj/item/lipstick/black, @@ -4785,7 +4785,7 @@ /obj/item/lipstick, /obj/item/lipstick/random, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lO" = ( /obj/structure/table/steel_reinforced, /obj/item/clothing/accessory/holster/hip, @@ -4814,7 +4814,7 @@ /obj/item/clothing/accessory/medal/gold, /obj/item/clothing/accessory/medal/bronze_heart, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lP" = ( /obj/structure/table/steel_reinforced, /obj/item/clothing/under/cheongsam, @@ -4844,7 +4844,7 @@ /obj/item/clothing/under/dress/dress_orange, /obj/item/clothing/under/dress/maid/janitor, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lQ" = ( /obj/structure/table/steel_reinforced, /obj/item/clothing/suit/hgpirate, @@ -4857,7 +4857,7 @@ /obj/item/clothing/suit/justice, /obj/item/clothing/suit/pirate, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lR" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/structure/closet/crate/solar, @@ -4865,7 +4865,7 @@ dir = 8 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lS" = ( /obj/structure/window/reinforced{ dir = 4 @@ -4884,7 +4884,7 @@ }, /obj/structure/window/reinforced, /turf/simulated/shuttle/plating, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lT" = ( /obj/machinery/door/airlock/command{ name = "Captain's Quarters"; @@ -4892,7 +4892,7 @@ req_one_access = newlist() }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lU" = ( /obj/structure/table/woodentable, /obj/item/paper_bin{ @@ -4903,16 +4903,16 @@ pixel_y = 4 }, /turf/simulated/floor/carpet, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lV" = ( /obj/structure/table/woodentable, /turf/simulated/floor/carpet, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lW" = ( /obj/structure/table/woodentable, /obj/item/modular_computer/laptop, /turf/simulated/floor/carpet, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lX" = ( /obj/structure/window/reinforced{ dir = 1 @@ -4931,7 +4931,7 @@ }, /obj/structure/window/reinforced, /turf/simulated/shuttle/plating, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lY" = ( /obj/structure/window/reinforced{ dir = 1 @@ -4947,7 +4947,7 @@ /obj/structure/grille, /obj/structure/window/reinforced, /turf/simulated/shuttle/plating, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "lZ" = ( /obj/structure/window/reinforced{ dir = 1 @@ -4966,7 +4966,7 @@ }, /obj/structure/window/reinforced, /turf/simulated/shuttle/plating, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "ma" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 @@ -4976,7 +4976,7 @@ }, /obj/machinery/meter, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "mb" = ( /obj/machinery/access_button{ command = "cycle_interior"; @@ -4990,13 +4990,13 @@ dir = 1 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "mc" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "md" = ( /obj/structure/table/standard, /obj/item/clothing/suit/space/void/merc, @@ -5009,7 +5009,7 @@ /obj/item/clothing/head/helmet/space/void/merc, /obj/item/clothing/head/helmet/space/void/merc, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "me" = ( /obj/structure/table/standard, /obj/item/stack/cable_coil, @@ -5018,7 +5018,7 @@ /obj/item/clothing/gloves/yellow, /obj/item/clothing/gloves/yellow, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "mf" = ( /obj/structure/table/standard, /obj/item/stack/material/steel{ @@ -5034,39 +5034,39 @@ amount = 15 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "mg" = ( /obj/structure/bed/padded, /obj/item/bedsheet/captain, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "mh" = ( /obj/structure/table/glass, /obj/machinery/computer/security/telescreen{ pixel_y = -35 }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "mi" = ( /obj/structure/filingcabinet/filingcabinet, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "mj" = ( /obj/machinery/light, /turf/simulated/floor/carpet, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "mk" = ( /obj/structure/bed/chair/comfy/black{ dir = 1 }, /turf/simulated/floor/carpet, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "ml" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-10" }, /turf/simulated/floor/carpet, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "mm" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/machinery/door/airlock/glass_external{ @@ -5077,7 +5077,7 @@ name = "Ship Hatch" }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "mn" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1331; @@ -5088,15 +5088,15 @@ }, /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "mo" = ( /obj/machinery/vending/engivend, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "mp" = ( /obj/machinery/vending/tool, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "mq" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 1; @@ -5114,7 +5114,7 @@ tag_interior_door = "trade2_shuttle_inner" }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "mr" = ( /obj/machinery/light/small{ dir = 4 @@ -5130,7 +5130,7 @@ id_tag = "trade2_vent" }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "ms" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1331; @@ -5140,7 +5140,7 @@ name = "Ship Hatch" }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "mt" = ( /obj/machinery/access_button{ command = "cycle_exterior"; @@ -5157,7 +5157,7 @@ name = "Ship Hatch" }, /turf/simulated/shuttle/floor/black, -/area/shuttle/trade/centcom) +/area/shuttle/trade) "mu" = ( /obj/effect/transit/light{ dir = 8 @@ -6398,7 +6398,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "pj" = ( /obj/structure/bed/chair, /obj/machinery/light{ @@ -6407,7 +6407,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "pk" = ( /turf/unsimulated/floor{ icon_state = "dark" @@ -6501,7 +6501,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "ps" = ( /obj/machinery/atmospherics/pipe/tank/air{ dir = 4; @@ -6509,7 +6509,7 @@ }, /obj/machinery/door/window, /turf/simulated/shuttle/floor/white, -/area/syndicate_station/start) +/area/shuttle/mercenary) "pt" = ( /obj/machinery/shower{ dir = 8; @@ -6519,7 +6519,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_white" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "pu" = ( /obj/structure/table/rack, /obj/item/gun/energy/sniperrifle, @@ -6695,13 +6695,13 @@ dir = 9 }, /turf/simulated/shuttle/floor/white, -/area/syndicate_station/start) +/area/shuttle/mercenary) "pN" = ( /obj/machinery/embedded_controller/radio/airlock/phoron{ id_tag = "merc_south_airlock" }, /turf/simulated/shuttle/wall/dark, -/area/syndicate_station/start) +/area/shuttle/mercenary) "pO" = ( /obj/machinery/access_button/airlock_exterior{ command = "cycle_interior"; @@ -6718,7 +6718,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_dred" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "pP" = ( /obj/machinery/door/airlock/glass_external/public{ frequency = 1379; @@ -6729,7 +6729,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_dred" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "pS" = ( /obj/structure/table/rack, /obj/item/cell/device/weapon, @@ -6902,7 +6902,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "qg" = ( /obj/effect/floor_decal/corner/purple{ dir = 5 @@ -6956,7 +6956,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_dred" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "qk" = ( /obj/effect/floor_decal/corner/red{ dir = 6 @@ -7144,7 +7144,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "qy" = ( /obj/structure/table/rack, /obj/item/ammo_magazine/m45/rubber, @@ -7864,7 +7864,7 @@ scrub_id = "merc_south_airlock_scrubber" }, /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "rI" = ( /obj/structure/table/rack, /obj/item/storage/box/handcuffs{ @@ -7974,7 +7974,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_dred" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "rP" = ( /obj/structure/table/rack, /obj/item/storage/box/syndie_kit/combat_armor, @@ -8162,7 +8162,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_dred" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "sa" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1331; @@ -8186,7 +8186,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_dred" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "sb" = ( /obj/structure/table/rack, /obj/effect/floor_decal/borderfloorblack{ @@ -8249,11 +8249,11 @@ "se" = ( /obj/structure/symbol/da, /turf/simulated/shuttle/wall/dark, -/area/syndicate_station/start) +/area/shuttle/mercenary) "sf" = ( /obj/structure/symbol/lo, /turf/simulated/shuttle/wall/dark, -/area/syndicate_station/start) +/area/shuttle/mercenary) "sg" = ( /obj/structure/closet{ name = "custodial" @@ -8266,7 +8266,7 @@ }, /obj/item/clothing/gloves/yellow, /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "sh" = ( /obj/structure/sink{ dir = 8; @@ -8274,7 +8274,7 @@ pixel_y = 8 }, /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "si" = ( /obj/machinery/door/window{ name = "Cell"; @@ -8434,14 +8434,14 @@ /obj/machinery/meter, /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "sv" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, /obj/effect/decal/cleanable/generic, /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "sw" = ( /obj/structure/toilet{ dir = 4 @@ -8563,7 +8563,7 @@ req_one_access = list(150) }, /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "sH" = ( /obj/structure/table/reinforced, /obj/item/storage/belt/utility/full, @@ -8571,7 +8571,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_black" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "sI" = ( /obj/effect/floor_decal/borderfloorblack/corner{ dir = 4 @@ -8699,13 +8699,13 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "sT" = ( /obj/machinery/atmospherics/pipe/manifold/visible, /turf/simulated/shuttle/floor{ icon_state = "floor_dred" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "sU" = ( /obj/effect/floor_decal/borderfloorblack, /obj/machinery/recharger/wallcharger{ @@ -8787,7 +8787,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_black" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "tb" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -8795,7 +8795,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_dred" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "tc" = ( /turf/unsimulated/floor{ icon_state = "freezerfloor" @@ -8820,7 +8820,7 @@ opacity = 0 }, /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "te" = ( /obj/structure/toilet, /turf/unsimulated/floor{ @@ -9049,7 +9049,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "tF" = ( /obj/machinery/shower{ dir = 1 @@ -9093,7 +9093,7 @@ opacity = 0 }, /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "tJ" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/drinks/bottle/vodka{ @@ -9308,7 +9308,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "uj" = ( /obj/structure/closet, /obj/item/reagent_containers/food/snacks/tastybread, @@ -9321,23 +9321,23 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "uk" = ( /obj/structure/mopbucket, /turf/simulated/floor/plating, -/area/syndicate_station/start) +/area/shuttle/mercenary) "ul" = ( /obj/machinery/door/airlock/glass, /turf/simulated/shuttle/floor{ icon_state = "floor_dred" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "um" = ( /obj/machinery/door/airlock/multi_tile/glass, /turf/simulated/shuttle/floor{ icon_state = "floor_dred" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "un" = ( /obj/structure/closet/syndicate, /obj/item/clothing/mask/gas/wwii, @@ -9352,7 +9352,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "uo" = ( /obj/structure/bed/chair{ dir = 8 @@ -9366,7 +9366,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "up" = ( /obj/machinery/door/airlock/multi_tile/metal{ dir = 1; @@ -9375,7 +9375,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_dred" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "uq" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 1 @@ -9383,7 +9383,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_dred" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "ur" = ( /obj/item/radio/intercom{ desc = "Talk through this. Evilly"; @@ -9403,25 +9403,25 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "us" = ( /obj/structure/bed/padded, /obj/item/bedsheet/hos, /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "ut" = ( /obj/structure/sign/department/armory, /turf/simulated/shuttle/wall/dark, -/area/syndicate_station/start) +/area/shuttle/mercenary) "uu" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/shuttle/floor{ icon_state = "floor_black" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "uv" = ( /obj/structure/table/rack, /obj/item/paper{ @@ -9432,7 +9432,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_black" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "uw" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 @@ -9441,7 +9441,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_dred" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "ux" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -9450,7 +9450,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "uy" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 @@ -9458,13 +9458,13 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "uz" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/shuttle/floor{ icon_state = "floor_dred" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "uA" = ( /obj/item/aicard, /obj/item/plastique, @@ -9474,7 +9474,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_black" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "uB" = ( /obj/effect/floor_decal/corner_steel_grid{ dir = 10 @@ -9496,7 +9496,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_dred" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "uC" = ( /obj/machinery/light{ dir = 8 @@ -9505,7 +9505,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "uD" = ( /obj/structure/bed/chair{ dir = 1 @@ -9516,7 +9516,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "uE" = ( /obj/structure/bed/chair{ dir = 1 @@ -9527,7 +9527,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "uF" = ( /obj/item/radio/intercom{ desc = "Talk through this. Evilly"; @@ -9550,7 +9550,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "uH" = ( /obj/machinery/washing_machine, /obj/machinery/light{ @@ -9559,7 +9559,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "uI" = ( /obj/structure/bed/padded, /obj/item/bedsheet/hos, @@ -9569,7 +9569,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "uJ" = ( /obj/structure/bed/padded, /obj/item/bedsheet/hos, @@ -9579,7 +9579,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "uK" = ( /obj/structure/toilet{ dir = 4 @@ -9590,7 +9590,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_white" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "uL" = ( /obj/item/radio/intercom{ desc = "Talk through this. Evilly"; @@ -9609,7 +9609,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_white" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "uM" = ( /obj/structure/closet/secure_closet/medical_wall{ pixel_y = -32; @@ -9631,7 +9631,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "uN" = ( /obj/item/radio/intercom{ desc = "Talk through this. Evilly"; @@ -9647,7 +9647,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "uO" = ( /obj/machinery/light{ dir = 8 @@ -9655,7 +9655,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_black" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "uP" = ( /obj/item/storage/box/frags, /obj/structure/table/reinforced, @@ -9665,7 +9665,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_black" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "uQ" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; @@ -9678,7 +9678,7 @@ /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, -/area/syndicate_station/start) +/area/shuttle/mercenary) "vi" = ( /obj/structure/table/standard, /obj/item/storage/firstaid/surgery, @@ -10118,6 +10118,16 @@ initial_gas_mix = "phoron=101;TEMP=293.15" }, /area/holodeck/holodorm/source_phoron) +"IO" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/space; + base_turf = /turf/space; + docking_controller = "trade_shuttle_bay"; + landmark_tag = "trade_cc"; + name = "Trader Station" + }, +/turf/simulated/shuttle/floor/black, +/area/shuttle/trade) "IX" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -28561,7 +28571,7 @@ gC gC iy iD -jg +IO am jg jH diff --git a/maps/tether/submaps/tether_ships.dmm b/maps/tether/submaps/tether_ships.dmm index 817c74b70b4..b0a2452422d 100644 --- a/maps/tether/submaps/tether_ships.dmm +++ b/maps/tether/submaps/tether_ships.dmm @@ -3,8 +3,14 @@ /turf/space, /area/space) "ab" = ( +/obj/effect/shuttle_landmark/transit{ + base_area = /area/space; + base_turf = /turf/space/transit/east; + landmark_tag = "belter_transit"; + name = "Belter Transit" + }, /turf/space/transit/east, -/area/shuttle/belter/transit) +/area/space) "ac" = ( /obj/effect/step_trigger/teleporter/random{ affect_ghosts = 1; @@ -40,15 +46,27 @@ /turf/space/sandyscroll, /area/space) "fg" = ( +/obj/effect/shuttle_landmark/transit{ + base_area = /area/space; + base_turf = /turf/space/bluespace; + landmark_tag = "tether_excursion_bluespace"; + name = "Excursion Bluespace Transit" + }, /turf/space/bluespace, -/area/shuttle/excursion/bluespace) +/area/space) "gO" = ( /obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, /turf/simulated/sky/virgo3b/south, /area/space) "gP" = ( +/obj/effect/shuttle_landmark/transit{ + base_area = /area/space; + base_turf = /turf/simulated/sky/virgo3b/south; + landmark_tag = "tether_excursion_virgo3bsky"; + name = "Excursion Virgo3b Sky" + }, /turf/simulated/sky/virgo3b/south, -/area/shuttle/excursion/virgo3b_sky) +/area/space) "gT" = ( /turf/space/transit/east, /area/space) @@ -86,25 +104,57 @@ }, /area/space) "ha" = ( +/obj/effect/shuttle_landmark/transit{ + base_area = /area/space; + base_turf = /turf/space/transit/south; + landmark_tag = "antag_space_transit"; + name = "Proto Shuttle Transit" + }, /turf/space/transit/south, -/area/shuttle/antag_space/transit) +/area/space) "hb" = ( +/obj/effect/shuttle_landmark/transit{ + base_area = /area/space; + base_turf = /turf/unsimulated/floor/techfloor_grid; + flags = 0; + landmark_tag = "antag_ground_transit"; + name = "Secret Tunnel" + }, /turf/unsimulated/floor/techfloor_grid{ icon = 'icons/turf/transit_vr.dmi' }, -/area/shuttle/antag_ground/transit) +/area/space) "hc" = ( /turf/simulated/sky/virgo3b/south, /area/space) "hd" = ( +/obj/effect/shuttle_landmark/transit{ + base_area = /area/space; + base_turf = /turf/space/sandyscroll; + landmark_tag = "tether_excursion_transit_sand"; + name = "Excursion Sandy Transit" + }, /turf/space/sandyscroll, -/area/shuttle/excursion/sand_moving) +/area/space) "he" = ( +/obj/effect/shuttle_landmark/transit{ + base_area = /area/space; + base_turf = /turf/space; + docking_controller = null; + landmark_tag = "tether_excursion_space"; + name = "Excursion Space" + }, /turf/space, -/area/shuttle/excursion/space) +/area/space) "hf" = ( +/obj/effect/shuttle_landmark/transit{ + base_area = /area/space; + base_turf = /turf/space/transit/east; + landmark_tag = "escapepod1_transit"; + name = "Escapepod 1 Transit" + }, /turf/space/transit/east, -/area/shuttle/large_escape_pod1/transit) +/area/space) "hh" = ( /obj/effect/floor_decal/transit/orange{ dir = 8 @@ -138,8 +188,14 @@ /turf/space/bluespace, /area/space) "hk" = ( +/obj/effect/shuttle_landmark/transit{ + base_area = /area/space; + base_turf = /turf/simulated/sky/virgo3b/south; + landmark_tag = "tether_backup_transit"; + name = "Tether Backup Transit" + }, /turf/simulated/sky/virgo3b/south, -/area/shuttle/tether/transit) +/area/space) "hn" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -163,8 +219,15 @@ /turf/space/transit/south, /area/space) "hq" = ( +/obj/effect/shuttle_landmark/transit{ + base_area = /area/space; + base_turf = /turf/space; + docking_controller = null; + landmark_tag = "tether_excursion_transit_space"; + name = "Excursion Transit Space" + }, /turf/space/transit/south, -/area/shuttle/excursion/space_moving) +/area/space) "hr" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -293,8 +356,14 @@ /turf/space/transit/north, /area/space) "Js" = ( +/obj/effect/shuttle_landmark/transit{ + base_area = /area/space; + base_turf = /turf/space/transit/north; + landmark_tag = "skipjack_transit"; + name = "Skipjack Transit" + }, /turf/space/transit/north, -/area/skipjack_station/transit) +/area/space) "Nb" = ( /turf/space, /turf/space/transit/north, @@ -311,8 +380,14 @@ /turf/space/transit/north, /area/space) "TL" = ( +/obj/effect/shuttle_landmark/transit{ + base_area = /area/space; + base_turf = /turf/space/transit/east; + landmark_tag = "specops_transit"; + name = "Specops Transit" + }, /turf/space/transit/east, -/area/shuttle/escape_pod3/transit) +/area/space) (1,1,1) = {" aa diff --git a/maps/tether/tether_shuttle_defs.dm b/maps/tether/tether_shuttle_defs.dm index 5f51237e7ac..4c902f2f6f5 100644 --- a/maps/tether/tether_shuttle_defs.dm +++ b/maps/tether/tether_shuttle_defs.dm @@ -38,17 +38,17 @@ // Trade Ship /datum/shuttle/autodock/multi/trade name = "Trade" - current_location = "trade_dock" + current_location = "cc_trade_dock" shuttle_area = /area/shuttle/trade docking_controller_tag = "trade_shuttle" warmup_time = 10 //want some warmup time so people can cancel. destination_tags = list( - "trade_dock", + "cc_trade_dock", "tether_dockarm_d1l", - "aerostat_south", - "beach_e", - "beach_c", - "beach_nw" + "nav_aerostat_south", + "nav_beach_e", + "nav_beach_c", + "nav_beach_nw" ) ////////////////////////////////////////////////////////////// @@ -65,7 +65,6 @@ docking_controller_tag = "tether_shuttle" ////////////////////////////////////////////////////////////// - // Mercenary Shuttle /datum/shuttle/autodock/multi/mercenary name = "Mercenary" diff --git a/modular_citadel/maps/tether/submaps/tether_ships.dmm b/modular_citadel/maps/tether/submaps/tether_ships.dmm index d07caac6ebf..f9f84ed0ecb 100644 --- a/modular_citadel/maps/tether/submaps/tether_ships.dmm +++ b/modular_citadel/maps/tether/submaps/tether_ships.dmm @@ -41,7 +41,7 @@ /area/space) "fg" = ( /turf/space/bluespace, -/area/shuttle/excursion/bluespace) +/area/space) "gO" = ( /obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, /turf/simulated/sky/virgo3b/south, diff --git a/vorestation.dme b/vorestation.dme index 78c5be687ef..1ff99d5138b 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -55,7 +55,6 @@ #include "code\__DEFINES\math_physics.dm" #include "code\__DEFINES\MC.dm" #include "code\__DEFINES\misc.dm" -#include "code\__DEFINES\misc_vr.dm" #include "code\__DEFINES\mobs.dm" #include "code\__DEFINES\mobs_vr.dm" #include "code\__DEFINES\nifs.dm" @@ -2281,7 +2280,6 @@ #include "code\modules\mob\death.dm" #include "code\modules\mob\emote.dm" #include "code\modules\mob\gender.dm" -#include "code\modules\mob\gender_vr.dm" #include "code\modules\mob\hear_say.dm" #include "code\modules\mob\holder.dm" #include "code\modules\mob\inventory.dm"