diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm index caf18b4dbd..1f5fdef65c 100644 --- a/maps/offmap_vr/talon/talon_v2.dmm +++ b/maps/offmap_vr/talon/talon_v2.dmm @@ -46,6 +46,22 @@ }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway/fore) +"af" = ( +/obj/structure/closet/secure_closet/talon_guard, +/obj/item/device/radio/off{ + channels = list("Talon" = 1) + }, +/obj/item/weapon/storage/box/nifsofts_security, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/sec_room) +"ag" = ( +/obj/structure/closet/secure_closet/talon_doctor, +/obj/item/device/radio/off{ + channels = list("Talon" = 1) + }, +/obj/item/weapon/storage/box/nifsofts_medical, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/med_room) "ah" = ( /obj/structure/cable/green{ d1 = 4; @@ -96,6 +112,28 @@ }, /turf/simulated/floor/reinforced/airless, /area/talon_v2/engineering/port) +"al" = ( +/obj/machinery/vending/nifsoft_shop, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"am" = ( +/obj/machinery/alarm/talon{ + dir = 4; + pixel_x = -22 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/power/apc/talon{ + dir = 1; + name = "north bump"; + pixel_y = 28 + }, +/obj/structure/table/steel, +/obj/item/weapon/storage/box/nifsofts_mining, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/refining) "an" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/light_switch{ @@ -109,6 +147,35 @@ /obj/random/maintenance/engineering, /turf/simulated/floor/plating, /area/talon_v2/engineering/port_store) +"ap" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/table/steel, +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 + }, +/obj/machinery/camera/network/talon{ + dir = 4 + }, +/obj/fiftyspawner/uranium, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/generators) +"aq" = ( +/obj/effect/catwalk_plated/dark, +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/generators) +"ar" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/table/steel, +/obj/machinery/recharger, +/obj/item/device/geiger{ + pixel_x = -7 + }, +/obj/machinery/alarm/talon{ + pixel_y = 24 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/generators) "as" = ( /obj/machinery/holoposter{ dir = 8; @@ -126,6 +193,13 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/talon_v2/engineering/port) +"au" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) "av" = ( /obj/structure/table/standard, /obj/machinery/recharger, @@ -149,6 +223,14 @@ }, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/med_room) +"ax" = ( +/obj/structure/closet/secure_closet/talon_engineer, +/obj/item/device/radio/off{ + channels = list("Talon" = 1) + }, +/obj/item/weapon/storage/box/nifsofts_engineering, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/eng_room) "ay" = ( /obj/machinery/disposal/wall{ dir = 4 @@ -158,6 +240,43 @@ }, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/meditation) +"az" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/catwalk, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/power/apc/talon/hyper{ + dir = 1; + pixel_x = -24 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/generators) +"aA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/generators) "aB" = ( /obj/structure/cable/green{ d1 = 1; @@ -195,6 +314,48 @@ }, /turf/simulated/floor/plating, /area/talon_v2/engineering/port) +"aD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/catwalk, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/generators) +"aE" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/hatch{ + name = "Generator Room"; + req_one_access = list(301) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/sign/warning/radioactive{ + pixel_y = 32 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/generators) "aF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/vending/medical_talon{ @@ -202,6 +363,21 @@ }, /turf/simulated/floor/tiled/white, /area/talon_v2/medical) +"aG" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) "aH" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ dir = 1 @@ -224,6 +400,17 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) +"aJ" = ( +/obj/structure/cable/yellow, +/obj/machinery/power/rtg/advanced, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/generators) +"aK" = ( +/obj/structure/cable/yellow, +/obj/machinery/light/small, +/obj/machinery/power/port_gen/pacman/super/potato, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/generators) "aL" = ( /obj/structure/cable/green{ d1 = 4; @@ -232,6 +419,16 @@ }, /turf/simulated/wall/rshull, /area/talon_v2/engineering/star_store) +"aM" = ( +/obj/structure/cable/yellow, +/obj/machinery/firealarm{ + dir = 4; + layer = 3.3; + pixel_x = 26 + }, +/obj/machinery/power/rtg/advanced, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/generators) "aN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -253,6 +450,35 @@ }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/bridge) +"aP" = ( +/obj/machinery/power/apc/talon/hyper{ + pixel_y = -24 + }, +/obj/effect/catwalk_plated/dark, +/obj/structure/closet/walllocker_double/hydrant/west, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"aQ" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) "aR" = ( /obj/structure/cable/green{ d1 = 4; @@ -294,6 +520,23 @@ /obj/machinery/camera/network/talon, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway/fore) +"aV" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/light/small, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 2; + pixel_y = -28 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) "aW" = ( /obj/effect/shuttle_landmark/shuttle_initializer/talonboat, /obj/machinery/atmospherics/pipe/manifold/hidden/aux{ @@ -536,6 +779,7 @@ }, /turf/simulated/floor/tiled/white, /area/talon_v2/medical) +<<<<<<< HEAD "bT" = ( /obj/item/device/radio/off{ channels = list("Talon" = 1) @@ -543,6 +787,16 @@ /obj/structure/closet/secure_closet/talon_guard, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/sec_room) +||||||| parent of bcdfc2d951... Merge pull request #10329 from VictorZisthus/talonfix +"bT" = ( +/obj/structure/closet/secure_closet/talon_guard, +/obj/item/device/radio/off{ + channels = list("Talon" = 1) + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/sec_room) +======= +>>>>>>> bcdfc2d951... Merge pull request #10329 from VictorZisthus/talonfix "bU" = ( /obj/structure/table/steel, /obj/item/device/measuring_tape, @@ -3363,13 +3617,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/armory) -"lK" = ( -/obj/structure/closet/secure_closet/talon_engineer, -/obj/item/device/radio/off{ - channels = list("Talon" = 1) - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/eng_room) "lM" = ( /obj/effect/landmark/start{ name = "Talon Captain" @@ -3659,28 +3906,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/talon_v2/engineering) -"mN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" - }, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/generators) "mO" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/railing/grey{ @@ -4595,25 +4820,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway/port) -"qt" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/hatch{ - name = "Generator Room"; - req_one_access = list(301) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/generators) "qu" = ( /obj/structure/barricade, /turf/simulated/floor/plating, @@ -5545,19 +5751,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/talonboat) -"tI" = ( -/obj/machinery/camera/network/talon, -/obj/machinery/power/apc/talon/hyper{ - dir = 1; - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" - }, -/obj/effect/catwalk_plated/dark, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/generators) "tJ" = ( /obj/structure/railing/grey{ dir = 4 @@ -7295,6 +7488,7 @@ /obj/structure/cable/green, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/bar) +<<<<<<< HEAD "Ae" = ( /obj/item/device/radio/off{ channels = list("Talon" = 1) @@ -7302,6 +7496,16 @@ /obj/structure/closet/secure_closet/talon_doctor, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/med_room) +||||||| parent of bcdfc2d951... Merge pull request #10329 from VictorZisthus/talonfix +"Ae" = ( +/obj/structure/closet/secure_closet/talon_doctor, +/obj/item/device/radio/off{ + channels = list("Talon" = 1) + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/med_room) +======= +>>>>>>> bcdfc2d951... Merge pull request #10329 from VictorZisthus/talonfix "Ag" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/aux, /obj/structure/cable/green{ @@ -7526,26 +7730,6 @@ }, /turf/simulated/floor/plating, /area/talon_v2/engineering/starboard) -"AU" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) "AW" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -8334,16 +8518,6 @@ /obj/machinery/atmospherics/pipe/manifold/visible, /turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) -"DT" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/fiftyspawner/tritium, -/obj/structure/table/steel, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/generators) "DU" = ( /obj/machinery/vending/boozeomat{ density = 0; @@ -8369,25 +8543,6 @@ }, /turf/simulated/floor/tiled/white, /area/talon_v2/crew_quarters/bar) -"DV" = ( -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_x = -30 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/catwalk, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/generators) "DW" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -8430,18 +8585,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) -"Ej" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/light/small, -/obj/structure/railing/grey{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) "Ek" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -9574,6 +9717,7 @@ /obj/machinery/recharge_station, /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/engineering) +<<<<<<< HEAD "HV" = ( /obj/structure/cable/yellow, /obj/machinery/power/apc/talon/hyper{ @@ -9585,6 +9729,21 @@ }, /turf/simulated/floor/plating, /area/talon_v2/engineering) +||||||| parent of bcdfc2d951... Merge pull request #10329 from VictorZisthus/talonfix +"HV" = ( +/obj/structure/cable/yellow, +/obj/machinery/power/apc/talon/hyper{ + pixel_y = -24 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -24 + }, +/obj/effect/catwalk_plated/dark, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +======= +>>>>>>> bcdfc2d951... Merge pull request #10329 from VictorZisthus/talonfix "HW" = ( /obj/machinery/disposal/wall{ dir = 4 @@ -9932,10 +10091,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/eng_room) -"IZ" = ( -/obj/structure/closet/walllocker_double/hydrant/south, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/generators) "Jd" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 @@ -10565,23 +10720,6 @@ /obj/machinery/camera/network/talon, /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/engineering/star_store) -"Ln" = ( -/obj/machinery/alarm/talon{ - dir = 4; - pixel_x = -22 - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/power/apc/talon{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, -/obj/structure/table/steel, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/refining) "Lo" = ( /obj/structure/sign/warning/nosmoking_1{ pixel_x = -26 @@ -11430,16 +11568,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/talon_v2/engineering/port) -"OG" = ( -/obj/fiftyspawner/tritium, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/alarm/talon{ - dir = 8; - pixel_x = 22 - }, -/obj/structure/table/steel, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/generators) "OH" = ( /obj/machinery/power/pointdefense{ id_tag = "talon_pd" @@ -12600,18 +12728,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/central_hallway) -"SC" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/catwalk, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) "SE" = ( /obj/machinery/light/small, /obj/machinery/light_switch{ @@ -12735,16 +12851,6 @@ /obj/machinery/portable_atmospherics/canister/empty/phoron, /turf/simulated/floor/plating, /area/talon_v2/engineering/star_store) -"Tc" = ( -/obj/structure/sign/warning/nosmoking_1{ - pixel_x = -26 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) "Td" = ( /obj/structure/cable/green{ d1 = 1; @@ -13053,22 +13159,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/maintenance/wing_starboard) -"Ul" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/cable/yellow, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/generators) "Um" = ( /obj/machinery/mineral/mint, /turf/simulated/floor/tiled/techfloor, @@ -14402,13 +14492,6 @@ "Zk" = ( /turf/simulated/wall/rshull, /area/talon_v2/engineering/port) -"Zl" = ( -/obj/machinery/power/port_gen/pacman/mrs{ - anchored = 1 - }, -/obj/structure/cable/yellow, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/generators) "Zm" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -23637,7 +23720,7 @@ Fz VT Qo NC -bT +af ai QN nE @@ -24381,9 +24464,9 @@ Zc Zc KX IK -DT -DV -Zl +ap +az +aJ IK Zk Zk @@ -24523,9 +24606,9 @@ Fx mM Ck IK -tI -Ul -IZ +aq +aA +aK IK ei eK @@ -24637,7 +24720,7 @@ Eq jg TL lU -pG +al Hh yV sf @@ -24665,9 +24748,9 @@ vz Ii AZ IK -OG -mN -Zl +ar +aD +aM IK ep zm @@ -24808,7 +24891,7 @@ Qa Zo IK IK -qt +aE IK IK ex @@ -24949,9 +25032,9 @@ Uw Ho Hc yo -Tc -AU -HV +au +aG +aP zm eF eN @@ -25093,7 +25176,7 @@ LN Im GN gj -SC +aQ Gb IM RO @@ -25235,7 +25318,7 @@ pA Bb pt vb -Ej +aV zm AL AT @@ -25341,7 +25424,7 @@ dc VT mb qr -Ae +ag EH iQ AQ @@ -25789,7 +25872,7 @@ RQ ah Ml fW -Ln +am Ok dh HT @@ -26369,7 +26452,7 @@ AY WJ JK Yp -lK +ax kn WJ fb diff --git a/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm b/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm index 8495119f9d..e64719e2d0 100644 --- a/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm +++ b/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm @@ -1495,6 +1495,12 @@ }, /turf/simulated/floor, /area/engineering/engine_room) +"di" = ( +/obj/item/modular_computer/console/preset/engineering{ + dir = 1 + }, +/turf/template_noop, +/area/template_noop) "dj" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -2573,7 +2579,7 @@ aa aa aa aa -aa +di aa aa aa