From 514c7b34850896fe57ff9ee9e16efb5baa9f0bea Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Sat, 25 Feb 2023 13:01:41 +1000 Subject: [PATCH] ERT/Von Braun updates --- maps/submaps/admin_use_vr/ert.dm | 4 + maps/submaps/admin_use_vr/ert.dmm | 19765 +++++++++++++++++----------- 2 files changed, 11730 insertions(+), 8039 deletions(-) diff --git a/maps/submaps/admin_use_vr/ert.dm b/maps/submaps/admin_use_vr/ert.dm index bfa9a49c5c..4bed750cba 100644 --- a/maps/submaps/admin_use_vr/ert.dm +++ b/maps/submaps/admin_use_vr/ert.dm @@ -93,6 +93,10 @@ name = "\improper NRV Von Braun - Cannon Control Room" icon_state = "security_sub" +/area/ship/ert/brig + name = "\improper NRV Von Braun - Prisoner Holding Area" + icon_state = "brig" + /area/shuttle/ert_ship_boat name = "\improper NRB Robineau" icon_state = "yellow" diff --git a/maps/submaps/admin_use_vr/ert.dmm b/maps/submaps/admin_use_vr/ert.dmm index 9de4da08c6..7119cfd85f 100644 --- a/maps/submaps/admin_use_vr/ert.dmm +++ b/maps/submaps/admin_use_vr/ert.dmm @@ -10,15 +10,73 @@ /turf/simulated/floor/reinforced/airless, /area/ship/ert/barracks) "ac" = ( +/obj/effect/shuttle_landmark/premade/ert_ship_port, +/turf/space, +/area/space) +"ad" = ( +/obj/machinery/light/no_nightshift, +/obj/machinery/porta_turret/stationary/CIWS, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/barracks) +"ae" = ( /obj/machinery/light/no_nightshift, /obj/machinery/porta_turret/stationary/CIWS, /turf/simulated/floor/reinforced/airless, /area/ship/ert/dock_port) -"ad" = ( +"af" = ( /obj/structure/hull_corner, /turf/simulated/floor/reinforced/airless, /area/ship/ert/dock_port) -"ae" = ( +"ag" = ( +/obj/machinery/door/airlock/external, +/obj/effect/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/dock_port) +"ah" = ( +/obj/structure/hull_corner{ + dir = 8 + }, +/turf/simulated/floor/reinforced/airless, +<<<<<<< HEAD +/area/ship/ert/mech_bay) +"ag" = ( +/obj/machinery/pointdefense{ +======= +/area/ship/ert/barracks) +"aj" = ( +/obj/machinery/power/pointdefense{ +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + id_tag = "vonbraun_pd" + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/engine) +"al" = ( +/obj/structure/hull_corner/long_horiz{ + dir = 6 + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/hallways_aft) +"ap" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/border_only, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/blast/regular/open{ + dir = 4; + id = "braun_blast_shields"; + name = "Blast Shield" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"aq" = ( +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/meter, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/atmos) +"au" = ( /obj/machinery/door/airlock/external, /obj/effect/map_helper/airlock/door/ext_door, /obj/machinery/airlock_sensor/airlock_exterior{ @@ -29,267 +87,103 @@ /obj/effect/map_helper/airlock/sensor/ext_sensor, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_port) -"af" = ( -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/reinforced/airless, +"av" = ( +/turf/simulated/floor/tiled/techmaint, /area/ship/ert/mech_bay) -"ag" = ( -/obj/machinery/pointdefense{ - id_tag = "vonbraun_pd" - }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/mech_bay) -"ah" = ( -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/mech_bay) -"ai" = ( -/obj/machinery/porta_turret/stationary/CIWS, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/mech_bay) -"aj" = ( -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/engine) -"ak" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 6 - }, -/turf/simulated/wall/rshull, -/area/ship/ert/dock_port) -"al" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8 - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/structure/sign/vacuum{ - pixel_x = -32 - }, +"ay" = ( +/obj/effect/floor_decal/industrial/outline/grey, +<<<<<<< HEAD +/obj/structure/dispenser/oxygen, +======= +/obj/machinery/gear_dispenser/suit/ert, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/dock_port) -"am" = ( -/obj/machinery/airlock_sensor{ +/area/ship/ert/barracks) +"aB" = ( +/obj/structure/hull_corner, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/barracks) +"aC" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/wall/shull, +/area/ship/ert/med_surg) +"aD" = ( +/obj/item/weapon/circuitboard/aiupload, +/obj/item/weapon/circuitboard/borgupload, +/obj/item/weapon/circuitboard/smes, +/obj/item/weapon/aiModule/nanotrasen, +/obj/item/weapon/aiModule/reset, +/obj/item/weapon/aiModule/freeformcore, +/obj/item/weapon/aiModule/protectStation, +/obj/item/weapon/aiModule/quarantine, +/obj/item/weapon/aiModule/paladin, +/obj/item/weapon/aiModule/robocop, +/obj/item/weapon/aiModule/safeguard, +/obj/structure/table/steel_reinforced, +/obj/item/weapon/smes_coil, +/obj/item/weapon/smes_coil, +/obj/item/device/t_scanner/advanced{ + pixel_x = -3 + }, +/obj/item/device/t_scanner/advanced{ + pixel_x = 3 + }, +/obj/machinery/power/apc/hyper{ + alarms_hidden = 1; + name = "VB APC - South"; + pixel_y = -24 + }, +/obj/structure/cable/yellow, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/eng_storage) +"aE" = ( +/obj/structure/table/rack/steel, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/machinery/power/apc/hyper{ + alarms_hidden = 1; + dir = 4; + name = "VB APC - East"; pixel_x = 24 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/dock_port) -"an" = ( -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/structure/dispenser/oxygen, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"ao" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/tank/jetpack/oxygen{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/weapon/tank/jetpack/oxygen{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/weapon/tank/jetpack/oxygen{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/weapon/tank/jetpack/oxygen{ - pixel_x = 6; - pixel_y = 6 - }, +/obj/structure/cable/yellow, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) -"ap" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"aq" = ( -/obj/machinery/telecomms/relay, -/turf/simulated/floor/tiled/techfloor, +"aF" = ( +/obj/structure/hull_corner/long_horiz{ + dir = 6 + }, +/turf/simulated/floor/reinforced/airless, /area/ship/ert/atmos) -"ar" = ( -/obj/structure/table/rack/steel, -/obj/item/toy/plushie/squid/blue{ - desc = "A small, cute and loveable squid friend. This one is blue. Despite the name, it seems no more or less deadly than your regular plush squid."; - name = "NT 'Deathsquid' Plushie" - }, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/item/device/mapping_unit/deathsquad, -/obj/item/device/holomap_beacon/deathsquad, -/obj/item/device/holomap_beacon/deathsquad, -/obj/item/device/holomap_beacon/deathsquad, -/obj/item/device/holomap_beacon/deathsquad, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"as" = ( -/obj/machinery/light_switch{ - pixel_y = 23 - }, -/obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp, -/obj/item/device/holomap_beacon/ert, -/obj/item/device/holomap_beacon/ert, -/obj/item/device/mapping_unit/ert, -/turf/simulated/floor/wood, -/area/ship/ert/commander) -"at" = ( -/obj/item/device/mapping_unit/ert, -/turf/simulated/floor/wood, -/area/ship/ert/commander) -"ar" = ( -/obj/structure/table/rack/steel, -/obj/item/toy/plushie/squid/blue{ - desc = "A small, cute and loveable squid friend. This one is blue. Despite the name, it seems no more or less deadly than your regular plush squid."; - name = "NT 'Deathsquid' Plushie" - }, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/item/device/mapping_unit/deathsquad, -/obj/item/device/holomap_beacon/deathsquad, -/obj/item/device/holomap_beacon/deathsquad, -/obj/item/device/holomap_beacon/deathsquad, -/obj/item/device/holomap_beacon/deathsquad, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"as" = ( -/obj/machinery/light_switch{ - pixel_y = 23 - }, -/obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp, -/obj/item/device/holomap_beacon/ert, -/obj/item/device/holomap_beacon/ert, -/obj/item/device/mapping_unit/ert, -/turf/simulated/floor/wood, -/area/ship/ert/commander) -"at" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/wood, -/area/ship/ert/commander) -"au" = ( -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/structure/table/rack/steel, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, -/obj/item/clothing/suit/armor/vest/ert/medical, -/obj/item/clothing/suit/armor/vest/ert/medical, -/obj/item/clothing/suit/armor/vest/ert/medical, -/obj/item/clothing/suit/armor/vest/ert/medical, -/obj/item/clothing/suit/armor/vest/ert/medical, -/obj/item/clothing/suit/armor/vest/ert/medical, -/obj/item/clothing/head/helmet/ert/medical, -/obj/item/clothing/head/helmet/ert/medical, -/obj/item/clothing/head/helmet/ert/medical, -/obj/item/clothing/head/helmet/ert/medical, -/obj/item/clothing/head/helmet/ert/medical, -/obj/item/clothing/head/helmet/ert/medical, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"av" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/gunnery) -"aw" = ( -/obj/structure/table/rack/steel, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/item/clothing/mask/gas{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/clothing/mask/gas{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/clothing/mask/gas{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/clothing/mask/gas{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"ax" = ( -/obj/structure/hull_corner{ - dir = 8 - }, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/ert_ship_boat) -"ay" = ( -/obj/structure/table/rack/steel, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/item/clothing/mask/gas{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/clothing/mask/gas{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/clothing/mask/gas{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/clothing/mask/gas{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/clothing/shoes/magboots/adv, -/obj/item/clothing/shoes/magboots/adv, -/obj/item/clothing/shoes/magboots/adv, -/obj/item/clothing/shoes/magboots/adv, -/obj/item/clothing/shoes/magboots/adv, -/obj/item/clothing/shoes/magboots/adv, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"az" = ( +"aG" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/mech_bay) +"aH" = ( /obj/structure/table/rack/steel, /obj/item/weapon/storage/backpack/ert/security{ pixel_y = -3 @@ -298,9 +192,53 @@ /obj/item/weapon/storage/backpack/ert/security{ pixel_y = 3 }, +<<<<<<< HEAD +/obj/structure/table/woodentable, +/obj/item/device/flashlight/lamp, +/obj/item/device/holomap_beacon/ert, +/obj/item/device/holomap_beacon/ert, +/obj/item/device/mapping_unit/ert, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"at" = ( +/obj/item/device/mapping_unit/ert, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"ar" = ( +/obj/structure/table/rack/steel, +/obj/item/toy/plushie/squid/blue{ + desc = "A small, cute and loveable squid friend. This one is blue. Despite the name, it seems no more or less deadly than your regular plush squid."; + name = "NT 'Deathsquid' Plushie" + }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/device/mapping_unit/deathsquad, +/obj/item/device/holomap_beacon/deathsquad, +/obj/item/device/holomap_beacon/deathsquad, +/obj/item/device/holomap_beacon/deathsquad, +/obj/item/device/holomap_beacon/deathsquad, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"as" = ( +/obj/machinery/light_switch{ + pixel_y = 23 + }, +/obj/structure/table/woodentable, +/obj/item/device/flashlight/lamp, +/obj/item/device/holomap_beacon/ert, +/obj/item/device/holomap_beacon/ert, +/obj/item/device/mapping_unit/ert, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"at" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" +======= /obj/effect/floor_decal/industrial/outline/grey, /obj/item/weapon/storage/backpack/ert/security{ pixel_y = 6 +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg }, /obj/item/weapon/storage/backpack/ert/security{ pixel_y = 9 @@ -316,59 +254,149 @@ /obj/item/clothing/suit/space/void/responseteam/security, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) -"aA" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/clothing/suit/armor/vest/ert/security, -/obj/item/clothing/suit/armor/vest/ert/security, -/obj/item/clothing/suit/armor/vest/ert/security, -/obj/item/clothing/suit/armor/vest/ert/security, -/obj/item/clothing/suit/armor/vest/ert/security, -/obj/item/clothing/suit/armor/vest/ert/security, -/obj/item/clothing/head/helmet/ert/security, -/obj/item/clothing/head/helmet/ert/security, -/obj/item/clothing/head/helmet/ert/security, -/obj/item/clothing/head/helmet/ert/security, -/obj/item/clothing/head/helmet/ert/security, -/obj/item/clothing/head/helmet/ert/security, +<<<<<<< HEAD +"av" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +======= +"aJ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/universal, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"aB" = ( -/obj/effect/floor_decal/industrial/outline/grey, +/area/ship/ert/atmos) +"aQ" = ( +/obj/structure/sign/department/operational{ + name = "MEDICAL & SURGERY" + }, +/turf/simulated/wall/shull, +/area/ship/ert/med_surg) +"aV" = ( +/obj/machinery/power/pointdefense{ + id_tag = "vonbraun_pd" + }, +/obj/structure/cable/yellow{ + d2 = 4; + dir = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/eng_storage) +"aZ" = ( +/obj/structure/table/steel_reinforced, +/obj/fiftyspawner/phoron, +/obj/fiftyspawner/glass, +/obj/fiftyspawner/glass, +/obj/fiftyspawner/glass, +/obj/fiftyspawner/glass, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/plasteel, +/obj/fiftyspawner/plasteel, +/obj/fiftyspawner/plasteel, +/obj/fiftyspawner/plasteel, +/obj/fiftyspawner/rglass, +/obj/fiftyspawner/rglass, +/obj/fiftyspawner/rglass, +/obj/fiftyspawner/phoronglass, +/obj/fiftyspawner/phoronglass, +/obj/fiftyspawner/rods, +/obj/fiftyspawner/rods, +/obj/fiftyspawner/rods, +/obj/fiftyspawner/rods, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/eng_storage) +"be" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/obj/effect/floor_decal/corner/yellow{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/sign/warning/engineering_access{ + pixel_x = -32 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/corner/red{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways_aft) +"bn" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/machinery/alarm/alarms_hidden{ + dir = 1; + pixel_y = -26 + }, +/obj/effect/floor_decal/corner/white{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"br" = ( +/obj/machinery/porta_turret/stationary/CIWS, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/mech_bay) +"bv" = ( +/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/machinery/door/airlock/glass_security{ + name = "ORB Control"; + req_one_access = list(103) + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/mech_bay) +"bw" = ( /obj/structure/table/rack/steel, -/obj/structure/table/rack/steel, -/obj/item/weapon/storage/belt/utility/chief/full{ +/obj/item/weapon/storage/box/frags{ + pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/storage/belt/utility/chief/full, -/obj/item/weapon/storage/belt/utility/chief/full{ +/obj/item/weapon/storage/box/frags{ + pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/belt/utility/chief/full{ - pixel_y = 4 +/obj/machinery/power/apc/hyper{ + alarms_hidden = 1; + dir = 4; + name = "VB APC - East"; + pixel_x = 24 }, -/obj/item/weapon/storage/belt/utility/chief/full{ - pixel_y = 6 +/obj/structure/cable/yellow, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_dl) +"bB" = ( +/obj/structure/hull_corner{ + dir = 1 }, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/storage/belt/explorer/pathfinder{ - name = "ERT belt" - }, -/obj/item/weapon/storage/belt/explorer/pathfinder{ - name = "ERT belt" - }, -/obj/item/weapon/storage/belt/explorer/pathfinder{ - name = "ERT belt" +/turf/space, +/area/space) +"bG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, +<<<<<<< HEAD /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "aC" = ( @@ -376,151 +404,147 @@ id_tag = "vonbraun_pd" }, /turf/simulated/floor/reinforced/airless, +======= +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg /area/ship/ert/med_surg) -"aD" = ( +"bI" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/item/weapon/paper/vonbraun_shields, /obj/structure/table/steel_reinforced, -/obj/machinery/alarm/alarms_hidden{ - dir = 1; - pixel_y = -26 - }, -/obj/fiftyspawner/tritium, -/obj/fiftyspawner/tritium, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/eng_storage) -"aE" = ( -/obj/machinery/alarm/alarms_hidden{ - dir = 1; - pixel_y = -26 - }, -/obj/structure/table/rack/steel, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, -/obj/item/clothing/suit/armor/vest/ert/engineer, -/obj/item/clothing/suit/armor/vest/ert/engineer, -/obj/item/clothing/suit/armor/vest/ert/engineer, -/obj/item/clothing/suit/armor/vest/ert/engineer, -/obj/item/clothing/suit/armor/vest/ert/engineer, -/obj/item/clothing/suit/armor/vest/ert/engineer, -/obj/item/clothing/head/helmet/ert/engineer, -/obj/item/clothing/head/helmet/ert/engineer, -/obj/item/clothing/head/helmet/ert/engineer, -/obj/item/clothing/head/helmet/ert/engineer, -/obj/item/clothing/head/helmet/ert/engineer, -/obj/item/clothing/head/helmet/ert/engineer, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"aF" = ( -/obj/machinery/porta_turret/stationary/CIWS, +/area/ship/ert/bridge) +"bJ" = ( /turf/simulated/floor/reinforced/airless, -/area/ship/ert/atmos) -"aG" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/storage/backpack/ert/medical{ - pixel_y = -3 - }, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical{ - pixel_y = 3 +/area/ship/ert/gunnery) +"bM" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/machinery/light/no_nightshift, -/obj/item/weapon/storage/backpack/ert/medical{ - pixel_y = 6 - }, -/obj/item/weapon/storage/backpack/ert/medical{ - pixel_y = 9 - }, -/obj/item/weapon/storage/backpack/ert/medical{ - pixel_y = 12 - }, -/obj/item/clothing/suit/space/void/responseteam/medical, -/obj/item/clothing/suit/space/void/responseteam/medical, -/obj/item/clothing/suit/space/void/responseteam/medical, -/obj/item/clothing/suit/space/void/responseteam/medical, -/obj/item/clothing/suit/space/void/responseteam/medical, -/obj/item/clothing/suit/space/void/responseteam/medical, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"aH" = ( -/obj/item/weapon/storage/belt/medical/emt{ - pixel_y = -4 - }, -/obj/item/weapon/storage/belt/medical/emt{ - pixel_y = -2 - }, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt{ - pixel_y = 2 - }, -/obj/item/weapon/storage/belt/medical/emt{ - pixel_y = 4 - }, -/obj/item/weapon/storage/belt/medical/emt{ - pixel_y = 6 - }, -/obj/item/clothing/accessory/storage/white_vest{ - pixel_y = -4 - }, -/obj/item/clothing/accessory/storage/white_vest{ - pixel_y = -2 - }, -/obj/item/clothing/accessory/storage/white_vest, -/obj/item/clothing/accessory/storage/white_vest{ - pixel_y = 2 - }, -/obj/item/clothing/accessory/storage/white_vest{ - pixel_y = 4 - }, -/obj/item/clothing/accessory/storage/white_vest{ - pixel_y = 6 - }, /obj/structure/table/rack/steel, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/storage/belt/explorer/pathfinder{ - name = "ERT belt" - }, -/obj/item/weapon/storage/belt/explorer/pathfinder{ - name = "ERT belt" - }, -/obj/item/weapon/storage/belt/explorer/pathfinder{ - name = "ERT belt" - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"aI" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/item/weapon/rig/ert/medical, +/obj/item/weapon/rig/ert/medical, +/obj/item/weapon/rig/ert/medical, +/obj/item/weapon/rig/ert/medical, +/obj/item/weapon/rig/ert/medical, +/obj/item/weapon/rig/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/head/helmet/ert/medical, +/obj/item/clothing/head/helmet/ert/medical, +/obj/item/clothing/head/helmet/ert/medical, +/obj/item/clothing/head/helmet/ert/medical, +/obj/item/clothing/head/helmet/ert/medical, +/obj/item/clothing/head/helmet/ert/medical, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"bO" = ( +/obj/machinery/shipsensors{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/atmos) +"bR" = ( +/obj/machinery/porta_turret/stationary/CIWS, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/atmos) +"bW" = ( +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/atmos) +"ca" = ( +/obj/machinery/porta_turret/stationary/CIWS, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/gunnery) +"cb" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/med) -"aJ" = ( -/obj/item/device/multitool/station_buffered, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/atmos) -"aK" = ( +/area/ship/ert/hallways_aft) +"ch" = ( +/obj/machinery/power/pointdefense{ + id_tag = "vonbraun_pd" + }, +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/gunnery) +"ci" = ( +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/med_surg) +"cl" = ( +/obj/effect/shuttle_landmark/premade/ert_ship_near_aft, +/turf/space, +/area/space) +"co" = ( +/obj/item/roller_holder, +/obj/item/roller/adv, +/obj/item/roller/adv{ + pixel_y = 6 + }, +/obj/item/roller/adv{ + pixel_y = 12 + }, +/obj/machinery/light/no_nightshift, +/obj/effect/floor_decal/industrial/outline, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"cs" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/hallways_aft) +"cu" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/barracks) +"cv" = ( +/obj/machinery/shieldgen, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/eng_storage) +"cz" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +<<<<<<< HEAD /obj/effect/floor_decal/corner/white{ dir = 10 }, @@ -540,62 +564,60 @@ /area/ship/ert/med_surg) "aV" = ( /obj/machinery/pointdefense{ +======= +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/brig) +"cJ" = ( +/obj/machinery/power/pointdefense{ +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg id_tag = "vonbraun_pd" }, /turf/simulated/floor/reinforced/airless, -/area/ship/ert/eng_storage) -"bp" = ( -/obj/machinery/atmospherics/pipe/simple/visible/universal, +/area/ship/ert/hallways_aft) +"cM" = ( +/obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/atmos) -"br" = ( -/obj/structure/table/rack/steel, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/tank/jetpack/carbondioxide{ - pixel_x = -4; - pixel_y = -4 +/area/ship/ert/hallways_aft) +"cO" = ( +/obj/machinery/bodyscanner{ + dir = 8 }, -/obj/item/weapon/tank/jetpack/carbondioxide{ - pixel_x = -2; - pixel_y = -2 +/obj/machinery/light/no_nightshift{ + dir = 8 }, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/weapon/tank/jetpack/carbondioxide{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/weapon/tank/jetpack/carbondioxide{ - pixel_x = 6; - pixel_y = 6 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"bt" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/bridge) -"bv" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"cR" = ( +/obj/machinery/light/no_nightshift{ dir = 1 }, +/obj/machinery/porta_turret/stationary/CIWS, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/med) +"cS" = ( +/turf/simulated/wall/shull, +/area/ship/ert/hallways_aft) +"cV" = ( +/obj/structure/table/steel_reinforced, +/obj/fiftyspawner/durasteel, +/obj/fiftyspawner/durasteel, +/obj/fiftyspawner/durasteel, +/obj/fiftyspawner/durasteel, +/obj/fiftyspawner/titanium_glass, +/obj/fiftyspawner/titanium_glass, +/obj/fiftyspawner/titanium_glass, +/obj/fiftyspawner/titanium_glass, +/obj/fiftyspawner/plastitanium_glass, +/obj/fiftyspawner/plastitanium_glass, +/obj/fiftyspawner/plastitanium_glass, +/obj/fiftyspawner/plastitanium_glass, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/eng_storage) +"cW" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6 + }, +<<<<<<< HEAD /obj/structure/window/reinforced, /turf/simulated/floor/airless, /area/ship/ert/gunnery) @@ -611,14 +633,23 @@ ======= >>>>>>> 7f76eb5c10d... Merge pull request #12174 from Novacat/nova-basicfixes "bJ" = ( +======= +/turf/simulated/wall/rshull, +/area/ship/ert/dock_port) +"cY" = ( +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8 }, /obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/machinery/light/no_nightshift{ - dir = 8 +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/sign/vacuum{ + pixel_x = -32 }, /turf/simulated/floor/tiled/techfloor, +<<<<<<< HEAD /area/ship/ert/dock_star) "bM" = ( /turf/simulated/wall/rshull, @@ -661,124 +692,1252 @@ /obj/machinery/atmospherics/pipe/tank/air{ dir = 4; start_pressure = 740.5 +======= +/area/ship/ert/dock_port) +"db" = ( +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/apc/hyper{ + alarms_hidden = 1; + dir = 4; + name = "VB APC - East"; + pixel_x = 24 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/mech_bay) +"dd" = ( +/obj/machinery/airlock_sensor{ + pixel_x = 24 + }, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_port) -"cu" = ( -/obj/machinery/light/no_nightshift, -/obj/machinery/porta_turret/stationary/CIWS, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/barracks) -"cv" = ( -/obj/machinery/shield_gen, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/eng_storage) -"cC" = ( -/obj/effect/floor_decal/corner/white{ - dir = 4 - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 23 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/eng_storage) -"cH" = ( -/obj/machinery/computer/ship/disperser{ - dir = 8 - }, -/obj/item/weapon/paper/vonbraun_cannon, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/gunnery) -"cJ" = ( +"dg" = ( /obj/machinery/light/no_nightshift{ dir = 1 }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/hallways_aft) -"cO" = ( -/obj/machinery/computer/operating, -/turf/simulated/floor/tiled/white, -/area/ship/ert/med_surg) -"cP" = ( -/obj/machinery/recharge_station, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/dispenser/oxygen, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + }, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/bridge) -"cS" = ( -/turf/simulated/wall/shull, -/area/ship/ert/hallways_aft) -"cV" = ( -/obj/machinery/vending/assist, +/area/ship/ert/barracks) +"dj" = ( +/obj/structure/table/rack/steel, +/obj/item/taperoll/engineering{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/taperoll/engineering{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/taperoll/engineering{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/taperoll/engineering{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) -"cW" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ +"dk" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/gun/projectile/heavysniper, +/obj/item/ammo_magazine/ammo_box/b145, +/obj/item/ammo_magazine/ammo_box/b145, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/alarm/alarms_hidden{ + dir = 1; + pixel_y = -26 + }, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_dl) +"dn" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"dq" = ( +/turf/simulated/wall/shull, +/area/ship/ert/med_surg) +"ds" = ( +/obj/machinery/door/blast/shutters{ + density = 0; + icon_state = "shutter0"; + id = "braun_cells_privacy"; + name = "Privacy Shutters"; + opacity = 0 + }, +/obj/structure/grille, +/obj/structure/window/titanium/full, +/obj/structure/window/titanium{ + dir = 1 + }, +/obj/structure/window/titanium, +/obj/structure/window/titanium{ dir = 4 }, -/obj/machinery/meter, -/obj/machinery/power/apc/hyper{ - alarms_hidden = 1; - dir = 1; - name = "VB APC - North"; - pixel_y = 24 +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" }, /obj/structure/cable/yellow{ d2 = 2; icon_state = "0-2" }, -/obj/machinery/light/small{ +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/brig) +"dx" = ( +/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 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/med) +"dA" = ( +/obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/portable_atmospherics/canister/carbon_dioxide/engine_setup, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"dC" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/bridge) +"dR" = ( +/obj/machinery/shield_capacitor, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/eng_storage) +"dT" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"dV" = ( +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"dW" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/wall/rshull, +/area/ship/ert/gunnery) +"dX" = ( +/obj/structure/table/rack/steel, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/tank/jetpack/carbondioxide{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/weapon/tank/jetpack/carbondioxide{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/weapon/tank/jetpack/carbondioxide{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/tank/jetpack/carbondioxide{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/tank/jetpack/carbondioxide{ + pixel_x = 6; + pixel_y = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"dY" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/blast/regular{ + closed_layer = 4; + dir = 4; + id = "NRV_DELTA"; + layer = 4 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"dZ" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"ee" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +<<<<<<< HEAD +/obj/machinery/pointdefense{ + id_tag = "vonbraun_pd" + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/gunnery) +/obj/machinery/power/pointdefense{ + id_tag = "vonbraun_pd" + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/gunnery) +/turf/space, +/area/space) +"dX" = ( +======= +/turf/simulated/wall/rshull, +/area/ship/ert/mech_bay) +"ef" = ( +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/engineering{ + req_one_access = list(103) + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_port) -"cY" = ( +"es" = ( +/obj/machinery/door/airlock/glass_command{ + req_one_access = list(103) + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +<<<<<<< HEAD +/obj/item/clothing/glasses/night{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/glasses/night{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/machinery/firealarm/alarms_hidden{ + pixel_y = 26 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"eg" = ( +/obj/structure/table/rack/steel, +/obj/item/clothing/glasses/night{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/glasses/night{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/clothing/glasses/night, +/obj/item/clothing/glasses/night{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/glasses/night{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/glasses/night{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/machinery/atm{ + pixel_y = 26 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"ej" = ( +/obj/machinery/door/blast/regular{ + id = "Von_Braun_Cannon"; + name = "Cannon Firing Port" + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/gunnery) +"es" = ( +/obj/structure/closet/crate{ + dir = 2 + }, +/obj/item/ammo_magazine/m9mml/ap, +/obj/item/ammo_magazine/m9mml/ap, +/obj/item/ammo_magazine/m9mml/ap, +/obj/item/ammo_magazine/m9mml/ap, +/obj/item/ammo_magazine/m9mml/ap, +/obj/item/ammo_magazine/m9mml/ap, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/outline/red, +======= +/obj/machinery/door/firedoor/border_only, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/bridge) +"et" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +<<<<<<< HEAD +/area/ship/ert/teleporter) +======= +/area/ship/ert/engine) +"eG" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/multi_tile{ + dir = 1; + req_one_access = list(103) + }, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 1; + name = "Outfitting"; + req_one_access = list(103) + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +"eH" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/wall/rshull, +/area/ship/ert/gunnery) +"eI" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/glass{ + req_one_access = list(103) + }, +/obj/structure/sign/warning/airlock{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/dock_star) +"eJ" = ( +/obj/machinery/shield_diffuser, +/obj/machinery/door/blast/regular/open{ + dir = 2; + id = "ERT_Blast_Windows"; + name = "Blast Shield" + }, +/obj/machinery/door/blast/regular{ + id = "ERT_Shuttle_Fore" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/ert_ship_boat) +"eX" = ( +/obj/effect/landmark/late_antag/ert, +/obj/structure/table/bench/steel, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"fe" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways) +"ff" = ( +/obj/machinery/vending/food, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"fj" = ( +/obj/machinery/vending/security, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"fk" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/wall/rshull, +/area/ship/ert/gunnery) +"fn" = ( +/obj/machinery/power/pointdefense{ + id_tag = "vonbraun_pd" + }, +/obj/structure/cable/yellow{ + d2 = 4; + dir = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/med) +"fo" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/table/steel_reinforced, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +<<<<<<< HEAD +/area/ship/ert/dock_star) +"fx" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/obj/machinery/firealarm/alarms_hidden{ + pixel_y = 26 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -23 + }, +/obj/item/rig_module/sprinter{ + pixel_x = -4; + pixel_y = 4 +======= +/area/ship/ert/brig) +"fp" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/effect/landmark{ + name = "Commando" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"fr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/eng_storage) +"ft" = ( +/obj/machinery/sleeper{ + dir = 4 +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +<<<<<<< HEAD +======= +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"fu" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/hallways_aft) +"fx" = ( +/obj/structure/table/rack/steel, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/mask/gas{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/mask/gas{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/mask/gas{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/mask/gas{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"fE" = ( +/obj/structure/hull_corner{ + dir = 8 + }, +/turf/space, +/area/space) +"fS" = ( +/obj/machinery/alarm/alarms_hidden{ + dir = 1; + pixel_y = -26 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways_aft) +"fV" = ( +/obj/structure/bed/chair/bay/shuttle, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/ert_ship_boat) +"fW" = ( +/obj/effect/floor_decal/corner/yellow{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/obj/machinery/light/no_nightshift, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -23 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways) +"fZ" = ( +/obj/machinery/door/blast/regular{ + closed_layer = 4; + dir = 4; + id = "NRV_DELTA"; + layer = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"ga" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/obj/item/device/defib_kit/compact/combat/loaded{ + pixel_y = -3 + }, +/obj/item/device/defib_kit/compact/combat/loaded{ + pixel_y = 3 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"gf" = ( +/obj/structure/table/steel_reinforced, +/obj/item/weapon/storage/firstaid/surgery, +/obj/item/weapon/storage/firstaid/surgery, +/obj/item/weapon/surgical/bone_clamp, +/obj/item/weapon/surgical/bone_clamp, +/obj/item/weapon/surgical/scalpel/manager, +/obj/item/weapon/surgical/scalpel/manager, +/obj/item/weapon/surgical/circular_saw/manager, +/obj/item/weapon/surgical/circular_saw/manager, +/obj/item/stack/nanopaste, +/obj/item/stack/nanopaste, +/turf/simulated/floor/tiled/techfloor, +<<<<<<< HEAD +/area/ship/ert/eng_storage) +======= +/area/ship/ert/med) +"gi" = ( +/obj/structure/closet/crate/medical, +/obj/item/weapon/storage/box/autoinjectors, +/obj/item/weapon/storage/box/beakers, +/obj/item/weapon/storage/box/bodybags, +/obj/item/weapon/storage/box/bodybags{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/storage/box/gloves, +/obj/item/weapon/storage/box/freezer, +/obj/item/weapon/storage/box/masks, +/obj/effect/floor_decal/industrial/outline, +/obj/item/weapon/storage/box/bodybags, +/obj/item/weapon/storage/box/bodybags, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"gk" = ( +/obj/machinery/light/no_nightshift, +/obj/machinery/teleport/hub, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/teleporter) +"gl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/landmark{ + name = "Commando" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +"gn" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/atmos) +<<<<<<< HEAD +"gx" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/melee/baton{ + pixel_x = -6 + }, +/obj/item/weapon/melee/baton{ + pixel_x = -2 + }, +/obj/item/weapon/melee/baton{ + pixel_x = 2 +======= +"go" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/wall/rshull, +/area/ship/ert/eng_storage) +"gp" = ( +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/airlock_sensor{ + pixel_x = 24 +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + }, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/dock_star) +"gq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"gs" = ( +/obj/machinery/door/airlock/external, +/obj/effect/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/dock_star) +"gx" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/wall/rshull, +/area/ship/ert/hallways_aft) +"gA" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/atmos) +"gF" = ( +/obj/structure/table/steel_reinforced, +/obj/item/rig_module/chem_dispenser/combat, +/obj/item/rig_module/chem_dispenser/combat, +/obj/item/rig_module/chem_dispenser/injector, +/obj/item/rig_module/chem_dispenser/injector, +/obj/item/rig_module/device/healthscanner, +/obj/item/rig_module/device/healthscanner, +/obj/item/rig_module/device/healthscanner, +/obj/item/rig_module/device/healthscanner, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/mech_bay) +"gN" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /obj/machinery/firealarm/alarms_hidden{ dir = 1; pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engine) -"db" = ( -/obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/gunnery) -"dd" = ( -/obj/machinery/atmospherics/pipe/manifold/visible, -/turf/simulated/wall/shull, -/area/ship/ert/dock_port) -"dg" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8 - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/dock_port) -"dk" = ( -/obj/effect/floor_decal/industrial/warning{ +/area/ship/ert/atmos) +"gP" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/teleporter) +"gQ" = ( +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/machinery/door/blast/regular/open{ + dir = 8; + id = "ERT_Blast_Windows"; + name = "Blast Shield" + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/ert_ship_boat) +"gR" = ( +/obj/machinery/atmospherics/pipe/tank/air{ + dir = 4; + start_pressure = 740.5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/dock_port) +"gT" = ( +/obj/machinery/cryopod/ert_ship, +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"gV" = ( +/obj/effect/floor_decal/corner/white{ + dir = 6 + }, +/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 }, /turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) -"dn" = ( -/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{ - dir = 8; - id_tag = "von_braun_port"; - master_tag = "von_braun_master"; - name = "Port Docking Control"; - pixel_x = 22 +/area/ship/ert/eng_storage) +"gW" = ( +/obj/structure/table/steel_reinforced, +/obj/item/rig_module/device/rcd{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/rig_module/device/rcd{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/rig_module/device/plasmacutter{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/rig_module/device/plasmacutter{ + pixel_x = 4; + pixel_y = 4 }, /turf/simulated/floor/tiled/techfloor, +/area/ship/ert/mech_bay) +"gX" = ( +/obj/structure/table/rack/steel, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = 12 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = 10 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = 8 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = 6 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = 4 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = 2 + }, +/obj/item/ammo_magazine/m9mmp90, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = -2 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = -4 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = -6 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = -8 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = -10 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/projectile/automatic/p90{ + pixel_y = -6 + }, +/obj/item/weapon/gun/projectile/automatic/p90{ + pixel_y = -2 + }, +/obj/item/weapon/gun/projectile/automatic/p90{ + pixel_y = 2 + }, +/obj/item/weapon/gun/projectile/automatic/p90{ + pixel_y = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_dl) +"gY" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/effect/catwalk_plated/techmaint, +/turf/simulated/floor/plating, +/area/ship/ert/brig) +"gZ" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"ha" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/highsecurity{ + name = "Teleporter Chamber"; + req_one_access = list(103) + }, +<<<<<<< HEAD +======= +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/teleporter) +"hb" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/wall/rshull, +/area/ship/ert/med_surg) +"hc" = ( +/obj/machinery/sleep_console{ + dir = 4 + }, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"hd" = ( +/obj/machinery/power/apc/hyper{ + alarms_hidden = 1; + dir = 4; + name = "VB APC - East"; + pixel_x = 24 + }, +/obj/structure/cable/yellow, +/obj/machinery/embedded_controller/radio/docking_port_multi{ + child_names_txt = "Port Airlock Control;Starboard Airlock Control"; + child_tags_txt = "von_braun_port;von_braun_star"; + dir = 1; + id_tag = "von_braun_master"; + pixel_y = -22 + }, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"hj" = ( +/obj/structure/table/steel_reinforced, +/obj/item/rig_module/device/drill{ + pixel_y = -4 + }, +/obj/item/rig_module/device/drill{ + pixel_y = 4 + }, +/obj/item/rig_module/maneuvering_jets{ + pixel_x = -5 + }, +/obj/item/rig_module/maneuvering_jets{ + pixel_x = -2 + }, +/obj/item/rig_module/maneuvering_jets{ + pixel_x = 1 + }, +/obj/item/rig_module/maneuvering_jets{ + pixel_x = 4 + }, +/obj/item/rig_module/maneuvering_jets{ + pixel_x = 7 + }, +/obj/item/rig_module/maneuvering_jets{ + pixel_x = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/mech_bay) +"hl" = ( +/obj/effect/floor_decal/corner/red{ + dir = 8 + }, +/obj/structure/reagent_dispensers/foam, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +<<<<<<< HEAD +"hW" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/machinery/pointdefense{ + id_tag = "vonbraun_pd" + }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/hangar) +"hW" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/machinery/power/pointdefense{ + id_tag = "vonbraun_pd" + }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/hangar) +"hY" = ( +/obj/structure/hull_corner{ + dir = 4 +======= +"hq" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 23 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/dock_star) +"hs" = ( +/obj/machinery/atmospherics/pipe/manifold/visible, +/turf/simulated/wall/shull, /area/ship/ert/dock_port) -"dp" = ( +"hv" = ( +/obj/structure/closet/medical_wall{ + pixel_x = 32 + }, +/obj/item/weapon/storage/firstaid/adv{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/firstaid/adv{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/firstaid/fire{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/storage/firstaid/fire{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/storage/firstaid/o2, +/obj/item/weapon/storage/firstaid/o2, +/obj/item/weapon/storage/firstaid/toxin{ + pixel_x = -2; + pixel_y = -2 + }, +<<<<<<< HEAD +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"ib" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/machinery/pointdefense{ + id_tag = "vonbraun_pd" + }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/machinery/power/pointdefense{ + id_tag = "vonbraun_pd" + }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/hangar) +"ij" = ( +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"ik" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/dock_port) +"ip" = ( +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) +"ix" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/glass{ + req_one_access = list(103) + }, +/obj/structure/sign/warning/airlock{ + pixel_y = -32 + }, +======= +/obj/item/weapon/storage/firstaid/toxin{ + pixel_x = -2; + pixel_y = -2 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"hx" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/hallways_aft) +"hA" = ( +/obj/machinery/power/pointdefense{ + id_tag = "vonbraun_pd" + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/engine) +"hF" = ( +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/teleporter) +"hN" = ( +/obj/structure/closet/wardrobe/ert, +/obj/item/modular_computer/tablet/preset/custom_loadout/elite, +/obj/item/weapon/storage/box/survival/comp{ + starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/modular_computer/laptop/preset/custom_loadout/elite, +/turf/simulated/floor/tiled/techfloor, +<<<<<<< HEAD +/area/ship/ert/med) +"iO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +======= +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/area/ship/ert/barracks) +"hQ" = ( +/obj/machinery/door/airlock/glass_medical{ + name = "Medical Bay"; + req_access = list(103) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +<<<<<<< HEAD +======= +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"hS" = ( +/obj/structure/closet/wardrobe/ert, +/obj/item/modular_computer/tablet/preset/custom_loadout/elite, +/obj/item/weapon/storage/box/survival/comp{ + starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/modular_computer/laptop/preset/custom_loadout/elite, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"hU" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/ship_munition/disperser_charge/explosive, +/turf/simulated/floor/reinforced, +/area/ship/ert/hallways_aft) +"hV" = ( +/obj/structure/closet/crate{ + dir = 2 + }, +/obj/item/ammo_magazine/m9mml/ap, +/obj/item/ammo_magazine/m9mml/ap, +/obj/item/ammo_magazine/m9mml/ap, +/obj/item/ammo_magazine/m9mml/ap, +/obj/item/ammo_magazine/m9mml/ap, +/obj/item/ammo_magazine/m9mml/ap, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_dl) +"hY" = ( /obj/structure/table/rack/steel, /obj/item/weapon/rig/ert/assetprotection{ pixel_x = -4; @@ -804,31 +1963,61 @@ /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) -"dq" = ( +"ia" = ( +/turf/simulated/wall/shull, +/area/ship/ert/dock_port) +"ii" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"ij" = ( +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"ik" = ( +/obj/structure/table/rack/steel, +/obj/item/toy/plushie/squid/blue{ + desc = "A small, cute and loveable squid friend. This one is blue. Despite the name, it seems no more or less deadly than your regular plush squid."; + name = "NT 'Deathsquid' Plushie" + }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/device/mapping_unit/deathsquad, +/obj/item/device/holomap_beacon/deathsquad, +/obj/item/device/holomap_beacon/deathsquad, +/obj/item/device/holomap_beacon/deathsquad, +/obj/item/device/holomap_beacon/deathsquad, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"ip" = ( +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) +"ir" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/wall/shull, /area/ship/ert/med_surg) -"ds" = ( -/obj/structure/table/rack, -/obj/item/weapon/storage/backpack/ert/commander, -/obj/item/clothing/suit/space/void/responseteam/command, -/obj/item/clothing/head/helmet/ert/command, -/obj/item/clothing/suit/armor/vest/ert/command, -/turf/simulated/floor/wood, -/area/ship/ert/commander) -"dx" = ( -/obj/effect/floor_decal/corner/white{ - dir = 9 +"is" = ( +/obj/machinery/computer/cryopod/ert{ + pixel_y = 32 }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/med) -"dA" = ( -/obj/machinery/door/airlock/glass_medical{ - name = "Medical Bay"; - req_access = list(103) - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) -"dB" = ( +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"iw" = ( +/obj/machinery/door/window/brigdoor/northleft, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/hallways_aft) +"ix" = ( /obj/structure/table/rack/steel, /obj/item/clothing/suit/armor/swat{ pixel_x = -4; @@ -902,23 +2091,201 @@ }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, +<<<<<<< HEAD +/area/ship/ert/armoury_st) +"kh" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 +======= /area/ship/ert/barracks) -"dT" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/blast/regular/open{ - dir = 8; - id = "ERT_Blast_Windows"; - name = "Blast Shield" +"iz" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/structure/window/reinforced{ +/turf/simulated/wall/shull, +/area/ship/ert/mech_bay) +"iC" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/eng_storage) +"iD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"iF" = ( +/obj/machinery/porta_turret/stationary/CIWS, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/med_surg) +"iG" = ( +/obj/machinery/vending/tool, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +<<<<<<< HEAD +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways_aft) +"km" = ( +/obj/effect/floor_decal/corner/white{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"kt" = ( +/obj/machinery/door/blast/regular/open{ + id = "ERT_Shuttle_Rear"; + name = "Boarding Hatch" + }, +/obj/machinery/button/remote/blast_door{ + id = "ERT_Shuttle_Rear"; + name = "ERT Shuttle Access"; + pixel_y = 24; + req_access = list(103) +======= +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/eng_storage) +"iK" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/table/steel_reinforced, +/obj/item/weapon/gun/energy/sizegun, +/obj/item/weapon/gun/energy/sizegun, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/brig) +"iO" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/dock_port) +"iR" = ( +/obj/machinery/airlock_sensor{ + pixel_y = 21 + }, +/obj/effect/map_helper/airlock/sensor/int_sensor, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/dock_port) +"iT" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways) +"iW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +<<<<<<< HEAD +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"kz" = ( +/obj/structure/closet/crate{ + dir = 1 +======= +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/firealarm/alarms_hidden{ + pixel_y = 26 +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"iX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/landmark{ + name = "Commando" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) +"iY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"jb" = ( +/obj/machinery/autolathe{ + desc = "Your typical Autolathe. It appears to have much more options than your regular one, however..."; + hacked = 1; + name = "Unlocked Autolathe" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/eng_storage) +"jn" = ( +/obj/effect/floor_decal/corner/white{ + dir = 4 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 23 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/eng_storage) +"jt" = ( +/obj/machinery/computer/ship/sensors, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/railing/grey{ dir = 1 }, /turf/simulated/floor/tiled/techfloor, -/area/shuttle/ert_ship_boat) -"dV" = ( +/area/ship/ert/bridge) +"jv" = ( /obj/structure/table/rack/steel, /obj/item/clothing/glasses/thermal{ pixel_x = -4; @@ -944,668 +2311,403 @@ /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) -"dW" = ( -/obj/structure/hull_corner{ - dir = 8 +"jy" = ( +/obj/item/device/aicard, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/obj/machinery/pointdefense{ - id_tag = "vonbraun_pd" +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -23 }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/gunnery) -/obj/machinery/power/pointdefense{ - id_tag = "vonbraun_pd" - }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/gunnery) -/turf/space, -/area/space) -"dX" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/engineering{ - req_one_access = list(103) - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/dock_port) -"dY" = ( -/obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/int_door, -/obj/machinery/door/firedoor/multi_tile, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/dock_port) -"ee" = ( -/obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/dock_port) -"ef" = ( -/obj/structure/table/rack/steel, -/obj/item/clothing/glasses/night{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/clothing/glasses/night{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/clothing/glasses/night{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/clothing/glasses/night{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"eg" = ( -/obj/structure/table/rack/steel, -/obj/item/clothing/glasses/night{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/clothing/glasses/night{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/clothing/glasses/night{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/clothing/glasses/night{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/machinery/atm{ - pixel_y = 26 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"ej" = ( -/obj/machinery/door/blast/regular{ - id = "Von_Braun_Cannon"; - name = "Cannon Firing Port" - }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/gunnery) -"es" = ( -/obj/structure/closet/crate{ - dir = 2 - }, -/obj/item/ammo_magazine/m9mml/ap, -/obj/item/ammo_magazine/m9mml/ap, -/obj/item/ammo_magazine/m9mml/ap, -/obj/item/ammo_magazine/m9mml/ap, -/obj/item/ammo_magazine/m9mml/ap, -/obj/item/ammo_magazine/m9mml/ap, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_dl) -"et" = ( -/obj/machinery/atmospherics/pipe/manifold4w/visible/fuel, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/blast/regular/open{ - id = "VB_Rear_Blast"; - name = "Blast Shield" - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/ship/ert/engine) -"eD" = ( -/obj/structure/hull_corner{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/med) -"eF" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/teleporter) -"eH" = ( -/obj/structure/sign/department/cargo{ - name = "ENGINEERING SUPPLIES" - }, -/turf/simulated/wall/rshull, -/area/ship/ert/bridge) -"eI" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"jz" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/tiled/techmaint, -/area/ship/ert/eng_storage) -"eL" = ( -/mob/living/simple_mob/animal/passive/mimepet, -/turf/simulated/floor/wood, -/area/ship/ert/commander) -"eO" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ +/area/ship/ert/barracks) +"jA" = ( +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 2; + icon_state = "shutter0"; + id = "braun_cells_privacy"; + name = "Privacy Shutters"; + opacity = 0 + }, +/obj/structure/grille, +/obj/structure/window/titanium/full, +/obj/structure/window/titanium{ dir = 1 }, -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - id_tag = "vb_cannon_loader"; - pixel_x = 24; - pixel_y = 23 - }, -/obj/machinery/airlock_sensor{ - pixel_x = -25; - pixel_y = 22 - }, -/turf/simulated/floor/airless, -/area/ship/ert/gunnery) -"eP" = ( -/obj/structure/table/steel_reinforced, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/weapon/storage/box/cdeathalarm_kit{ - pixel_x = -1; - pixel_y = -1 - }, -/obj/item/weapon/storage/box/cdeathalarm_kit{ - pixel_x = 1; - pixel_y = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"eX" = ( -/obj/structure/table/steel_reinforced, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/item/weapon/storage/box/backup_kit{ - pixel_x = -1; - pixel_y = -1 - }, -/obj/item/weapon/storage/box/backup_kit{ - pixel_x = 1; - pixel_y = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"ff" = ( -/obj/machinery/vending/fitness, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"fj" = ( -/obj/machinery/door/blast/regular{ - closed_layer = 4; - dir = 4; - id = "NRV_DELTA"; - layer = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"fk" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ +/obj/structure/window/titanium, +/obj/structure/window/titanium{ dir = 4 }, -/obj/machinery/meter, -/obj/machinery/power/apc/hyper{ - alarms_hidden = 1; - name = "VB APC - South"; - pixel_y = -24 +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" }, /obj/structure/cable/yellow, -/obj/machinery/light/small{ +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/brig) +"jB" = ( +/obj/machinery/alarm/alarms_hidden{ + dir = 8; + pixel_x = 26 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/ert/brig) +"jD" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/dock_star) -"fx" = ( -/obj/structure/table/steel_reinforced, -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -23 - }, -/obj/item/rig_module/sprinter{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/rig_module/sprinter{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/rig_module/rescue_pharm{ - pixel_y = -2 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/mech_bay) -"fE" = ( -/obj/structure/table/steel_reinforced, -/obj/item/rig_module/mounted{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/rig_module/mounted/egun{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/rig_module/mounted/egun, -/obj/item/rig_module/mounted/egun{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/rig_module/mounted/egun{ - pixel_x = 4; - pixel_y = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/mech_bay) -"fP" = ( -/obj/structure/table/steel_reinforced, -/obj/item/rig_module/chem_dispenser/combat, -/obj/item/rig_module/chem_dispenser/combat, -/obj/item/rig_module/chem_dispenser/injector, -/obj/item/rig_module/chem_dispenser/injector, -/obj/item/rig_module/device/healthscanner, -/obj/item/rig_module/device/healthscanner, -/obj/item/rig_module/device/healthscanner, -/obj/item/rig_module/device/healthscanner, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/mech_bay) -"fU" = ( -/obj/structure/table/steel_reinforced, -/obj/item/rig_module/device/rcd{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/rig_module/device/rcd{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/rig_module/device/plasmacutter{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/rig_module/device/plasmacutter{ - pixel_x = 4; - pixel_y = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/mech_bay) -"fZ" = ( -/obj/structure/table/steel_reinforced, -/obj/item/rig_module/device/drill{ - pixel_y = -4 - }, -/obj/item/rig_module/device/drill{ - pixel_y = 4 - }, -/obj/item/rig_module/maneuvering_jets{ - pixel_x = -5 - }, -/obj/item/rig_module/maneuvering_jets{ - pixel_x = -2 - }, -/obj/item/rig_module/maneuvering_jets{ - pixel_x = 1 - }, -/obj/item/rig_module/maneuvering_jets{ - pixel_x = 4 - }, -/obj/item/rig_module/maneuvering_jets{ - pixel_x = 7 - }, -/obj/item/rig_module/maneuvering_jets{ - pixel_x = 10 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/mech_bay) -"ga" = ( -/obj/structure/sign/department/operational{ - name = "MEDICAL & SURGERY" - }, -/turf/simulated/wall/shull, -/area/ship/ert/med_surg) -"gf" = ( -/obj/machinery/bodyscanner{ - dir = 8 - }, -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/ship/ert/med_surg) -"gh" = ( -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/obj/machinery/button/remote/blast_door{ - description_fluff = "\\(OOC) DO NOT TOUCH THIS BUTTON WITHOUT THE EXPLICIT PERMISSION OF AN ADMINISTRATOR."; - dir = 4; - id = "NRV_MECHS"; - name = "MECH BAY CONTROL"; - pixel_x = -25; - req_one_access = list(108) - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/gunnery) -"gk" = ( -/obj/machinery/shieldwallgen, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/eng_storage) -"gn" = ( -/obj/machinery/light/no_nightshift, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/light_switch{ - dir = 1; - pixel_y = -23 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/atmos) -"gx" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/melee/baton{ - pixel_x = -6 - }, -/obj/item/weapon/melee/baton{ - pixel_x = -2 - }, -/obj/item/weapon/melee/baton{ - pixel_x = 2 - }, -/obj/item/weapon/melee/baton{ - pixel_x = 6 - }, -/obj/item/weapon/shield/riot{ - pixel_x = -6 - }, -/obj/item/weapon/shield/riot{ - pixel_x = -2 - }, -/obj/item/weapon/shield/riot{ - pixel_x = 2 - }, -/obj/item/weapon/shield/riot{ - pixel_x = 6 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/machinery/recharger/wallcharger{ - pixel_x = -23; - pixel_y = 5 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = -23; - pixel_y = -4 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = -23; - pixel_y = -12 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_st) -"gA" = ( -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/atmos) -"gF" = ( +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) +"jJ" = ( /obj/machinery/light/no_nightshift{ dir = 1 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 10 +/obj/machinery/porta_turret/stationary/CIWS, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/eng_storage) +"jK" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) +"jQ" = ( +/obj/structure/ship_munition/disperser_charge/emp, +/obj/effect/floor_decal/industrial/warning, /obj/structure/railing, /turf/simulated/floor/reinforced, /area/ship/ert/gunnery) -"gN" = ( +"jU" = ( +/obj/structure/ship_munition/disperser_charge/emp, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/reinforced, +/area/ship/ert/gunnery) +"jY" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) +"jZ" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/table/steel_reinforced, +/obj/item/device/laser_pointer/upgraded, +/obj/item/device/laser_pointer/upgraded, +/obj/item/device/flash, +/obj/item/device/flash, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/brig) +"kg" = ( +/obj/structure/ship_munition/disperser_charge/emp, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/railing, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/reinforced, +/area/ship/ert/gunnery) +"kh" = ( +/obj/machinery/firealarm/alarms_hidden{ + pixel_y = 26 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways_aft) +"kk" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/engine) +"kl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/alarm/alarms_hidden{ + dir = 1; + pixel_y = -26 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/dock_port) +"km" = ( +/obj/machinery/chem_master, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"kp" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 8 + }, +<<<<<<< HEAD +======= +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/outline/red, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"kt" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/gun/energy/netgun{ + pixel_y = -4 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/energy/sniperrifle{ + battery_lock = 0; + pixel_y = 6 + }, +<<<<<<< HEAD +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"mr" = ( +/obj/structure/reagent_dispensers/water_cooler/full, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"mt" = ( +/obj/structure/cable/green, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" +======= +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_st) +"kw" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/teleporter) +"kx" = ( +/obj/structure/table/steel_reinforced, +/obj/item/weapon/storage/box/pillbottles, +/obj/item/weapon/storage/box/pillbottles, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"ky" = ( +/obj/structure/table/steel_reinforced, +/obj/item/weapon/storage/firstaid/surgery, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/obj/item/weapon/surgical/bone_clamp, +/obj/item/weapon/surgical/scalpel/manager, +/obj/item/weapon/surgical/circular_saw/manager, +/obj/item/stack/nanopaste, +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"kz" = ( +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways) +"kE" = ( +/obj/machinery/light/no_nightshift, +/obj/machinery/firealarm/alarms_hidden{ + dir = 1; + pixel_y = -26 +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + }, +/obj/machinery/power/port_gen/pacman/mrs, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +<<<<<<< HEAD +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_dl) +"mC" = ( /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/atmos) -"gR" = ( -/obj/machinery/power/apc/hyper{ - alarms_hidden = 1; - dir = 4; - name = "VB APC - East"; - pixel_x = 24 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) +"mF" = ( /obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" + d1 = 4; + d2 = 8; + icon_state = "4-8" }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) +"mH" = ( +/obj/structure/bed/chair/bay/shuttle, +/obj/machinery/recharger/wallcharger{ + pixel_x = -23; + pixel_y = 5 +======= /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engine) -"gW" = ( -/obj/machinery/disposal/deliveryChute{ - dir = 8 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/structure/railing, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/reinforced, -/area/ship/ert/gunnery) -"gX" = ( +/area/ship/ert/eng_storage) +"kG" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/box/emps{ - pixel_x = -2; - pixel_y = -2 +/obj/item/weapon/gun/projectile/automatic/z8{ + pixel_y = 3 +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg }, -/obj/item/weapon/storage/box/emps{ - pixel_x = 2; - pixel_y = 2 +/obj/item/weapon/gun/projectile/automatic/z8{ + pixel_y = -3 + }, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762/ap, +/obj/item/ammo_magazine/m762/ap, +/obj/item/ammo_magazine/m762/ap, +/obj/item/ammo_magazine/m762/ap, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -23 }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) -"gZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +"kJ" = ( +/turf/simulated/wall/rshull, +/area/ship/ert/atmos) +"kL" = ( +/obj/machinery/atmospherics/pipe/tank/air, +/turf/simulated/floor/airless, +/area/ship/ert/gunnery) +"kM" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, +/obj/effect/landmark{ + name = "Commando" + }, +/obj/effect/catwalk_plated/techmaint, +/turf/simulated/floor/plating, +/area/ship/ert/barracks) +"kO" = ( +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/dock_port) +"kP" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/atmos) +"kQ" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12; + pixel_y = 8 + }, +/obj/structure/medical_stand, /turf/simulated/floor/tiled/white, /area/ship/ert/med_surg) -"ha" = ( +<<<<<<< HEAD +"mR" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" +======= +"kS" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/atmos) +"kT" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/atmos) +"kW" = ( +/obj/machinery/computer/teleporter{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/teleporter) +"kX" = ( +/obj/machinery/porta_turret/stationary/CIWS, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/engine) +"lm" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/bridge) -"hj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/wall/rshull, -/area/ship/ert/gunnery) -"hk" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/visible, -/turf/simulated/floor/airless, -/area/ship/ert/gunnery) -"hs" = ( -/obj/machinery/pointdefense_control{ - id_tag = "vonbraun_pd" - }, -/obj/machinery/light/no_nightshift{ - dir = 1 - }, +/turf/simulated/wall/shull, +/area/ship/ert/hallways_aft) +"ls" = ( +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/bridge) -"hv" = ( -/obj/machinery/sleeper{ - dir = 8 - }, -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/ship/ert/med_surg) -"hx" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/light/no_nightshift{ - dir = 8 +/area/ship/ert/dock_port) +"lv" = ( +/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{ + dir = 8; + id_tag = "von_braun_port"; + master_tag = "von_braun_master"; + name = "Port Docking Control"; + pixel_x = 22 +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_port) -"hH" = ( -/obj/machinery/airlock_sensor{ - pixel_y = 21 - }, -/obj/effect/map_helper/airlock/sensor/int_sensor, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/dock_port) -"hN" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/alarm/alarms_hidden{ - pixel_y = 26 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engineering) -"hP" = ( -/obj/machinery/autolathe{ - desc = "Your typical Autolathe. It appears to have much more options than your regular one, however..."; - hacked = 1; - name = "Unlocked Autolathe" - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/eng_storage) -"hS" = ( -/obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/machinery/light_switch{ - dir = 1; - pixel_y = -23 - }, -/obj/effect/floor_decal/industrial/outline, -/turf/simulated/floor/tiled/white, -/area/ship/ert/med_surg) -"hU" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/dock_port) -"hV" = ( -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) -"hW" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/obj/machinery/pointdefense{ - id_tag = "vonbraun_pd" - }, -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/hangar) -"hW" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/obj/machinery/power/pointdefense{ - id_tag = "vonbraun_pd" - }, -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/hangar) -"hY" = ( -/obj/structure/hull_corner{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/dock_star) -"ia" = ( +"lx" = ( /obj/structure/table/rack/steel, /obj/item/clothing/accessory/holster/leg{ pixel_x = -4; @@ -1631,445 +2733,136 @@ /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) -"ib" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/machinery/pointdefense{ - id_tag = "vonbraun_pd" - }, -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/machinery/power/pointdefense{ - id_tag = "vonbraun_pd" - }, -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/hangar) -"ij" = ( -/turf/simulated/floor/tiled/white, -/area/ship/ert/med_surg) -"ik" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/dock_port) -"ip" = ( -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/barracks) -"ix" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/glass{ - req_one_access = list(103) - }, -/obj/structure/sign/warning/airlock{ - pixel_y = -32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/dock_star) -"iy" = ( -/obj/machinery/alarm/alarms_hidden{ - dir = 1; - pixel_y = -26 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/bridge) -"iz" = ( -/obj/structure/ship_munition/disperser_charge/emp, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/reinforced, -/area/ship/ert/gunnery) -"iB" = ( -/turf/simulated/wall/shull, -/area/ship/ert/dock_port) -"iC" = ( -/obj/item/device/healthanalyzer/phasic{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/device/healthanalyzer/phasic, -/obj/item/device/healthanalyzer/phasic{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/structure/table/rack/steel, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/med) -"iO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/barracks) -"iR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/barracks) -"iW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, -/area/ship/ert/med_surg) -"iX" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/barracks) -"jn" = ( -/obj/machinery/chem_master, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/med) -"jv" = ( -/obj/machinery/computer/cryopod/ert{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/white, -/area/ship/ert/med_surg) -"jz" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/barracks) -"jA" = ( -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/teleporter) -"jD" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/barracks) -"jI" = ( -/obj/machinery/teleport/station, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/teleporter) -"jK" = ( -/obj/machinery/door/airlock/glass_engineering{ - name = "Engineering"; - req_access = list(103) - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/mech_bay) -"jQ" = ( -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/mech_bay) -"jU" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/mech_bay) -"jY" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/mech_bay) -"kf" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/automatic/pdw{ - pixel_y = 6 - }, -/obj/item/weapon/gun/projectile/automatic/pdw{ - pixel_y = 4 - }, -/obj/item/weapon/gun/projectile/automatic/pdw{ - pixel_y = 2 - }, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw{ - pixel_y = -2 - }, -/obj/item/weapon/gun/projectile/automatic/pdw{ - pixel_y = -4 - }, -/obj/item/ammo_magazine/m9mml{ - pixel_x = 10 - }, -/obj/item/ammo_magazine/m9mml{ - pixel_x = 8 - }, -/obj/item/ammo_magazine/m9mml{ - pixel_x = 6 - }, -/obj/item/ammo_magazine/m9mml{ - pixel_x = 4 - }, -/obj/item/ammo_magazine/m9mml{ - pixel_x = 2 - }, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml{ - pixel_x = -2 - }, -/obj/item/ammo_magazine/m9mml{ - pixel_x = -4 - }, -/obj/item/ammo_magazine/m9mml{ - pixel_x = -6 - }, -/obj/item/ammo_magazine/m9mml{ - pixel_x = -8 - }, -/obj/item/ammo_magazine/m9mml{ - pixel_x = -10 - }, -/obj/item/ammo_magazine/m9mml{ - pixel_x = -12 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_st) -"kh" = ( -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hallways_aft) -"km" = ( -/obj/effect/floor_decal/corner/white{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/med) -"kt" = ( -/obj/machinery/door/blast/regular/open{ - id = "ERT_Shuttle_Rear"; - name = "Boarding Hatch" - }, -/obj/machinery/button/remote/blast_door{ - id = "ERT_Shuttle_Rear"; - name = "ERT Shuttle Access"; - pixel_y = 24; - req_access = list(103) - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/ert_ship_boat) -"kx" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/border_only, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/med) -"kz" = ( -/obj/structure/closet/crate{ - dir = 1 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/effect/floor_decal/industrial/outline/red, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_dl) -"kG" = ( -/obj/effect/floor_decal/corner/white{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) -"kJ" = ( -/turf/simulated/wall/rshull, -/area/ship/ert/atmos) -"kL" = ( -/obj/machinery/light/no_nightshift{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/engine) -"kM" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/barracks) -"kO" = ( -/obj/structure/hull_corner{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/barracks) -"kP" = ( -/obj/machinery/atmospherics/pipe/tank/air{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/atmos) -"kS" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 10 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/atmos) -"kT" = ( -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/atmos) -"kW" = ( -/turf/simulated/wall/shull, -/area/ship/ert/dock_star) -"kX" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 1 - }, -/turf/simulated/wall/shull, -/area/ship/ert/dock_star) -"kY" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 6 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/atmos) -"lm" = ( -/obj/effect/floor_decal/industrial/outline/blue, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide/engine_setup, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"lq" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/teleporter) -"ls" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/empty, -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/atmos) -"lu" = ( -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hallways_aft) -"lv" = ( -/obj/structure/closet/wardrobe/ert, -/obj/item/modular_computer/tablet/preset/custom_loadout/elite, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) - }, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/item/modular_computer/laptop/preset/custom_loadout/elite, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"lx" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/airlock_sensor/airlock_exterior{ - pixel_x = 24; - pixel_y = -11 - }, -/obj/effect/map_helper/airlock/door/ext_door, -/obj/effect/map_helper/airlock/sensor/ext_sensor, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/dock_star) "lz" = ( /obj/structure/cable/yellow{ - d1 = 4; + d1 = 1; d2 = 8; - icon_state = "4-8" + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/med) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/catwalk_plated/techmaint, +/turf/simulated/floor/plating, +/area/ship/ert/eng_storage) "lB" = ( -/obj/item/modular_computer/console/preset/engineering{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engineering) -"lL" = ( -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/dock_port) -"lO" = ( -/obj/machinery/alarm/alarms_hidden{ - dir = 1; - pixel_y = -26 +"lE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/light_switch{ + pixel_y = 23 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/teleporter) +"lR" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hallways_aft) -"lR" = ( +"lU" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/hallways_aft) +"lZ" = ( +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/engine) +"md" = ( +/obj/structure/table/rack/steel, +/obj/item/ammo_magazine/ammo_box/b12g/pellet, +/obj/item/ammo_magazine/ammo_box/b12g/pellet, +/obj/item/ammo_magazine/ammo_box/b12g, +/obj/item/ammo_magazine/ammo_box/b12g, +/obj/item/ammo_magazine/ammo_box/b12g/emp, +/obj/item/ammo_magazine/ammo_box/b12g/flash, +/obj/item/ammo_magazine/ammo_box/b12g/beanbag, +/obj/item/ammo_magazine/ammo_box/b12g/beanbag, +/obj/item/ammo_magazine/ammo_box/b12g/stunshell, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/projectile/automatic/as24{ + pixel_y = 3 + }, +/obj/item/weapon/gun/projectile/automatic/as24{ + pixel_y = -3 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_dl) +"mg" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 4 + }, +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "ERT_Blast_Windows"; + name = "Emergency Blast Shields"; + pixel_x = 55; + req_one_access = list(101) + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/ert_ship_boat) +"mh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/med) +"mj" = ( +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/dock_port) +"ml" = ( +/obj/machinery/light/no_nightshift, +/obj/structure/sign/vacuum{ + pixel_y = -32 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"mp" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"mq" = ( /obj/machinery/firealarm/alarms_hidden{ dir = 1; pixel_y = -26 }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/dock_port) -"lV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/alarm/alarms_hidden{ - dir = 1; - pixel_y = -26 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/dock_port) -"lX" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 23 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/dock_port) -"lZ" = ( -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/engine) -"mb" = ( +"mr" = ( /obj/structure/table/rack/steel, /obj/item/weapon/storage/belt/security/tactical{ pixel_x = -4; @@ -2116,50 +2909,17 @@ /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) -"mh" = ( -/obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/effect/floor_decal/industrial/outline, -/turf/simulated/floor/tiled/white, -/area/ship/ert/med_surg) -"mj" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/effect/landmark{ - name = "Commando" - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"mq" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/effect/landmark{ - name = "Commando" - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"mr" = ( -/obj/structure/reagent_dispensers/water_cooler/full, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) "mt" = ( -/obj/structure/cable/green, /obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" + d1 = 1; + d2 = 8; + icon_state = "1-8" }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" +/obj/machinery/power/apc/hyper{ + alarms_hidden = 1; + dir = 4; + name = "VB APC - East"; + pixel_x = 24 }, /obj/structure/cable/green{ d2 = 8; @@ -2167,232 +2927,69 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engineering) -"my" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, +"mv" = ( /turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_dl) -"mC" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/area/shuttle/ert_ship_boat) +"mz" = ( +/obj/machinery/button/flasher{ + pixel_x = -9; + pixel_y = 22 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/barracks) -"mF" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/button/remote/blast_door{ + id = "braun_cells_privacy"; + name = "Privacy Shutter Controls"; + pixel_x = 8; + pixel_y = 25; + req_access = list(103) }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/barracks) -"mH" = ( -/obj/structure/bed/chair/bay/shuttle, -/obj/machinery/recharger/wallcharger{ - pixel_x = -23; - pixel_y = 5 +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/obj/machinery/recharger/wallcharger{ - pixel_x = -23; - pixel_y = -4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/obj/machinery/recharger/wallcharger{ - pixel_x = -23; - pixel_y = -12 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/tiled/techfloor, -/area/shuttle/ert_ship_boat) +/area/ship/ert/brig) +"mC" = ( +/obj/effect/landmark{ + name = "Commando" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) "mI" = ( +/obj/effect/landmark{ + name = "Commando" + }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(103) - }, -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 1; - req_one_access = list(103) - }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "mJ" = ( -/obj/structure/table/steel_reinforced, -/obj/fiftyspawner/durasteel, -/obj/fiftyspawner/durasteel, -/obj/fiftyspawner/durasteel, -/obj/fiftyspawner/durasteel, -/obj/fiftyspawner/titanium_glass, -/obj/fiftyspawner/titanium_glass, -/obj/fiftyspawner/titanium_glass, -/obj/fiftyspawner/titanium_glass, -/obj/fiftyspawner/plastitanium_glass, -/obj/fiftyspawner/plastitanium_glass, -/obj/fiftyspawner/plastitanium_glass, -/obj/fiftyspawner/plastitanium_glass, +/obj/machinery/teleport/station, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/eng_storage) +/area/ship/ert/teleporter) "mN" = ( -/obj/machinery/sleep_console{ - dir = 4 +/obj/structure/medical_stand, +/obj/structure/sink{ + dir = 4; + pixel_x = 12; + pixel_y = 8 }, /turf/simulated/floor/tiled/white, /area/ship/ert/med_surg) "mR" = ( /obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/barracks) -"mT" = ( -/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 = 5 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/barracks) -"mV" = ( -/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 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/barracks) -"mZ" = ( -/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/machinery/door/firedoor/multi_tile{ - dir = 1 - }, -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 1; - req_one_access = list(103) - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/barracks) -"na" = ( -/obj/machinery/airlock_sensor{ - pixel_y = -23 - }, -/obj/effect/map_helper/airlock/sensor/int_sensor, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/dock_star) -"nb" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/xray{ - pixel_y = -3 - }, -/obj/item/weapon/gun/energy/xray{ - pixel_y = 3 - }, -/obj/machinery/light/no_nightshift, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; - pixel_y = -26 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_dl) -"nc" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/effect/catwalk_plated/techmaint, -/turf/simulated/floor/plating, -/area/ship/ert/barracks) -"nl" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/border_only, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/med_surg) -"nn" = ( -/obj/machinery/door/airlock/glass_engineering{ - name = "Engineering"; - req_access = list(103) - }, -/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/machinery/door/firedoor/multi_tile{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/mech_bay) -"no" = ( -/obj/machinery/photocopier, -/turf/simulated/floor/wood, -/area/ship/ert/commander) -"np" = ( -/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 + d1 = 2; + d2 = 4; + icon_state = "2-4" }, +<<<<<<< HEAD /turf/simulated/floor/tiled/techmaint, /area/ship/ert/mech_bay) "nq" = ( @@ -2409,44 +3006,18 @@ /turf/simulated/floor/reinforced/airless, /area/ship/ert/gunnery) "nt" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/mech_bay) -"nv" = ( -/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/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/mech_bay) -"nx" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, +======= /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/glass_engineeringatmos{ - req_one_access = list(103) +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, /turf/simulated/floor/tiled/techmaint, -/area/ship/ert/atmos) -"nz" = ( +/area/ship/ert/barracks) +"mV" = ( +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -2458,6 +3029,79 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) +"mX" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/table/steel_reinforced, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/brig) +"mZ" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) +"nb" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/item/weapon/storage/box/cdeathalarm_kit{ + pixel_x = -1; + pixel_y = -1 + }, +/obj/item/weapon/storage/box/cdeathalarm_kit{ + pixel_x = 1; + pixel_y = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"nc" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) +"nl" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/border_only, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med_surg) +"nn" = ( +/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 + }, +<<<<<<< HEAD /obj/machinery/door/airlock/glass_security{ req_one_access = list(103) }, @@ -2501,35 +3145,37 @@ /obj/item/device/binoculars, /obj/item/device/survivalcapsule{ pixel_x = 3 - }, -/obj/item/device/survivalcapsule{ - pixel_x = -3 - }, -/turf/simulated/floor/wood, -/area/ship/ert/commander) -"og" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/blast/regular/open{ - dir = 8; - id = "ERT_Blast_Windows"; - name = "Blast Shield" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/ert_ship_boat) -"oi" = ( -/turf/simulated/wall/shull, -/area/ship/ert/hangar) -"oj" = ( -/obj/machinery/alarm/alarms_hidden{ - pixel_y = 26 +======= +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" }, /turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) +"np" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor/multi_tile{ + dir = 1 + }, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 1; + name = "Outfitting"; + req_one_access = list(103) + }, +/turf/simulated/floor/tiled/techmaint, +<<<<<<< HEAD /area/ship/ert/hallways_aft) "ok" = ( /obj/machinery/alarm/alarms_hidden{ @@ -2538,6 +3184,170 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engine) "op" = ( +/obj/machinery/firealarm/alarms_hidden{ + pixel_y = 26 +======= +/area/ship/ert/barracks) +"nq" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/wall/rshull, +/area/ship/ert/barracks) +"nt" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/item/weapon/storage/box/backup_kit{ + pixel_x = -1; + pixel_y = -1 +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + }, +/obj/item/weapon/storage/box/backup_kit{ + pixel_x = 1; + pixel_y = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"nv" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/effect/catwalk_plated/techmaint, +/turf/simulated/floor/plating, +/area/ship/ert/barracks) +"nx" = ( +/obj/machinery/vending/fitness{ + prices = list() + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"nz" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/obj/machinery/button/remote/blast_door{ + description_fluff = "\\(OOC) DO NOT TOUCH THIS BUTTON WITHOUT THE EXPLICIT PERMISSION OF AN ADMINISTRATOR."; + dir = 4; + id = "NRV_MECHS"; + name = "MECH BAY CONTROL"; + pixel_x = -25; + req_one_access = list(108) + }, +<<<<<<< HEAD +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/eng_storage) +"oQ" = ( +/obj/effect/floor_decal/corner/white{ + dir = 9 +======= +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/gunnery) +"nB" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/mech_bay) +"nC" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/gunnery) +"nM" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/obj/structure/railing, +/turf/simulated/floor/reinforced, +/area/ship/ert/gunnery) +"nS" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/corner/red{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways_aft) +"nU" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "ERT_Shuttle_Fore"; + name = "ERT Deployment Access"; + pixel_y = -25; + req_access = list(103) + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/ert_ship_boat) +"nX" = ( +/obj/machinery/atmospherics/pipe/simple/visible/fuel{ + dir = 10 + }, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/blast/regular/open{ + id = "VB_Rear_Blast"; + name = "Blast Shield" + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/ship/ert/engine) +"nY" = ( +/obj/machinery/door/blast/regular/open{ + dir = 4; + id = "braun_blast_shields"; + name = "Blast Shield" + }, +/turf/space, +/area/space) +"ob" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engineering) +"oi" = ( +/obj/machinery/disposal/deliveryChute{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/railing, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/reinforced, +/area/ship/ert/gunnery) +"ok" = ( /obj/machinery/firealarm/alarms_hidden{ pixel_y = 26 }, @@ -2546,45 +3356,163 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engine) -"os" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 4 +"om" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/gun/launcher/grenade{ + pixel_y = 3 }, +/obj/item/weapon/gun/launcher/grenade{ + pixel_y = -3 + }, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/atmos) -"oy" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ +/area/ship/ert/armoury_dl) +"oo" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/gun/energy/taser{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/taser{ + pixel_y = 1 + }, +/obj/item/weapon/gun/energy/taser{ + pixel_y = -1 + }, +/obj/item/weapon/gun/energy/taser{ + pixel_y = -3 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_st) +"op" = ( +/obj/machinery/atmospherics/pipe/tank/phoron{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"ot" = ( +/obj/machinery/door/airlock/glass_engineering{ + name = "Engineering Control"; + req_access = list(103) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/border_only, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/engineering) +"ox" = ( +/obj/machinery/power/apc/hyper{ + alarms_hidden = 1; + dir = 4; + name = "VB APC - East"; + pixel_x = 24 + }, +/obj/machinery/vending/nifsoft_shop{ + categories = 111; + desc = "For all your mindware and mindware accessories. Now paid for by Central!"; + dir = 8; + emagged = 1; + name = "ERT NIFSoft Vendor" + }, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/hallways) +"oy" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/empty, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/techfloor, /area/ship/ert/atmos) -"oC" = ( -/obj/machinery/portable_atmospherics/canister/air, -/obj/effect/floor_decal/industrial/outline, +"oz" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/table/steel_reinforced, +/obj/item/weapon/rcd/advanced/loaded{ + desc = "A device used to rapidly build and deconstruct. This version works faster, and has a much larger capacity than a standard model, but doesn't work at range. Reload with compressed matter cartridges."; + name = "emergency rapid construction device"; + pixel_y = 3; + ranged = 0 + }, +/obj/item/weapon/rcd/advanced/loaded{ + desc = "A device used to rapidly build and deconstruct. This version works faster, and has a much larger capacity than a standard model, but doesn't work at range. Reload with compressed matter cartridges."; + name = "emergency rapid construction device"; + pixel_y = -3; + ranged = 0 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) +"oC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/alarm/alarms_hidden{ + pixel_y = 26 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/dock_star) "oN" = ( /obj/effect/shuttle_landmark/premade/ert_ship_near_fore, /turf/space, /area/space) "oO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/airlock_sensor{ + pixel_y = -23 + }, +/obj/effect/map_helper/airlock/sensor/int_sensor, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/dock_star) +"oV" = ( +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, +/turf/simulated/wall/rshull, +/area/ship/ert/gunnery) +"oX" = ( /obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) +"pf" = ( +/obj/effect/landmark/map_data/ert_ship, +/turf/space, +/area/space) +"pg" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/glass{ + req_one_access = list(103) }, /turf/simulated/floor/tiled/techmaint, +/area/ship/ert/dock_port) +"pm" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) -"oQ" = ( -/obj/effect/floor_decal/corner/white{ - dir = 9 +"pn" = ( +/obj/item/modular_computer/console/preset/engineering{ + dir = 4 }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engineering) +"po" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -2596,55 +3524,90 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/med) -"oV" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +"pq" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/storage/toolbox/mechanical{ + pixel_x = -4; + pixel_y = -6 }, +/obj/item/weapon/storage/toolbox/mechanical{ + pixel_x = -4; + pixel_y = -2 + }, +/obj/item/weapon/storage/toolbox/electrical{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/weapon/storage/toolbox/electrical{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/weapon/storage/briefcase/inflatable{ + pixel_x = 4; + pixel_y = -6 + }, +/obj/item/weapon/storage/briefcase/inflatable{ + pixel_x = 4; + pixel_y = -2 + }, +/obj/item/weapon/storage/briefcase/inflatable{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/weapon/storage/briefcase/inflatable{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/eng_storage) +"pr" = ( /obj/machinery/light/no_nightshift{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/dock_port) -"oW" = ( +/obj/structure/ship_munition/disperser_charge/explosive, +/obj/machinery/firealarm/alarms_hidden{ + dir = 1; + pixel_y = -26 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/ship/ert/gunnery) +"pt" = ( /obj/structure/table/rack/steel, -/obj/item/clothing/accessory/storage/black_vest{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/clothing/accessory/storage/black_vest{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/clothing/accessory/storage/black_vest{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/clothing/accessory/storage/black_vest{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/machinery/power/apc/hyper{ - alarms_hidden = 1; - dir = 4; - name = "VB APC - East"; - pixel_x = 24 - }, -/obj/structure/cable/yellow, -/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/rig/ert/security, +/obj/item/weapon/rig/ert/security, +/obj/item/weapon/rig/ert/security, +/obj/item/weapon/rig/ert/security, +/obj/item/weapon/rig/ert/security, +/obj/item/weapon/rig/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/head/helmet/ert/security, +/obj/item/clothing/head/helmet/ert/security, +/obj/item/clothing/head/helmet/ert/security, +/obj/item/clothing/head/helmet/ert/security, +/obj/item/clothing/head/helmet/ert/security, +/obj/item/clothing/head/helmet/ert/security, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) -"oX" = ( +"pv" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, /obj/item/clothing/gloves/yellow{ @@ -2681,35 +3644,269 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) -"pb" = ( -/obj/structure/medical_stand, -/obj/structure/sink{ - dir = 4; - pixel_x = 12; - pixel_y = 8 +"pw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/ship/ert/med_surg) -"pf" = ( -/obj/effect/landmark/map_data/ert_ship, -/turf/space, -/area/space) -"pg" = ( -/obj/effect/landmark{ - name = "Commando" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/blast/regular/open{ + dir = 2; + id = "braun_blast_shields"; + name = "Blast Shield" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"px" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/glass{ + req_one_access = list(103) + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/dock_star) +"pA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/visible, +/turf/simulated/floor/airless, +/area/ship/ert/gunnery) +"pD" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/ert_ship_boat) +"pE" = ( +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "Von_Braun_Cannon"; + name = "Cannon Port Access"; + pixel_y = -24; + req_one_access = list(103) + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/gunnery) +"pG" = ( +/obj/machinery/alarm/alarms_hidden{ + dir = 1; + pixel_y = -26 + }, +/obj/structure/table/rack/steel, +/obj/item/weapon/rig/ert/engineer, +/obj/item/weapon/rig/ert/engineer, +/obj/item/weapon/rig/ert/engineer, +/obj/item/weapon/rig/ert/engineer, +/obj/item/weapon/rig/ert/engineer, +/obj/item/weapon/rig/ert/engineer, +/obj/item/clothing/suit/armor/vest/ert/engineer, +/obj/item/clothing/suit/armor/vest/ert/engineer, +/obj/item/clothing/suit/armor/vest/ert/engineer, +/obj/item/clothing/suit/armor/vest/ert/engineer, +/obj/item/clothing/suit/armor/vest/ert/engineer, +/obj/item/clothing/suit/armor/vest/ert/engineer, +/obj/item/clothing/head/helmet/ert/engineer, +/obj/item/clothing/head/helmet/ert/engineer, +/obj/item/clothing/head/helmet/ert/engineer, +/obj/item/clothing/head/helmet/ert/engineer, +/obj/item/clothing/head/helmet/ert/engineer, +/obj/item/clothing/head/helmet/ert/engineer, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"pK" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/storage/backpack/ert/medical{ + pixel_y = -3 + }, +/obj/item/weapon/storage/backpack/ert/medical, +/obj/item/weapon/storage/backpack/ert/medical{ + pixel_y = 3 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/light/no_nightshift, +/obj/item/weapon/storage/backpack/ert/medical{ + pixel_y = 6 + }, +/obj/item/weapon/storage/backpack/ert/medical{ + pixel_y = 9 + }, +/obj/item/weapon/storage/backpack/ert/medical{ + pixel_y = 12 + }, +/obj/item/clothing/suit/space/void/responseteam/medical, +/obj/item/clothing/suit/space/void/responseteam/medical, +/obj/item/clothing/suit/space/void/responseteam/medical, +/obj/item/clothing/suit/space/void/responseteam/medical, +/obj/item/clothing/suit/space/void/responseteam/medical, +/obj/item/clothing/suit/space/void/responseteam/medical, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"pM" = ( +/obj/item/weapon/storage/belt/medical/emt{ + pixel_y = -4 + }, +/obj/item/weapon/storage/belt/medical/emt{ + pixel_y = -2 + }, +/obj/item/weapon/storage/belt/medical/emt, +/obj/item/weapon/storage/belt/medical/emt{ + pixel_y = 2 + }, +/obj/item/weapon/storage/belt/medical/emt{ + pixel_y = 4 + }, +/obj/item/weapon/storage/belt/medical/emt{ + pixel_y = 6 + }, +/obj/item/clothing/accessory/storage/white_vest{ + pixel_y = -4 + }, +/obj/item/clothing/accessory/storage/white_vest{ + pixel_y = -2 + }, +/obj/item/clothing/accessory/storage/white_vest, +/obj/item/clothing/accessory/storage/white_vest{ + pixel_y = 2 + }, +/obj/item/clothing/accessory/storage/white_vest{ + pixel_y = 4 + }, +/obj/item/clothing/accessory/storage/white_vest{ + pixel_y = 6 + }, +/obj/structure/table/rack/steel, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/storage/belt/explorer/pathfinder{ + name = "ERT belt" + }, +/obj/item/weapon/storage/belt/explorer/pathfinder{ + name = "ERT belt" + }, +/obj/item/weapon/storage/belt/explorer/pathfinder{ + name = "ERT belt" }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) -"pm" = ( -/obj/effect/floor_decal/corner/yellow{ - dir = 9 +"pN" = ( +/obj/structure/disposaloutlet, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/airless, +/area/ship/ert/gunnery) +"pO" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/gunnery) +"pP" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 5 + }, +/turf/simulated/wall/rshull, +/area/ship/ert/dock_star) +"pQ" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/table/steel_reinforced, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/brig) +"pS" = ( +/obj/effect/shuttle_landmark/premade/ert_ship_near_port, +/turf/space, +/area/space) +"pU" = ( +/obj/structure/sign/department/medbay{ + name = "MEDICAL OUTFITTING & SUPPLIES" + }, +/turf/simulated/wall/shull, +/area/ship/ert/med) +"pV" = ( +/turf/simulated/wall/shull, +/area/ship/ert/atmos) +"pY" = ( +/obj/machinery/power/pointdefense{ + id_tag = "vonbraun_pd" + }, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/engine) +"pZ" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/glass_security{ + name = "Delta Armoury"; + req_one_access = list(103) + }, +/obj/machinery/door/blast/regular{ + closed_layer = 4; + id = "NRV_DELTA"; + layer = 4 }, /turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_dl) +"qa" = ( +/obj/structure/closet/crate/medical, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu11, +/obj/item/stack/nanopaste/advanced, +/obj/item/stack/nanopaste/advanced, +/obj/item/stack/nanopaste/advanced, +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, +/obj/item/weapon/storage/pill_bottle/iron, +/obj/item/weapon/storage/pill_bottle/iron, +/obj/item/weapon/storage/pill_bottle/sleevingcure/full, +/obj/item/weapon/storage/box/syringes, +/obj/item/weapon/storage/box/syringes{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 23 + }, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) -"po" = ( -/obj/machinery/door/airlock/glass_medical{ - name = "Medical Bay"; - req_access = list(103) +"qc" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"ql" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2718,50 +3915,13 @@ dir = 4 }, /obj/structure/cable/yellow{ - d1 = 4; + d1 = 2; d2 = 8; - icon_state = "4-8" + icon_state = "2-8" }, -/turf/simulated/floor/tiled/white, -/area/ship/ert/med_surg) -"pq" = ( -/obj/structure/table/steel_reinforced, -/obj/item/bodybag/cryobag{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/bodybag/cryobag{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/bodybag/cryobag{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/bodybag/cryobag{ - pixel_x = 6; - pixel_y = 6 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/med) -"pr" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/border_only, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/airless, -/area/ship/ert/gunnery) -"pt" = ( +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/eng_storage) +"qo" = ( /obj/structure/table/rack/steel, /obj/item/clothing/suit/space/void/responseteam/janitor{ pixel_y = -2 @@ -2786,12 +3946,51 @@ /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) -"pv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +"qp" = ( +/obj/machinery/door/airlock/glass_engineering{ + name = "Engineering"; + req_access = list(103) + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only, /turf/simulated/floor/tiled/techmaint, -/area/ship/ert/barracks) -"pz" = ( +/area/ship/ert/engineering) +"qq" = ( +/obj/machinery/power/thermoregulator, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/eng_storage) +"qt" = ( +/obj/structure/cable/green, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engineering) +"qw" = ( +/obj/structure/bed/pod, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/ert/brig) +"qy" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -2803,112 +4002,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 1; - req_one_access = list(103) +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" }, /turf/simulated/floor/tiled/techmaint, -/area/ship/ert/med) -"pA" = ( -/obj/structure/ship_munition/disperser_charge/explosive, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/reinforced, -/area/ship/ert/hallways_aft) -"pE" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/gunnery) -"pG" = ( -/obj/structure/closet{ - name = "custodial" - }, -/obj/item/weapon/reagent_containers/spray/cleaner{ - pixel_x = -6 - }, -/obj/item/weapon/reagent_containers/spray/cleaner{ - pixel_x = -2 - }, -/obj/item/weapon/reagent_containers/spray/cleaner{ - pixel_x = 2 - }, -/obj/item/weapon/reagent_containers/spray/cleaner{ - pixel_x = 6 - }, -/obj/item/weapon/reagent_containers/glass/bucket{ - pixel_x = 6 - }, -/obj/item/weapon/reagent_containers/glass/bucket{ - pixel_x = 2 - }, -/obj/item/weapon/reagent_containers/glass/bucket{ - pixel_x = -2 - }, -/obj/item/weapon/reagent_containers/glass/bucket{ - pixel_x = -6 - }, -/obj/item/weapon/mop{ - pixel_x = 6 - }, -/obj/item/weapon/mop{ - pixel_x = 2 - }, -/obj/item/weapon/mop{ - pixel_x = -2 - }, -/obj/item/weapon/mop{ - pixel_x = -6 - }, -/obj/item/weapon/rig/ert/janitor, -/obj/item/device/lightreplacer{ - pixel_y = -2 - }, -/obj/item/device/lightreplacer{ - pixel_y = 2 - }, -/obj/item/weapon/storage/box/lights/mixed{ - pixel_x = -1; - pixel_y = -1 - }, -/obj/item/weapon/storage/box/lights/mixed{ - pixel_x = 1; - pixel_y = 1 - }, -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"pI" = ( -/obj/structure/table/rack/steel, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/gun/energy/pulse_rifle{ - pixel_y = 6 - }, -/obj/item/weapon/gun/energy/pulse_rifle{ - pixel_y = 4 - }, -/obj/item/weapon/gun/energy/pulse_rifle{ - pixel_y = 2 - }, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle{ - pixel_y = -2 - }, -/obj/item/weapon/gun/energy/pulse_rifle{ - pixel_y = -4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_dl) -"pK" = ( +/area/ship/ert/mech_bay) +"qz" = ( /obj/structure/sign/department/eng{ name = "RIG AND MECH BAY" }, /turf/simulated/wall/shull, /area/ship/ert/mech_bay) -"pM" = ( +"qD" = ( /obj/structure/table/steel_reinforced, /obj/item/rig_module/mounted/taser{ pixel_x = -4; @@ -2940,19 +4047,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) -"pN" = ( -/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{ - dir = 8; - id_tag = "von_braun_star"; - master_tag = "von_braun_master"; - name = "Starboard Docking Control"; - pixel_x = 22 +"qF" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/dock_star) -"pO" = ( -/obj/machinery/light/no_nightshift, +/obj/machinery/porta_turret/stationary/CIWS, /turf/simulated/floor/reinforced/airless, +<<<<<<< HEAD /area/ship/ert/gunnery) "pS" = ( /obj/effect/shuttle_landmark/premade/ert_ship_near_port, @@ -2997,128 +4098,126 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "ql" = ( +======= +/area/ship/ert/dock_star) +"qJ" = ( +/turf/simulated/wall/shull, +/area/ship/ert/hallways) +"qP" = ( +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg /obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/med) -"qo" = ( -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/mech_bay) -"qt" = ( -/obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/structure/table/steel_reinforced, -/obj/fiftyspawner/uranium, -/obj/fiftyspawner/uranium, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engineering) -"qy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/machinery/door/firedoor/multi_tile{ + dir = 1 }, +<<<<<<< HEAD +======= +/obj/machinery/door/airlock/glass_engineering{ + name = "RIG Bay & ORB Access"; + req_access = list(103) + }, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg /turf/simulated/floor/tiled/techmaint, -/area/ship/ert/gunnery) -"qz" = ( -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/obj/structure/ship_munition/disperser_charge/explosive, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; - pixel_y = -26 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/reinforced, -/area/ship/ert/gunnery) -"qA" = ( -/obj/effect/floor_decal/corner/white{ - dir = 8 - }, -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/obj/machinery/alarm/alarms_hidden{ - pixel_y = 26 - }, -/obj/machinery/recharge_station, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/med) -"qD" = ( -/obj/structure/ship_munition/disperser_charge/explosive, -/obj/machinery/alarm/alarms_hidden{ - dir = 1; - pixel_y = -26 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/reinforced, -/area/ship/ert/gunnery) -"qF" = ( -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/obj/machinery/porta_turret/stationary/CIWS, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/eng_storage) -"qJ" = ( -/obj/structure/table/rack/steel, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/item/ammo_magazine/m545{ - pixel_x = -8 - }, -/obj/item/ammo_magazine/m545{ - pixel_x = -5 - }, -/obj/item/ammo_magazine/m545{ - pixel_x = -2 - }, -/obj/item/ammo_magazine/m545{ - pixel_x = 1 - }, -/obj/item/ammo_magazine/m545{ - pixel_x = 4 - }, -/obj/item/ammo_magazine/m545{ - pixel_x = 7 - }, -/obj/item/weapon/gun/projectile/automatic/sts35{ - pixel_y = -2 - }, -/obj/item/weapon/gun/projectile/automatic/sts35{ - pixel_y = 2 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_st) -"qP" = ( +/area/ship/ert/mech_bay) +"qR" = ( +/obj/machinery/light/no_nightshift, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -23 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/atmos) +"ra" = ( +/obj/machinery/power/pointdefense{ + id_tag = "vonbraun_pd" }, /obj/structure/cable/yellow{ - d1 = 1; d2 = 8; - icon_state = "1-8" + icon_state = "0-8" }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/med_surg) +"rc" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/gun/projectile/automatic/l6_saw{ + pixel_y = 3 + }, +/obj/item/weapon/gun/projectile/automatic/l6_saw{ + pixel_y = -3 + }, +/obj/item/ammo_magazine/m545saw{ + pixel_x = 6 + }, +/obj/item/ammo_magazine/m545saw{ + pixel_x = 2 + }, +/obj/item/ammo_magazine/m545saw{ + pixel_x = -2 + }, +/obj/item/ammo_magazine/m545saw{ + pixel_x = -6 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_dl) +"rh" = ( +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/med) +"rn" = ( +/obj/machinery/alarm/alarms_hidden{ + dir = 1; + pixel_y = -26 + }, +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"rp" = ( +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/gunnery) +"rr" = ( +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/apc/hyper{ + alarms_hidden = 1; + dir = 8; + name = "VB APC - West"; + pixel_x = -24 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/gunnery) +"rs" = ( +/obj/machinery/power/apc/hyper{ + alarms_hidden = 1; + dir = 4; + name = "VB APC - East"; + pixel_x = 24 + }, +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"rt" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +<<<<<<< HEAD /turf/simulated/floor/tiled/techmaint, /area/ship/ert/gunnery) "qR" = ( @@ -3140,38 +4239,72 @@ /area/ship/ert/gunnery) "rs" = ( /obj/machinery/atmospherics/pipe/simple/visible/universal, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engine) -"rt" = ( -/obj/machinery/atmospherics/pipe/tank/air{ - dir = 4; - start_pressure = 740.5 +======= +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/dock_star) +/turf/simulated/wall/rshull, +/area/ship/ert/engine) "ry" = ( -/obj/machinery/light/no_nightshift{ - dir = 1 +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 9 }, -/obj/machinery/light_switch{ - pixel_y = 23 - }, -/obj/structure/table/steel_reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engineering) "rA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 10 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"rN" = ( +/obj/structure/table/steel_reinforced, +/obj/item/rig_module/mounted{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/rig_module/mounted/egun{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/rig_module/mounted/egun, +/obj/item/rig_module/mounted/egun{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/rig_module/mounted/egun{ + pixel_x = 4; + pixel_y = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/mech_bay) +"rO" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/light/no_nightshift{ dir = 8 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/machinery/firealarm/alarms_hidden{ + pixel_y = 26 }, -/obj/structure/window/reinforced{ - dir = 8 +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -23 }, +<<<<<<< HEAD /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engine) "rD" = ( @@ -3187,24 +4320,105 @@ "rO" = ( /turf/simulated/floor/tiled/techfloor, /area/ship/ert/gunnery) -"rR" = ( -/obj/machinery/atmospherics/pipe/tank/phoron{ - dir = 8 +======= +/obj/item/rig_module/sprinter{ + pixel_x = -4; + pixel_y = 4 }, -/obj/machinery/light/no_nightshift{ - dir = 4 +/obj/item/rig_module/sprinter{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/rig_module/rescue_pharm{ + pixel_y = -2 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engine) +/area/ship/ert/mech_bay) +"rP" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/hallways_aft) +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +"rR" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/dock_port) "rS" = ( -/obj/machinery/atmospherics/portables_connector{ +/obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4 }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/atmos) "rV" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/glass{ + req_one_access = list(103) + }, +/obj/structure/sign/warning/airlock{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/dock_port) +"sc" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/blast/regular/open{ + id = "VB_Rear_Blast"; + name = "Blast Shield" + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engineering) +"sd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/eng_storage) +"sf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) +"sk" = ( /obj/machinery/door/airlock/glass_medical{ name = "Medical Bay"; req_access = list(103) @@ -3214,96 +4428,80 @@ /obj/machinery/door/firedoor/multi_tile, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hangar) -"sd" = ( -/obj/effect/floor_decal/corner/yellow{ - dir = 9 +"sq" = ( +/obj/structure/table/rack, +/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid, +/obj/item/weapon/storage/belt/explorer/pathfinder{ + name = "ERT belt" }, -/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 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/med) -"sf" = ( -/obj/structure/table/steel_reinforced, -/obj/machinery/chemical_dispenser/ert, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/med) -"so" = ( -/obj/machinery/light/no_nightshift, -/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"sr" = ( /obj/structure/table/rack/steel, -/obj/item/clothing/accessory/storage/brown_vest{ +/obj/item/clothing/glasses/night{ + pixel_x = -4; pixel_y = -4 }, -/obj/item/clothing/accessory/storage/brown_vest{ +/obj/item/clothing/glasses/night{ + pixel_x = -2; pixel_y = -2 }, -/obj/item/clothing/accessory/storage/brown_vest, -/obj/item/clothing/accessory/storage/brown_vest{ +/obj/item/clothing/glasses/night, +/obj/item/clothing/glasses/night{ + pixel_x = 2; pixel_y = 2 }, -/obj/item/clothing/accessory/storage/brown_vest{ +/obj/item/clothing/glasses/night{ + pixel_x = 4; pixel_y = 4 }, -/obj/item/clothing/accessory/storage/brown_vest{ +/obj/item/clothing/glasses/night{ + pixel_x = 6; pixel_y = 6 }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"sp" = ( -/turf/simulated/wall/rshull, -/area/ship/ert/commander) -"sq" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atm{ + pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/dock_port) -"sr" = ( -/obj/machinery/vending/food, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "sw" = ( -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 2; + icon_state = "shutter0"; + id = "braun_cells_privacy"; + name = "Privacy Shutters"; + opacity = 0 }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/teleporter) -"sz" = ( -/obj/structure/closet/wardrobe/ert, -/obj/item/modular_computer/tablet/preset/custom_loadout/elite, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) - }, -/obj/machinery/light/no_nightshift, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/item/modular_computer/laptop/preset/custom_loadout/elite, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"sA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/door/airlock/glass{ + req_one_access = list(103) }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/brig) +"sy" = ( +/obj/effect/floor_decal/corner/red{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/modular_computer/console/preset/medical{ - dir = 8 +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"sz" = ( +/obj/structure/filingcabinet/filingcabinet, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"sA" = ( +/obj/machinery/door/airlock/glass_command{ + req_one_access = list(103) }, +<<<<<<< HEAD /turf/simulated/floor/tiled/techfloor, /area/ship/ert/bridge) "sB" = ( @@ -3317,82 +4515,100 @@ /turf/simulated/floor/reinforced/airless, /area/ship/ert/barracks) "sC" = ( +======= +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/dock_star) -"sF" = ( -/obj/structure/table/rack/steel, -/obj/item/clothing/glasses/graviton{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/clothing/glasses/graviton, -/obj/item/clothing/glasses/graviton{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/clothing/glasses/graviton{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"sH" = ( -/obj/machinery/computer/ship/sensors, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 4 }, -/obj/structure/railing/grey{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/tiled/techfloor, +/obj/machinery/door/firedoor/border_only, +/turf/simulated/floor/tiled/techmaint, /area/ship/ert/bridge) -"sJ" = ( -/obj/structure/table/rack/steel, -/obj/item/clothing/accessory/storage/black_vest{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/clothing/accessory/storage/black_vest{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/clothing/accessory/storage/black_vest{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/clothing/accessory/storage/black_vest{ - pixel_x = 6; - pixel_y = 6 +"sE" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/light/no_nightshift{ + dir = 4 }, /obj/machinery/alarm/alarms_hidden{ + dir = 8; + pixel_x = 26 + }, +/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/weapon/reagent_containers/spray/cleaner, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/brig) +"sF" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/mech_bay) +"sI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor/multi_tile{ + dir = 1 + }, +/obj/machinery/door/airlock/glass_security{ + name = "Delta Armoury"; + req_one_access = list(103) + }, +/obj/machinery/door/blast/regular{ + closed_layer = 4; + id = "NRV_DELTA"; + layer = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_dl) +"sM" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = -23; + pixel_y = -12 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = -23; + pixel_y = -4 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = -23; + pixel_y = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/ert_ship_boat) +"sN" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/teleporter) +"sR" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/gun/energy/xray{ + pixel_y = -3 + }, +/obj/item/weapon/gun/energy/xray{ + pixel_y = 3 + }, +/obj/machinery/light/no_nightshift, +/obj/machinery/firealarm/alarms_hidden{ dir = 1; pixel_y = -26 }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"sS" = ( -/obj/machinery/shieldwallgen, -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/eng_storage) +/area/ship/ert/armoury_dl) "sU" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -3406,37 +4622,65 @@ dir = 4 }, /turf/simulated/floor/tiled/techmaint, -/area/ship/ert/med) +/area/ship/ert/eng_storage) "sW" = ( +<<<<<<< HEAD /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/eng_storage) +======= +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/dock_star) +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg "sX" = ( +/obj/structure/bed/chair/bay/comfy/captain{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "braun_blast_shields"; + name = "Blast Shields Control"; + pixel_x = 32; + pixel_y = 35; + req_one_access = list(101) + }, /turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hallways) +/area/ship/ert/bridge) "ta" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor/multi_tile, -/obj/machinery/door/airlock/multi_tile/glass{ - req_one_access = list(103) +/obj/machinery/airlock_sensor{ + dir = 8; + pixel_x = 22; + pixel_y = -24 }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) -"tg" = ( -/obj/effect/floor_decal/corner/white{ - dir = 6 +/obj/effect/map_helper/airlock/sensor/int_sensor, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/gunnery) +"th" = ( +/obj/structure/hull_corner{ + dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/reinforced/airless, /area/ship/ert/med) -"tp" = ( +"tn" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -3445,36 +4689,71 @@ /obj/machinery/light/no_nightshift{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, -/area/ship/ert/dock_star) -"tx" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ +/area/ship/ert/hallways_aft) +"tp" = ( +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/gunnery) +"ts" = ( +/obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/ship/ert/med_surg) -"tA" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, +/obj/effect/floor_decal/corner/white, /turf/simulated/floor/tiled/techmaint, -/area/ship/ert/dock_star) -"tE" = ( -/obj/structure/sign/department/dock{ - name = "ROBINEAU DOCK" - }, -/turf/simulated/wall/shull, /area/ship/ert/hangar) +"tv" = ( +/obj/effect/floor_decal/corner/white{ + dir = 8 + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/obj/machinery/alarm/alarms_hidden{ + pixel_y = 26 + }, +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"tx" = ( +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1 + }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + id_tag = "vb_cannon_loader"; + pixel_x = 24; + pixel_y = 23 + }, +/obj/machinery/airlock_sensor{ + pixel_x = -25; + pixel_y = 22 + }, +/turf/simulated/floor/airless, +/area/ship/ert/gunnery) +"tA" = ( +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/ext_door, +/turf/simulated/floor/airless, +/area/ship/ert/gunnery) +"tE" = ( +/obj/effect/map_helper/airlock/sensor/ext_sensor, +/obj/machinery/airlock_sensor/airlock_exterior{ + dir = 4; + pixel_x = 24; + pixel_y = 24 + }, +/turf/simulated/floor/airless, +/area/ship/ert/gunnery) "tH" = ( /turf/simulated/wall/rshull, /area/ship/ert/armoury_st) +<<<<<<< HEAD "tK" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/door/window/brigdoor/northleft, @@ -3484,45 +4763,66 @@ /obj/machinery/atmospherics/pipe/simple/visible/fuel{ dir = 9 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/blast/regular/open{ - id = "VB_Rear_Blast"; - name = "Blast Shield" - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/ship/ert/engine) -"tV" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/ert_ship_boat) +======= "tW" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - id_tag = "ert_boarding_shuttle"; - pixel_x = -8; - pixel_y = 22 - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/ert_ship_boat) -"tX" = ( +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/machinery/door/firedoor/border_only, /obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/blast/regular/open{ + dir = 2; + id = "braun_blast_shields"; + name = "Blast Shield" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_st) +"tX" = ( +/turf/simulated/wall/shull, +/area/ship/ert/hangar) +"tZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/gunnery) +"ua" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/chemical_dispenser/full, +/obj/item/weapon/reagent_containers/glass/beaker/large, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"uc" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/bridge) +"ue" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +<<<<<<< HEAD /obj/structure/window/reinforced, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) @@ -3545,30 +4845,129 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/med) -"uh" = ( -/obj/machinery/atmospherics/pipe/simple/visible/fuel{ - dir = 10 +======= +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/blast/regular/open{ - id = "VB_Rear_Blast"; - name = "Blast Shield" +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"uf" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"uh" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, /obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/floor/plating, -/area/ship/ert/engine) -"um" = ( -/obj/machinery/vending/engineering, /turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"uj" = ( +/obj/structure/hull_corner{ + dir = 1 + }, +/turf/simulated/floor/reinforced/airless, /area/ship/ert/eng_storage) -"un" = ( -/obj/machinery/door/airlock/glass_medical{ - name = "Medical Bay"; +"uq" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/airless, +/area/ship/ert/gunnery) +"us" = ( +/obj/item/weapon/storage/box/trackimp, +/obj/item/weapon/storage/box/cdeathalarm_kit, +/obj/item/weapon/stamp/centcomm, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"ut" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways_aft) +"uu" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways_aft) +"uD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +<<<<<<< HEAD +/obj/machinery/atmospherics/unary/vent_scrubber/on, +======= +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"uE" = ( +/obj/structure/hull_corner/long_horiz{ + dir = 5 + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/hallways_aft) +"uG" = ( +/obj/structure/window/reinforced, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/cable/yellow, +/obj/machinery/shieldwallgen{ + anchored = 1; + name = "secured shield generator"; + req_access = list(103); + state = 1 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/teleporter) +"uJ" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/hallways_aft) +"uK" = ( +/obj/machinery/atmospherics/pipe/tank/phoron{ + dir = 8 + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"uS" = ( +/obj/machinery/door/airlock/glass_engineering{ + name = "Engine Bay"; req_access = list(103) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3577,72 +4976,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/med) -"uq" = ( -/obj/structure/sign/department/medbay, -/turf/simulated/wall/shull, -/area/ship/ert/med_surg) -"us" = ( -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/bridge) -"uu" = ( -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/dock_star) -"ux" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engine) -"uE" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8 - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/floor_decal/industrial/warning, -/obj/structure/sign/vacuum{ - pixel_x = -32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/dock_star) -"uG" = ( -/obj/item/modular_computer/console/preset/sysadmin{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/bridge) -"uJ" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/dock_star) -"uK" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engine) -"uS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +<<<<<<< HEAD /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -3653,34 +4987,7 @@ "vb" = ( /obj/machinery/sleeper{ dir = 4 - }, -/obj/machinery/light/no_nightshift{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/ship/ert/med_surg) -"vd" = ( -/obj/machinery/atmospherics/pipe/tank/phoron{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engine) -"vg" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/machinery/meter, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/atmos) -"vi" = ( -/obj/machinery/door/airlock/glass_engineering{ - name = "Engineering"; - req_access = list(103) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +======= /obj/machinery/door/firedoor/border_only, /obj/structure/cable/yellow{ d1 = 4; @@ -3690,110 +4997,156 @@ /obj/machinery/door/blast/regular/open{ id = "VB_Rear_Blast"; name = "Blast Shield" +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/engineering) -"vt" = ( -/obj/effect/floor_decal/corner/yellow{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/obj/machinery/light/no_nightshift, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +"vb" = ( +/obj/machinery/light/no_nightshift{ dir = 4 }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/engine) +"vd" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/wall/rshull, +/area/ship/ert/engine) +"vi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/light_switch{ - dir = 1; - pixel_y = -23 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hallways) -"vv" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; - pixel_y = -26 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/simulated/floor/tiled/techmaint, +/area/ship/ert/engineering) +"vn" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"vo" = ( +/obj/structure/window/reinforced, +/obj/machinery/computer/shuttle_control/explore/ert_ship_boat{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/ert_ship_boat) +"vp" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +<<<<<<< HEAD /area/ship/ert/hallways_aft) +======= +/area/ship/ert/dock_star) +"vt" = ( +/obj/item/modular_computer/console/preset/sysadmin{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"vw" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/machinery/meter, +/obj/machinery/power/apc/hyper{ + alarms_hidden = 1; + dir = 1; + name = "VB APC - North"; + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/dock_port) +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg "vK" = ( /turf/simulated/wall/rshull, /area/ship/ert/gunnery) -"vQ" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/teleporter) "vX" = ( /turf/simulated/wall/shull, /area/ship/ert/engineering) "wd" = ( -/obj/structure/sign/department/conference_room{ - name = "OUTFITTING" +/obj/machinery/atmospherics/pipe/tank/air{ + dir = 4 }, -/turf/simulated/wall/rshull, -/area/ship/ert/bridge) +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/atmos) "wh" = ( -/obj/machinery/light/no_nightshift{ - dir = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/airless, +/turf/simulated/floor/tiled/techfloor, /area/ship/ert/gunnery) "wi" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor/multi_tile, -/obj/machinery/door/airlock/multi_tile/glass{ - req_one_access = list(103) - }, /turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hallways) -"wl" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/gun{ - pixel_y = 6 +/area/ship/ert/hallways_aft) +"wp" = ( +/turf/simulated/wall/shull, +/area/ship/ert/med) +"wq" = ( +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 2; + icon_state = "shutter0"; + id = "braun_cells_privacy"; + name = "Privacy Shutters"; + opacity = 0 }, -/obj/item/weapon/gun/energy/gun{ - pixel_y = 4 +/obj/structure/grille, +/obj/structure/window/titanium/full, +/obj/structure/window/titanium{ + dir = 1 }, -/obj/item/weapon/gun/energy/gun{ - pixel_y = 2 +/obj/structure/window/titanium, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" }, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun{ - pixel_y = -2 - }, -/obj/item/weapon/gun/energy/gun{ - pixel_y = -4 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_st) -"wn" = ( -/obj/structure/sign/department/telecoms{ - name = "TELEPORTER" - }, -/turf/simulated/wall/rshull, -/area/ship/ert/teleporter) -"wo" = ( -/obj/machinery/light/no_nightshift, -/obj/machinery/teleport/hub, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, +<<<<<<< HEAD /area/ship/ert/teleporter) "wp" = ( /obj/machinery/sleep_console, @@ -3807,6 +5160,246 @@ /area/ship/ert/hallways_aft) "wt" = ( /obj/structure/table/steel_reinforced, +/obj/item/weapon/storage/firstaid/bonemed{ + pixel_x = 4; + pixel_y = 4 +======= +/area/ship/ert/brig) +"wC" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 23 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/dock_port) +"wG" = ( +/obj/structure/reagent_dispensers/water_cooler/full, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"wI" = ( +/obj/machinery/door/firedoor/multi_tile{ + dir = 1 + }, +/obj/machinery/door/airlock/glass_medical{ + name = "Medical Bay"; + req_access = list(103) + }, +<<<<<<< HEAD +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"wG" = ( +/obj/structure/hull_corner/long_horiz{ + dir = 5 + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/engine) +======= +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"wM" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/wall/shull, +/area/ship/ert/med_surg) +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +"wO" = ( +/obj/machinery/light/no_nightshift, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/engineering) +"wU" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) +"wX" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/med) +"wZ" = ( +<<<<<<< HEAD +/obj/machinery/oxygen_pump/anesthetic, +/turf/simulated/wall/shull, +/area/ship/ert/med_surg) +======= +/obj/machinery/power/apc/hyper{ + alarms_hidden = 1; + name = "VB APC - South"; + pixel_y = -24 + }, +/obj/structure/cable/yellow, +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"xc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +"xe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/glass_security{ + name = "Prisoner Containment"; + req_one_access = list(103) + }, +/obj/machinery/door/firedoor/border_only, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/brig) +"xg" = ( +/obj/structure/sign/department/conference_room{ + name = "OUTFITTING" + }, +/turf/simulated/wall/rshull, +/area/ship/ert/bridge) +"xo" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/corner/white{ + dir = 10 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"xq" = ( +/obj/structure/bed/chair/bay/shuttle, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/ert_ship_boat) +"xs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/brig) +"xt" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) +"xv" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/melee/baton{ + pixel_x = -6 + }, +/obj/item/weapon/melee/baton{ + pixel_x = -2 + }, +/obj/item/weapon/melee/baton{ + pixel_x = 2 + }, +/obj/item/weapon/melee/baton{ + pixel_x = 6 + }, +/obj/item/weapon/shield/riot{ + pixel_x = -6 + }, +/obj/item/weapon/shield/riot{ + pixel_x = -2 + }, +/obj/item/weapon/shield/riot{ + pixel_x = 2 + }, +/obj/item/weapon/shield/riot{ + pixel_x = 6 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/recharger/wallcharger{ + pixel_x = -23; + pixel_y = 5 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = -23; + pixel_y = -4 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = -23; + pixel_y = -12 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_st) +"xx" = ( +/obj/machinery/power/pointdefense{ + id_tag = "vonbraun_pd" + }, +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/hallways_aft) +"xz" = ( +/obj/structure/table/steel_reinforced, /obj/item/weapon/storage/firstaid/bonemed{ pixel_x = 4; pixel_y = 4 @@ -3825,57 +5418,44 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) -"wG" = ( -/obj/structure/hull_corner/long_horiz{ - dir = 5 +"xC" = ( +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/dock_star) +"xD" = ( +/obj/structure/table/rack/steel, +/obj/item/clothing/glasses/night{ + pixel_x = -4; + pixel_y = -4 }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/engine) -"wO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/item/clothing/glasses/night{ + pixel_x = -2; + pixel_y = -2 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/item/clothing/glasses/night, +/obj/item/clothing/glasses/night{ + pixel_x = 2; + pixel_y = 2 }, +/obj/item/clothing/glasses/night{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/glasses/night{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/machinery/firealarm/alarms_hidden{ + pixel_y = 26 + }, +/obj/effect/floor_decal/industrial/outline/grey, /obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/engineering) -"wU" = ( -/turf/simulated/wall/shull, -/area/ship/ert/hallways) -"wX" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/med) -"wZ" = ( -/obj/machinery/oxygen_pump/anesthetic, -/turf/simulated/wall/shull, -/area/ship/ert/med_surg) -"xe" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/bridge) -"xg" = ( +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"xG" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, /obj/item/weapon/gun/energy/gun/nuclear{ @@ -3896,7 +5476,21 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) -"xh" = ( +"xK" = ( +/obj/machinery/door/airlock/centcom{ + name = "Commander's Quarters"; + req_access = list(103) + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/border_only, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/commander) +"xM" = ( /obj/structure/table/rack/steel, /obj/machinery/light_switch{ pixel_y = 23 @@ -3954,26 +5548,90 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) -"xi" = ( +"xO" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"xR" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/table/steel_reinforced, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/brig) +"xU" = ( +/obj/effect/floor_decal/corner/white{ + dir = 9 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/med) +"xX" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/blue{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/bridge) +"xZ" = ( +/obj/item/modular_computer/console/preset/ert{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"ya" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/gunnery) +"yf" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, /obj/item/ammo_magazine/m545{ - pixel_x = 7 - }, -/obj/item/ammo_magazine/m545{ - pixel_x = 4 - }, -/obj/item/ammo_magazine/m545{ - pixel_x = 1 - }, -/obj/item/ammo_magazine/m545{ - pixel_x = -2 + pixel_x = -8 }, /obj/item/ammo_magazine/m545{ pixel_x = -5 }, /obj/item/ammo_magazine/m545{ - pixel_x = -8 + pixel_x = -2 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = 1 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = 4 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = 7 }, /obj/item/weapon/gun/projectile/automatic/sts35{ pixel_y = -2 @@ -3983,7 +5641,44 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) -"xt" = ( +"yg" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + id_tag = "ert_boarding_shuttle"; + pixel_x = -8; + pixel_y = 22 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/ert_ship_boat) +"yi" = ( +/obj/structure/table/rack/steel, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/projectile/automatic/z8{ + pixel_y = -3 + }, +/obj/item/weapon/gun/projectile/automatic/z8{ + pixel_y = 3 + }, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762/ap, +/obj/item/ammo_magazine/m762/ap, +/obj/item/ammo_magazine/m762/ap, +/obj/item/ammo_magazine/m762/ap, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_dl) +"yj" = ( /obj/structure/table/rack/steel, /obj/item/weapon/storage/box/flashbangs, /obj/item/weapon/storage/box/flashbangs, @@ -4002,90 +5697,57 @@ /obj/item/weapon/storage/box/empslite, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) -"xv" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/ionrifle/pistol{ - pixel_y = 4 +"yl" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/border_only, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 }, -/obj/item/weapon/gun/energy/ionrifle/pistol, -/obj/item/weapon/gun/energy/ionrifle{ - pixel_y = -4 - }, -/obj/item/weapon/gun/energy/ionrifle{ - pixel_y = -8 - }, -/obj/machinery/power/apc/hyper{ - alarms_hidden = 1; +/obj/machinery/door/blast/regular/open{ dir = 4; - name = "VB APC - East"; - pixel_x = 24 + id = "braun_blast_shields"; + name = "Blast Shield" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/hallways_aft) +"yo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" + d1 = 1; + d2 = 8; + icon_state = "1-8" }, -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_st) -"xx" = ( -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/hallways_aft) -"xz" = ( -/obj/structure/closet/medical_wall{ - pixel_x = 32 +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/gunnery) +"yr" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 }, -/obj/item/weapon/storage/firstaid/adv{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/weapon/storage/firstaid/adv{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/weapon/storage/firstaid/fire{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/weapon/storage/firstaid/fire{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/toxin{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/weapon/storage/firstaid/toxin{ - pixel_x = -2; - pixel_y = -2 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/med) -"xA" = ( -/obj/effect/floor_decal/industrial/outline/grey, -/obj/machinery/gear_dispenser/suit/ert, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"xC" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/structure/table/steel_reinforced, -/obj/item/weapon/rcd/advanced/loaded{ - desc = "A device used to rapidly build and deconstruct. This version works faster, and has a much larger capacity than a standard model, but doesn't work at range. Reload with compressed matter cartridges."; - name = "emergency rapid construction device"; - pixel_y = 3; - ranged = 0 - }, -/obj/item/weapon/rcd/advanced/loaded{ - desc = "A device used to rapidly build and deconstruct. This version works faster, and has a much larger capacity than a standard model, but doesn't work at range. Reload with compressed matter cartridges."; - name = "emergency rapid construction device"; - pixel_y = -3; - ranged = 0 +/obj/machinery/light/no_nightshift{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor, +<<<<<<< HEAD /area/ship/ert/eng_storage) "xG" = ( +======= +/area/shuttle/ert_ship_boat) +"ys" = ( +/obj/structure/hull_corner{ + dir = 1 + }, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/ert_ship_boat) +"yv" = ( +/obj/machinery/computer/ship/sensors, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/gunnery) +"yx" = ( +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/alarm/alarms_hidden{ pixel_y = 26 @@ -4097,80 +5759,96 @@ /obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hangar) -"xM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +"yz" = ( +/turf/space, +/area/space) +"yB" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/border_only, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) -"xO" = ( +/obj/structure/window/reinforced, +/turf/simulated/floor/airless, +/area/ship/ert/gunnery) +"yD" = ( /obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/turf/simulated/floor/airless, +/area/ship/ert/gunnery) +"yF" = ( +/obj/machinery/sleeper{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) -"xU" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"yG" = ( +/obj/machinery/light/no_nightshift{ dir = 1 }, +/obj/machinery/atmospherics/unary/engine{ + dir = 4 + }, +/turf/space, +/area/ship/ert/engine) +"yH" = ( +/obj/machinery/alarm/alarms_hidden{ + dir = 1; + pixel_y = -26 + }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/white, -/area/ship/ert/med_surg) -"xZ" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/gun/launcher/grenade{ - pixel_y = 3 - }, -/obj/item/weapon/gun/launcher/grenade{ - pixel_y = -3 - }, -/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_dl) -"ya" = ( +/area/ship/ert/engine) +"yJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hallways_aft) -"yf" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/space_heater, -/obj/machinery/light/no_nightshift{ - dir = 1 +"yM" = ( +/obj/machinery/atmospherics/pipe/tank/air{ + dir = 4; + start_pressure = 740.5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/dock_star) +"yP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hangar) -"yg" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/blast/regular/open{ - dir = 2; - id = "ERT_Blast_Windows"; - name = "Blast Shield" +"yR" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/structure/window/reinforced{ +/obj/machinery/light/no_nightshift{ dir = 8 }, -/obj/structure/window/reinforced{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/dock_port) +"yU" = ( +/obj/structure/table/rack/steel, +/obj/effect/floor_decal/corner/red, +/obj/item/device/radio/off{ + pixel_x = -4; + pixel_y = -4 }, -/obj/machinery/shield_diffuser, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/ert_ship_boat) -"yi" = ( -/obj/effect/floor_decal/corner/white{ - dir = 10 +/obj/item/device/radio/off{ + pixel_x = -2; + pixel_y = -2 }, +<<<<<<< HEAD /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -4204,65 +5882,36 @@ pixel_y = 4 }, /obj/item/weapon/storage/firstaid/fire{ +======= +/obj/item/device/radio/off, +/obj/item/device/radio/off{ +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/adv{ - pixel_x = -2; - pixel_y = -2 +/obj/item/device/radio/off{ + pixel_x = 4; + pixel_y = 4 }, -/obj/effect/floor_decal/corner/yellow{ - dir = 8 - }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 +/obj/item/device/radio/off{ + pixel_x = 6; + pixel_y = 6 }, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/med) -"yv" = ( +/area/ship/ert/hallways) +"yX" = ( /obj/effect/floor_decal/industrial/warning, -/obj/machinery/pipedispenser/orderable, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) -"yx" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/pipedispenser/disposal/orderable, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + id_tag = "ert_boarding_shuttle_dock"; + pixel_y = 22 }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hangar) -"yz" = ( -/turf/space, -/area/space) -"yB" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) -"yC" = ( -/obj/machinery/vending/engivend, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/eng_storage) -"yD" = ( -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/obj/structure/sign/vacuum{ - pixel_y = 32 - }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) +<<<<<<< HEAD "yG" = ( /obj/structure/ship_munition/disperser_charge/explosive, /obj/effect/floor_decal/industrial/warning{ @@ -4305,29 +5954,34 @@ "yX" = ( /turf/simulated/wall/rshull, /area/ship/ert/hangar) +======= +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg "yY" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/border_only, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/reinforced/airless, /area/ship/ert/barracks) "za" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8 + dir = 4 }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/hangar) +/obj/machinery/button/remote/blast_door{ + id = "ERT_Shuttle_Fore"; + name = "ERT Deployment Access"; + pixel_y = 24; + req_access = list(103) + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/ert_ship_boat) "zb" = ( +/obj/effect/floor_decal/corner/white{ + dir = 6 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +<<<<<<< HEAD /obj/machinery/firealarm/alarms_hidden{ pixel_y = 26 }, @@ -4336,141 +5990,237 @@ "zc" = ( /turf/simulated/wall/shull, /area/ship/ert/eng_storage) +======= +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/med) +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg "zg" = ( -/obj/item/modular_computer/console/preset/engineering{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/structure/panic_button{ - pixel_x = -32 +/obj/machinery/alarm/alarms_hidden{ + pixel_y = 26 }, +/obj/machinery/porta_turret/industrial/teleport_defense, +/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/bridge) +/area/ship/ert/teleporter) "zh" = ( -/obj/machinery/button/remote/blast_door{ - id = "VB_Rear_Blast"; - name = "Emergency Blast Doors"; - pixel_y = 24; - req_access = list(103) +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/light_switch{ + pixel_y = 23 }, /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engineering) "zk" = ( -/obj/machinery/light/no_nightshift{ +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 8 }, +<<<<<<< HEAD /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +======= +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engine) "zo" = ( -/obj/item/modular_computer/console/preset/command{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/techfloor, +/area/ship/ert/teleporter) +"zs" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, /area/ship/ert/bridge) -"zr" = ( +"zO" = ( +/obj/machinery/vending/engivend, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/eng_storage) +"zR" = ( +/obj/machinery/alarm/alarms_hidden{ + pixel_y = 26 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways_aft) +"zT" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/machinery/alarm/alarms_hidden{ - dir = 1; - pixel_y = -26 - }, -/obj/effect/floor_decal/corner/white{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) -"zs" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/catwalk_plated/techmaint, -/turf/simulated/floor/plating, -/area/ship/ert/hallways) -"zB" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/blue{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/bridge) -"zP" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/wood, -/area/ship/ert/commander) -"zT" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/wood, -/area/ship/ert/commander) -"Af" = ( -/obj/machinery/power/apc/hyper{ - alarms_hidden = 1; - dir = 4; - name = "VB APC - East"; - pixel_x = 24 - }, -/obj/structure/cable/yellow, -/obj/machinery/embedded_controller/radio/docking_port_multi{ - child_names_txt = "Port Airlock Control;Starboard Airlock Control"; - child_tags_txt = "von_braun_port;von_braun_star"; - dir = 1; - id_tag = "von_braun_master"; - pixel_y = -22 - }, -/obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/bridge) -"Ah" = ( +/area/ship/ert/brig) +"Ad" = ( +/obj/structure/closet/crate/freezer, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"Af" = ( +/obj/machinery/light/no_nightshift, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/table/rack/steel, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_y = -4 + }, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_y = -2 + }, +/obj/item/clothing/accessory/storage/brown_vest, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_y = 2 + }, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_y = 4 + }, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_y = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"Ao" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"Ap" = ( +/obj/machinery/vending/coffee{ + dir = 1; + prices = list() + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/hallways_aft) +"Aq" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"Ar" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/table/rack/steel, +/obj/structure/table/rack/steel, +/obj/item/weapon/storage/belt/utility/chief/full{ + pixel_y = -2 + }, +/obj/item/weapon/storage/belt/utility/chief/full, +/obj/item/weapon/storage/belt/utility/chief/full{ + pixel_y = 2 + }, +/obj/item/weapon/storage/belt/utility/chief/full{ + pixel_y = 4 + }, +/obj/item/weapon/storage/belt/utility/chief/full{ + pixel_y = 6 + }, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/storage/belt/explorer/pathfinder{ + name = "ERT belt" + }, +/obj/item/weapon/storage/belt/explorer/pathfinder{ + name = "ERT belt" + }, +/obj/item/weapon/storage/belt/explorer/pathfinder{ + name = "ERT belt" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"Av" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/table/woodentable, /obj/item/weapon/implantpad, /obj/item/weapon/implanter, /obj/item/weapon/storage/box/admints, +/obj/structure/table/hardwoodtable, /turf/simulated/floor/wood, /area/ship/ert/commander) -"Ai" = ( -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +"Ax" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/teleporter) +"Ay" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"Az" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hallways_aft) -"An" = ( +/area/ship/ert/barracks) +"AC" = ( +/obj/structure/bed/chair/bay/shuttle, +/obj/machinery/recharger/wallcharger{ + pixel_x = -23; + pixel_y = 5 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = -23; + pixel_y = -4 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = -23; + pixel_y = -12 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/ert_ship_boat) +"AI" = ( +/turf/simulated/wall/shull, +/area/ship/ert/eng_storage) +"AK" = ( /obj/machinery/power/apc/hyper{ alarms_hidden = 1; dir = 4; @@ -4483,6 +6233,7 @@ }, /turf/simulated/floor/wood, /area/ship/ert/commander) +<<<<<<< HEAD "Ao" = ( /obj/item/modular_computer/console/preset/medical{ dir = 4 @@ -4562,10 +6313,185 @@ "AZ" = ( /obj/machinery/alarm/alarms_hidden{ pixel_y = 26 +======= +"AN" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/wall/rshull, +/area/ship/ert/engine) +"AS" = ( +/obj/structure/closet{ + name = "custodial" + }, +/obj/item/weapon/reagent_containers/spray/cleaner{ + pixel_x = -6 + }, +/obj/item/weapon/reagent_containers/spray/cleaner{ + pixel_x = -2 +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + }, +/obj/item/weapon/reagent_containers/spray/cleaner{ + pixel_x = 2 + }, +/obj/item/weapon/reagent_containers/spray/cleaner{ + pixel_x = 6 + }, +/obj/item/weapon/reagent_containers/glass/bucket{ + pixel_x = 6 + }, +/obj/item/weapon/reagent_containers/glass/bucket{ + pixel_x = 2 + }, +/obj/item/weapon/reagent_containers/glass/bucket{ + pixel_x = -2 + }, +/obj/item/weapon/reagent_containers/glass/bucket{ + pixel_x = -6 + }, +/obj/item/weapon/mop{ + pixel_x = 6 + }, +/obj/item/weapon/mop{ + pixel_x = 2 + }, +/obj/item/weapon/mop{ + pixel_x = -2 + }, +/obj/item/weapon/mop{ + pixel_x = -6 + }, +/obj/item/weapon/rig/ert/janitor, +/obj/item/device/lightreplacer{ + pixel_y = -2 + }, +/obj/item/device/lightreplacer{ + pixel_y = 2 + }, +/obj/item/weapon/storage/box/lights/mixed{ + pixel_x = -1; + pixel_y = -1 + }, +/obj/item/weapon/storage/box/lights/mixed{ + pixel_x = 1; + pixel_y = 1 + }, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"AT" = ( +/obj/item/device/healthanalyzer/phasic{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/device/healthanalyzer/phasic, +/obj/item/device/healthanalyzer/phasic{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/structure/table/rack/steel, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"AW" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/wall/rshull, +/area/ship/ert/engine) +"AX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) +"AY" = ( +/obj/machinery/firealarm/alarms_hidden{ + pixel_y = 26 }, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/bridge) +/area/ship/ert/teleporter) "Bb" = ( +/obj/machinery/firealarm/alarms_hidden{ + pixel_y = 26 + }, +/obj/item/modular_computer/console/preset/security, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"Bc" = ( +/obj/item/modular_computer/console/preset/security, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"Bf" = ( +/obj/item/modular_computer/console/preset/research, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"Bl" = ( +/obj/structure/ship_munition/disperser_charge/explosive, +/obj/machinery/alarm/alarms_hidden{ + dir = 1; + pixel_y = -26 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/ship/ert/gunnery) +"Bo" = ( +/turf/simulated/wall/shull, +/area/ship/ert/barracks) +"Bp" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/airlock/multi_tile/glass{ + req_one_access = list(103) + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways) +"Bq" = ( +/obj/item/modular_computer/console/preset/medical, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"Br" = ( +/obj/machinery/shieldwallgen, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/eng_storage) +"Bx" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/alarm/alarms_hidden{ + dir = 1; + pixel_y = -26 + }, +/obj/fiftyspawner/tritium, +/obj/fiftyspawner/tritium, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/eng_storage) +"BE" = ( /obj/effect/floor_decal/corner/blue{ dir = 8 }, @@ -4590,7 +6516,7 @@ }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hallways) -"Bc" = ( +"BF" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -4604,7 +6530,28 @@ }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hallways) -"Bf" = ( +"BI" = ( +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/engineering) +"BK" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/engineering) +"BM" = ( +/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/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/mech_bay) +"BU" = ( /obj/effect/floor_decal/corner/red{ dir = 6 }, @@ -4627,244 +6574,161 @@ }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hallways) -"Bj" = ( -/obj/machinery/shieldgen, +"Cf" = ( +/turf/simulated/wall/shull, +/area/ship/ert/mech_bay) +"Ck" = ( +/obj/machinery/door/airlock/glass_medical{ + name = "Medical Bay"; + req_access = list(103) + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"Cn" = ( +/obj/machinery/computer/ship/helm{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"Cr" = ( +/obj/machinery/door/airlock/glass_medical{ + name = "Medical Bay"; + req_access = list(103) + }, +/obj/machinery/door/firedoor/border_only, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/med_surg) +"Cv" = ( +/obj/machinery/door/firedoor/multi_tile{ + dir = 1 + }, +/obj/machinery/door/airlock/glass_medical{ + name = "Medical Bay"; + req_access = list(103) + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/med) +"Cx" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"CC" = ( +/obj/machinery/shieldwallgen{ + anchored = 1; + name = "secured shield generator"; + req_access = list(103); + state = 1 + }, +/obj/structure/window/reinforced, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/cable/yellow, /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/eng_storage) -"Bl" = ( -/obj/machinery/disperser/back{ - dir = 4 +/area/ship/ert/teleporter) +"CH" = ( +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/machinery/door/blast/regular/open{ + dir = 4; + id = "ERT_Blast_Windows"; + name = "Blast Shield" }, -/turf/simulated/floor/airless, -/area/ship/ert/gunnery) -"Bo" = ( -/turf/simulated/wall/shull, -/area/ship/ert/barracks) -"Bp" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/automatic/z8{ - pixel_y = 3 +/obj/structure/window/reinforced{ + dir = 1 }, -/obj/item/weapon/gun/projectile/automatic/z8{ - pixel_y = -3 - }, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762/ap, -/obj/item/ammo_magazine/m762/ap, -/obj/item/ammo_magazine/m762/ap, -/obj/item/ammo_magazine/m762/ap, -/obj/machinery/light_switch{ - dir = 1; - pixel_y = -23 - }, -/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_dl) -"Bq" = ( -/obj/machinery/door/airlock/glass_security{ - req_one_access = list(103) - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_st) -"Br" = ( -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/eng_storage) -"Bx" = ( -/obj/structure/bed/chair/bay/chair/padded/blue, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/med) -"BE" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_st) -"BF" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_st) -"BI" = ( -/obj/structure/hull_corner/long_horiz{ - dir = 5 - }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/engineering) -"BK" = ( -/obj/machinery/shipsensors, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/engineering) -"BM" = ( -/obj/machinery/computer/ship/sensors, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/gunnery) -"BU" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_st) -"BW" = ( -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hallways) -"Ce" = ( +/area/shuttle/ert_ship_boat) +"CK" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_st) -"Cf" = ( -/obj/structure/ship_munition/disperser_charge/emp, -/obj/effect/floor_decal/industrial/warning, -/obj/structure/railing, -/turf/simulated/floor/reinforced, -/area/ship/ert/gunnery) -"Ci" = ( -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/eng_storage) -"Cn" = ( -/obj/machinery/power/apc/hyper{ - alarms_hidden = 1; - dir = 4; - name = "VB APC - East"; - pixel_x = 24 - }, -/obj/machinery/vending/nifsoft_shop{ - categories = 111; - desc = "For all your mindware and mindware accessories. Now paid for by Central!"; - dir = 8; - emagged = 1; - name = "ERT NIFSoft Vendor" - }, -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/hallways) -"Cq" = ( -/obj/effect/floor_decal/corner/white{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/area/ship/ert/dock_star) +"CL" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/med) -"Cr" = ( -/obj/machinery/porta_turret/stationary/CIWS, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/med_surg) -"Cx" = ( -/turf/simulated/wall/shull, -/area/ship/ert/mech_bay) -"CH" = ( -/obj/machinery/door/firedoor/border_only, -/obj/structure/fans/hardlight, -/obj/machinery/door/blast/regular{ - id = "Von_Braun_Hangar"; - name = "Hangar Blast Door" - }, -/turf/simulated/floor/reinforced, -/area/ship/ert/hangar) -"CI" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/border_only, -/obj/structure/window/reinforced{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_st) -"CL" = ( -/obj/effect/floor_decal/corner/red{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) -"CM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 4 }, /turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) +/area/ship/ert/armoury_st) +"CM" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_st) "CN" = ( +<<<<<<< HEAD /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +======= +/obj/machinery/atmospherics/pipe/simple/visible/universal, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engine) "CP" = ( -/obj/machinery/door/firedoor/multi_tile{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 1; - req_one_access = list(103) +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, /turf/simulated/floor/tiled/white, /area/ship/ert/med_surg) "CR" = ( -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/med_surg) +/obj/machinery/computer/ship/disperser{ + dir = 8 + }, +/obj/item/weapon/paper/vonbraun_cannon, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/gunnery) "CT" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/atmos) "CZ" = ( +<<<<<<< HEAD /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light/no_nightshift{ dir = 8 @@ -4885,9 +6749,164 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "Dh" = ( +======= +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/machinery/door/firedoor/border_only, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/airless, +/area/ship/ert/gunnery) +"Dd" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"Dh" = ( +/obj/machinery/button/remote/blast_door{ + id = "VB_Rear_Blast"; + name = "Emergency Blast Doors"; + pixel_y = 24; + req_access = list(103) + }, +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engineering) +"Dk" = ( +/obj/structure/sign/nosmoking_1, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/wall/rshull, +/area/ship/ert/engine) +"Dm" = ( +/obj/structure/table/steel_reinforced, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/obj/item/weapon/grenade/chem_grenade/metalfoam, +/obj/item/weapon/grenade/chem_grenade/metalfoam, +/obj/item/weapon/grenade/chem_grenade/metalfoam, +/obj/item/weapon/grenade/chem_grenade/metalfoam, +/obj/item/weapon/grenade/chem_grenade/metalfoam, +/obj/item/weapon/grenade/chem_grenade/metalfoam, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/eng_storage) +"Dn" = ( +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/atmos) +"Do" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/engine) +"Dp" = ( +/obj/item/device/perfect_tele_beacon/stationary{ + tele_name = "NRB Robineau"; + tele_network = "centcom" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/ert_ship_boat) +"Dt" = ( +/obj/machinery/disperser/back{ + dir = 4 + }, +/turf/simulated/floor/airless, +/area/ship/ert/gunnery) +"Du" = ( +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "ERT_Shuttle_Rear"; + name = "ERT Shuttle Access"; + pixel_y = -25; + req_access = list(103) + }, +/obj/machinery/door/blast/regular/open{ + id = "ERT_Shuttle_Rear"; + name = "Boarding Hatch" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/ert_ship_boat) +"Dx" = ( +/obj/machinery/disperser/middle{ + dir = 4 + }, +/turf/simulated/floor/airless, +/area/ship/ert/gunnery) +"Dy" = ( +/obj/machinery/door/window/brigdoor/southright, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/hallways_aft) +"DJ" = ( +/obj/effect/floor_decal/corner/white{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/eng_storage) +"DK" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/atmos) +"DM" = ( +/obj/structure/table/steel_reinforced, +/obj/item/weapon/storage/firstaid/fire{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/firstaid/fire{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/storage/firstaid/adv, +/obj/item/weapon/storage/firstaid/adv{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/effect/floor_decal/corner/yellow{ + dir = 8 + }, +/obj/machinery/firealarm/alarms_hidden{ + pixel_y = 26 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"DN" = ( +/obj/machinery/atmospherics/pipe/manifold4w/visible/fuel, +/obj/structure/grille, +/obj/structure/window/reinforced/full, /obj/machinery/door/blast/regular/open{ id = "VB_Rear_Blast"; name = "Blast Shield" @@ -4895,59 +6914,1408 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/window/reinforced{ +/turf/simulated/floor/plating, +/area/ship/ert/engine) +"DQ" = ( +/obj/machinery/disperser/front{ dir = 4 }, +/turf/simulated/floor/airless, +/area/ship/ert/gunnery) +"DS" = ( +/turf/simulated/wall/rshull, +/area/ship/ert/hallways_aft) +"Eb" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/glass_security{ + name = "Delta Armoury"; + req_one_access = list(103) + }, +<<<<<<< HEAD +======= +/obj/machinery/door/blast/regular{ + closed_layer = 4; + id = "NRV_DELTA"; + layer = 4 + }, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_dl) +"Ed" = ( +/obj/machinery/door/blast/regular{ + id = "Von_Braun_Cannon"; + name = "Cannon Firing Port" + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/gunnery) +"Ee" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/gun/energy/plasmastun{ + pixel_y = -3 + }, +/obj/item/weapon/gun/energy/plasmastun{ + pixel_y = 3 + }, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engineering) -"Di" = ( +/area/ship/ert/armoury_dl) +"Em" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/blast/regular{ + closed_layer = 4; + dir = 4; + id = "NRV_DELTA"; + layer = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_dl) +"Eo" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/dock_star) +"Eq" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/gunnery) +"Ev" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"EB" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/gun/energy/sniperrifle{ + battery_lock = 0; + pixel_y = -3 + }, +/obj/item/weapon/gun/energy/sniperrifle{ + battery_lock = 0; + pixel_y = 3 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_dl) +"ED" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"EF" = ( +/obj/machinery/shield_capacitor, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/eng_storage) +"EP" = ( +/obj/machinery/atmospherics/unary/engine{ + dir = 4 + }, +/turf/space, +/area/ship/ert/engine) +"Fd" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/atmos) +"Ff" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"Fg" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"Fl" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/storage/box/handcuffs{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/storage/box/handcuffs{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/effect/floor_decal/corner/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/techfloor, +<<<<<<< HEAD +/area/ship/ert/armoury_dl) +"Fz" = ( +/obj/structure/bed/chair/bay/chair/padded/blue{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/bridge) +"FD" = ( +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/bridge) +"FF" = ( +/obj/effect/shuttle_landmark/premade/ert_ship_port, +/turf/space, +/area/space) +"FJ" = ( +/obj/machinery/door/airlock/glass_command{ + req_one_access = list(103) +======= +/area/ship/ert/hallways) +"Fq" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/gun/energy/gun/burst{ + pixel_y = 3 +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + }, +/obj/item/weapon/gun/energy/gun/burst{ + pixel_y = -3 + }, +/obj/item/weapon/gun/energy/lasershotgun{ + pixel_y = -3 + }, +<<<<<<< HEAD +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways) +"FM" = ( +/obj/effect/floor_decal/corner/yellow{ + dir = 10 +======= +/obj/item/weapon/gun/energy/lasershotgun{ + pixel_y = 3 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/recharger/wallcharger{ + pixel_x = -23; + pixel_y = -12 +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = -23; + pixel_y = -4 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = -23; + pixel_y = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_dl) +"Fz" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 8 + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"FF" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/obj/machinery/alarm/alarms_hidden{ + pixel_y = 26 + }, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"FG" = ( +/obj/machinery/computer/operating, +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"FK" = ( +/obj/structure/bed/chair/bay/chair/padded/blue{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/bridge) +"FM" = ( +/obj/machinery/firealarm/alarms_hidden{ + dir = 1; + pixel_y = -26 + }, +/obj/item/modular_computer/console/preset/medical{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"FN" = ( +/obj/structure/bed/chair/bay/chair/padded/blue{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/bridge) +"FO" = ( +/obj/machinery/light_switch{ + pixel_y = 23 + }, +/obj/structure/table/woodentable, +/obj/item/device/flashlight/lamp, +/obj/item/device/holomap_beacon/ert, +/obj/item/device/holomap_beacon/ert, +/obj/item/device/mapping_unit/ert, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"FP" = ( +/obj/structure/table/steel_reinforced, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/machinery/cell_charger, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/tool/screwdriver, +/obj/item/weapon/tool/wrench, +/obj/item/weapon/tool/crowbar, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/mech_bay) +"FQ" = ( +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"FR" = ( +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_st) +"FS" = ( +/obj/item/modular_computer/console/preset/engineering{ + dir = 4 + }, +/obj/structure/panic_button{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"FT" = ( +/obj/machinery/door/airlock/glass_command{ + req_one_access = list(103) + }, +/obj/machinery/door/firedoor/border_only, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/bridge) +"FV" = ( +/obj/structure/table/rack/steel, +/obj/item/ammo_magazine/ammo_box/b12g/pellet, +/obj/item/ammo_magazine/ammo_box/b12g/pellet, +/obj/item/ammo_magazine/ammo_box/b12g, +/obj/item/ammo_magazine/ammo_box/b12g, +/obj/item/ammo_magazine/ammo_box/b12g/emp, +/obj/item/ammo_magazine/ammo_box/b12g/flash, +/obj/item/ammo_magazine/ammo_box/b12g/beanbag, +/obj/item/ammo_magazine/ammo_box/b12g/beanbag, +/obj/item/ammo_magazine/ammo_box/b12g/stunshell, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/projectile/shotgun/pump/combat{ + pixel_y = 3 + }, +/obj/item/weapon/gun/projectile/shotgun/pump/combat{ + pixel_y = -3 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_st) +"FW" = ( +/obj/structure/closet/walllocker/emerglocker{ + pixel_y = 32 + }, +/obj/structure/bed/pod, +/obj/item/weapon/bedsheet/blue, +/obj/structure/curtain/open/bed, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"FX" = ( +/obj/effect/floor_decal/corner/blue{ + dir = 9 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways) +"FY" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/bridge) +"Gl" = ( +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways) +"Gn" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/wall/rshull, +/area/ship/ert/med_surg) +"Gs" = ( +/obj/machinery/vending/engineering, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/eng_storage) +"Gu" = ( +/obj/machinery/optable, +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"Gv" = ( +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/hallways_aft) +"Gw" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/dock_port) +"GE" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/shuttle_landmark/shuttle_initializer/ert_ship_boat, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/ert_ship_boat) +"GI" = ( +/obj/machinery/alarm/alarms_hidden{ + pixel_y = 26 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"GJ" = ( +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/dock_star) +"GK" = ( +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways) +"GO" = ( +/obj/machinery/photocopier, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"GQ" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"GR" = ( +/obj/structure/closet/crate{ + dir = 2 + }, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_st) +"GS" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/table/steel_reinforced, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = -8; + pixel_y = -8 + }, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/rcd_ammo/large, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = 6; + pixel_y = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/eng_storage) +"GT" = ( +/obj/effect/floor_decal/corner/white{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"GU" = ( +/obj/structure/table/rack/steel, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/energy/pulse_rifle{ + pixel_y = 6 + }, +/obj/item/weapon/gun/energy/pulse_rifle{ + pixel_y = 4 + }, +/obj/item/weapon/gun/energy/pulse_rifle{ + pixel_y = 2 + }, +/obj/item/weapon/gun/energy/pulse_rifle, +/obj/item/weapon/gun/energy/pulse_rifle{ + pixel_y = -2 + }, +/obj/item/weapon/gun/energy/pulse_rifle{ + pixel_y = -4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_dl) +"GY" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/dock_port) +"GZ" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/ert_ship_boat) +"Hf" = ( +/turf/simulated/wall/rshull, +/area/ship/ert/engine) +"Hg" = ( +/obj/effect/floor_decal/corner/yellow{ + dir = 9 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/med) +"Ho" = ( +/obj/machinery/power/emitter, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/eng_storage) +"Hp" = ( /obj/machinery/vending/medical{ req_access = null }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) -"Dn" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +"Hu" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"Hz" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/ship_munition/disperser_charge/emp, +/turf/simulated/floor/reinforced, +/area/ship/ert/hallways_aft) +"HB" = ( +/obj/structure/closet/wardrobe/ert, +/obj/item/modular_computer/tablet/preset/custom_loadout/elite, +/obj/item/weapon/storage/box/survival/comp{ + starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) + }, +/obj/machinery/light/no_nightshift, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/modular_computer/laptop/preset/custom_loadout/elite, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"HC" = ( +/obj/structure/table/steel_reinforced, +/obj/item/bodybag/cryobag{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/bodybag/cryobag{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/bodybag/cryobag{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/bodybag/cryobag{ + pixel_x = 6; + pixel_y = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"HE" = ( +/obj/structure/table/rack/steel, +/obj/item/clothing/glasses/graviton{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/clothing/glasses/graviton, +/obj/item/clothing/glasses/graviton{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/glasses/graviton{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"HH" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"HK" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/ert_ship_boat) +"HL" = ( +/obj/machinery/door/blast/shutters{ + density = 0; + icon_state = "shutter0"; + id = "braun_cells_privacy"; + name = "Privacy Shutters"; + opacity = 0 + }, +/obj/machinery/door/airlock/glass{ + req_one_access = list(103) + }, +<<<<<<< HEAD +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762/ap, +/obj/item/ammo_magazine/m762/ap, +/obj/item/ammo_magazine/m762/ap, +/obj/item/ammo_magazine/m762/ap, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_dl) +"Gr" = ( +/obj/machinery/power/emitter, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/eng_storage) +"Gv" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/machinery/door/window/brigdoor/southleft, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/hallways_aft) +"Gw" = ( +/obj/structure/closet/wardrobe/ert, +/obj/item/modular_computer/tablet/preset/custom_loadout/elite, +/obj/item/weapon/storage/box/survival/comp{ + starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +======= +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/brig) +"HO" = ( +/turf/simulated/wall/rshull, +/area/shuttle/ert_ship_boat) +"HR" = ( +/obj/structure/table/rack/steel, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = 2; + pixel_y = 2 +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/machinery/alarm/alarms_hidden{ + dir = 1; + pixel_y = -26 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"HT" = ( +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/titanium/full, +/obj/structure/window/titanium, +/obj/structure/window/titanium{ + dir = 1 + }, +/obj/structure/window/titanium{ dir = 4 }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/brig) +"Ia" = ( +/obj/machinery/power/pointdefense{ + id_tag = "vonbraun_pd" + }, +/obj/structure/cable/yellow, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/engine) +"Id" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"If" = ( +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/int_door, +/obj/machinery/door/firedoor/multi_tile, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/dock_star) +"Ii" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/airlock/multi_tile/glass{ + req_one_access = list(103) + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"Il" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/ert_ship_boat) +"Io" = ( +/obj/machinery/power/apc/hyper{ + alarms_hidden = 1; + dir = 4; + name = "VB APC - East"; + pixel_x = 24 + }, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/alarm/alarms_hidden{ + dir = 1; + pixel_y = -26 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/atmos) -"Do" = ( +"Ip" = ( +/obj/structure/sign/department/dock{ + name = "ROBINEAU DOCK" + }, +/turf/simulated/wall/shull, +/area/ship/ert/hangar) +"Is" = ( +/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/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) +"Iu" = ( +/obj/machinery/power/pointdefense{ + id_tag = "vonbraun_pd" + }, +/obj/structure/cable/yellow{ + d2 = 4; + dir = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/med_surg) +"Ix" = ( +/obj/machinery/door/blast/shutters{ + density = 0; + icon_state = "shutter0"; + id = "braun_cells_privacy"; + name = "Privacy Shutters"; + opacity = 0 + }, +/obj/structure/grille, +/obj/structure/window/titanium/full, +/obj/structure/window/titanium{ + dir = 1 + }, +/obj/structure/window/titanium, +/obj/structure/window/titanium{ + dir = 8 + }, +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/brig) +"II" = ( +/obj/machinery/door/firedoor/multi_tile{ + dir = 1 + }, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 1; + req_one_access = list(103) + }, +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"IK" = ( +/obj/machinery/door/blast/shutters{ + density = 0; + icon_state = "shutter0"; + id = "braun_cells_privacy"; + name = "Privacy Shutters"; + opacity = 0 + }, +/obj/structure/grille, +/obj/structure/window/titanium/full, +/obj/structure/window/titanium{ + dir = 1 + }, +/obj/structure/window/titanium, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/brig) +"Jd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) +"Je" = ( +/obj/machinery/oxygen_pump/anesthetic, +/turf/simulated/wall/shull, +/area/ship/ert/med_surg) +"Jf" = ( +/obj/item/modular_computer/console/preset/command{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"Jg" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/med_surg) +"Jh" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"Jk" = ( +/obj/item/modular_computer/console/preset/medical{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"Js" = ( +/obj/structure/ship_munition/disperser_charge/explosive, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/reinforced, +/area/ship/ert/hallways_aft) +"Jx" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/border_only, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/mech_bay) +"Jy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +<<<<<<< HEAD +======= +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways_aft) +"Jz" = ( +/obj/structure/bed/chair/bay/chair/padded/blue{ + dir = 8 + }, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/hallways_aft) +"JA" = ( +/obj/machinery/button/flasher{ + pixel_x = -9; + pixel_y = -22 + }, +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "braun_cells_privacy"; + name = "Privacy Shutter Controls"; + pixel_x = 9; + pixel_y = -24; + req_access = list(103) + }, +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/brig) +"JE" = ( +/obj/structure/table/rack/steel, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/ammo_magazine/m545{ + pixel_x = 7 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = 4 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = 1 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = -2 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = -5 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = -8 + }, +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = -2 + }, +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = 2 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_st) +"JF" = ( +/obj/machinery/vending/assist, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/eng_storage) +"JG" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, /obj/machinery/porta_turret/stationary/CIWS, /turf/simulated/floor/reinforced/airless, -/area/ship/ert/engine) -"Dt" = ( +/area/ship/ert/gunnery) +"JH" = ( +/obj/machinery/computer/ship/navigation{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /obj/structure/railing/grey, -/obj/structure/railing/grey{ +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"JJ" = ( +/obj/machinery/light/no_nightshift, +/obj/machinery/atmospherics/unary/engine{ dir = 4 }, +/turf/space, +/area/ship/ert/engine) +"JM" = ( +/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 = 5 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) +"JW" = ( +/obj/machinery/atmospherics/pipe/simple/visible/fuel{ + dir = 9 + }, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/blast/regular/open{ + id = "VB_Rear_Blast"; + name = "Blast Shield" + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/ship/ert/engine) +"JX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways_aft) +"JY" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/fuel{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"Kb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"Kd" = ( +/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/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways_aft) +"Kj" = ( +/obj/machinery/telecomms/relay, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/atmos) +"Kk" = ( +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/int_door, +/obj/machinery/door/firedoor/multi_tile, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/dock_port) +"Kq" = ( +/obj/machinery/ntnet_relay, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/atmos) +"Kr" = ( +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"Ks" = ( +/obj/machinery/power/apc/hyper{ + alarms_hidden = 1; + dir = 4; + name = "VB APC - East"; + pixel_x = 24 + }, +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/brig) +"Kt" = ( +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/teleporter) +"KB" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/sign/vacuum{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/dock_star) +"KD" = ( +/obj/machinery/door/window/brigdoor/northright, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/hallways_aft) +"KF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"KG" = ( +/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{ + dir = 8; + id_tag = "von_braun_star"; + master_tag = "von_braun_master"; + name = "Starboard Docking Control"; + pixel_x = 22 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/dock_star) +"KK" = ( +/mob/living/simple_mob/animal/passive/mimepet, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"KM" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/blue, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/bridge) +"KN" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/wall/shull, +/area/ship/ert/barracks) +"KO" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/dock_star) +"KS" = ( +/obj/structure/table/rack/steel, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/obj/machinery/firealarm/alarms_hidden{ + pixel_y = 26 + }, +/obj/item/weapon/gun/energy/laser{ + pixel_y = 6 + }, +/obj/item/weapon/gun/energy/laser{ + pixel_y = 4 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/energy/laser{ + pixel_y = 2 + }, +/obj/item/weapon/gun/energy/laser, +/obj/item/weapon/gun/energy/laser{ + pixel_y = -2 + }, +/obj/item/weapon/gun/energy/laser{ + pixel_y = -4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_st) +"KT" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/dock_star) +"KW" = ( +/obj/structure/table/rack, +/obj/item/weapon/hand_tele, +/obj/item/device/perfect_tele, +/obj/item/device/binoculars, +/obj/item/device/survivalcapsule{ + pixel_x = 3 + }, +/obj/item/device/survivalcapsule{ + pixel_x = -3 + }, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"La" = ( +/obj/machinery/vending/coffee{ + prices = list() + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/hallways_aft) +"Ld" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "braun_cells_privacy"; + name = "Privacy Shutter Controls"; + pixel_x = -24; + pixel_y = -9; + req_access = list(103) + }, +/obj/item/weapon/handcuffs, +/obj/item/weapon/handcuffs, +/obj/item/weapon/handcuffs, +/obj/item/weapon/handcuffs, +/obj/item/weapon/handcuffs/legcuffs, +/obj/item/weapon/handcuffs/legcuffs, +/obj/item/weapon/handcuffs/legcuffs, +/obj/item/weapon/handcuffs/legcuffs, +/obj/machinery/firealarm/alarms_hidden{ + dir = 8; + pixel_x = -26; + pixel_y = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/brig) +"Lh" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/med) +"Lk" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/structure/railing/grey{ + dir = 1 + }, /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/bridge) -"Du" = ( -/obj/effect/floor_decal/industrial/warning{ +"Lm" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/gun/energy/ionrifle/pistol{ + pixel_y = 4 + }, +/obj/item/weapon/gun/energy/ionrifle/pistol, +/obj/item/weapon/gun/energy/ionrifle{ + pixel_y = -4 + }, +/obj/item/weapon/gun/energy/ionrifle{ + pixel_y = -8 + }, +/obj/machinery/power/apc/hyper{ + alarms_hidden = 1; + dir = 4; + name = "VB APC - East"; + pixel_x = 24 + }, +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_st) +"Lq" = ( +/obj/machinery/door/firedoor/border_only, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "ERT_Shuttle_Fore"; - name = "ERT Deployment Access"; - pixel_y = -25; - req_access = list(103) +/obj/structure/window/reinforced{ + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/ert_ship_boat) -"Dx" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/glass{ - req_one_access = list(103) +/obj/machinery/door/blast/regular/open{ + dir = 2; + id = "braun_blast_shields"; + name = "Blast Shield" }, -/obj/structure/sign/warning/airlock{ - pixel_y = 32 +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"LA" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = -7 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = -4 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = -1 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = 2 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = 5 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = 8 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/hallways) +"LB" = ( +/obj/effect/floor_decal/corner/white{ + dir = 9 }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/dock_port) -"DJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -4961,39 +8329,1537 @@ }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/med) -"DK" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +"LC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +<<<<<<< HEAD +/area/ship/ert/bridge) +"JY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/atmos) -"DM" = ( -/obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/weapon/surgical/bone_clamp, -/obj/item/weapon/surgical/bone_clamp, -/obj/item/weapon/surgical/scalpel/manager, -/obj/item/weapon/surgical/scalpel/manager, -/obj/item/weapon/surgical/circular_saw/manager, -/obj/item/weapon/surgical/circular_saw/manager, -/obj/item/stack/nanopaste, -/obj/item/stack/nanopaste, +/area/ship/ert/engine) +"JZ" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/gun/projectile/heavysniper, +/obj/item/weapon/storage/box/sniperammo, +/obj/item/weapon/storage/box/sniperammo, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/alarm/alarms_hidden{ + dir = 1; + pixel_y = -26 +======= +/area/ship/ert/hangar) +"LF" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_dl) +"LH" = ( /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/med) -"DN" = ( -/obj/machinery/atmospherics/unary/engine{ +/area/ship/ert/eng_storage) +"LI" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways_aft) +"LJ" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +<<<<<<< HEAD +/area/ship/ert/teleporter) +"Kk" = ( +/obj/effect/landmark/late_antag/ert, +/obj/structure/table/bench/steel, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"Kq" = ( +/obj/machinery/light/no_nightshift{ dir = 4 }, -/turf/space, +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 8 + }, +======= +/area/ship/ert/med) +"LL" = ( +/obj/machinery/alarm/alarms_hidden{ + dir = 4; + pixel_x = -26 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/ert/brig) +"LM" = ( +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/eng_storage) +"LP" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/chemical_dispenser/biochemistry/full, +/obj/machinery/light/no_nightshift, +/obj/item/weapon/reagent_containers/glass/beaker/large, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"LR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"LV" = ( +/obj/effect/floor_decal/corner/blue{ + dir = 9 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways) +"LW" = ( +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/dock_star) +"LZ" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/catwalk_plated/techmaint, +/turf/simulated/floor/plating, +/area/ship/ert/med) +"Mb" = ( +/obj/machinery/sleeper{ + dir = 8 + }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"Md" = ( +/obj/machinery/door/firedoor/border_only, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/blast/regular/open{ + dir = 2; + id = "braun_blast_shields"; + name = "Blast Shield" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_st) +"Me" = ( +/obj/structure/table/rack/steel, +/obj/item/device/flash{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/device/flash{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/device/flash, +/obj/item/device/flash{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/device/flash{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/device/flash{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/hallways) +"Mi" = ( +/obj/machinery/door/window/brigdoor/southleft, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/hallways_aft) +"Mj" = ( +/obj/machinery/door/airlock/glass_medical{ + name = "Medical Bay"; + req_access = list(103) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +<<<<<<< HEAD +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"KM" = ( +/obj/structure/bed/chair/bay/chair/padded/blue{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/bridge) +"KO" = ( +/obj/machinery/vending/tool, +/obj/machinery/light/no_nightshift{ + dir = 1 +======= +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/med) +"Mk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/teleporter) +"Mm" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/table/steel_reinforced, +/obj/item/weapon/melee/baton/loaded, +/obj/item/weapon/melee/baton/loaded, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/brig) +"Mq" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/ert_ship_boat) +"Mr" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"Mt" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/gun/projectile/automatic/pdw{ + pixel_y = 6 + }, +/obj/item/weapon/gun/projectile/automatic/pdw{ + pixel_y = 4 + }, +/obj/item/weapon/gun/projectile/automatic/pdw{ + pixel_y = 2 + }, +/obj/item/weapon/gun/projectile/automatic/pdw, +/obj/item/weapon/gun/projectile/automatic/pdw{ + pixel_y = -2 + }, +/obj/item/weapon/gun/projectile/automatic/pdw{ + pixel_y = -4 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = 10 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = 8 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = 6 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = 4 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = 2 + }, +/obj/item/ammo_magazine/m9mml, +/obj/item/ammo_magazine/m9mml{ + pixel_x = -2 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = -4 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = -6 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = -8 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = -10 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = -12 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_st) +"Mx" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/powered/scrubber, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"My" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/space_heater, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"MC" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/pipedispenser/orderable, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"MD" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/gun/energy/gun/martin{ + battery_lock = 0 + }, +/obj/item/weapon/gun/energy/gun/martin{ + battery_lock = 0 + }, +/obj/item/weapon/gun/energy/gun/martin{ + battery_lock = 0 + }, +/obj/item/weapon/gun/energy/gun/martin{ + battery_lock = 0 + }, +/obj/item/weapon/gun/energy/gun/martin{ + battery_lock = 0 + }, +/obj/item/weapon/gun/energy/gun/martin{ + battery_lock = 0 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ + pixel_y = 6 + }, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ + pixel_y = 4 + }, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ + pixel_y = 2 + }, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ + pixel_y = -2 + }, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ + pixel_y = -4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_st) +<<<<<<< HEAD +"LA" = ( +/obj/structure/table/rack/steel, +<<<<<<< HEAD +/obj/item/weapon/storage/box/shotgunshells/large, +/obj/item/weapon/storage/box/shotgunshells/large, +/obj/item/weapon/storage/box/shotgunammo/large, +/obj/item/weapon/storage/box/shotgunammo/large, +/obj/item/weapon/storage/box/empshells/large, +/obj/item/weapon/storage/box/flashshells/large, +/obj/item/weapon/storage/box/beanbags/large, +/obj/item/weapon/storage/box/beanbags/large, +/obj/item/weapon/storage/box/stunshells/large, +======= +/obj/item/ammo_magazine/ammo_box/b12g/pellet, +/obj/item/ammo_magazine/ammo_box/b12g/pellet, +/obj/item/ammo_magazine/ammo_box/b12g, +/obj/item/ammo_magazine/ammo_box/b12g, +/obj/item/ammo_magazine/ammo_box/b12g/emp, +/obj/item/ammo_magazine/ammo_box/b12g/flash, +/obj/item/ammo_magazine/ammo_box/b12g/beanbag, +/obj/item/ammo_magazine/ammo_box/b12g/beanbag, +/obj/item/ammo_magazine/ammo_box/b12g/stunshell, +>>>>>>> aa6720eacd... Merge pull request #13898 from KillianKirilenko/kk-talontweaks +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/projectile/shotgun/pump/combat{ + pixel_y = 3 + }, +/obj/item/weapon/gun/projectile/shotgun/pump/combat{ + pixel_y = -3 +======= +"MK" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, /area/ship/ert/engine) -"DQ" = ( +"ML" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/pipedispenser/disposal/orderable, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"MQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +<<<<<<< HEAD +/turf/simulated/floor/tiled/white, +======= +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/eng_storage) +"MT" = ( +/obj/effect/floor_decal/corner/red{ + dir = 1 + }, +/obj/structure/reagent_dispensers/watertank/high, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"MX" = ( +/obj/machinery/flasher, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/ert/brig) +"MZ" = ( +/turf/simulated/wall/rshull, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/area/ship/ert/med_surg) +"Nb" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/table/steel_reinforced, +/obj/fiftyspawner/uranium, +/obj/fiftyspawner/uranium, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engineering) +"Nd" = ( +/obj/structure/table/rack/steel, +/obj/effect/floor_decal/industrial/outline, +/obj/item/weapon/hand_labeler, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"Nf" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_st) +"Ng" = ( +/obj/machinery/door/blast/regular/open{ + id = "ERT_Shuttle_Rear"; + name = "Boarding Hatch" + }, +/obj/machinery/button/remote/blast_door{ + id = "ERT_Shuttle_Rear"; + name = "ERT Shuttle Access"; + pixel_y = 24; + req_access = list(103) + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/ert_ship_boat) +"Nh" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +<<<<<<< HEAD +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"LR" = ( +/obj/machinery/door/airlock/external, +/obj/effect/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/dock_port) +"LV" = ( +/obj/structure/table/steel_reinforced, +======= +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/brig) +"Nk" = ( +/obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/machinery/firealarm/alarms_hidden{ + pixel_y = 26 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"Np" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/catwalk_plated/techfloor, +/turf/simulated/floor/plating, +/area/ship/ert/engine) +"Nq" = ( +/obj/machinery/door/airlock/glass_engineering{ + name = "RIG Bay & ORB Access"; + req_access = list(103) + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/mech_bay) +"Nu" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/obj/structure/sign/vacuum{ + pixel_y = 32 + }, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"NH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +<<<<<<< HEAD +======= +/obj/machinery/atmospherics/binary/pump/fuel/on, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"NJ" = ( +/obj/machinery/body_scanconsole, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"NN" = ( +/obj/machinery/computer/operating{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"NP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +<<<<<<< HEAD +/area/ship/ert/armoury_st) +"Me" = ( +/obj/structure/table/rack/steel, +<<<<<<< HEAD +/obj/item/weapon/storage/box/shotgunshells/large, +/obj/item/weapon/storage/box/shotgunshells/large, +/obj/item/weapon/storage/box/shotgunammo/large, +/obj/item/weapon/storage/box/shotgunammo/large, +/obj/item/weapon/storage/box/empshells/large, +/obj/item/weapon/storage/box/flashshells/large, +/obj/item/weapon/storage/box/beanbags/large, +/obj/item/weapon/storage/box/beanbags/large, +/obj/item/weapon/storage/box/stunshells/large, +======= +/obj/item/ammo_magazine/ammo_box/b12g/pellet, +/obj/item/ammo_magazine/ammo_box/b12g/pellet, +/obj/item/ammo_magazine/ammo_box/b12g, +/obj/item/ammo_magazine/ammo_box/b12g, +/obj/item/ammo_magazine/ammo_box/b12g/emp, +/obj/item/ammo_magazine/ammo_box/b12g/flash, +/obj/item/ammo_magazine/ammo_box/b12g/beanbag, +/obj/item/ammo_magazine/ammo_box/b12g/beanbag, +/obj/item/ammo_magazine/ammo_box/b12g/stunshell, +>>>>>>> aa6720eacd... Merge pull request #13898 from KillianKirilenko/kk-talontweaks +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/projectile/automatic/as24{ + pixel_y = 3 +======= +/area/ship/ert/engine) +"NR" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/effect/catwalk_plated/techmaint, +/turf/simulated/floor/plating, +/area/ship/ert/engineering) +"NU" = ( +/obj/effect/floor_decal/corner/yellow{ + dir = 10 + }, +/obj/effect/floor_decal/corner/blue{ + dir = 1 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways) +"NY" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways_aft) +"NZ" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +<<<<<<< HEAD +/area/shuttle/ert_ship_boat) +"Nk" = ( +/obj/machinery/pointdefense{ + id_tag = "vonbraun_pd" + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/engine) +"Np" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"Nq" = ( +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/apc/hyper{ + alarms_hidden = 1; + dir = 8; + name = "VB APC - West"; + pixel_x = -24 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/gunnery) +"Nu" = ( +/obj/structure/hull_corner/long_horiz{ +======= +/area/ship/ert/engineering) +"Oa" = ( +/obj/effect/floor_decal/corner/yellow{ + dir = 9 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/effect/floor_decal/corner/red{ +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways_aft) +"Of" = ( +/turf/simulated/wall/rshull, +/area/ship/ert/hangar) +<<<<<<< HEAD +"NH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +<<<<<<< HEAD +/obj/effect/catwalk_plated/dark, +======= +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +======= +"Og" = ( +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +<<<<<<< HEAD +/obj/effect/catwalk_plated/techfloor, +>>>>>>> aa6720eacd... Merge pull request #13898 from KillianKirilenko/kk-talontweaks +/turf/simulated/floor/plating, +/area/ship/ert/engine) +"NI" = ( +/obj/structure/table/rack, +/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid, +/obj/item/weapon/storage/belt/explorer/pathfinder, +/obj/item/weapon/storage/belt/explorer/pathfinder{ + name = "ERT belt" + }, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"NJ" = ( +/obj/machinery/optable, +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"NP" = ( +======= +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +<<<<<<< HEAD +/obj/machinery/atmospherics/binary/pump/fuel/on, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"NR" = ( +/obj/machinery/light/no_nightshift, +======= +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/glass_security{ + name = "Prisoner Containment"; + req_one_access = list(103) + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/brig) +"Oh" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/brig) +"Oi" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/bridge) +"Ok" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/space_heater, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"Om" = ( +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/mech_bay) +"On" = ( +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_dl) +"Oq" = ( +/obj/machinery/firealarm/alarms_hidden{ + dir = 1; + pixel_y = -26 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways_aft) +"Ox" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engineering) +"Oy" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +<<<<<<< HEAD +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"Og" = ( +======= +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/brig) +"OA" = ( +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/med) +"OB" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways) +"OE" = ( +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/hangar) +"OF" = ( +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/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/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +<<<<<<< HEAD +======= +/obj/effect/catwalk_plated/techmaint, +/turf/simulated/floor/plating, +/area/ship/ert/hallways_aft) +"OG" = ( +/obj/machinery/shield_gen, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/eng_storage) +"OH" = ( +/obj/structure/cable/yellow, +/obj/machinery/power/smes/buildable/point_of_interest, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engineering) +"OM" = ( +/obj/structure/sign/nosmoking_1, +/turf/simulated/wall/rshull, +/area/ship/ert/engine) +"ON" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/mech_bay) +"OO" = ( +/obj/structure/sign/department/cargo{ + name = "ENGINEERING SUPPLIES" + }, +/turf/simulated/wall/rshull, +/area/ship/ert/bridge) +"OR" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/bed/chair/bay/chair/padded/blue, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/bridge) +"OS" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +<<<<<<< HEAD +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/bridge) +"Ok" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + id_tag = "ert_boarding_shuttle_dock"; + pixel_y = 22 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"Om" = ( +/obj/machinery/pointdefense{ + id_tag = "vonbraun_pd" + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/gunnery) +"On" = ( +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_dl) +"Oq" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 +======= +/obj/machinery/light/no_nightshift{ + dir = 1 +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways_aft) +"OT" = ( +/obj/item/device/multitool/station_buffered, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/atmos) -"DR" = ( +"OU" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/dock_port) +"OV" = ( +/obj/structure/hull_corner{ + dir = 4 + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/dock_star) +"OW" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; +<<<<<<< HEAD + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/effect/catwalk_plated/techmaint, +/turf/simulated/floor/plating, +/area/ship/ert/bridge) +"OE" = ( +======= + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/glass{ + req_one_access = list(103) + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/bridge) +"OX" = ( +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/effect/catwalk_plated/techmaint, +/turf/simulated/floor/plating, +/area/ship/ert/bridge) +"OY" = ( +/obj/structure/grille, +/obj/structure/window/titanium/full, +/obj/structure/window/titanium, +/obj/structure/window/titanium{ + dir = 1 + }, +/obj/structure/window/titanium{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/brig) +"OZ" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = 6 + }, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = 3 + }, +/obj/item/weapon/reagent_containers/hypospray, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = -3 + }, +/obj/machinery/alarm/alarms_hidden{ + pixel_y = 26 + }, +/obj/effect/floor_decal/industrial/outline, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = -6 + }, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = -9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"Pc" = ( +/obj/structure/table/rack, +/obj/item/ammo_magazine/m44{ + pixel_x = -3 + }, +/obj/item/ammo_magazine/m44{ + pixel_x = 3 + }, +/obj/item/weapon/gun/projectile/deagle, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"Pe" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/storage/box/emps{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/storage/box/emps{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_dl) +"Ph" = ( +/obj/item/device/healthanalyzer/phasic{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/device/healthanalyzer/phasic, +/obj/item/device/healthanalyzer/phasic{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/structure/table/rack/steel, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"Pj" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/obj/effect/floor_decal/corner/yellow{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/red, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways_aft) +"Pl" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/blast/regular{ + closed_layer = 4; + dir = 4; + id = "NRV_DELTA"; + layer = 4 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_dl) +"Pn" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"Pq" = ( +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"Pw" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/atmos) +<<<<<<< HEAD +======= +"Px" = ( +/obj/structure/table/rack/steel, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/mask/gas{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/mask/gas{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/mask/gas{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/mask/gas{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +"Py" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/med) +"PA" = ( +/obj/structure/bed/chair/bay/chair/padded/blue, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"PC" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/effect/catwalk_plated/techmaint, +/turf/simulated/floor/plating, +/area/ship/ert/hallways) +"PD" = ( +/obj/structure/table/steel_reinforced, +/obj/item/weapon/storage/firstaid/toxin{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/firstaid/toxin{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/storage/firstaid/o2, +/obj/item/weapon/storage/firstaid/o2{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"PE" = ( +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/eng_storage) +"PG" = ( +/obj/effect/floor_decal/corner/white{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/med) +"PH" = ( +/obj/machinery/pointdefense_control{ + id_tag = "vonbraun_pd" + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"PO" = ( +/obj/machinery/power/pointdefense{ + id_tag = "vonbraun_pd" + }, +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/mech_bay) +"PP" = ( +/obj/structure/hull_corner/long_horiz{ + dir = 5 + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/engineering) +"Qb" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/teleporter) +"Qc" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock/glass_security{ + name = "Armoury"; + req_one_access = list(103) + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_st) +"Qd" = ( +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -23 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"Qz" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 1 + }, +/turf/simulated/wall/shull, +/area/ship/ert/dock_star) +"QE" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/machinery/door/blast/regular/open{ + dir = 4; + id = "ERT_Blast_Windows"; + name = "Blast Shield" + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/ert_ship_boat) +"QF" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/teleporter) +<<<<<<< HEAD +"PZ" = ( +/obj/structure/table/bench/steel, +/obj/effect/landmark{ + name = "Commando" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/space) +"Qc" = ( +======= +"QP" = ( +/turf/simulated/wall/rshull, +/area/ship/ert/armoury_dl) +"QR" = ( +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/obj/machinery/power/apc/hyper{ + alarms_hidden = 1; + dir = 8; + name = "VB APC - West"; + pixel_x = -24 + }, +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"QT" = ( /obj/structure/table/rack/steel, /obj/item/weapon/extinguisher/mini, /obj/item/weapon/extinguisher/mini, @@ -5016,79 +9882,147 @@ /obj/item/weapon/extinguisher/mini, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) -"DS" = ( -/turf/simulated/wall/rshull, +"QU" = ( +/obj/structure/ship_munition/disperser_charge/emp, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/reinforced, /area/ship/ert/hallways_aft) -"Ed" = ( -/obj/machinery/light/no_nightshift{ - dir = 4 +"QV" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/machinery/door/blast/regular/open{ + dir = 8; + id = "ERT_Blast_Windows"; + name = "Blast Shield" }, -/obj/effect/floor_decal/corner/yellow{ +/obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/sign/warning/engineering_access{ - pixel_x = -32 +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/ert_ship_boat) +"QZ" = ( +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"Rc" = ( +/obj/machinery/door/blast/regular/open{ + id = "ERT_Shuttle_Rear"; + name = "Boarding Hatch" }, /turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hallways_aft) -"Ee" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/effect/floor_decal/corner/white{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/powered/pump/filled, -/obj/machinery/light/no_nightshift, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) -"Eh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/wood, -/area/ship/ert/commander) -"Eo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/area/shuttle/ert_ship_boat) +"Rd" = ( +/obj/machinery/porta_turret/stationary/CIWS, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/engineering) +"Rh" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/tiled/techmaint, -/area/ship/ert/eng_storage) -"Eq" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 +/area/ship/ert/armoury_st) +"Rt" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" }, /turf/simulated/floor/tiled/techmaint, -/area/shuttle/ert_ship_boat) -"EA" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/storage/box/trackimp, -/obj/item/weapon/storage/box/cdeathalarm_kit, -/obj/item/weapon/stamp/centcomm, +/area/ship/ert/armoury_st) +"Rv" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/med) +"Rw" = ( +/obj/effect/landmark/late_antag/ert, +/obj/structure/table/bench/steel, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"Rz" = ( +/obj/item/modular_computer/console/preset/engineering{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"RB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +<<<<<<< HEAD +======= /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/ship/ert/commander) -"EB" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"RC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"RJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"RN" = ( +/obj/structure/sign/department/medbay, +/turf/simulated/wall/shull, +/area/ship/ert/med_surg) +"RQ" = ( +/obj/effect/floor_decal/corner/red{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"RU" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/med_surg) +"RV" = ( +/obj/effect/floor_decal/corner/blue{ + dir = 1 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways) +"RW" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/hallways_aft) +"RX" = ( /obj/effect/floor_decal/corner/white, /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/firealarm/alarms_hidden{ @@ -5102,208 +10036,301 @@ /obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hangar) -"EC" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 8 - }, -/obj/machinery/light/no_nightshift{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/ship/ert/commander) -"ED" = ( -/obj/item/modular_computer/console/preset/ert{ - dir = 4 - }, -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/bridge) -"EG" = ( -/obj/structure/bed/chair/bay/shuttle{ +"Sc" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/light/no_nightshift{ +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engineering) +"Se" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/ert_ship_boat) -"EP" = ( -/obj/structure/closet/crate/medical, -/obj/item/weapon/storage/box/autoinjectors, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/storage/box/bodybags{ - pixel_x = 2; - pixel_y = 2 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/storage/box/freezer, -/obj/item/weapon/storage/box/masks, -/obj/effect/floor_decal/industrial/outline, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/storage/box/bodybags, -/turf/simulated/floor/tiled/techfloor, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, /area/ship/ert/med) -"Fd" = ( -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/med) -"Ff" = ( -/obj/machinery/light/no_nightshift, -/obj/structure/sign/vacuum{ - pixel_y = -32 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +"Sh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hangar) -"Fg" = ( -/obj/structure/bed/chair/bay/chair/padded/blue{ +"Si" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/recharger, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_dl) +"Sj" = ( +/turf/simulated/wall/rshull, +/area/ship/ert/teleporter) +"Sl" = ( +/obj/structure/sign/department/telecoms{ + name = "TELEPORTER" + }, +/turf/simulated/wall/rshull, +/area/ship/ert/teleporter) +"Sn" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/glass_security{ + name = "Delta Armoury"; + req_one_access = list(103) + }, +/obj/machinery/door/blast/regular{ + closed_layer = 4; + id = "NRV_DELTA"; + layer = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_dl) +"Sp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/med) +"Sr" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/ship/ert/hangar) +"St" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/structure/railing/grey, +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"Sx" = ( +/obj/structure/bed/chair/bay/chair/padded/blue{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/bridge) -"Fp" = ( +"Sy" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/border_only, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/blast/regular{ + closed_layer = 4; + id = "NRV_DELTA"; + layer = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_dl) +"Sz" = ( +/obj/machinery/vending/fitness{ + dir = 1; + prices = list() + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/hallways_aft) +"SA" = ( +/obj/machinery/door/firedoor/border_only, +/obj/structure/fans/hardlight, +/obj/machinery/door/blast/regular{ + id = "Von_Braun_Hangar"; + name = "Hangar Blast Door" + }, +/turf/simulated/floor/reinforced, +/area/ship/ert/hangar) +"SB" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/hangar) +"SD" = ( +/obj/machinery/door/window/brigdoor/southleft{ + req_access = list(150); + req_one_access = list(150) + }, +/obj/machinery/door/firedoor/glass, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/ert/brig) +"SE" = ( /obj/structure/sign/nosmoking_1, /turf/simulated/wall/rshull, /area/ship/ert/engineering) -"Fq" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/storage/box/frags{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/weapon/storage/box/frags{ - pixel_x = 2; - pixel_y = 2 +"SF" = ( +/obj/machinery/alarm/alarms_hidden{ + pixel_y = 26 }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"SG" = ( +/turf/simulated/wall/shull, +/area/ship/ert/dock_star) +<<<<<<< HEAD +"SA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/power/apc/hyper{ alarms_hidden = 1; dir = 4; name = "VB APC - East"; pixel_x = 24 }, -/obj/structure/cable/yellow, -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_dl) -"Fz" = ( +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" +======= +"SI" = ( +/obj/machinery/firealarm/alarms_hidden{ + pixel_y = 26 +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/dock_star) +"SJ" = ( /obj/structure/bed/chair/bay/chair/padded/blue{ - dir = 1 + dir = 4 + }, +<<<<<<< HEAD +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"SD" = ( +/obj/structure/table/rack, +/obj/item/ammo_magazine/m44{ + pixel_x = -3 + }, +/obj/item/ammo_magazine/m44{ + pixel_x = 3 + }, +/obj/item/weapon/gun/projectile/deagle, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"SE" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 +======= +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/hallways_aft) +"SM" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + }, +/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 }, /turf/simulated/floor/tiled/techmaint, -/area/ship/ert/bridge) -"FD" = ( -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/bridge) -"FF" = ( -/obj/effect/shuttle_landmark/premade/ert_ship_port, +/area/ship/ert/brig) +"SN" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/gunnery) +"SO" = ( +/obj/effect/floor_decal/corner/white{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"SV" = ( +/obj/machinery/shield_gen/external, +/obj/effect/floor_decal/corner/white, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/eng_storage) +"SX" = ( +/obj/effect/shuttle_landmark/premade/ert_ship_star, /turf/space, /area/space) -"FJ" = ( -/obj/machinery/door/airlock/glass_command{ +"SY" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/glass_engineeringatmos{ + name = "Atmospherics"; req_one_access = list(103) }, -/obj/machinery/door/firedoor/border_only, /turf/simulated/floor/tiled/techmaint, -/area/ship/ert/bridge) -"FK" = ( -/obj/effect/floor_decal/corner/blue{ +/area/ship/ert/atmos) +"SZ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"Td" = ( +/obj/effect/floor_decal/corner/yellow{ dir = 9 }, /obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hallways) -"FM" = ( -/obj/effect/floor_decal/corner/yellow{ - dir = 10 - }, -/obj/effect/floor_decal/corner/blue{ - dir = 1 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hallways) -"FN" = ( -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hallways) -"FO" = ( -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/obj/machinery/porta_turret/stationary/CIWS, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/dock_star) -"FP" = ( -/obj/structure/ship_munition/disperser_charge/explosive, -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/obj/structure/railing{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/reinforced, -/area/ship/ert/gunnery) -"FQ" = ( -/obj/machinery/door/airlock/glass_security{ - req_one_access = list(103) - }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_st) -"FR" = ( -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_st) -"FT" = ( -/obj/structure/closet/crate{ - dir = 2 +/area/ship/ert/med) +"Ti" = ( +/obj/item/weapon/paper_bin{ + pixel_x = -3; + pixel_y = 8 }, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_st) -"FW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/item/weapon/pen{ + pixel_y = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hallways_aft) -"FX" = ( +/obj/machinery/firealarm/alarms_hidden{ + dir = 1; + pixel_y = -26 + }, +/obj/item/toy/figure/ert, +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"Tl" = ( /obj/structure/table/steel_reinforced, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -5438,369 +10465,57 @@ }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/armoury_st) -"FY" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_dl) -"Ga" = ( -/obj/structure/table/steel_reinforced, -/obj/machinery/recharger, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_st) -"Gl" = ( -/obj/structure/table/rack/steel, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/gun/projectile/automatic/z8{ - pixel_y = -3 - }, -/obj/item/weapon/gun/projectile/automatic/z8{ - pixel_y = 3 - }, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762/ap, -/obj/item/ammo_magazine/m762/ap, -/obj/item/ammo_magazine/m762/ap, -/obj/item/ammo_magazine/m762/ap, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_dl) -"Gr" = ( -/obj/machinery/power/emitter, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/eng_storage) -"Gv" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/machinery/door/window/brigdoor/southleft, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/hallways_aft) -"Gw" = ( -/obj/structure/closet/wardrobe/ert, -/obj/item/modular_computer/tablet/preset/custom_loadout/elite, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) - }, -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/item/modular_computer/laptop/preset/custom_loadout/elite, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"GI" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engine) -"GJ" = ( -/obj/structure/hull_corner{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/eng_storage) -"GK" = ( -/obj/structure/closet/crate{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_st) -"GM" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hallways) -"GO" = ( -/obj/machinery/door/airlock/glass_security{ - req_one_access = list(103) - }, -/obj/machinery/door/firedoor/border_only, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_st) -"GR" = ( -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) -"GS" = ( -/obj/effect/floor_decal/corner/white{ - dir = 6 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/eng_storage) -"GT" = ( -/obj/machinery/power/apc/hyper{ - alarms_hidden = 1; - name = "VB APC - South"; - pixel_y = -24 - }, -/obj/structure/cable/yellow, -/turf/simulated/floor/tiled/white, -/area/ship/ert/med_surg) -"GU" = ( -/obj/effect/floor_decal/corner/red{ - dir = 8 - }, -/obj/structure/reagent_dispensers/foam, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/floor_decal/industrial/outline, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) -"GY" = ( -/obj/machinery/cryopod/ert_ship, -/turf/simulated/floor/tiled/white, -/area/ship/ert/med_surg) -"GZ" = ( -/obj/structure/bed/chair/bay/shuttle, -/obj/machinery/light/no_nightshift{ +"Tp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/ert_ship_boat) -"Hf" = ( -/turf/simulated/wall/rshull, -/area/ship/ert/engine) -"Hp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/med) -"Hq" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "ERT_Blast_Windows"; - name = "Blast Shield" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/ert_ship_boat) -"Hu" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "ERT_Blast_Windows"; - name = "Blast Shield" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/ert_ship_boat) -"HB" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/gun/burst{ - pixel_y = 3 - }, -/obj/item/weapon/gun/energy/gun/burst{ - pixel_y = -3 - }, -/obj/item/weapon/gun/energy/lasershotgun{ - pixel_y = -3 - }, -/obj/item/weapon/gun/energy/lasershotgun{ - pixel_y = 3 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/machinery/recharger/wallcharger{ - pixel_x = -23; - pixel_y = -12 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = -23; - pixel_y = -4 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = -23; - pixel_y = 5 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_dl) -"HC" = ( -/obj/structure/closet/crate/medical, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/stack/nanopaste/advanced, -/obj/item/stack/nanopaste/advanced, -/obj/item/stack/nanopaste/advanced, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, -/obj/item/weapon/storage/pill_bottle/iron, -/obj/item/weapon/storage/pill_bottle/iron, -/obj/item/weapon/storage/pill_bottle/sleevingcure/full, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/storage/box/syringes{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 23 - }, -/obj/effect/floor_decal/industrial/outline, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/med) -"HE" = ( -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/dock_port) -"HH" = ( -/obj/structure/bed/chair/bay/shuttle{ - dir = 1 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = -23; - pixel_y = -12 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = -23; - pixel_y = -4 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = -23; - pixel_y = 5 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/ert_ship_boat) -"HK" = ( -/obj/machinery/shield_diffuser, -/obj/machinery/door/blast/regular/open{ - dir = 2; - id = "ERT_Blast_Windows"; - name = "Blast Shield" - }, -/obj/machinery/door/blast/regular{ - id = "ERT_Shuttle_Fore" - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/ert_ship_boat) -"HO" = ( -/turf/simulated/wall/rshull, -/area/shuttle/ert_ship_boat) -"HR" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/door/window/brigdoor/northright, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/hallways_aft) -"HZ" = ( -/obj/machinery/computer/ship/navigation{ - dir = 1 - }, +<<<<<<< HEAD +======= /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 4 + }, +/obj/item/modular_computer/console/preset/medical{ + dir = 8 }, -/obj/structure/railing/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/bridge) -"Ia" = ( -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/engine) -"Ib" = ( -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/hallways_aft) -"Id" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engine) -"Ig" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ - dir = 4 - }, +"Tx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engine) -"Ii" = ( -/obj/machinery/atmospherics/portables_connector/fuel{ - dir = 8 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/outline/red, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engine) -"Io" = ( +"TB" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/machinery/firealarm/alarms_hidden{ - dir = 1; - pixel_y = -26 + pixel_y = 26 + }, +<<<<<<< HEAD +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engineering) +======= +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/atmos) -"Ip" = ( -/obj/machinery/power/apc/hyper{ - alarms_hidden = 1; - dir = 4; - name = "VB APC - East"; - pixel_x = 24 - }, -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/alarm/alarms_hidden{ - dir = 1; - pixel_y = -26 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/atmos) -"Is" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, +/area/ship/ert/engineering) +"TD" = ( +/turf/simulated/wall/rshull, +/area/ship/ert/mech_bay) +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +"TF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -5808,121 +10523,17 @@ dir = 4 }, /obj/structure/cable/yellow{ - d1 = 1; + d1 = 4; d2 = 8; - icon_state = "1-8" + icon_state = "4-8" }, +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"TG" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/mech_bay) -"Iv" = ( -/turf/simulated/floor/wood, -/area/ship/ert/commander) -"Ix" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/wood, -/area/ship/ert/commander) -"IA" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/barracks) -"IF" = ( -/obj/structure/table/rack/steel, -/obj/effect/floor_decal/industrial/outline, -/obj/item/weapon/hand_labeler, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/med) -"IK" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/wood, -/area/ship/ert/commander) -"IL" = ( -/obj/structure/table/woodentable, -/obj/item/device/aicard, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/light_switch{ - dir = 1; - pixel_y = -23 - }, -/turf/simulated/floor/wood, -/area/ship/ert/commander) -"IZ" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ - pixel_x = -3; - pixel_y = 8 - }, -/obj/item/weapon/pen{ - pixel_y = 4 - }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; - pixel_y = -26 - }, -/obj/item/toy/figure/ert, -/turf/simulated/floor/wood, -/area/ship/ert/commander) -"Jb" = ( -/obj/machinery/door/firedoor/border_only, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_st) -"Jc" = ( -/obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/firstaid/toxin{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/weapon/storage/firstaid/toxin{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/o2{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/med) -"Jd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/barracks) -"Jf" = ( +"TI" = ( /obj/effect/floor_decal/corner/yellow{ dir = 10 }, @@ -5934,79 +10545,101 @@ }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hallways) -"Jg" = ( -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/med_surg) -"Jk" = ( -/obj/machinery/door/firedoor/border_only, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/bridge) -"Jl" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 1 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, +"TM" = ( +<<<<<<< HEAD +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hallways) -"Js" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hallways) -"Jw" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/storage/box/handcuffs{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/weapon/storage/box/handcuffs{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/effect/floor_decal/corner/red{ +/area/ship/ert/hallways_aft) +"TR" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/border_only, +/obj/structure/window/reinforced{ + dir = 4 +======= +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/hallways) -"Jx" = ( -/obj/item/device/perfect_tele_beacon/stationary{ - tele_name = "NRB Robineau"; - tele_network = "centcom" +/area/ship/ert/atmos) +"TQ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/ert_ship_boat) -"JB" = ( -/turf/simulated/wall/rshull, -/area/ship/ert/dock_port) -"JE" = ( +/obj/effect/floor_decal/corner/white{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/machinery/light/no_nightshift, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hangar) -"JG" = ( +"TR" = ( +/obj/structure/railing/grey, +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"TU" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/border_only, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/blast/regular/open{ + dir = 4; + id = "braun_blast_shields"; + name = "Blast Shield" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"TW" = ( +/obj/item/device/perfect_tele_beacon/stationary{ + tele_name = "NRV Von Braun Teleporter Room"; + tele_network = "centcom" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/teleporter) +<<<<<<< HEAD +======= +"TZ" = ( +/obj/structure/grille, +/obj/structure/window/titanium/full, +/obj/structure/window/titanium, +/obj/structure/window/titanium{ + dir = 1 + }, +/obj/structure/window/titanium{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/brig) +"Ue" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/atmos) +"Ug" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/brig) +"Uk" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -6015,7 +10648,585 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engineering) -"JJ" = ( +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +"Ul" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/teleporter) +"Un" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways_aft) +"Ut" = ( +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 2; + icon_state = "shutter0"; + id = "braun_cells_privacy"; + name = "Privacy Shutters"; + opacity = 0 + }, +/obj/structure/grille, +/obj/structure/window/titanium/full, +/obj/structure/window/titanium{ + dir = 1 + }, +/obj/structure/window/titanium, +/obj/structure/window/titanium{ + dir = 8 + }, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable/yellow, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/brig) +"Ux" = ( +/obj/machinery/vending/fitness{ + prices = list() + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/hallways_aft) +"Uy" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/gun/energy/gun{ + pixel_y = 6 + }, +/obj/item/weapon/gun/energy/gun{ + pixel_y = 4 + }, +/obj/item/weapon/gun/energy/gun{ + pixel_y = 2 + }, +/obj/item/weapon/gun/energy/gun, +/obj/item/weapon/gun/energy/gun{ + pixel_y = -2 + }, +/obj/item/weapon/gun/energy/gun{ + pixel_y = -4 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_st) +"UD" = ( +/obj/structure/ship_munition/disperser_charge/explosive, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/ship/ert/gunnery) +"UE" = ( +/obj/structure/sign/warning/radioactive{ + desc = "WARNING: VON BRAUN PTTOS EMIT RADIATION WHILST OPERATIONAL."; + name = "\improper RADIOACTIVE GENERATORS BEHIND THESE DOORS"; + pixel_x = -16 + }, +/turf/simulated/wall/shull, +/area/ship/ert/engineering) +"UH" = ( +/obj/machinery/alarm/alarms_hidden{ + dir = 1; + pixel_y = -26 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"UI" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/wall/rshull, +/area/ship/ert/med) +"UJ" = ( +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 2; + icon_state = "shutter0"; + id = "braun_cells_privacy"; + name = "Privacy Shutters"; + opacity = 0 + }, +/obj/structure/grille, +/obj/structure/window/titanium/full, +/obj/structure/window/titanium{ + dir = 1 + }, +/obj/structure/window/titanium, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, +<<<<<<< HEAD +/area/ship/ert/teleporter) +======= +/area/ship/ert/brig) +"UK" = ( +/obj/structure/hull_corner/long_horiz{ + dir = 5 + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/engine) +"UN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/power/apc/hyper{ + alarms_hidden = 1; + dir = 4; + name = "VB APC - East"; + pixel_x = 24 + }, +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + d2 = 4; + dir = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways_aft) +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +"UT" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_dl) +"UU" = ( +/obj/machinery/door/window/brigdoor/northleft{ + req_access = list(150); + req_one_access = list(150) + }, +/obj/machinery/door/firedoor/glass, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/ert/brig) +"UY" = ( +/obj/structure/table/rack, +/obj/item/weapon/rig/ert, +/obj/item/weapon/cell/slime, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"Vc" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"Vd" = ( +/obj/structure/window/reinforced, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/ert_ship_boat) +"Vf" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/brig) +"Vg" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways) +"Vh" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"Vn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_dl) +"Vp" = ( +/obj/machinery/computer/ship/engines{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engineering) +"Vq" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +<<<<<<< HEAD +/area/ship/ert/gunnery) +"VC" = ( +/obj/machinery/power/port_gen/pacman/super/potato, +/obj/structure/cable/green, +/obj/machinery/light/no_nightshift, +/obj/effect/decal/cleanable/greenglow, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engineering) +"VJ" = ( +======= +/area/ship/ert/mech_bay) +"Vx" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"VC" = ( +/obj/machinery/door/airlock/glass_security{ + name = "Armoury"; + req_one_access = list(103) + }, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/obj/machinery/door/firedoor/multi_tile{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_st) +"VH" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/recharger, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_st) +"VI" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/corner/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways_aft) +"VJ" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +<<<<<<< HEAD +/obj/structure/bed/pod, +/obj/item/weapon/bedsheet/blue, +/obj/structure/curtain/open/bed, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"Wd" = ( +/obj/machinery/telecomms/relay, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/atmos) +"Wj" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 +======= +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/med) +"VK" = ( +/obj/structure/hull_corner{ + dir = 1 + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/med) +<<<<<<< HEAD +"Wq" = ( +======= +"VN" = ( +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/gunnery) +"VO" = ( +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/bridge) +"VQ" = ( +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/bridge) +"Wh" = ( +/obj/structure/closet/crate{ + dir = 1 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/item/weapon/plastique, +/obj/item/weapon/plastique, +/obj/item/weapon/plastique, +/obj/item/weapon/plastique, +/obj/effect/floor_decal/industrial/outline/red, +/obj/item/weapon/plastique, +/obj/item/weapon/plastique, +/obj/item/weapon/plastique, +/obj/item/weapon/plastique, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_dl) +"Wl" = ( +/obj/structure/sign/department/medbay, +/turf/simulated/wall/shull, +/area/ship/ert/med) +"Wq" = ( +/turf/simulated/wall/rshull, +/area/ship/ert/commander) +"Wu" = ( +/obj/structure/closet/crate{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_st) +"Wv" = ( +/obj/effect/shuttle_landmark/premade/ert_ship_near_star, +/turf/space, +/area/space) +"WA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_dl) +"WC" = ( +/turf/simulated/floor/reinforced, +/area/ship/ert/hangar) +"WE" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/glass_security{ + name = "Armoury"; + req_one_access = list(103) + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_st) +"WF" = ( +<<<<<<< HEAD +/obj/machinery/pointdefense{ + id_tag = "vonbraun_pd" + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/med) +======= +/obj/structure/hull_corner{ + dir = 8 + }, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/ert_ship_boat) +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +"WH" = ( +/obj/structure/closet/wardrobe/ert, +/obj/item/modular_computer/tablet/preset/custom_loadout/elite, +/obj/item/weapon/storage/box/survival/comp{ + starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) + }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/modular_computer/laptop/preset/custom_loadout/elite, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"WJ" = ( +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) +"WK" = ( +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways_aft) +"WO" = ( +<<<<<<< HEAD +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +======= +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 + }, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"WP" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/ert_ship_boat) +"WS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/bed/chair/bay/chair/padded/blue{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engineering) +"WT" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/blast/regular/open{ + dir = 2; + id = "ERT_Blast_Windows"; + name = "Blast Shield" + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/shield_diffuser, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/ert_ship_boat) +"WV" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/effect/landmark{ + name = "Commando" + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +<<<<<<< HEAD +"Xg" = ( +======= +"WW" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/brig) +"WX" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/atmos) +"WZ" = ( +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways_aft) +"Xg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engineering) +"Xh" = ( +/obj/machinery/door/blast/shutters{ + density = 0; + icon_state = "shutter0"; + id = "braun_cells_privacy"; + name = "Privacy Shutters"; + opacity = 0 + }, +/obj/structure/grille, +/obj/structure/window/titanium/full, +/obj/structure/window/titanium{ + dir = 1 + }, +/obj/structure/window/titanium, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/brig) +"Xo" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/med) +"Xu" = ( +/obj/machinery/power/smes/buildable/point_of_interest, +/obj/structure/cable/yellow, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engineering) +"Xv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_dl) +"Xw" = ( +/turf/simulated/floor/tiled/techfloor, +<<<<<<< HEAD +/area/ship/ert/teleporter) +"XB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" +======= +/area/ship/ert/mech_bay) +"Xz" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -6024,644 +11235,39 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/engineering{ req_one_access = list(103) +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_star) -"JM" = ( -/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/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/barracks) -"JN" = ( -/obj/structure/bed/chair/bay/shuttle, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/ert_ship_boat) -"JW" = ( -/obj/machinery/light/no_nightshift, -/obj/machinery/atmospherics/unary/engine{ - dir = 4 - }, -/turf/space, -/area/ship/ert/engine) -"JX" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/glass{ - req_one_access = list(103) - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/bridge) -"JY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engine) -"JZ" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/heavysniper, -/obj/item/weapon/storage/box/sniperammo, -/obj/item/weapon/storage/box/sniperammo, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/machinery/alarm/alarms_hidden{ +"XB" = ( +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/ert/brig) +"XG" = ( +/turf/simulated/wall/rshull, +/area/ship/ert/eng_storage) +"XH" = ( +/obj/machinery/firealarm/alarms_hidden{ dir = 1; pixel_y = -26 }, -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_dl) -"Kb" = ( -/obj/structure/railing/grey{ - dir = 4 - }, -/obj/structure/railing/grey{ - dir = 1 - }, -/obj/item/weapon/paper/vonbraun_shields, -/obj/structure/table/steel_reinforced, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/bridge) -"Kf" = ( -/obj/machinery/computer/teleporter{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/teleporter) -"Kk" = ( -/obj/effect/landmark/late_antag/ert, -/obj/structure/table/bench/steel, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"Kq" = ( -/obj/machinery/light/no_nightshift{ - dir = 4 - }, -/obj/machinery/atmospherics/portables_connector/fuel{ - dir = 8 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engine) -"Kr" = ( -/obj/machinery/light/no_nightshift{ - dir = 4 - }, -/obj/effect/floor_decal/corner/yellow{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hallways_aft) -"Ks" = ( -/obj/machinery/door/airlock/centcom{ - name = "Commander"; - req_access = list(103) - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor/border_only, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/commander) -"Kt" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/dock_star) -"Kw" = ( -/obj/structure/sign/department/eng, -/turf/simulated/wall/rshull, -/area/ship/ert/bridge) -"KB" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/border_only, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/eng_storage) -"KG" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/storage/toolbox/mechanical{ - pixel_x = -4; - pixel_y = -6 - }, -/obj/item/weapon/storage/toolbox/mechanical{ - pixel_x = -4; - pixel_y = -2 - }, -/obj/item/weapon/storage/toolbox/electrical{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/item/weapon/storage/toolbox/electrical{ - pixel_x = -4; - pixel_y = 6 - }, -/obj/item/weapon/storage/briefcase/inflatable{ - pixel_x = 4; - pixel_y = -6 - }, -/obj/item/weapon/storage/briefcase/inflatable{ - pixel_x = 4; - pixel_y = -2 - }, -/obj/item/weapon/storage/briefcase/inflatable{ - pixel_x = 4; - pixel_y = 2 - }, -/obj/item/weapon/storage/briefcase/inflatable{ - pixel_x = 4; - pixel_y = 6 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/eng_storage) -"KI" = ( -/turf/simulated/wall/shull, -/area/ship/ert/med) -"KJ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/structure/railing/grey{ - dir = 1 - }, -/obj/structure/table/steel_reinforced, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/bridge) -"KM" = ( -/obj/structure/bed/chair/bay/chair/padded/blue{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/bridge) -"KO" = ( -/obj/machinery/vending/tool, -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/eng_storage) -"KS" = ( -/obj/machinery/door/airlock/centcom{ - name = "Reactor Access"; - req_access = list(103) - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "VB_Rear_Blast"; - name = "Blast Shield" - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engineering) -"KT" = ( -/obj/structure/table/steel_reinforced, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/eng_storage) -"KW" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/bridge) -"La" = ( -/obj/item/modular_computer/console/preset/ert{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/bridge) -"Lg" = ( -/obj/structure/table/rack/steel, -/obj/item/taperoll/engineering{ - pixel_x = -6; - pixel_y = -6 - }, -/obj/item/taperoll/engineering{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/taperoll/engineering{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/taperoll/engineering{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/eng_storage) -"Lh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/med) -"Lk" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/material/knife/tacknife/combatknife{ - pixel_x = -7 - }, -/obj/item/weapon/material/knife/tacknife/combatknife{ - pixel_x = -4 - }, -/obj/item/weapon/material/knife/tacknife/combatknife{ - pixel_x = -1 - }, -/obj/item/weapon/material/knife/tacknife/combatknife{ - pixel_x = 2 - }, -/obj/item/weapon/material/knife/tacknife/combatknife{ - pixel_x = 5 - }, -/obj/item/weapon/material/knife/tacknife/combatknife{ - pixel_x = 8 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/hallways) -"Lm" = ( -/obj/machinery/ntnet_relay, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/atmos) -"Lq" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/gun/martin{ - battery_lock = 0 - }, -/obj/item/weapon/gun/energy/gun/martin{ - battery_lock = 0 - }, -/obj/item/weapon/gun/energy/gun/martin{ - battery_lock = 0 - }, -/obj/item/weapon/gun/energy/gun/martin{ - battery_lock = 0 - }, -/obj/item/weapon/gun/energy/gun/martin{ - battery_lock = 0 - }, -/obj/item/weapon/gun/energy/gun/martin{ - battery_lock = 0 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ - pixel_y = 6 - }, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ - pixel_y = 4 - }, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ - pixel_y = 2 - }, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ - pixel_y = -2 - }, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ - pixel_y = -4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_st) -"LA" = ( -/obj/structure/table/rack/steel, +"XM" = ( <<<<<<< HEAD -/obj/item/weapon/storage/box/shotgunshells/large, -/obj/item/weapon/storage/box/shotgunshells/large, -/obj/item/weapon/storage/box/shotgunammo/large, -/obj/item/weapon/storage/box/shotgunammo/large, -/obj/item/weapon/storage/box/empshells/large, -/obj/item/weapon/storage/box/flashshells/large, -/obj/item/weapon/storage/box/beanbags/large, -/obj/item/weapon/storage/box/beanbags/large, -/obj/item/weapon/storage/box/stunshells/large, -======= -/obj/item/ammo_magazine/ammo_box/b12g/pellet, -/obj/item/ammo_magazine/ammo_box/b12g/pellet, -/obj/item/ammo_magazine/ammo_box/b12g, -/obj/item/ammo_magazine/ammo_box/b12g, -/obj/item/ammo_magazine/ammo_box/b12g/emp, -/obj/item/ammo_magazine/ammo_box/b12g/flash, -/obj/item/ammo_magazine/ammo_box/b12g/beanbag, -/obj/item/ammo_magazine/ammo_box/b12g/beanbag, -/obj/item/ammo_magazine/ammo_box/b12g/stunshell, ->>>>>>> aa6720eacd... Merge pull request #13898 from KillianKirilenko/kk-talontweaks -/obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/gun/projectile/shotgun/pump/combat{ - pixel_y = 3 - }, -/obj/item/weapon/gun/projectile/shotgun/pump/combat{ - pixel_y = -3 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_st) -"LB" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/white, -/area/ship/ert/med_surg) -"LC" = ( -/obj/structure/table/rack/steel, -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, -/obj/item/weapon/gun/energy/laser{ - pixel_y = 6 - }, -/obj/item/weapon/gun/energy/laser{ - pixel_y = 4 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/gun/energy/laser{ - pixel_y = 2 - }, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser{ - pixel_y = -2 - }, -/obj/item/weapon/gun/energy/laser{ - pixel_y = -4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_st) -"LH" = ( -/obj/machinery/shield_gen/external, -/obj/effect/floor_decal/corner/white, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/eng_storage) -"LJ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/ship/ert/med_surg) -"LR" = ( -/obj/machinery/door/airlock/external, -/obj/effect/map_helper/airlock/door/ext_door, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/dock_port) -"LV" = ( -/obj/structure/table/steel_reinforced, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/button/remote/blast_door{ - description_fluff = "\\(OOC) DO NOT TOUCH THIS BUTTON WITHOUT THE EXPLICIT PERMISSION OF AN ADMINISTRATOR."; - dir = 1; - id = "NRV_DELTA"; - name = "DELTA ACCESS CONTROL"; - req_one_access = list(108) - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_dl) -"LX" = ( -/obj/structure/hull_corner/long_horiz{ - dir = 6 - }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/hallways_aft) -"LZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/ship/ert/med_surg) -"Mb" = ( -/obj/machinery/computer/operating{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/ship/ert/med_surg) -"Md" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/taser{ - pixel_y = 3 - }, -/obj/item/weapon/gun/energy/taser{ - pixel_y = 1 - }, -/obj/item/weapon/gun/energy/taser{ - pixel_y = -1 - }, -/obj/item/weapon/gun/energy/taser{ - pixel_y = -3 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_st) -"Me" = ( -/obj/structure/table/rack/steel, -<<<<<<< HEAD -/obj/item/weapon/storage/box/shotgunshells/large, -/obj/item/weapon/storage/box/shotgunshells/large, -/obj/item/weapon/storage/box/shotgunammo/large, -/obj/item/weapon/storage/box/shotgunammo/large, -/obj/item/weapon/storage/box/empshells/large, -/obj/item/weapon/storage/box/flashshells/large, -/obj/item/weapon/storage/box/beanbags/large, -/obj/item/weapon/storage/box/beanbags/large, -/obj/item/weapon/storage/box/stunshells/large, -======= -/obj/item/ammo_magazine/ammo_box/b12g/pellet, -/obj/item/ammo_magazine/ammo_box/b12g/pellet, -/obj/item/ammo_magazine/ammo_box/b12g, -/obj/item/ammo_magazine/ammo_box/b12g, -/obj/item/ammo_magazine/ammo_box/b12g/emp, -/obj/item/ammo_magazine/ammo_box/b12g/flash, -/obj/item/ammo_magazine/ammo_box/b12g/beanbag, -/obj/item/ammo_magazine/ammo_box/b12g/beanbag, -/obj/item/ammo_magazine/ammo_box/b12g/stunshell, ->>>>>>> aa6720eacd... Merge pull request #13898 from KillianKirilenko/kk-talontweaks -/obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/gun/projectile/automatic/as24{ - pixel_y = 3 - }, -/obj/item/weapon/gun/projectile/automatic/as24{ - pixel_y = -3 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_dl) -"Mm" = ( -/turf/simulated/wall/rshull, -/area/ship/ert/teleporter) -"Ms" = ( -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/teleporter) -"Mt" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/netgun{ - pixel_y = -4 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/gun/energy/sniperrifle{ - battery_lock = 0; - pixel_y = 6 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_st) -"Mv" = ( -/obj/item/device/perfect_tele_beacon/stationary{ - tele_name = "NRV Von Braun Teleporter Room"; - tele_network = "centcom" - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/teleporter) -"Mx" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/white, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) -"My" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/power/apc/hyper{ - alarms_hidden = 1; - dir = 4; - name = "VB APC - East"; +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/airlock_sensor{ pixel_x = 24 }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engineering) -"MC" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12; - pixel_y = 8 - }, -/obj/structure/medical_stand, -/turf/simulated/floor/tiled/white, -/area/ship/ert/med_surg) -"MD" = ( -/obj/effect/floor_decal/corner/red{ - dir = 1 - }, -/obj/structure/reagent_dispensers/watertank/high, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) -"MK" = ( -/obj/structure/sign/nosmoking_1, -/turf/simulated/wall/rshull, -/area/ship/ert/engine) -"ML" = ( -/obj/machinery/door/blast/regular/open{ - id = "ERT_Shuttle_Rear"; - name = "Boarding Hatch" - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/ert_ship_boat) -"MQ" = ( -/obj/effect/floor_decal/corner/white{ - dir = 6 - }, +/area/ship/ert/dock_star) +"XS" = ( +======= +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/hallways_aft) +"XN" = ( +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -6673,472 +11279,59 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/eng_storage) -"MT" = ( -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/ert_ship_boat) -"MU" = ( -/obj/structure/window/reinforced, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/ert_ship_boat) -"MZ" = ( -/turf/simulated/wall/rshull, -/area/ship/ert/med_surg) -"Na" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/glass{ +/obj/machinery/door/firedoor/multi_tile{ + dir = 1 + }, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 1; req_one_access = list(103) }, /turf/simulated/floor/tiled/techmaint, -/area/ship/ert/dock_port) -"Nb" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engineering) -"Nd" = ( -/obj/effect/floor_decal/corner/white{ - dir = 1 - }, +/area/ship/ert/med) +"XQ" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/chemical_dispenser/ert, +/obj/item/weapon/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) -"Nf" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) -"Ng" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/button/remote/blast_door{ - id = "ERT_Shuttle_Fore"; - name = "ERT Deployment Access"; - pixel_y = 24; - req_access = list(103) - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/ert_ship_boat) -"Nk" = ( -/obj/machinery/pointdefense{ - id_tag = "vonbraun_pd" - }, -/obj/machinery/light/no_nightshift{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/engine) -"Np" = ( -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engine) -"Nq" = ( -/obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/power/apc/hyper{ - alarms_hidden = 1; - dir = 8; - name = "VB APC - West"; - pixel_x = -24 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/gunnery) -"Nu" = ( -/obj/structure/hull_corner/long_horiz{ - dir = 6 - }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/engine) -"Nz" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/powered/scrubber, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) -"NH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -<<<<<<< HEAD -/obj/effect/catwalk_plated/dark, -======= -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, +"XS" = ( /obj/structure/cable/yellow{ d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - d1 = 4; d2 = 8; - icon_state = "4-8" + icon_state = "2-8" }, -/obj/effect/catwalk_plated/techfloor, ->>>>>>> aa6720eacd... Merge pull request #13898 from KillianKirilenko/kk-talontweaks -/turf/simulated/floor/plating, -/area/ship/ert/engine) -"NI" = ( -/obj/structure/table/rack, -/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid, -/obj/item/weapon/storage/belt/explorer/pathfinder, -/obj/item/weapon/storage/belt/explorer/pathfinder{ - name = "ERT belt" - }, -/turf/simulated/floor/wood, -/area/ship/ert/commander) -"NJ" = ( -/obj/machinery/optable, -/turf/simulated/floor/tiled/white, -/area/ship/ert/med_surg) -"NP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/binary/pump/fuel/on, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engine) -"NR" = ( -/obj/machinery/light/no_nightshift, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/engineering) -"NU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_dl) -"NY" = ( -/obj/machinery/door/airlock/glass_command{ - req_one_access = list(103) - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/bridge) -"NZ" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/engineering) -"Oa" = ( -/obj/machinery/door/airlock/glass_engineering{ - name = "Engineering"; - req_access = list(103) - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/engineering) -"Of" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/alarm/alarms_hidden{ + pixel_y = 26 }, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engine) -"Og" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/yellow{ - dir = 9 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hallways_aft) -"Oh" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/glass{ - req_one_access = list(103) - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hallways_aft) -"Oi" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/bridge) -"Ok" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - id_tag = "ert_boarding_shuttle_dock"; - pixel_y = 22 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) -"Om" = ( -/obj/machinery/pointdefense{ - id_tag = "vonbraun_pd" - }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/gunnery) -"On" = ( -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_dl) -"Oq" = ( -/obj/machinery/light/no_nightshift{ - dir = 8 +/area/ship/ert/engineering) +"XU" = ( +/obj/effect/floor_decal/corner/white{ + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, /turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hallways_aft) -"Ox" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/hangar) +"XW" = ( +/turf/simulated/wall/rshull, /area/ship/ert/engineering) -"Oy" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +"XX" = ( +/turf/simulated/wall/rshull, +/area/ship/ert/brig) +"XZ" = ( +/obj/machinery/door/airlock/external, +/obj/machinery/airlock_sensor/airlock_exterior{ + pixel_x = 24; + pixel_y = -11 }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/effect/catwalk_plated/techmaint, -/turf/simulated/floor/plating, -/area/ship/ert/bridge) -"OE" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/effect/catwalk_plated/techmaint, -/turf/simulated/floor/plating, -/area/ship/ert/bridge) -"OF" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/bridge) -"OH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/effect/map_helper/airlock/sensor/ext_sensor, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engineering) -"OM" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/obj/machinery/porta_turret/stationary/CIWS, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/gunnery) -"ON" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/gunnery) -"OO" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/sniperrifle{ - battery_lock = 0; - pixel_y = -3 - }, -/obj/item/weapon/gun/energy/sniperrifle{ - battery_lock = 0; - pixel_y = 3 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_dl) -"OR" = ( -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hallways) -"OS" = ( -/obj/structure/bed/chair/bay/comfy/captain{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/bridge) -"OT" = ( -/obj/machinery/computer/ship/helm{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/bridge) -"OU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/landmark{ - name = "Commando" - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/barracks) -"OW" = ( +/area/ship/ert/dock_star) +"Yd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -7155,20 +11348,250 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/bridge) -"OX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +"Ye" = ( +<<<<<<< HEAD +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/barracks) +"Yk" = ( +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" +======= +/turf/simulated/wall/rshull, +/area/ship/ert/dock_port) +"Yf" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/meter, +/obj/machinery/power/apc/hyper{ + alarms_hidden = 1; + name = "VB APC - South"; + pixel_y = -24 + }, +/obj/structure/cable/yellow, +/obj/machinery/light/small{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, +/area/ship/ert/dock_star) +"Yk" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) +"Ys" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways_aft) +"Yt" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/teleporter) +"Yu" = ( +/obj/effect/floor_decal/corner/blue{ + dir = 8 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways) +"Yv" = ( +/obj/machinery/power/port_gen/pacman/super/potato, +/obj/structure/cable/green, +/obj/machinery/light/no_nightshift, +/obj/effect/decal/cleanable/greenglow, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engineering) +"Yx" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techfloor, +<<<<<<< HEAD /area/ship/ert/bridge) -"OY" = ( -/obj/effect/shuttle_landmark/premade/ert_ship_star, -/turf/space, -/area/space) -"OZ" = ( +======= +/area/ship/ert/teleporter) +"YC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/med) +"YK" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +"YN" = ( +/obj/machinery/door/airlock/centcom{ + name = "Reactor Access"; + req_access = list(103) + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/blast/regular/open{ + dir = 4; + id = "VB_Rear_Blast"; + name = "Blast Shield" + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engineering) +"YO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"YP" = ( +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 8 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engine) +"YR" = ( +/obj/machinery/shipsensors, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/engineering) +"YS" = ( +/obj/machinery/sleep_console, +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"YU" = ( +/obj/structure/table/rack, +/obj/item/weapon/storage/backpack/ert/commander, +/obj/item/clothing/suit/space/void/responseteam/command, +/obj/item/clothing/head/helmet/ert/command, +/obj/item/clothing/suit/armor/vest/ert/command, +/turf/simulated/floor/wood, +/area/ship/ert/commander) +"YW" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_dl) +"YX" = ( +/obj/machinery/vending/wallmed1/public{ + dir = 4; + pixel_x = -23 + }, +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/brig) +"YZ" = ( +/obj/structure/closet/crate/freezer, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -23 + }, +/obj/effect/floor_decal/industrial/outline, +<<<<<<< HEAD +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) +"ZI" = ( +/obj/machinery/power/terminal{ +======= +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"Za" = ( +/obj/structure/bed/chair/bay/shuttle{ +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +<<<<<<< HEAD +/area/ship/ert/engineering) +"ZL" = ( +/obj/machinery/pointdefense{ + id_tag = "vonbraun_pd" + }, +/turf/simulated/floor/reinforced/airless, +======= +/area/shuttle/ert_ship_boat) +"Zb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +/area/ship/ert/engine) +"Zc" = ( /obj/structure/table/standard, /obj/item/weapon/soap{ pixel_x = -6; @@ -7178,6 +11601,10 @@ pixel_x = -2; pixel_y = -2 }, +<<<<<<< HEAD +/obj/machinery/power/port_gen/pacman/mrs, +/obj/effect/floor_decal/industrial/outline/yellow, +======= /obj/item/weapon/soap{ pixel_x = 2; pixel_y = 2 @@ -7212,1242 +11639,37 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) -"Pc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/bridge) -"Pe" = ( -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "ERT_Shuttle_Rear"; - name = "ERT Shuttle Access"; - pixel_y = -25; - req_access = list(103) - }, -/obj/machinery/door/blast/regular/open{ - id = "ERT_Shuttle_Rear"; - name = "Boarding Hatch" - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/ert_ship_boat) -"Pl" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/blast/regular{ - closed_layer = 4; - dir = 4; - id = "NRV_DELTA"; - layer = 4 - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_dl) -"Pn" = ( -/obj/item/modular_computer/console/preset/engineering{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/bridge) -"Pq" = ( -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/med) -"Pw" = ( -/obj/machinery/shipsensors{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/atmos) -"Py" = ( -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/obj/machinery/porta_turret/stationary/CIWS, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/med) -"PA" = ( -/obj/machinery/recharge_station, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/med) -"PC" = ( -/obj/machinery/door/blast/regular{ - dir = 4; - id = "NRV_DELTA" - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_dl) -"PD" = ( -/obj/structure/sign/department/medbay{ - name = "MEDICAL OUTFITTING & SUPPLIES" - }, -/turf/simulated/wall/shull, -/area/ship/ert/med) -"PE" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/effect/catwalk_plated/techmaint, -/turf/simulated/floor/plating, -/area/ship/ert/eng_storage) -"PG" = ( -/obj/machinery/alarm/alarms_hidden{ - dir = 1; - pixel_y = -26 - }, -/turf/simulated/floor/tiled/white, -/area/ship/ert/med_surg) -"PH" = ( -/obj/machinery/power/smes/buildable/point_of_interest, -/obj/structure/cable/yellow, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engineering) -"PO" = ( -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/gunnery) -"PP" = ( -/obj/machinery/porta_turret/stationary/CIWS, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/engineering) -"PS" = ( -/obj/machinery/shield_capacitor, +"Zi" = ( +/obj/machinery/shieldwallgen, /obj/effect/floor_decal/industrial/outline/blue, +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) -"PX" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/teleporter) -"PZ" = ( -/obj/structure/table/bench/steel, -/obj/effect/landmark{ - name = "Commando" - }, -/turf/simulated/floor/tiled/steel_grid, -/area/space) -"Qc" = ( -/obj/machinery/power/apc/hyper{ - alarms_hidden = 1; - dir = 8; - name = "VB APC - West"; - pixel_x = -24 - }, -/obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) -"Qh" = ( -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/obj/machinery/alarm/alarms_hidden{ - pixel_y = 26 - }, -/turf/simulated/floor/wood, -/area/ship/ert/commander) -"Ql" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/alarm/alarms_hidden{ - pixel_y = 26 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/dock_star) -"Qz" = ( -/obj/item/weapon/circuitboard/aiupload, -/obj/item/weapon/circuitboard/borgupload, -/obj/item/weapon/circuitboard/smes, -/obj/item/weapon/aiModule/nanotrasen, -/obj/item/weapon/aiModule/reset, -/obj/item/weapon/aiModule/freeformcore, -/obj/item/weapon/aiModule/protectStation, -/obj/item/weapon/aiModule/quarantine, -/obj/item/weapon/aiModule/paladin, -/obj/item/weapon/aiModule/robocop, -/obj/item/weapon/aiModule/safeguard, -/obj/structure/table/steel_reinforced, -/obj/item/weapon/smes_coil, -/obj/item/weapon/smes_coil, -/obj/item/device/t_scanner/advanced{ - pixel_x = -3 - }, -/obj/item/device/t_scanner/advanced{ - pixel_x = 3 - }, -/obj/machinery/power/apc/hyper{ - alarms_hidden = 1; - name = "VB APC - South"; - pixel_y = -24 - }, -/obj/structure/cable/yellow, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/eng_storage) -"QE" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/reinforced, -/area/ship/ert/hangar) -"QM" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_dl) -"QP" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/ert_ship_boat) -"QR" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/ert_ship_boat) -"QS" = ( -/obj/structure/bed/chair/bay/shuttle{ - dir = 4 - }, -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "ERT_Blast_Windows"; - name = "Emergency Blast Shields"; - pixel_x = 55; - req_one_access = list(101) - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/ert_ship_boat) -"QT" = ( -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/med) -"QV" = ( -/obj/structure/hull_corner{ - dir = 1 - }, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/ert_ship_boat) -"QX" = ( -/obj/structure/window/reinforced, -/obj/machinery/computer/shuttle_control/explore/ert_ship_boat{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/ert_ship_boat) -"QY" = ( -/obj/structure/table/rack, -/obj/item/weapon/rig/ert, -/obj/item/weapon/cell/slime, -/turf/simulated/floor/wood, -/area/ship/ert/commander) -"QZ" = ( -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engine) -"Rc" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/effect/shuttle_landmark/shuttle_initializer/ert_ship_boat, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/ert_ship_boat) -"Rd" = ( -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/engineering) -"Rh" = ( -/obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/int_door, -/obj/machinery/door/firedoor/multi_tile, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/dock_star) -"Rt" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/bridge) -"Rv" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, -/obj/machinery/door/airlock/glass_medical{ - name = "Medical Bay"; - req_access = list(103) - }, -/turf/simulated/floor/tiled/white, -/area/ship/ert/med_surg) -"Rw" = ( -/obj/machinery/vending/security, -/turf/simulated/floor/tiled/techfloor, +"Zo" = ( +/turf/simulated/wall/rshull, /area/ship/ert/barracks) -"Rz" = ( -/obj/machinery/door/airlock/glass_security{ - req_one_access = list(103) - }, -/obj/machinery/door/blast/regular{ - id = "NRV_DELTA" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_dl) -"RB" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engine) -"RC" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engine) -"RO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 9 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engine) -"RQ" = ( -/obj/machinery/door/airlock/glass_engineering{ - name = "Engineering"; - req_access = list(103) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor/border_only, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/engineering) -"RS" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/highsecurity{ - name = "Teleporter Chamber"; - req_one_access = list(103) - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/teleporter) -"Sc" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engineering) -"Sh" = ( -/obj/machinery/door/airlock/glass_medical{ - name = "Medical Bay"; - req_access = list(103) - }, -/obj/machinery/door/firedoor/border_only, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/med_surg) -"Sj" = ( -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -23 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/bridge) -"Sl" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/structure/railing/grey, -/obj/structure/table/steel_reinforced, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/bridge) -"Sp" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/catwalk_plated/techmaint, -/turf/simulated/floor/plating, -/area/ship/ert/med) -"Sr" = ( -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/barracks) -"St" = ( -/obj/structure/table/rack/steel, -/obj/item/device/flash{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/device/flash{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/device/flash, -/obj/item/device/flash{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/device/flash{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/device/flash{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/hallways) -"Sx" = ( -/obj/structure/table/rack/steel, -/obj/item/ammo_magazine/m9mmp90{ - pixel_x = 12 - }, -/obj/item/ammo_magazine/m9mmp90{ - pixel_x = 10 - }, -/obj/item/ammo_magazine/m9mmp90{ - pixel_x = 8 - }, -/obj/item/ammo_magazine/m9mmp90{ - pixel_x = 6 - }, -/obj/item/ammo_magazine/m9mmp90{ - pixel_x = 4 - }, -/obj/item/ammo_magazine/m9mmp90{ - pixel_x = 2 - }, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90{ - pixel_x = -2 - }, -/obj/item/ammo_magazine/m9mmp90{ - pixel_x = -4 - }, -/obj/item/ammo_magazine/m9mmp90{ - pixel_x = -6 - }, -/obj/item/ammo_magazine/m9mmp90{ - pixel_x = -8 - }, -/obj/item/ammo_magazine/m9mmp90{ - pixel_x = -10 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/gun/projectile/automatic/p90{ - pixel_y = -6 - }, -/obj/item/weapon/gun/projectile/automatic/p90{ - pixel_y = -2 - }, -/obj/item/weapon/gun/projectile/automatic/p90{ - pixel_y = 2 - }, -/obj/item/weapon/gun/projectile/automatic/p90{ - pixel_y = 6 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_dl) -"Sy" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/automatic/l6_saw{ - pixel_y = 3 - }, -/obj/item/weapon/gun/projectile/automatic/l6_saw{ - pixel_y = -3 - }, -/obj/item/ammo_magazine/m545saw{ - pixel_x = 6 - }, -/obj/item/ammo_magazine/m545saw{ - pixel_x = 2 - }, -/obj/item/ammo_magazine/m545saw{ - pixel_x = -2 - }, -/obj/item/ammo_magazine/m545saw{ - pixel_x = -6 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_dl) -"Sz" = ( +"Zv" = ( /turf/simulated/wall/rshull, /area/ship/ert/dock_star) -"SA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/power/apc/hyper{ - alarms_hidden = 1; - dir = 4; - name = "VB APC - East"; - pixel_x = 24 - }, -/obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hallways_aft) -"SB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/ship/ert/med_surg) -"SD" = ( -/obj/structure/table/rack, -/obj/item/ammo_magazine/m44{ - pixel_x = -3 - }, -/obj/item/ammo_magazine/m44{ - pixel_x = 3 - }, -/obj/item/weapon/gun/projectile/deagle, -/turf/simulated/floor/wood, -/area/ship/ert/commander) -"SE" = ( -/obj/machinery/light/no_nightshift{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engine) -"SF" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_st) -"SG" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/eng_storage) -"SI" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/table/steel_reinforced, -/obj/item/weapon/rcd_ammo/large{ - pixel_x = -8; - pixel_y = -8 - }, -/obj/item/weapon/rcd_ammo/large{ - pixel_x = -6; - pixel_y = -6 - }, -/obj/item/weapon/rcd_ammo/large{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/weapon/rcd_ammo/large{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/weapon/rcd_ammo/large, -/obj/item/weapon/rcd_ammo/large{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/weapon/rcd_ammo/large{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/weapon/rcd_ammo/large{ - pixel_x = 6; - pixel_y = 6 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/eng_storage) -"SJ" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 5 - }, -/turf/simulated/wall/rshull, -/area/ship/ert/dock_star) -"SN" = ( -/obj/effect/map_helper/airlock/sensor/ext_sensor, -/obj/machinery/airlock_sensor/airlock_exterior{ - dir = 4; - pixel_x = 24; - pixel_y = 24 - }, -/turf/simulated/floor/airless, -/area/ship/ert/gunnery) -"SV" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/reagent_containers/hypospray{ - pixel_x = 6 - }, -/obj/item/weapon/reagent_containers/hypospray{ - pixel_x = 3 - }, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray{ - pixel_x = -3 - }, -/obj/machinery/alarm/alarms_hidden{ - pixel_y = 26 - }, -/obj/effect/floor_decal/industrial/outline, -/obj/item/weapon/reagent_containers/hypospray{ - pixel_x = -6 - }, -/obj/item/weapon/reagent_containers/hypospray{ - pixel_x = -9 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/med) -"SZ" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/ert_ship_boat) -"Tl" = ( -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) -"Tx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engine) -"TB" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engineering) -"TF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/white, -/area/ship/ert/med_surg) -"TG" = ( -/obj/machinery/airlock_sensor{ - dir = 8; - pixel_x = 22; - pixel_y = -24 - }, -/obj/effect/map_helper/airlock/sensor/int_sensor, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/gunnery) -"TI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_dl) -"TM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hallways_aft) -"TR" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/border_only, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/blast/regular{ - closed_layer = 4; - id = "NRV_DELTA"; - layer = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/armoury_dl) -"TU" = ( -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/med) -"TZ" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/teleporter) -"Ul" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; - pixel_y = -26 - }, -/obj/item/modular_computer/console/preset/medical{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/bridge) -"Un" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/glass{ - req_one_access = list(103) - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/dock_star) -"Ut" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/alarm/alarms_hidden{ - pixel_y = 26 - }, -/obj/machinery/porta_turret/industrial/teleport_defense, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/teleporter) -"UD" = ( -/obj/machinery/disperser/middle{ - dir = 4 - }, -/turf/simulated/floor/airless, -/area/ship/ert/gunnery) -"UH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_dl) -"UI" = ( -/obj/structure/hull_corner{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/med) -"UJ" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/teleporter) -"UT" = ( -/obj/machinery/door/airlock/glass_security{ - req_one_access = list(103) - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/blast/regular{ - closed_layer = 4; - id = "NRV_DELTA"; - layer = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_dl) -"UU" = ( -/obj/machinery/shieldwallgen{ - anchored = 1; - name = "secured shield generator"; - req_access = list(103); - state = 1 - }, -/obj/structure/window/reinforced, -/obj/effect/floor_decal/industrial/warning, -/obj/structure/cable/yellow, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/teleporter) -"UY" = ( -/obj/structure/table/steel_reinforced, -/obj/machinery/chemical_dispenser/full, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/med) -"Vg" = ( -/obj/structure/table/steel_reinforced, -/obj/machinery/recharger, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_dl) -"Vm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/light_switch{ - pixel_y = 23 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/teleporter) -"Vn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) -"Vq" = ( -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/gunnery) -"VC" = ( -/obj/machinery/power/port_gen/pacman/super/potato, -/obj/structure/cable/green, -/obj/machinery/light/no_nightshift, -/obj/effect/decal/cleanable/greenglow, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engineering) -"VJ" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, -/obj/machinery/door/airlock/glass_medical{ - name = "Medical Bay"; - req_access = list(103) - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/med) -"VN" = ( -/obj/machinery/disperser/front{ - dir = 4 - }, -/turf/simulated/floor/airless, -/area/ship/ert/gunnery) -"VO" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 8 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hallways) -"VP" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hallways) -"VQ" = ( -/obj/structure/table/rack/steel, -/obj/effect/floor_decal/corner/red, -/obj/item/device/radio/off{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/device/radio/off{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/device/radio/off, -/obj/item/device/radio/off{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/device/radio/off{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/device/radio/off{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/hallways) -"Wa" = ( -/obj/structure/closet/walllocker/emerglocker{ - pixel_y = 32 - }, -/obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, -/obj/structure/curtain/open/bed, -/turf/simulated/floor/wood, -/area/ship/ert/commander) -"Wd" = ( -/obj/machinery/telecomms/relay, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/atmos) -"Wj" = ( -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/teleporter) -"Wl" = ( -/obj/structure/table/steel_reinforced, -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/obj/item/device/defib_kit/compact/combat/loaded{ - pixel_y = -3 - }, -/obj/item/device/defib_kit/compact/combat/loaded{ - pixel_y = 3 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/med) -"Wq" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/blue, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/bridge) -"Wu" = ( -/obj/machinery/door/airlock/glass_security{ - req_one_access = list(103) - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/blast/regular{ - closed_layer = 4; - id = "NRV_DELTA"; - layer = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/armoury_dl) -"Wv" = ( -/obj/effect/shuttle_landmark/premade/ert_ship_near_star, -/turf/space, -/area/space) -"WA" = ( -/obj/effect/floor_decal/corner/red{ - dir = 1 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) -"WC" = ( -/turf/simulated/floor/reinforced, -/area/ship/ert/hangar) -"WE" = ( -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) -"WF" = ( -/obj/machinery/pointdefense{ - id_tag = "vonbraun_pd" - }, -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/med) -"WH" = ( -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) -"WJ" = ( -/obj/structure/bed/chair/bay/shuttle{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/ert_ship_boat) -"WK" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 23 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/dock_star) -"WO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engine) -"WR" = ( -/obj/structure/filingcabinet/filingcabinet, -/turf/simulated/floor/wood, -/area/ship/ert/commander) -"WS" = ( -/obj/machinery/computer/ship/engines{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engineering) -"WV" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/barracks) -"WX" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/effect/landmark{ - name = "Commando" - }, -/obj/effect/catwalk_plated/techmaint, -/turf/simulated/floor/plating, -/area/ship/ert/barracks) -"Xg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/bed/chair/bay/chair/padded/blue{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engineering) -"Xh" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/machinery/door/window/brigdoor/southright, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/hallways_aft) -"Xo" = ( +"Zw" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/med) -"Xu" = ( -/obj/structure/cable/yellow, -/obj/machinery/power/smes/buildable/point_of_interest, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engineering) -"Xw" = ( -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "Von_Braun_Cannon"; - name = "Cannon Port Access"; - pixel_y = -24; - req_one_access = list(103) +"Zx" = ( +/obj/effect/floor_decal/corner/white{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 }, /turf/simulated/floor/tiled/techmaint, -/area/ship/ert/gunnery) -"Xx" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/teleporter) -"XB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/teleporter) -"XG" = ( -/turf/simulated/wall/rshull, -/area/ship/ert/eng_storage) -"XH" = ( -/obj/machinery/alarm/alarms_hidden{ - dir = 1; - pixel_y = -26 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engine) -"XM" = ( -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/machinery/airlock_sensor{ - pixel_x = 24 - }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/dock_star) -"XS" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engineering) -"XW" = ( -/turf/simulated/wall/rshull, -/area/ship/ert/engineering) -"XX" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/teleporter) -"Yd" = ( -/turf/simulated/wall/rshull, -/area/ship/ert/armoury_dl) -"Ye" = ( -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/barracks) -"Yk" = ( -/obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/power/apc/hyper{ - alarms_hidden = 1; - dir = 4; - name = "VB APC - East"; - pixel_x = 24 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/mech_bay) -"Yq" = ( +/area/ship/ert/hangar) +"ZC" = ( /obj/machinery/power/apc/hyper{ alarms_hidden = 1; dir = 4; @@ -8465,133 +11687,21 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/teleporter) -"Yr" = ( -/obj/machinery/light/no_nightshift{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/teleporter) -"Ys" = ( -/obj/structure/window/reinforced, -/obj/effect/floor_decal/industrial/warning, -/obj/structure/cable/yellow, -/obj/machinery/shieldwallgen{ - anchored = 1; - name = "secured shield generator"; - req_access = list(103); - state = 1 - }, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/teleporter) -"Yt" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/bed/chair/bay/chair/padded/blue{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/bridge) -"Yx" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/bridge) -"YN" = ( -/obj/structure/sign/warning/radioactive{ - desc = "WARNING: VON BRAUN PTTOS EMIT RADIATION WHILST OPERATIONAL."; - name = "\improper RADIOACTIVE GENERATORS BEHIND THESE DOORS"; - pixel_x = -16 - }, -/turf/simulated/wall/shull, -/area/ship/ert/engineering) -"YO" = ( -/obj/structure/hull_corner{ - dir = 1 - }, -/turf/space, -/area/space) -"YP" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/fuel{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engine) -"YR" = ( -/turf/simulated/floor/reinforced/airless, -/area/ship/ert/engineering) -"YU" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light/no_nightshift{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/bridge) -"YW" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8 - }, -/turf/simulated/floor/reinforced, -/area/shuttle/ert_ship_boat) -"Zi" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/eng_storage) -"Zo" = ( -/turf/simulated/wall/rshull, -/area/ship/ert/barracks) -"Zv" = ( -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/eng_storage) -"Zx" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hangar) -"ZC" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/bed/chair/bay/chair/padded/blue, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/bridge) "ZF" = ( -/obj/item/roller_holder, -/obj/item/roller/adv, -/obj/item/roller/adv{ - pixel_y = 6 +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/border_only, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 }, -/obj/item/roller/adv{ - pixel_y = 12 +/obj/machinery/door/blast/regular/open{ + dir = 4; + id = "braun_blast_shields"; + name = "Blast Shield" }, -/obj/machinery/light/no_nightshift, -/obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/techfloor, -/area/ship/ert/med) +/area/ship/ert/eng_storage) "ZI" = ( /obj/machinery/power/terminal{ dir = 1 @@ -8602,9 +11712,26 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engineering) +"ZK" = ( +/obj/structure/table/steel_reinforced, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/button/remote/blast_door{ + description_fluff = "\\(OOC) DO NOT TOUCH THIS BUTTON WITHOUT THE EXPLICIT PERMISSION OF AN ADMINISTRATOR."; + dir = 1; + id = "NRV_DELTA"; + name = "DELTA ACCESS CONTROL"; + req_one_access = list(108) + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/armoury_dl) "ZL" = ( -/obj/machinery/pointdefense{ - id_tag = "vonbraun_pd" +/obj/structure/hull_corner/long_horiz{ + dir = 6 }, /turf/simulated/floor/reinforced/airless, /area/ship/ert/engine) @@ -8612,67 +11739,62 @@ /turf/simulated/wall/rshull, /area/ship/ert/bridge) "ZP" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/bridge) -"ZT" = ( -/turf/simulated/wall/rshull, -/area/ship/ert/med) -"ZU" = ( -/obj/machinery/light/no_nightshift, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; - pixel_y = -26 - }, -/obj/machinery/power/port_gen/pacman/mrs, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/eng_storage) -"ZW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/med) -"ZX" = ( -/obj/machinery/door/airlock/glass_command{ - req_one_access = list(103) - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/border_only, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/bridge) -"ZY" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 9 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/cable/yellow{ d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" + d2 = 2; + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, -/area/ship/ert/hallways) +/area/ship/ert/bridge) +"ZQ" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/ship/ert/med_surg) +"ZT" = ( +/turf/simulated/wall/rshull, +/area/ship/ert/med) +"ZU" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/wall/shull, +/area/ship/ert/eng_storage) +"ZW" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/eng_storage) +"ZX" = ( +/obj/item/modular_computer/console/preset/ert{ + dir = 4 + }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/bridge) +"ZY" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/bed/chair/bay/chair/padded/blue{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/bridge) (1,1,1) = {" yz @@ -13288,9 +16410,13 @@ yz yz yz yz +<<<<<<< HEAD +Hf +======= yz +hA yz -yz +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg yz yz yz @@ -13421,27 +16547,51 @@ yz yz yz yz +<<<<<<< HEAD +lZ +ZL +kL +yz +yz +yz +Hf +nX +DN +JW +Hf +nX +DN +JW +Hf +yz +yz +yz +lZ +ZL +lZ +======= yz yz yz yz yz yz +kX yz yz yz +AW yz -Nk -yz -yz -yz -yz +yz +yz +kX yz yz yz yz yz yz +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg yz yz yz @@ -13563,27 +16713,49 @@ yz yz yz yz -yz -yz -yz -yz -yz -yz -Do +lZ +<<<<<<< HEAD +Hf +Hf +nX +DN +JW +Hf +uh +et +tL +Hf +uh +et +tL +Hf +nX +DN +JW +Hf +Hf +======= +pY +vb yz yz yz Hf +yG +EP +JJ +AW +yG +EP +JJ +Hf yz yz yz -Do -yz -yz -yz -yz -yz -yz +lZ +pY +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +lZ yz yz yz @@ -13705,27 +16877,47 @@ yz yz yz yz -lZ -ZL -kL -yz -yz -yz +<<<<<<< HEAD +Do Hf +======= +lZ +AW +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +Hf +yG +EP +JJ +Hf +<<<<<<< HEAD +GI +rA +GI +MK +GI +rA +GI +======= nX DN JW -Hf +AW nX DN JW +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg Hf -yz -yz -yz -lZ -ZL +yG +EP +JJ +Hf +<<<<<<< HEAD +Hf +Do +======= +AW lZ +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg yz yz yz @@ -13847,8 +17039,13 @@ yz yz yz yz -lZ +<<<<<<< HEAD +aj Hf +======= +kX +AW +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg Hf nX DN @@ -13856,18 +17053,23 @@ JW Hf uh et -tL -Hf +uh +Dk uh et -tL +uh Hf nX DN JW Hf +<<<<<<< HEAD Hf -lZ +Ia +======= +AW +kX +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg yz yz yz @@ -13989,27 +17191,51 @@ yz yz yz yz -Do +<<<<<<< HEAD +ZL Hf Hf +ok +rD +ux +zk +CN +Ig +JY +NH +RC +Tx +WO +CZ +Of +RO +XH +Hf +Hf +ZL +======= +Do +AW +Hf uh et -tL -Hf -GI -rA -GI -MK -GI -rA -GI -Hf +uh +OM +QZ +WO +Vc +uf +Vc +WO +QZ +OM uh et -tL +uh Hf -Hf -Do +AW +kk +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg yz yz yz @@ -14132,25 +17358,25 @@ yz yz yz aj -Hf -Hf +rt +vd GI rA -GI +Kb MK -QZ +Tx Id RB Np -RB -Id -QZ -MK -GI -rA -GI -Hf -Hf +mp +ii +uD +Ev +Zb +RJ +yH +vd +AN Ia yz yz @@ -14277,23 +17503,23 @@ ZL Hf Hf ok -rD -ux +zk +zk zk CN -Ig +JY JY NH RC -Tx -WO -CZ -Of -RO +QZ +QZ +QZ +QZ +Vx XH Hf Hf -ZL +UK yz yz yz @@ -14415,27 +17641,27 @@ yz yz yz yz -Nu +lZ Hf Hf op uK -uK -uK +op +op rs YP -YP +kp NP -RO +Vx QZ QZ QZ QZ -SE -cY Hf Hf -wG +Hf +Hf +lZ yz yz yz @@ -14556,29 +17782,29 @@ yz yz yz yz -yz -lZ -Hf -Hf -vd -rR -vd -vd -gR -Ii -Kq +bW +kJ +kJ +kJ +kJ +kJ +kJ +kJ +kJ +kJ +kJ uS SE -QZ -QZ -QZ -QZ -Hf -Hf -Hf -Hf -lZ -yz +sc +sc +sc +sc +SE +XW +XW +XW +XW +BI yz yz yz @@ -14700,24 +17926,24 @@ yz yz bO kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ +pV +wd +wd +Fd +Kj +OT +TM +WX +pV vi -Fp +vX Dh -Dh -Dh -Dh -Fp -XW -XW +Vp +pn +ob +YN +Uk +Yv XW XW YR @@ -14844,7 +18070,7 @@ Pw kJ pV kP -kP +rS rS aq aJ @@ -14857,9 +18083,9 @@ zh WS lB Ox -KS -JG -VC +vX +XW +XW XW XW BK @@ -14986,20 +18212,20 @@ bR kJ pV kS -os -os -vg -bp +Dn +Dn +Dn +Dn Dn gn -pV +SY NR -vX +ot ry Xg Sc Nb -vX +UE XW XW XW @@ -15130,20 +18356,20 @@ pV kT gA gA -gA -gA -gA +aq +aJ +Ue gN -nx -yR -RQ +pV +NZ +vX TB OH -nM +ZI qt YN -XW -XW +Uk +Yv XW XW PP @@ -15269,11 +18495,11 @@ yz bW kJ pV -kY oy oy -vg -bp +oy +Kq +Dn DK Io pV @@ -15283,9 +18509,9 @@ XS Xu ZI mt -KS -JG -VC +vX +XW +XW XW XW BI @@ -15407,31 +18633,59 @@ yz yz yz yz -yz -bO -kJ +<<<<<<< HEAD +wr +DS +yl +tK +Oq +ya +ya +ya +ya +SA +FW +Kr +Og +Ed +TM +TM +TM +TM +TM +ya +kh +Gv +nY +DS +wr +======= +cs +DS +DS pV -ls -ls -ls -Lm -gA -DQ -Ip pV -NZ +pV +pV +pV +pV +pV +pV +pV +qp +vX +vX +vX +vX +vX +vX +vX vX -hN -PH -ZI -My vX XW XW -XW -XW -YR -yz +RW +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg yz yz yz @@ -15550,29 +18804,29 @@ yz yz yz xx -DS -DS -pV -pV -pV -pV -pV -pV -pV -pV -pV +gx +lm +rP +wi +yJ +yJ +yJ +yJ +UN +WZ +Pj Oa -vX -vX -vX -vX -vX -vX -vX -vX -vX -XW -XW +be +Jy +Jy +Jy +Jy +Jy +yJ +LI +cb +lm +gx cJ yz yz @@ -15691,31 +18945,31 @@ yz yz yz yz -wr +XM DS -yl -tK +cS +Gv Oq -ya -ya -ya -ya -SA -FW -Kr +XX +XX +XX +XX +XX +XX +XX Og -Ed -TM -TM -TM -TM -TM -ya +XX +XX +XX +XX +XX +XX +XX kh Gv -nY +cS DS -wr +XM yz yz yz @@ -15833,31 +19087,31 @@ yz yz yz yz -LX -DS -pA -HR -vv -DS -DS -DS -DS -DS -DS -DS -Oh -DS -DS -DS -DS -DS -DS -DS -Ai +XM +yl +La +Gv +Un +XX +XB +LL +OY +pQ Xh -yG -DS -bU +Ld +Oh +YX +wq +mX +HT +LL +XB +XX +Un +Gv +Ap +yl +XM yz yz yz @@ -15975,31 +19229,31 @@ yz yz yz yz -Ib -DS -cS -cS -lu -DS -NI -oa +XM +yl +SJ +Gv +Un +XX +qw +MX SD -QY +cz ds -sp -Oi Mm +Nh +jZ jA -Wj +Vf UU -jA -jA -DS -lu -cS -cS -DS -Ib +MX +qw +XX +Un +Gv +SJ +yl +XM yz yz yz @@ -16116,33 +19370,33 @@ yz yz yz yz -Ib -DS -DS -cS -cS -oj -DS -Qh -Iv -Iv -Iv -Iv -sp -bt -Mm +yz +XM +yl +cM +Gv +Un +XX +XX +XX +XX +mz +HL +xs +gY +xs sw -Xx -eF -Ms -Kf -DS -lO -cS -DS -DS -DS -Ib +JA +XX +XX +XX +XX +Un +Gv +cM +yl +XM +yz yz yz yz @@ -16258,33 +19512,33 @@ yz yz yz yz -HE -JB -iB -iB -cS -lu -DS -as -Iv -zP -Eh +yz +XM +yl +Jz +Gv +Un +XX +qw +MX +SD +zT Ix -sp -Oi -Mm +WW +SM +iK Ut -XB -vQ -Ms -jI -DS -lu -cS -Sz -Sz -Sz -nC +Ug +UU +MX +qw +XX +Un +Gv +Jz +yl +XM +yz yz yz yz @@ -16400,33 +19654,33 @@ yz yz yz yz -ac -JB -cs -iB -iB -Na -JB -Wa -eL -zT -at +yz +XM +yl +Ux +Gv +fS +XX +XB +jB +TZ +xR IK Ks Oy -RS +sE UJ -PX +fo TZ -Mv -wo +jB +XB +XX +zR +Gv Sz -Un -kW -kW -rt -Sz -FO +yl +XM +yz yz yz yz @@ -16542,33 +19796,33 @@ yz yz yz yz -ad -JB -cW -dX +yz +XM +DS +cS hx -lL -JB -WR -Iv -Ah -EA -IL -sp -xe -Mm -Vm +Un XX -lq -jA -jA -Sz -ck +XX +XX +XX +XX +XX +XX +xe +XX +XX +XX +XX +XX +XX +XX +Un uJ -JJ -fk -Sz -hY +cS +DS +XM +yz yz yz yz @@ -16684,33 +19938,33 @@ yz yz yz yz -JB -ak -dd -iB -hH +yz +xx +gx +lm +fu lR -JB -no -Iv -An -EC -IZ -sp -Oi -wn -jA -Yq Ys -Yr -jA -Sz +Ys +Ys +tn +Ys +Ys +nS +Kd +VI +Ys +Ys +tn +Ys +Ys +Ys uu -na -kW -kX -SJ -Sz +lU +lm +gx +cJ +yz yz yz yz @@ -16824,37 +20078,37 @@ yz yz yz yz -FF yz -LR +yz +yz al -dg -dY -hU -lV -JB -JB -ZM -ZM -ZM -ZM -ZM +DS +DS +DS +WK +DS +DS +DS +DS +DS +DS +DS JX -ZM -ZM -ZM -ZM -ZM -Sz -Sz -Ql -sC -Rh -bJ +DS +DS +DS +DS +DS +DS +DS +WK +DS +DS +DS uE -yo yz -OY +yz +yz yz yz yz @@ -16968,33 +20222,33 @@ yz yz yz yz -ae -am -dn -ee -ik -lX -oV +yz +XM +DS +QU +iw +WK +DS sq KW -KW -KW +Pc +UY YU Wq -OE -zB -YU -KW -KW -KW +ut +Sj Kt -tp +Qb +CC +Kt +Kt +DS WK -tA -ch -pN +Mi +Hz +DS XM -lx +yz yz yz yz @@ -17110,33 +20364,33 @@ yz yz yz yz -JB -JB -iB -JB -Dx -iB -iB -iB -ZM -ZM -ZM -ZM -Kw +XM +DS +DS +Js +KD +WK +DS +FF +Kr +Kr +Kr +Kr +Wq NY -ZM -ZM -ZM -ZM -ZM +Sj +AY +kw +Ax +hF kW -kW -kW -ix -kW -kW -Sz -Sz +DS +WK +Dy +hU +DS +DS +XM yz yz yz @@ -17252,33 +20506,63 @@ yz yz yz yz -kO +<<<<<<< HEAD +ab Zo Bo -ia -ip -mb -mb -Bo +ef +iO +mj +Kk +sz ZM +Av +us +FD +sH +OS +HZ +FD +Yx +zo ZM -ED -Ao -cP -Oi -Sj -zg -ED -ZM -ZM -mJ -Ar -hP -Br +sS +Zv +xC +sW PS zc XG +aV +======= +kO +Ye +ia +Ye +DS +WK +DS +FO +Kr +Pn +ED +Ao +Wq +ut +Sj +zg +Mk +gP +hF +mJ +DS +WK +cS +Zv +Zv +Zv GJ +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg yz yz yz @@ -17394,32 +20678,32 @@ yz yz yz yz -cu -Zo -Bo +ae +Ye +gR +ia ia -ip pg -Kk -lv -ZM +Ye +FW +KK Aq Fg -FD -FD +GQ +xK OF ha -ha +QF Yt Ul -ZM +TW gk Zv +px +SG +SG +yM Zv -Br -PS -zc -XG qF yz yz @@ -17536,33 +20820,45 @@ yz yz yz yz -ab +af +Ye +<<<<<<< HEAD Zo -Bo +Gw +Kk +OU +pg +Kk +lv +ZM +AS +======= +vw ef iO mj -Kk +Ye sz -ZM +Kr Av +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg us -FD -sH +jy +Wq OS -HZ -FD +Sj +lE Yx zo -ZM -sS +Kt +Kt Zv xC sW -PS -zc -XG -aV +Xz +Yf +Zv +OV yz yz yz @@ -17675,36 +20971,59 @@ yz yz yz yz +<<<<<<< HEAD +Ye +yY +lv +Kk +OU +pg +Kk +sz +ZM +AZ +FD +FD +KM +OX +KM +FD +ZP +iy +ZM +KO +======= yz yz yz Ye -Zo -Bo -eg +cW +hs +ia iR mq -Kk -lv -ZM +Ye +GO +Kr AK Fz -FD -KJ -OT +Ti +Wq +ut Sl -FD +Kt ZC uG -ZM -Bj +sN +Kt +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg Zv SI oO SG Qz -XG -Ci +pP +Zv yz yz yz @@ -17818,39 +21137,45 @@ yz yz yz yz +ac yz -yz -Ye -Zo +ag +cY Gw Kk OU +<<<<<<< HEAD pg Kk lv +======= +kl +Ye +Ye +ZM +ZM +ZM +ZM ZM -AS -us -FD -Kb OW -Dt -FD -Yx -Pn ZM -um +ZM +ZM +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +ZM +ZM +Zv Zv oC Eo -Zv +If KT KB -Ci -yz -yz +gs yz +SX yz +PZ yz yz yz @@ -17962,33 +21287,33 @@ yz yz yz yz -Ye -yY +au +dd lv -Kk -OU -pg -Kk -sz -ZM -AZ -FD -FD +ls +rR +wC +yR +GY +ZP +ZP +ZP +uc KM OX -KM -FD +xX +uc +ZP +ZP ZP -iy -ZM KO -Zv -oC -Eo -Zv +vp +hq +CK +LW KG -KB -Ci +gp +XZ yz yz yz @@ -18105,36 +21430,36 @@ yz yz yz Ye -yY -lv -Kk -OU -pg -Kk -lv +Ye +ia +Ye +rV +ia +ia +ia +ZM +ZM +ZM +ZM ZM -hs -FD -La -La sA -La -La -Rt -Af ZM -yC -Zv -Gr +ZM +ZM +ZM +ZM +SG +SG +SG eI +SG +SG +Zv Zv -Lg -KB -Ci yz yz yz -PZ +yz yz yz yz @@ -18246,33 +21571,63 @@ yz yz yz yz -Ye -yY -lv +<<<<<<< HEAD +ab +Zo +Gw Kk OU -mr -WH -sF -wd -ZM -FJ -Jk -Jk -Pc -Jk -Jk -ZX -ZM -eH -cV -Zv -Gr +mF +ip +ip +BW +Bc +BW +Js +BW +sX +BW +VP +sX +Jf +BW +Br +Br +Br eI Zv +ZU +XG +aV +======= +ah +Zo +Bo +lx +ip +mr +mr +Bo +ZM +ZM +ZX +Jk +dZ +Oi +Qd +FS +ZX +ZM +ZM +cV +aZ +jb +PE +EF AI -KB -Ci +XG +uj +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg yz yz yz @@ -18388,33 +21743,33 @@ yz yz yz yz -Ye -yY -lv -Kk -WX +ad +Zo +Bo +lx +ip mC -IA -IA -wi +Rw +WH +ZM Bb FK -Jl -GM +VQ +VQ zs -GM +VO VO ZY FM -wi -Zi -Zi +ZM Zi +LH +LH PE -Zv +EF AI XG -Ci +jJ yz yz yz @@ -18531,31 +21886,31 @@ yz yz yz ab -Zo -Gw -Kk -OU -mF -ip -ip -BW +nq +KN +xD +xc +fp +Rw +HB +ZM Bc -BW -Js -BW -sX -BW -VP +FQ +VQ +jt sX +JH +VQ +Ay Jf -BW +ZM Br -Br -Br -eI -Zv +LH +oz +fr +dR ZU -XG +go aV yz yz @@ -18672,33 +22027,33 @@ yz yz yz yz -cu +yY Zo Bo sr Jd WV -oW -sJ -wU +Rw +WH +ZM Bf FN -Jw +VQ Lk Cn St VQ OR vt -wU +ZM cv LH GS MQ -cC +iC aD XG -qF +LM yz yz yz @@ -18813,35 +22168,67 @@ yz yz yz yz -yz -sB +<<<<<<< HEAD +ab Zo -Bo -Bo +an +WH +WH Jd +mF +so +tH +LC +SF +FR +FR +wl +Pl +xZ +On +FY +UH +nb +ZT +Jc +QT +sU +Pq +Pq +ZF +ZT +WF +======= +yz +yY +Zo +hN +Rw +gl mI -Bo -tH -tH +Rw +WH +ZM Bq FQ -Jb -Jb +VQ +bI Yd TR -TR +VQ Ay Rz -Yd -ZT -yI -QT -pz -KI -KI -ZT -eD +ZM +Gs +LH +pm +sd +LH +Dm +ZF +LM yz +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg yz yz yz @@ -18955,35 +22342,35 @@ yz yz yz yz -Sr -Zo -Zo -xA -xA -Jd -mF -az -tH -gx +yz +yY +ap +WH +Rw +gl +mI +Rw +HB +ZM SF -FR -FR -kf -Pl +VQ +VQ Sx -On +iD +Sx +VQ FY UH -HB -ZT -yp +ZM +iG +LH pm sd -wt +LH pq -ZT -ZT -Fd +ZF +LM +yz yz yz yz @@ -19097,35 +22484,35 @@ yz yz yz yz -ab -Zo -an +nY +yY +ap WH +Rw +gl +mI +Rw WH -Jd -mF -so -tH -LC -SF -FR -FR -wl -Pl +ZM +PH +VQ xZ -On -FY -UH -nb -ZT -Jc -QT +xZ +Tp +xZ +xZ +dC +hd +ZM +zO +LH +Ho sU -Pq -Pq +LH +dj ZF -ZT -WF +LM +yz yz yz yz @@ -19239,35 +22626,35 @@ yz yz yz yz -Ye +yz yY -ao +ap WH Rw -Jd -mF -aA -tH +gl +wG +dV +HE xg -SF +ZM FT -FR Lq -Pl -pI -On +Lq +pw +Lq +Lq es -UH +ZM OO -ZT -Di -QT +JF +LH +Ho sU -IF -Pq -AL -kx -TU +LH +qq +ZF +LM +yz yz yz yz @@ -19381,35 +22768,35 @@ yz yz yz yz -Ye +yz yY ap WH -eP +Rw kM mR oX -tH -xh +oX +Bp BE FX -FR -FR +RV +OB PC -On -On +OB +Yu LV NU Bp -ZT -Di +ZW +ZW ZW lz -ug -Pq -EP -kx -TU +LH +qq +XG +LM +yz yz yz yz @@ -19523,35 +22910,75 @@ yz yz yz yz -Ye -yY -lm +yz +ab +<<<<<<< HEAD +Zo +bI WH +WH +ip +mV +pd +======= +nq +<<<<<<< HEAD +au +Wo +Wo +AX +eG +aG +>>>>>>> 7f76eb5c10d... Merge pull request #12174 from Novacat/nova-basicfixes +tH +xt +BU +FR +FR +Md +Pl +Sy +On +FY +On +JZ +ZT +Wl +DJ +QT +Pq +Pq +yJ +ZT +WF +======= +hS eX iX -mT -aB -tH -xi +mZ +ip +ip +Gl BF -Ga -FR -FR -PC -On -On +Gl +iT +Gl +Vg +Gl +fe Vg TI Gl -ZT -DR -aI +PE +PE +PE ql iC -Pq -UY -kx -TU +kE +go +aV +yz +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg yz yz yz @@ -19665,35 +23092,35 @@ yz yz yz yz -Ye -yY -br -WH +yz +ad +Zo +Bo ff -ip -mV +AX +wU aE -tH +HR qJ BU GK -FR +Fl LA -Pl +ox Me -On +yU kz -On -pW -ZT +fW +qJ +OG SV DJ -QT +gV jn Bx -sf -kx -TU +XG +jJ +yz yz yz yz @@ -19807,45 +23234,35 @@ yz yz yz yz -ab -<<<<<<< HEAD +yz +aB Zo -bI -WH -WH -ip -mV -pd -======= -nq -au -Wo -Wo +Bo +Bo AX eG -aG ->>>>>>> 7f76eb5c10d... Merge pull request #12174 from Novacat/nova-basicfixes +Bo tH -xt -BU -FR -FR +tH +Qc +VC Md -Pl +Md +QP Sy -On -FY -On -JZ +Sy +Sn +sI +QP ZT Wl -DJ -QT -Pq -Pq -yJ +OA +XN +wp +wp ZT -WF +th +yz yz yz yz @@ -19962,27 +23379,27 @@ yz cu Zo Zo -aw ay -ip -mV +ay +AX +xt aH tH xv -Ce +CL FR FR Mt Pl gX On -QM -my +UT +WA Fq ZT DM -DJ -QT +Hg +Td xz HC ZT @@ -20101,35 +23518,35 @@ yz yz yz yz -yz -kO -Zo -Bo -Bo -ip +ab +nq +dg +Cx +Cx +sf mZ -Bo +Af tH -tH -CI -GO -GO -CI -Yd -TR -Wu +KS +CL +FR +FR +Uy +Pl +om +On UT -TR -Yd +WA +sR ZT PD -un +OA VJ -KI -KI -ZT +Vh +Vh +co UI -yz +fn yz yz yz @@ -20243,35 +23660,35 @@ yz yz yz yz -yz -Ye +yY +ap Dd -dp +dV fj -ip -mV +AX +xt pt -oi +tH xG CL GR -GR +FR MD -Qc +Pl GU -WE +On hV WA EB -oi -qA -oQ +ZT +Hp +OA dx Nd -PA +Pq kx TU -yz +rh yz yz yz @@ -20385,35 +23802,35 @@ yz yz yz yz -yz -Ye -Dd -ar -fj +yY +ap +dn +dV +nb jz nc pv -ta +tH xM CM Tl -Tl -Tl -Tl -Tl -Tl -Tl +FR +FR +Em +On +On +ZK Vn kG -rV +ZT Hp Sp wX +AT Pq -Pq -kx +gi TU -yz +rh yz yz yz @@ -20527,35 +23944,35 @@ yz yz yz yz -yz -Ye -Dd -dB -fj +yY +ap +dA +dV +nt jD JM -ip -Tl +Ar +tH JE Nf -Nf -Nf -Nf -Nf -Nf -Nf -Nf -Nf +VH +FR +FR +Em +On +On +Si +Xv yi -dA +ZT QT Lh Xo +Ph Pq -Pq -kx +ua TU -yz +rh yz yz yz @@ -20669,35 +24086,66 @@ yz yz yz yz +<<<<<<< HEAD +ag +bM +Cx +fx +jQ +np +pM +Cx +yj +WC +YW +HO +kt +ML +Pe +HO +YW +WC +dk +dq +gf +TF +ij +hv +dq +MZ +aC yz -Ye -Dd +======= +yY +ap +dX dV -fj +nx ip mV pG -tE +tH yf -WC -WC -WC -WC -WC -WC -WC -WC -WC +Rh +Wu +FR +FV +Pl +md +On +Wh +On Ee -tE +ZT OZ -Cq -tg +YC +OA km PA -kx +XQ TU -yz +rh +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg yz yz yz @@ -20811,35 +24259,35 @@ yz yz yz yz -yz -af +ab +nq bM Cx Cx jK nn pK -Cx +tH yj -WC -WC -YW -WC -WC -WC -YW -WC -WC +Rh +FR +FR +oo +Pl +rc +On +UT +On dk -uq +ZT ga po Rv -dq -dq -MZ -Jg -yz +Vh +Vh +LP +UI +fn yz yz yz @@ -20953,35 +24401,35 @@ yz yz yz yz -yz -ag -bM -Cx +ad +Zo +Zo +Px fx -jQ -np +ip +mV pM -Cx -yj -WC -YW -HO +tH +Lm +Rt +FR +FR kt -ML +Pl Pe -HO +On YW -WC -dk -dq +LF +bw +ZT gf -TF -ij +YC +OA hv -dq -MZ -aC -yz +qa +ZT +ZT +cR yz yz yz @@ -21097,32 +24545,32 @@ yz yz yz ah -bM -Cx -fE -jQ +Zo +Bo +Bo +ip np -pY -tX -yv -WC -HO -HO +Bo +tH +tH +tW +WE +WE tW QP -tV -HO -HO -WC -Nz -nl +Sy +pZ +Eb +Sy +QP +ZT pU -TF -ij +Mj +Cv wp -dq -MZ -ci +wp +ZT +VK yz yz yz @@ -21238,33 +24686,46 @@ yz yz yz yz -ah -bM -Cx -fP -jU -nt +yY +dY +hY +fZ +ip +mV qo tX yx -WC +RQ +Hu Hu -mH MT QR -MT +hl HH dT +<<<<<<< HEAD WC -Nz +Zx nl +pb +nq ij -LB -xU -GT +MC dq MZ ci +======= +sy +RX +tX +tv +LB +xU +GT +vn +TU +rh +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg yz yz yz @@ -21380,33 +24841,33 @@ yz yz yz yz -ai -bM -Cx -fU +yY +dY +ik +fZ jY nv -qo -tX -xO -WC -Hq -JN -MT -QS -MT +Az +Ii +LC +Sh WJ -og -WC -Nz -nl +WJ +WJ +WJ +WJ +WJ +WJ +yP +XU +sk mh LZ LJ -hS -dq -MZ -Cr +Pq +Pq +TU +rh yz yz yz @@ -21522,33 +24983,63 @@ yz yz yz yz -ah -bM -Cx -fZ -Yk -Is -qo -tX -xO +<<<<<<< HEAD +pO +vK +Cf +gh +Nq +qP +qz +vK +Ok WC Hu -JN -MU -QX -SZ -WJ +GZ +MT +Jx +MT +EG dT WC Zx nl -pb +aQ nq ij -MC +aQ dq MZ -ci +Jg +======= +yY +dY +ix +fZ +Yk +Is +ip +WJ +LR +SZ +SZ +SZ +SZ +SZ +SZ +SZ +SZ +SZ +Zx +Ck +OA +Se +Zw +Pq +Pq +TU +rh +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg yz yz yz @@ -21664,33 +25155,45 @@ yz yz yz yz -ah -bM -bM -bM -bM -nz -bM -bM -xO +yY +dY +jv +fZ +ip +mV +AS +Ip +My WC -Hq -JN -MU -Eq -SZ -WJ -og WC +<<<<<<< HEAD Zx nl -dq -zb -PG -dq +cO +nq +ij +Mb dq MZ ci +======= +WC +WC +WC +WC +WC +WC +WC +TQ +Ip +Zc +zb +PG +SO +vn +TU +rh +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg yz yz yz @@ -21806,30 +25309,51 @@ yz yz yz yz -pO +<<<<<<< HEAD +PO vK Cf -gh +rO +av +nB +FP +vK +xO +======= +aG +TD +Cf +Cf Nq qP qz -vK +Cf Ok +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg WC -Hu -GZ -MT -Jx -MT -EG -dT WC +<<<<<<< HEAD Zx nl -aQ +NJ nq ij +NJ +======= +GZ +WC +WC +WC +GZ +WC +WC +Mr +RN aQ +hQ +wI +dq +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg dq MZ Jg @@ -21948,33 +25472,40 @@ yz yz yz yz -PO +<<<<<<< HEAD +nr vK +vK +gF +======= +PO +ee iz +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg rO ON qy qD -vK -xO +Cf +Ok WC -HO +GZ HO Ng Rc Du HO -HO +GZ WC -Zx -nl -cO -nq -ij -Mb +Mr dq -MZ -ci +cO +iY +Jh +Mb +ir +hb +Iu yz yz yz @@ -22090,30 +25621,49 @@ yz yz yz yz +<<<<<<< HEAD PO vK +vK +gW +TG +BM +Vq +vK +xO +======= +Om +TD Cf -rO +rN av nB FP -vK -xO +Jx +MC +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg WC HO HO yg HK -yg +Il HO HO WC -Zx +<<<<<<< HEAD +aK +Sh +ij +nq +======= +Mx nl NJ -nq +TF +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg ij -NJ +YS dq MZ ci @@ -22232,33 +25782,42 @@ yz yz yz yz -nr +<<<<<<< HEAD +PO vK vK +hj +db +vK +======= +Om +TD +Cf gF -rO +sF Vq -Vq -vK -xO +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +Xw +Jx +ML WC -HO -HO -WC -WC -WC -HO -HO +CH +AC +mv +Mq +mv +sM +gQ WC Mx -dq -wZ +nl +ij gZ CP wZ dq MZ -Cr +ci yz yz yz @@ -22374,33 +25933,33 @@ yz yz yz yz -PO -vK -vK +br +TD +Cf gW TG BM -Vq -vK +Xw +Jx xO WC -ax -HO -WC -WC -WC -HO +QE +fV +mv +mg +mv +Za QV WC -aK -Sh -ij -nq -ij -ij +Mx +nl +Ad +gq +qc +YZ dq MZ -ci +iF yz yz yz @@ -22457,150 +26016,38 @@ yz yz yz yz +<<<<<<< HEAD +Om +vK +rM +hk +eO +bv +cH +vK +yD +QE +QE +QE +QE +QE +QE +QE +QE +QE +Ff +dq +vb +iW +LJ +vb +dq +MZ +aC +======= "} (98,1,1) = {" -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -PO -vK -vK -hj -db -vK -Xw -vK -yB -WC -WC -WC -WC -WC -WC -WC -WC -WC -zr -dq -mN -SB -tx -mN -dq -MZ -ci -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -"} -(99,1,1) = {" +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg yz yz yz @@ -22659,32 +26106,204 @@ yz yz yz Om -vK -rM -hk -eO -bv -cH -vK -yD -QE -QE -QE -QE -QE -QE -QE -QE -QE +TD +Cf +hj +db +qy +Xw +Jx +xO +WC +CH +fV +Vd +vo +pD +Za +gQ +WC Ff -dq -vb -iW -LJ -vb +nl +mN +TF +ij +kQ dq MZ -aC +ci +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +<<<<<<< HEAD +pO +vK +vK +hj +rr +vK +pr +vK +yX +CH +CH +CH +CH +CH +CH +CH +CH +CH +yX +MZ +dq +ij +ij +dq +MZ +MZ +Jg +======= +"} +(99,1,1) = {" +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +Om +TD +TD +TD +TD +bv +TD +TD +xO +WC +QE +fV +Vd +WP +pD +Za +QV +WC +Ff +nl +dq +iW +rn +dq +dq +MZ +ci yz yz yz @@ -22745,6 +26364,34 @@ yz (100,1,1) = {" yz yz +<<<<<<< HEAD +vK +vK +rp +SN +tZ +Bl +vK +ib +za +za +za +za +za +za +za +za +za +ib +MZ +dq +jv +ij +dq +MZ +MZ +======= +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg yz yz yz @@ -22802,30 +26449,30 @@ yz yz pO vK -vK -hj +jQ +nz rr -vK +ya pr vK yX +WC CH -CH -CH -CH -CH -CH -CH -CH -CH -yX -MZ -dq -ij +xq +mv +Dp +mv +yr +gQ +WC +Ff +nl +ky +TF ij +ky dq MZ -MZ Jg yz yz @@ -22909,6 +26556,16 @@ yz yz yz yz +<<<<<<< HEAD +MZ +MZ +GY +GY +MZ +MZ +YO +======= +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg yz yz yz @@ -22942,33 +26599,33 @@ yz yz yz yz -yz -vK +bJ vK +jU rp SN tZ Bl vK -ib +xO +WC +HO +HO za -za -za -za -za -za -za -za -za -ib -MZ -dq -jv +GE +nU +HO +HO +WC +Ff +nl +FG +TF ij +NN dq MZ -MZ -yz +ci yz yz yz @@ -23065,51 +26722,15 @@ yz yz yz yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -dW -vK -vK -wh -tZ -UD -vK -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz +<<<<<<< HEAD +MZ MZ MZ -GY -GY MZ MZ YO +======= +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg yz yz yz @@ -23129,6 +26750,51 @@ yz yz yz yz +bJ +dW +kg +nC +wh +yo +UD +vK +xO +WC +HO +HO +WT +eJ +WT +HO +HO +WC +Ff +nl +Gu +TF +ij +Gu +dq +MZ +ci +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz yz yz yz @@ -23223,37 +26889,45 @@ yz yz yz yz -yz -yz -yz -yz -yz -dW -vK -vK -tZ -VN -vK -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -MZ -MZ +<<<<<<< HEAD +Cr MZ MZ MZ YO +======= +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg yz yz yz +ca +eH +vK +nM +rp +VN +VN +vK +xO +WC +HO +HO +WC +WC +WC +HO +HO +WC +ts +dq +Je +bG +II +Je +dq +MZ +iF +yz yz yz yz @@ -23368,44 +27042,51 @@ yz yz yz yz -yz -yz -yz -dW +bJ +eH vK +oi +ta +yv +VN vK -ej -vK -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz +xO +WC +WF +HO +WC +WC +WC +HO +ys +WC +xo Cr +ij +TF +ij +ij +dq MZ +ci +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +<<<<<<< HEAD +CR MZ MZ YO -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz +======= +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg yz yz yz @@ -23510,64 +27191,70 @@ yz yz yz yz -yz -yz -yz -yz -dW +bJ +eH +vK +oV +tp vK pE -OM -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -CR +vK +Nk +WC +WC +WC +WC +WC +WC +WC +WC +WC +bn +dq +hc +KF +ZQ +hc +dq MZ +ci +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +<<<<<<< HEAD +ci MZ YO -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz +======= +>>>>>>> c55e7a1c3b... Merge pull request #14538 from KillianKirilenko/kk-vbupg yz yz yz @@ -23652,33 +27339,33 @@ yz yz yz yz -yz -yz -yz -yz -yz -dW -PO -PO -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -ci -MZ +ch +fk +kL +pA +tx +yB +CR +vK +Nu +Sr +Sr +Sr +Sr +Sr +Sr +Sr +Sr +Sr +ml +dq +yF YO -yz -yz -yz -yz -yz +ue +ft +ir +hb +Iu yz yz yz @@ -23794,33 +27481,33 @@ yz yz yz yz -yz -yz -yz -yz -yz -yz -PO -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz +pO +vK +vK +oV +tA +vK +CZ +vK +Of +SA +SA +SA +SA +SA +SA +SA +SA +SA +Of +MZ aC -yz -yz -yz -yz -yz -yz +YK +ij +dq +MZ +MZ +Jg yz yz yz @@ -23937,31 +27624,31 @@ yz yz yz yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz +vK +vK +pN +tE +yD +Dt +vK +OE +SB +SB +SB +SB +SB +SB +SB +SB +SB +OE +MZ +wM +is +ij +dq +MZ +MZ yz yz yz @@ -24079,6 +27766,13 @@ yz yz yz yz +fE +vK +vK +uq +yD +Dx +vK yz yz yz @@ -24090,20 +27784,13 @@ yz yz yz yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz +MZ +Gn +gT +gT +MZ +MZ +bB yz yz yz @@ -24222,6 +27909,12 @@ yz yz yz yz +fE +vK +vK +yD +DQ +vK yz yz yz @@ -24233,18 +27926,12 @@ yz yz yz yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz +MZ +Gn +MZ +MZ +MZ +bB yz yz yz @@ -24365,6 +28052,11 @@ yz yz yz yz +fE +vK +vK +Ed +vK yz yz yz @@ -24376,16 +28068,11 @@ yz yz yz yz -yz -yz -yz -yz -yz -yz -yz -yz -yz -yz +iF +Gn +MZ +MZ +bB yz yz yz @@ -24508,6 +28195,10 @@ yz yz yz yz +fE +vK +Eq +JG yz yz yz @@ -24519,14 +28210,10 @@ yz yz yz yz -yz -yz -yz -yz -yz -yz -yz -yz +RU +Gn +MZ +bB yz yz yz @@ -24651,6 +28338,9 @@ yz yz yz yz +fE +bJ +bJ yz yz yz @@ -24662,12 +28352,9 @@ yz yz yz yz -yz -yz -yz -yz -yz -yz +ci +Gn +bB yz yz yz @@ -24794,6 +28481,7 @@ yz yz yz yz +bJ yz yz yz @@ -24807,8 +28495,7 @@ yz yz yz yz -yz -yz +ra yz yz yz