diff --git a/maps/tether/submaps/offmap/talon1.dmm b/maps/tether/submaps/offmap/talon1.dmm index 4e32a660e10..81e4081c712 100644 --- a/maps/tether/submaps/offmap/talon1.dmm +++ b/maps/tether/submaps/offmap/talon1.dmm @@ -56,9 +56,7 @@ dir = 4; icon_state = "map_connector-aux" }, -/obj/machinery/portable_atmospherics/canister/air/airlock{ - start_pressure = 4559.63 - }, +/obj/machinery/portable_atmospherics/canister/air/airlock, /turf/simulated/floor/tiled/eris/steel/gray_perforated, /area/talon/deckone/port_eng) "ai" = ( @@ -155,11 +153,15 @@ /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "ar" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/machinery/door/blast/regular/open{ + dir = 4; + icon_state = "pdoor1"; + id = "talon_unused_hardpoint"; + name = "Unused Hardpoint Blast Door" }, -/turf/simulated/floor/tiled/eris/white/orangecorner, -/area/talon/deckone/armory) +/obj/structure/lattice, +/turf/space, +/area/talon/maintenance/deckone_starboard) "as" = ( /obj/structure/cable/green{ d1 = 4; @@ -198,9 +200,7 @@ dir = 8; icon_state = "map_connector-aux" }, -/obj/machinery/portable_atmospherics/canister/air/airlock{ - start_pressure = 4559.63 - }, +/obj/machinery/portable_atmospherics/canister/air/airlock, /turf/simulated/floor/tiled/eris/steel/gray_perforated, /area/talon/deckone/starboard_eng) "av" = ( @@ -216,9 +216,138 @@ /obj/machinery/chemical_dispenser/full, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/talon/deckone/medical) +"ax" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/weapon/tank/oxygen, +/obj/item/weapon/tank/oxygen, +/obj/item/weapon/tank/oxygen, +/obj/item/weapon/tank/oxygen, +/turf/simulated/floor/tiled/eris/dark/danger, +/area/talon/deckone/secure_storage) +"ay" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/turf/simulated/floor/plating/eris/under, +/area/talon/maintenance/deckone_port) +"az" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/light/small{ + dir = 8; + pixel_x = 0 + }, +/turf/simulated/floor/plating/eris/under, +/area/talon/maintenance/deckone_starboard) +"aA" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/light/small, +/turf/simulated/floor/plating/eris/under, +/area/talon/maintenance/deckone_port) +"aB" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/light/small, +/turf/simulated/floor/plating/eris/under, +/area/talon/maintenance/deckone_starboard) "aC" = ( /turf/simulated/wall/rshull, /area/talon/maintenance/deckone_port) +"aD" = ( +/obj/structure/table/rack/steel, +/obj/machinery/camera/network/talon, +/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit, +/turf/simulated/floor/tiled/eris/dark/danger, +/area/talon/deckone/secure_storage) +"aE" = ( +/obj/machinery/camera/network/talon, +/obj/structure/table/rack/steel, +/obj/item/clothing/under/syndicate/combat, +/obj/item/clothing/suit/armor/combat, +/obj/item/clothing/head/helmet/combat, +/turf/simulated/floor/tiled/eris/white/danger, +/area/talon/deckone/armory) +"aF" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 6 + }, +/turf/simulated/floor/greengrid/airless, +/area/talon/maintenance/deckone_starboard) +"aG" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 8; + icon_state = "intact" + }, +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 8; + icon_state = "intact" + }, +/obj/structure/handrail{ + dir = 8 + }, +/turf/space, +/area/talon/maintenance/deckone_port_fore_wing) +"aH" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 4; + icon_state = "intact" + }, +/obj/structure/handrail{ + dir = 4 + }, +/turf/space, +/area/talon/maintenance/deckone_starboard_fore_wing) +"aI" = ( +/obj/structure/catwalk, +/obj/structure/sign/warning/moving_parts{ + pixel_x = 30 + }, +/turf/space, +/area/talon/maintenance/deckone_port_fore_wing) +"aJ" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots, +/turf/simulated/floor/tiled/eris/dark/danger, +/area/talon/deckone/secure_storage) "aK" = ( /turf/simulated/wall/rshull, /area/talon/maintenance/deckone_starboard) @@ -241,9 +370,25 @@ "aM" = ( /turf/simulated/wall, /area/talon/maintenance/deckone_port) +"aN" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/weapon/tank/jetpack/carbondioxide, +/turf/simulated/floor/tiled/eris/dark/danger, +/area/talon/deckone/secure_storage) "aO" = ( /turf/simulated/wall, /area/talon/maintenance/deckone_starboard) +"aP" = ( +/obj/structure/table/rack/steel, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/syndicate/black, +/obj/item/clothing/head/helmet/space/syndicate/black, +/turf/simulated/floor/tiled/eris/white/danger, +/area/talon/deckone/armory) "aQ" = ( /obj/machinery/computer/ship/engines{ dir = 8; @@ -255,6 +400,30 @@ "aR" = ( /turf/simulated/wall, /area/talon/deckone/secure_storage) +"aS" = ( +/obj/structure/catwalk, +/obj/structure/sign/warning/moving_parts{ + pixel_x = -30 + }, +/turf/space, +/area/talon/maintenance/deckone_starboard_fore_wing) +"aT" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/space, +/area/talon/maintenance/deckone_port_fore_wing) +"aU" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + dir = 1; + icon_state = "4-8" + }, +/turf/space, +/area/talon/maintenance/deckone_starboard_fore_wing) "aV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/structure/catwalk, @@ -264,9 +433,67 @@ }, /turf/simulated/floor/plating/eris/under, /area/talon/maintenance/deckone_port) +"aW" = ( +/obj/machinery/alarm/talon{ + dir = 1; + pixel_y = -25 + }, +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/simulated/floor/tiled/eris/dark/danger, +/area/talon/deckone/secure_storage) +"aX" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/closet/wardrobe/black{ + starts_with = list(/obj/item/clothing/under/color/black = 4, /obj/item/clothing/accessory/storage/black_vest = 4, /obj/item/clothing/accessory/storage/black_drop_pouches = 4, /obj/item/clothing/gloves/black = 4, /obj/item/clothing/head/soft/black = 4, /obj/item/clothing/mask/balaclava = 4, /obj/item/clothing/mask/bandana = 4, /obj/item/clothing/mask/gas/commando = 4, /obj/item/weapon/storage/backpack/messenger/black = 4, /obj/item/weapon/storage/backpack/dufflebag = 4, /obj/item/clothing/shoes/black = 4, /obj/item/clothing/shoes/boots/duty = 4) + }, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/talon/deckone/armory) "aY" = ( /turf/simulated/wall, /area/talon/deckone/armory) +"aZ" = ( +/obj/structure/catwalk, +/turf/space, +/area/talon/maintenance/deckone_port_fore_wing) +"ba" = ( +/obj/structure/catwalk, +/turf/space, +/area/talon/maintenance/deckone_starboard_fore_wing) +"bb" = ( +/obj/structure/closet/secure_closet/chemical{ + req_access = list(301) + }, +/turf/simulated/floor/tiled/eris/white/bluecorner, +/area/talon/deckone/medical) +"bc" = ( +/obj/structure/catwalk, +/obj/structure/handrail{ + dir = 8 + }, +/turf/space, +/area/talon/maintenance/deckone_port_aft_wing) +"bd" = ( +/obj/structure/catwalk, +/obj/structure/handrail{ + dir = 4 + }, +/turf/space, +/area/talon/maintenance/deckone_starboard_aft_wing) +"be" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/table/standard, +/obj/item/clothing/gloves/sterile/nitrile, +/obj/item/clothing/mask/surgical, +/obj/item/clothing/suit/surgicalapron, +/turf/simulated/floor/tiled/eris/white/bluecorner, +/area/talon/deckone/medical) +"bf" = ( +/obj/structure/table/standard, +/obj/machinery/chemical_dispenser/biochemistry/full, +/turf/simulated/floor/tiled/eris/white/bluecorner, +/area/talon/deckone/medical) "bg" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -280,6 +507,17 @@ }, /turf/simulated/floor/tiled/eris/steel, /area/talon/deckone/brig) +"bh" = ( +/obj/structure/table/standard, +/obj/item/device/defib_kit/loaded, +/obj/item/weapon/storage/belt/medical/emt, +/obj/item/device/sleevemate, +/turf/simulated/floor/tiled/eris/white/bluecorner, +/area/talon/deckone/medical) +"bi" = ( +/obj/structure/catwalk, +/turf/space, +/area/talon/maintenance/deckone_port_aft_wing) "bj" = ( /obj/structure/window/reinforced, /turf/simulated/floor/tiled/eris/steel, @@ -291,6 +529,62 @@ }, /turf/simulated/floor/plating/eris/under, /area/talon/maintenance/deckone_starboard) +"bl" = ( +/obj/structure/catwalk, +/turf/space, +/area/talon/maintenance/deckone_starboard_aft_wing) +"bm" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/space, +/area/talon/maintenance/deckone_port_aft_wing) +"bn" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/space, +/area/talon/maintenance/deckone_starboard_aft_wing) +"bo" = ( +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/obj/structure/catwalk, +/turf/space, +/area/talon/maintenance/deckone_port) +"bp" = ( +/obj/machinery/light/small{ + dir = 8; + pixel_y = 0 + }, +/obj/structure/catwalk, +/turf/space, +/area/talon/maintenance/deckone_starboard) +"bq" = ( +/obj/machinery/airlock_sensor{ + dir = 4; + pixel_x = -28; + req_one_access = list(301) + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/light/small{ + dir = 1; + icon_state = "bulb1" + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 4; + icon_state = "map_vent_aux" + }, +/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/area/shuttle/talonboat) "br" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -305,6 +599,23 @@ }, /turf/simulated/floor/plating, /area/talon/maintenance/deckone_port) +"bs" = ( +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 8; + id_tag = "talon_boat"; + pixel_x = 28 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 8; + icon_state = "map_vent_aux" + }, +/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/area/shuttle/talonboat) +"bt" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/simulated/floor/tiled/eris/steel, +/area/talon/deckone/central_hallway) "bu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4; @@ -323,6 +634,20 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/talon/deckone/secure_storage) +"bv" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/blast/regular/open{ + dir = 4; + id = "talon_windows" + }, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating/eris/under, +/area/talon/maintenance/deckone_starboard) "bw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4; @@ -330,6 +655,17 @@ }, /turf/simulated/floor/tiled/eris/dark/brown_perforated, /area/talon/deckone/port_eng) +"bx" = ( +/obj/machinery/airlock_sensor{ + dir = 8; + pixel_x = 28; + pixel_y = 28; + req_one_access = list(301) + }, +/obj/effect/map_helper/airlock/sensor/ext_sensor, +/obj/structure/catwalk, +/turf/space, +/area/talon/maintenance/deckone_port) "by" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4; @@ -349,6 +685,48 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/talon/deckone/armory) +"bz" = ( +/obj/machinery/airlock_sensor{ + dir = 4; + pixel_x = -28; + pixel_y = 28; + req_one_access = list(301) + }, +/obj/effect/map_helper/airlock/sensor/ext_sensor, +/obj/structure/catwalk, +/turf/space, +/area/talon/maintenance/deckone_starboard) +"bA" = ( +/obj/structure/catwalk, +/obj/structure/sign/warning/moving_parts{ + pixel_x = 30 + }, +/obj/machinery/camera/network/talon{ + dir = 8; + icon_state = "camera" + }, +/turf/space, +/area/talon/maintenance/deckone_port) +"bB" = ( +/obj/structure/catwalk, +/obj/structure/sign/warning/moving_parts{ + pixel_x = -30 + }, +/obj/machinery/camera/network/talon{ + dir = 4; + icon_state = "camera" + }, +/turf/space, +/area/talon/maintenance/deckone_starboard) +"bC" = ( +/obj/structure/table/rack, +/obj/item/weapon/storage/box/bodybags, +/obj/item/roller, +/obj/item/roller{ + pixel_y = 8 + }, +/turf/simulated/floor/tiled/eris/white/bluecorner, +/area/talon/deckone/medical) "bP" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/tiled/eris/dark/brown_perforated, @@ -844,39 +1222,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/aux, /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/shuttle/talonboat) -"fo" = ( -/obj/structure/catwalk, -/obj/structure/sign/warning/moving_parts{ - pixel_x = 30 - }, -/obj/machinery/camera/network/talon{ - dir = 8; - icon_state = "camera" - }, -/turf/space, -/area/talon/maintenance/deckone_port) -"fy" = ( -/obj/structure/catwalk, -/obj/structure/sign/warning/moving_parts{ - pixel_x = -30 - }, -/obj/machinery/camera/network/talon{ - dir = 4; - icon_state = "camera" - }, -/turf/space, -/area/talon/maintenance/deckone_starboard) -"fz" = ( -/obj/machinery/airlock_sensor{ - dir = 8; - pixel_x = 28; - pixel_y = 28; - req_one_access = list(301) - }, -/obj/effect/map_helper/airlock/sensor/ext_sensor, -/obj/structure/catwalk, -/turf/space, -/area/talon/maintenance/deckone_port) "fH" = ( /obj/machinery/firealarm{ dir = 1; @@ -899,17 +1244,6 @@ /obj/effect/catwalk_plated, /turf/simulated/floor/plating/eris/under, /area/talon/deckone/central_hallway) -"fW" = ( -/obj/machinery/airlock_sensor{ - dir = 4; - pixel_x = -28; - pixel_y = 28; - req_one_access = list(301) - }, -/obj/effect/map_helper/airlock/sensor/ext_sensor, -/obj/structure/catwalk, -/turf/space, -/area/talon/maintenance/deckone_starboard) "ga" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -1165,20 +1499,6 @@ /obj/machinery/optable, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/talon/deckone/medical) -"iw" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating/eris/under, -/area/talon/maintenance/deckone_port) "ix" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -1405,22 +1725,6 @@ }, /turf/simulated/floor/reinforced/airless, /area/talon/deckone/starboard_eng) -"kl" = ( -/obj/machinery/light/small{ - dir = 4; - pixel_y = 0 - }, -/obj/structure/catwalk, -/turf/space, -/area/talon/maintenance/deckone_port) -"km" = ( -/obj/machinery/light/small{ - dir = 8; - pixel_y = 0 - }, -/obj/structure/catwalk, -/turf/space, -/area/talon/maintenance/deckone_starboard) "kr" = ( /obj/structure/barricade, /obj/structure/catwalk, @@ -1746,15 +2050,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating/eris/under, /area/talon/maintenance/deckone_starboard) -"mM" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/space, -/area/talon/maintenance/deckone_port_fore_wing) "mN" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -1821,13 +2116,6 @@ }, /turf/simulated/floor/hull/airless, /area/talon/maintenance/deckone_port_aft_wing) -"nI" = ( -/obj/structure/catwalk, -/obj/structure/sign/warning/moving_parts{ - pixel_x = 30 - }, -/turf/space, -/area/talon/maintenance/deckone_port_fore_wing) "nN" = ( /obj/structure/cable/green{ d1 = 4; @@ -1837,20 +2125,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating/eris/under, /area/talon/maintenance/deckone_starboard) -"nR" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ - dir = 4; - icon_state = "intact" - }, -/turf/space, -/area/talon/maintenance/deckone_starboard_fore_wing) -"nS" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/turf/simulated/floor/tiled/eris/dark/danger, -/area/talon/deckone/secure_storage) "nT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2221,11 +2495,6 @@ }, /turf/simulated/floor/tiled/eris/steel, /area/talon/deckone/central_hallway) -"sb" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/shoes/magboots, -/turf/simulated/floor/tiled/eris/dark/danger, -/area/talon/deckone/secure_storage) "sc" = ( /obj/structure/cable/green{ d1 = 1; @@ -2566,13 +2835,6 @@ }, /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/talon/deckone/brig) -"vc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/table/standard, -/obj/item/clothing/mask/surgical, -/obj/item/clothing/suit/surgicalapron, -/turf/simulated/floor/tiled/eris/white/bluecorner, -/area/talon/deckone/medical) "vf" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 5; @@ -2667,12 +2929,6 @@ }, /turf/simulated/floor/tiled/eris/white/golden, /area/talon/deckone/bridge) -"wz" = ( -/obj/structure/table/rack/steel, -/obj/machinery/camera/network/talon, -/obj/item/device/suit_cooling_unit, -/turf/simulated/floor/tiled/eris/dark/danger, -/area/talon/deckone/secure_storage) "wD" = ( /obj/machinery/power/terminal{ dir = 8; @@ -2877,15 +3133,6 @@ /obj/structure/table/standard, /turf/simulated/floor/tiled/eris/steel, /area/talon/deckone/brig) -"yn" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/space, -/area/talon/maintenance/deckone_port_aft_wing) "yo" = ( /obj/structure/cable/green{ d1 = 1; @@ -2909,15 +3156,6 @@ }, /turf/simulated/floor/tiled/eris/white/gray_platform, /area/shuttle/talonboat) -"yy" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/space, -/area/talon/maintenance/deckone_starboard_aft_wing) "yA" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 @@ -2997,15 +3235,6 @@ }, /turf/simulated/floor/tiled/eris/steel, /area/talon/deckone/central_hallway) -"zt" = ( -/obj/machinery/alarm/talon{ - dir = 1; - pixel_y = -25 - }, -/obj/structure/table/rack/steel, -/obj/item/weapon/tank/oxygen, -/turf/simulated/floor/tiled/eris/dark/danger, -/area/talon/deckone/secure_storage) "zx" = ( /obj/structure/cable/green{ d2 = 2; @@ -3367,11 +3596,6 @@ }, /turf/simulated/floor/hull/airless, /area/talon/maintenance/deckone_port_fore_wing) -"Dq" = ( -/obj/structure/table/standard, -/obj/item/device/sleevemate, -/turf/simulated/floor/tiled/eris/white/bluecorner, -/area/talon/deckone/medical) "Dr" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 6; @@ -3779,12 +4003,6 @@ /obj/machinery/door/firedoor/glass/talon, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/talon/deckone/medical) -"GK" = ( -/obj/structure/table/standard, -/obj/item/device/defib_kit/loaded, -/obj/item/weapon/storage/belt/medical/emt, -/turf/simulated/floor/tiled/eris/white/bluecorner, -/area/talon/deckone/medical) "GL" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 1; @@ -3813,10 +4031,6 @@ }, /turf/simulated/floor/hull/airless, /area/talon/maintenance/deckone_starboard_fore_wing) -"Hb" = ( -/obj/structure/catwalk, -/turf/space, -/area/talon/maintenance/deckone_starboard_fore_wing) "Hh" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/light_switch{ @@ -4226,24 +4440,6 @@ /obj/machinery/vending/medical_talon, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/talon/deckone/medical) -"Kx" = ( -/obj/machinery/airlock_sensor{ - dir = 4; - pixel_x = -28; - req_one_access = list(301) - }, -/obj/machinery/atmospherics/unary/vent_pump/aux{ - dir = 4; - icon_state = "map_vent_aux" - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/shuttle/talonboat) "KF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -4333,26 +4529,6 @@ }, /turf/simulated/floor/tiled/eris/steel, /area/talon/deckone/central_hallway) -"Lm" = ( -/obj/structure/table/rack/steel, -/obj/item/clothing/suit/armor/combat, -/obj/item/clothing/head/helmet/combat, -/obj/item/clothing/under/syndicate/combat, -/obj/machinery/camera/network/talon, -/turf/simulated/floor/tiled/eris/white/danger, -/area/talon/deckone/armory) -"Lt" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ - dir = 8; - icon_state = "intact" - }, -/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ - dir = 8; - icon_state = "intact" - }, -/turf/space, -/area/talon/maintenance/deckone_port_fore_wing) "Ly" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/window/brigdoor/eastleft{ @@ -4549,18 +4725,6 @@ }, /turf/simulated/floor/plating/eris/under, /area/talon/maintenance/deckone_port) -"MJ" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating/eris/under, -/area/talon/maintenance/deckone_starboard) "ML" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -4730,11 +4894,6 @@ }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) -"Ou" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/weapon/tank/oxygen, -/turf/simulated/floor/tiled/eris/dark/danger, -/area/talon/deckone/secure_storage) "Ow" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/machinery/alarm/talon{ @@ -4790,10 +4949,6 @@ /obj/structure/bedsheetbin, /turf/simulated/floor/tiled/eris/steel, /area/talon/deckone/brig) -"Pi" = ( -/obj/structure/catwalk, -/turf/space, -/area/talon/maintenance/deckone_port_fore_wing) "Pu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -5225,13 +5380,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/eris/steel, /area/talon/deckone/central_hallway) -"TN" = ( -/obj/structure/table/rack/steel, -/obj/item/clothing/suit/space/syndicate/black, -/obj/item/clothing/head/helmet/space/syndicate/black, -/obj/item/clothing/shoes/magboots, -/turf/simulated/floor/tiled/eris/white/danger, -/area/talon/deckone/armory) "TO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/machinery/alarm/talon{ @@ -5265,21 +5413,6 @@ /obj/item/clothing/accessory/holster/waist, /turf/simulated/floor/tiled/eris/white/danger, /area/talon/deckone/armory) -"Ue" = ( -/obj/structure/catwalk, -/obj/structure/sign/warning/moving_parts{ - pixel_x = -30 - }, -/turf/space, -/area/talon/maintenance/deckone_starboard_fore_wing) -"Ui" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - dir = 1; - icon_state = "4-8" - }, -/turf/space, -/area/talon/maintenance/deckone_starboard_fore_wing) "Uq" = ( /obj/machinery/alarm/talon{ dir = 4; @@ -5565,19 +5698,6 @@ }, /turf/simulated/floor/plating/eris/under, /area/talon/maintenance/deckone_port) -"VZ" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 8; - id_tag = "talon_boat"; - pixel_x = 28 - }, -/obj/machinery/atmospherics/unary/vent_pump/aux{ - dir = 8; - icon_state = "map_vent_aux" - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/shuttle/talonboat) "Wo" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -5840,10 +5960,6 @@ }, /turf/simulated/floor/tiled/eris/steel/techfloor_grid, /area/shuttle/talonboat) -"YS" = ( -/obj/structure/catwalk, -/turf/space, -/area/talon/maintenance/deckone_port_aft_wing) "YT" = ( /obj/machinery/alarm/talon{ dir = 1; @@ -5855,10 +5971,6 @@ }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) -"Za" = ( -/obj/structure/catwalk, -/turf/space, -/area/talon/maintenance/deckone_starboard_aft_wing) "Zg" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -13287,11 +13399,11 @@ vz qo sc Dh -YS -kl -fz -fo -YS +bi +bo +bx +bA +bi Dh Dh Dh @@ -13429,11 +13541,11 @@ lD Sc Km Dh -YS +bi aC TP aC -YS +bi Dh Dh Dh @@ -13566,22 +13678,22 @@ aa aa aa aa -YS -YS -YS -yn -YS -YS +bc +bi +bi +bm +bi +bi aC MH aC -YS -YS -YS -YS -YS -YS -YS +bi +bi +bi +bi +bi +bi +bc aa aa aa @@ -14261,11 +14373,11 @@ aa aa aa aa -Lt -nI -mM -Pi -Lt +aG +aI +aT +aZ +aG aa aC am @@ -14548,12 +14660,12 @@ am am am yC -GH +ay GH GH VY GH -iw +aA cl Se FQ @@ -14829,9 +14941,9 @@ aa aa ab ac -Ou +ax dQ -sb +aJ kN en aR @@ -14973,7 +15085,7 @@ ab ac wj kN -nS +aN kN LO aR @@ -15113,11 +15225,11 @@ ab ab ab ac -wz +aD kN sK kN -zt +aW aR aM aM @@ -15721,7 +15833,7 @@ YO YO mT lb -Kx +bq lb nc ki @@ -16005,7 +16117,7 @@ ht xu Kk lb -VZ +bs lb nc ki @@ -16253,7 +16365,7 @@ ZH if mj VN -ar +aX bQ jp aO @@ -16533,9 +16645,9 @@ ab ab ab ac -Lm +aE Fl -TN +aP Fl xd aY @@ -16573,7 +16685,7 @@ iN dL wk UN -Bj +bt Bj Bj ki @@ -16955,8 +17067,8 @@ aa aa aa aa -aa -aa +aK +aK aK aO aY @@ -16978,7 +17090,7 @@ dO xH aw Xd -vc +be eV dO uN @@ -17097,19 +17209,19 @@ aa aa aa aa -aa -aa -aK +ar +aF +bv sI Of qA mN -sL +az sL sL BD sL -MJ +aB co yN kz @@ -17239,8 +17351,8 @@ aa aa aa aa -aa -aa +aK +aK aK aK aK @@ -17260,10 +17372,10 @@ co qA dO NG -Gb +bb Gb qB -Dq +bf dO hD pz @@ -17385,11 +17497,11 @@ aa aa aa aa -nR -Ue -Ui -Hb -nR +aH +aS +aU +ba +aH aa aK qA @@ -17404,8 +17516,8 @@ dO dz Rk Gb -Gb -GK +bC +bh dO Gt SI @@ -18110,22 +18222,22 @@ aa aa aa aa -Za -Za -Za -yy -Za -Za +bd +bl +bl +bn +bl +bl aK xQ aK -Za -Za -Za -Za -Za -Za -Za +bl +bl +bl +bl +bl +bl +bd aa aa aa @@ -18257,11 +18369,11 @@ Eo QX UI Ru -Za +bl aK oU aK -Za +bl Ru Ru Ru @@ -18399,11 +18511,11 @@ Bs uo rL Ru -Za -km -fW -fy -Za +bl +bp +bz +bB +bl Ru Ru Ru diff --git a/maps/tether/submaps/offmap/talon2.dmm b/maps/tether/submaps/offmap/talon2.dmm index 54c9448b66b..1c3794d1d8f 100644 --- a/maps/tether/submaps/offmap/talon2.dmm +++ b/maps/tether/submaps/offmap/talon2.dmm @@ -114,11 +114,21 @@ dir = 1; icon_state = "map_connector-aux" }, -/obj/machinery/portable_atmospherics/canister/air/airlock{ - start_pressure = 4559.63 - }, +/obj/machinery/portable_atmospherics/canister/air/airlock, /turf/simulated/floor/plating/eris/under, /area/talon/maintenance/decktwo_aft) +"ar" = ( +/obj/structure/closet/secure_closet/personal/cabinet{ + locked = 0 + }, +/turf/simulated/floor/wood, +/area/talon/decktwo/eng_room) +"as" = ( +/obj/structure/closet/secure_closet/personal/cabinet{ + locked = 0 + }, +/turf/simulated/floor/wood, +/area/talon/decktwo/pilot_room) "at" = ( /turf/simulated/floor/tiled/eris/steel, /area/talon/decktwo/central_hallway) @@ -185,6 +195,18 @@ "aC" = ( /turf/simulated/wall, /area/talon/decktwo/cap_room) +"aD" = ( +/obj/structure/closet/secure_closet/personal/cabinet{ + locked = 0 + }, +/turf/simulated/floor/wood, +/area/talon/decktwo/med_room) +"aE" = ( +/obj/structure/closet/secure_closet/personal/cabinet{ + locked = 0 + }, +/turf/simulated/floor/wood, +/area/talon/decktwo/sec_room) "aF" = ( /obj/structure/bed/chair/bay/chair, /turf/simulated/floor/wood, @@ -203,6 +225,29 @@ }, /turf/simulated/floor/tiled/eris/white, /area/talon/decktwo/central_hallway) +"aI" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/turf/simulated/floor/plating/eris/under, +/area/talon/maintenance/decktwo_port) +"aJ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating/eris/under, +/area/talon/maintenance/decktwo_aft) "aK" = ( /turf/simulated/floor/carpet/blucarpet, /area/talon/decktwo/cap_room) @@ -217,6 +262,39 @@ "aM" = ( /turf/simulated/floor/wood, /area/talon/decktwo/cap_room) +"aN" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atm{ + pixel_x = 32; + step_x = 0 + }, +/turf/simulated/floor/tiled/eris/steel, +/area/talon/decktwo/central_hallway) +"aO" = ( +/obj/machinery/airlock_sensor{ + dir = 4; + pixel_x = -28; + req_one_access = list(301) + }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 8; + id_tag = "talon_aft_solar"; + pixel_x = 28; + req_one_access = list(301) + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 1 + }, +/turf/simulated/floor/plating/eris/under, +/area/talon/maintenance/decktwo_aft) "aP" = ( /obj/machinery/alarm/talon{ dir = 4; @@ -230,12 +308,38 @@ "aQ" = ( /turf/simulated/floor/wood, /area/talon/decktwo/bar) -"aV" = ( +"aR" = ( +/obj/structure/handrail{ + dir = 1 + }, +/turf/simulated/floor/hull/airless, +/area/talon/maintenance/decktwo_solars) +"aS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/vending/food{ + dir = 1 + }, +/turf/simulated/floor/tiled/eris/steel/gray_perforated, +/area/talon/decktwo/bar) +"aT" = ( /obj/machinery/vending/coffee{ dir = 1 }, /turf/simulated/floor/tiled/eris/steel/gray_perforated, /area/talon/decktwo/bar) +"aU" = ( +/obj/machinery/vending/dinnerware{ + dir = 1; + icon_state = "dinnerware" + }, +/turf/simulated/floor/tiled/eris/steel/gray_perforated, +/area/talon/decktwo/bar) "aX" = ( /obj/structure/bed/chair/bay/chair{ dir = 1; @@ -560,13 +664,6 @@ }, /turf/simulated/open, /area/talon/decktwo/central_hallway) -"cn" = ( -/obj/machinery/vending/dinnerware{ - dir = 1; - icon_state = "dinnerware" - }, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/talon/decktwo/bar) "cp" = ( /obj/structure/lattice, /obj/structure/cable/green{ @@ -991,10 +1088,6 @@ }, /turf/simulated/floor/wood, /area/talon/decktwo/eng_room) -"eE" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/turf/simulated/floor/wood, -/area/talon/decktwo/eng_room) "eF" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -1022,10 +1115,6 @@ /obj/structure/closet/secure_closet/talon_pilot, /turf/simulated/floor/wood, /area/talon/decktwo/pilot_room) -"eJ" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/turf/simulated/floor/wood, -/area/talon/decktwo/pilot_room) "eK" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -1346,10 +1435,6 @@ }, /turf/simulated/floor/wood, /area/talon/decktwo/med_room) -"ga" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/turf/simulated/floor/wood, -/area/talon/decktwo/med_room) "gb" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -1364,10 +1449,6 @@ /obj/structure/closet/secure_closet/talon_guard, /turf/simulated/floor/wood, /area/talon/decktwo/sec_room) -"gd" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/turf/simulated/floor/wood, -/area/talon/decktwo/sec_room) "ge" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -2265,19 +2346,6 @@ }, /turf/simulated/floor/plating/eris/under, /area/talon/maintenance/decktwo_aft) -"rz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/vending/food{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/talon/decktwo/bar) "rA" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -2309,26 +2377,6 @@ }, /turf/simulated/floor/tiled/eris/steel, /area/talon/decktwo/central_hallway) -"rJ" = ( -/obj/machinery/airlock_sensor{ - dir = 4; - pixel_x = -28; - req_one_access = list(301) - }, -/obj/machinery/atmospherics/unary/vent_pump/aux{ - dir = 1; - icon_state = "map_vent_aux" - }, -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 8; - id_tag = "talon_aft_solar"; - pixel_x = 28; - req_one_access = list(301) - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/turf/simulated/floor/plating/eris/under, -/area/talon/maintenance/decktwo_aft) "rQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12990,7 +13038,7 @@ Qt lx lx lx -lx +aI lx lx lx @@ -13281,7 +13329,7 @@ cc gZ gZ hu -WG +aJ mm ht ao @@ -13385,7 +13433,7 @@ aa aa aa pi -pi +aR ap ap ap @@ -13833,13 +13881,13 @@ dz dM ea eo -eE +ar dr eV fm fA fN -ga +aD eT gn gn @@ -14525,7 +14573,7 @@ As dX ay Rm -Gq +aN Gq Af Gq @@ -14561,7 +14609,7 @@ gC gT gS nj -rJ +aO pt DT pi @@ -15100,7 +15148,7 @@ WS VZ bI Uf -rz +aS aw cl cz @@ -15242,7 +15290,7 @@ Zn UY aQ vB -aV +aT aw cl cz @@ -15253,13 +15301,13 @@ dH dU eh ew -eJ +as du fb fs fG fT -gd +aE eZ gn gn @@ -15384,7 +15432,7 @@ UY ZF bJ bP -cn +aU aw ck cy @@ -15656,8 +15704,8 @@ aa aa aa aa -aa -aa +pi +aR ax ax ax @@ -15798,8 +15846,8 @@ aa aa aa aa -aa -aa +pi +pi pi pi pi @@ -15940,8 +15988,8 @@ aa aa aa aa -aa -aa +pi +pi pi pi pi @@ -16114,7 +16162,7 @@ Az QA QA QA -QA +AX QA QA QA