From 19dcb033c3de05066a0f294619240aedd2510736 Mon Sep 17 00:00:00 2001
From: TDSSS <32099540+TDSSS@users.noreply.github.com>
Date: Tue, 25 Aug 2020 20:19:25 +0200
Subject: [PATCH 1/9] Initial commit

---
 _maps/map_files/shuttles/admin_armory.dmm | 157 ++++++++++++++++++++++
 code/datums/shuttles.dm                   |   5 +
 2 files changed, 162 insertions(+)
 create mode 100644 _maps/map_files/shuttles/admin_armory.dmm

diff --git a/_maps/map_files/shuttles/admin_armory.dmm b/_maps/map_files/shuttles/admin_armory.dmm
new file mode 100644
index 00000000000..b5a33c56490
--- /dev/null
+++ b/_maps/map_files/shuttles/admin_armory.dmm
@@ -0,0 +1,157 @@
+"ae" = (/obj/structure/sign/securearea,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall4"; tag = "icon-swall14"},/area/shuttle/administration)
+"al" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/table/reinforced,/obj/item/folder,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"aI" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/recharger,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"aP" = (/obj/machinery/vending/security,/obj/machinery/light/spot{dir = 8; icon_state = "tube1"; tag = "icon-tube1 (WEST)"},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"bi" = (/obj/machinery/recharger/wallcharger{pixel_y = 25},/obj/machinery/recharger/wallcharger{pixel_y = 35},/obj/structure/table/reinforced,/obj/item/storage/firstaid,/obj/item/storage/firstaid/brute,/obj/item/storage/box/bodybags,/obj/item/storage/firstaid/surgery,/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"bm" = (/obj/structure/shuttle/window{dir = 8; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (WEST)"},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"bn" = (/obj/structure/shuttle/window{dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (EAST)"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/space,/area/shuttle/administration)
+"ce" = (/obj/machinery/autolathe/upgraded{hacked = 1},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"cV" = (/obj/structure/closet/emcloset,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"de" = (/obj/machinery/suit_storage_unit/security/secure,/obj/machinery/light/spot,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"df" = (/obj/structure/rack,/obj/item/storage/box/buck{pixel_x = -3; pixel_y = 3},/obj/item/storage/box/buck,/obj/structure/window/reinforced,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"dn" = (/obj/machinery/computer/camera_advanced/shuttle_docker/admin{name = "NRV Sparta navigation computer"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"dH" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/item/gun/energy/gun,/obj/item/gun/energy/gun{pixel_x = 3; pixel_y = -3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"dP" = (/obj/machinery/recharge_station/upgraded,/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"ee" = (/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_mid"; tag = "icon-window5_mid"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"eI" = (/obj/machinery/turretid/stun{check_access = 0; name = "Shuttle Turret Control"; pixel_y = 30},/obj/structure/table/reinforced,/obj/item/folder,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"eL" = (/obj/structure/chair{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"fo" = (/obj/structure/chair{dir = 1},/obj/machinery/light/spot,/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"fF" = (/obj/machinery/light/spot{dir = 4; icon_state = "tube1"; tag = "icon-tube1 (EAST)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"fQ" = (/obj/structure/chair/comfy/shuttle{dir = 1},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"gd" = (/obj/machinery/door/airlock/shuttle,/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"gh" = (/obj/structure/chair/comfy/shuttle{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"gj" = (/obj/machinery/computer/communications{name = "NRV Sparta Communications Console"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"hN" = (/obj/structure/chair{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"ig" = (/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/shuttle/window{dir = 1; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (NORTH)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"ir" = (/obj/structure/closet/emcloset,/obj/machinery/light/spot{dir = 1; icon_state = "tube1"; tag = "icon-tube1 (NORTH)"},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"jn" = (/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"jB" = (/obj/structure/table/reinforced,/obj/item/storage/lockbox/mindshield,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"jU" = (/obj/machinery/suit_storage_unit/security/secure,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"kf" = (/obj/structure/sign/securearea,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall8"; tag = "icon-swall12"},/area/shuttle/administration)
+"mw" = (/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"mM" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall13"},/area/shuttle/administration)
+"mS" = (/obj/structure/shuttle/window{dir = 8; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (WEST)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"nG" = (/obj/structure/shuttle/window{dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_mid"; tag = "icon-window5 (EAST)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"nI" = (/turf/simulated/shuttle/wall{icon_state = "swall8"},/area/shuttle/administration)
+"oj" = (/obj/structure/chair/comfy/shuttle{dir = 1},/obj/machinery/light/spot,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"oR" = (/obj/machinery/porta_turret{installation = /obj/item/gun/energy/gun},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"oY" = (/obj/structure/chair,/obj/machinery/light/spot{dir = 1; icon_state = "tube1"; tag = "icon-tube1 (NORTH)"},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"pa" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall11"},/area/shuttle/administration)
+"pK" = (/obj/structure/shuttle/engine/propulsion{dir = 4; icon_state = "propulsion"},/turf/simulated/shuttle/plating,/area/shuttle/administration)
+"pQ" = (/obj/structure/chair{dir = 8},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"qQ" = (/obj/machinery/recharger/wallcharger{pixel_y = 25},/obj/machinery/recharger/wallcharger{pixel_y = 35},/obj/machinery/light/spot{dir = 1; icon_state = "tube1"; tag = "icon-tube1 (NORTH)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"rb" = (/obj/machinery/door/window/brigdoor/southleft{req_one_access_txt = "2;19"},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"rx" = (/obj/machinery/mech_bay_recharge_port/upgraded/unsimulated,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"sq" = (/obj/structure/table/reinforced,/obj/item/kitchen/knife/combat{pixel_x = -3; pixel_y = 3},/obj/item/kitchen/knife/combat,/obj/item/kitchen/knife/combat{pixel_x = 3; pixel_y = -3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"tx" = (/obj/machinery/sleeper/upgraded{dir = 4},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"ty" = (/obj/structure/shuttle/window{dir = 1; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (NORTH)"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"ua" = (/obj/structure/chair{dir = 8},/obj/machinery/door_control{dir = 4; id = "Asclshutters"; name = "remote shutter control"; pixel_x = -5; pixel_y = 35; req_access = list(101); req_access_txt = "0"},/obj/machinery/keycard_auth{pixel_y = 24},/obj/machinery/door_control{dir = 2; id = "asclblast"; name = "blast door control"; pixel_x = 5; pixel_y = 35; pixel_z = 0; req_access = list(101); req_access_txt = "0"},/obj/structure/chair/comfy/shuttle{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"uz" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall4"; tag = "icon-swall14"},/area/shuttle/administration)
+"uW" = (/obj/structure/shuttle/engine/heater{dir = 4; icon_state = "heater"},/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/plating,/area/shuttle/administration)
+"uY" = (/obj/structure/window/reinforced,/obj/structure/table/reinforced,/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"vk" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall_s6"},/area/shuttle/administration)
+"vy" = (/obj/structure/table/reinforced,/obj/item/stack/sheet/metal/fifty,/obj/item/stack/sheet/glass/fifty,/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"vA" = (/obj/structure/chair/comfy/shuttle,/obj/machinery/light/spot{dir = 1; icon_state = "tube1"; tag = "icon-tube1 (NORTH)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"vW" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/storage/box/handcuffs,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"wG" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/item/clothing/suit/armor/bulletproof{pixel_x = 0; pixel_y = 0},/obj/item/clothing/head/helmet/alt,/obj/item/clothing/suit/armor/bulletproof{pixel_x = 0; pixel_y = 0},/obj/item/clothing/head/helmet/alt,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"wH" = (/obj/machinery/light/spot{dir = 8; icon_state = "tube1"; tag = "icon-tube1 (WEST)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"wQ" = (/obj/structure/shuttle/window{dir = 8; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (WEST)"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/space,/area/shuttle/administration)
+"xm" = (/obj/structure/table/reinforced,/obj/item/clothing/mask/breath{pixel_x = 3; pixel_y = -3},/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath{pixel_x = -3; pixel_y = 3},/obj/item/flashlight,/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"xF" = (/obj/structure/rack,/obj/item/storage/box/buck{pixel_x = -3; pixel_y = 3},/obj/item/storage/box/buck,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"xG" = (/obj/structure/shuttle/window{dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (EAST)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"xK" = (/obj/structure/sign/nosmoking_2,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall3"; tag = "icon-swall3"},/area/shuttle/administration)
+"xQ" = (/obj/structure/chair{dir = 4},/obj/machinery/light/spot{dir = 1; icon_state = "tube1"; tag = "icon-tube1 (NORTH)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"xU" = (/obj/structure/table/reinforced,/obj/item/stack/sheet/metal/fifty,/obj/item/stack/sheet/glass/fifty,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"xZ" = (/turf/space,/area/shuttle/administration)
+"yg" = (/obj/structure/table/reinforced,/obj/machinery/door/window/brigdoor/eastleft{name = "Armory"; req_access_txt = "3"},/obj/machinery/door/window/brigdoor/westleft{name = "Armory},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"yF" = (/obj/machinery/status_display,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall3"},/area/shuttle/administration)
+"yH" = (/obj/structure/table/reinforced,/obj/machinery/door/window/brigdoor/eastleft{name = "Armory"; req_access_txt = "3"},/obj/machinery/door/window/brigdoor/westleft{name = "Armory"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"zY" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall14"},/area/shuttle/administration)
+"AH" = (/obj/machinery/mech_bay_recharge_port/upgraded/unsimulated,/obj/machinery/light/spot,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Bc" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 8},/obj/item/shield/riot,/obj/item/shield/riot{pixel_x = 2; pixel_y = -4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Bj" = (/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Bn" = (/obj/machinery/door/window/brigdoor/southleft{req_one_access_txt = "2;19"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Bq" = (/obj/structure/sign/nosmoking_2,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall1"; tag = "icon-swall1"},/area/shuttle/administration)
+"Cl" = (/obj/structure/table/reinforced,/obj/item/storage/toolbox/emergency{pixel_x = -3; pixel_y = 3},/obj/item/storage/toolbox/mechanical,/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"Dp" = (/obj/machinery/porta_turret{installation = /obj/item/gun/energy/gun},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Du" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/item/gun/energy/gun,/obj/item/gun/energy/gun{pixel_x = 3; pixel_y = -3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"DZ" = (/obj/structure/chair{dir = 4},/obj/machinery/light/spot,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Ea" = (/obj/structure/table/reinforced,/obj/item/paper_bin/nanotrasen,/obj/item/pen,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"EQ" = (/obj/machinery/door/airlock/shuttle/glass,/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"Fd" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/gun/energy/gun,/obj/item/gun/energy/gun{pixel_x = 3; pixel_y = -3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Fo" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/item/gun/energy/immolator/multi{pixel_y = -3},/obj/item/gun/energy/immolator/multi,/obj/item/gun/energy/immolator/multi{pixel_y = 3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"FF" = (/obj/structure/sign/poster/official/enlist,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall12"},/area/shuttle/administration)
+"FT" = (/obj/structure/rack,/obj/item/storage/box/buck{pixel_x = -3; pixel_y = 3},/obj/item/storage/box/buck,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Gn" = (/obj/item/gun/projectile/shotgun/riot{pixel_x = -3; pixel_y = 3},/obj/item/gun/projectile/shotgun/riot,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/rack,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Gs" = (/obj/structure/shuttle/window{dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_mid"; tag = "icon-window5 (EAST)"},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Gx" = (/obj/structure/fans/tiny,/obj/machinery/door/airlock/external,/obj/docking_port/mobile{dir = 2; dwidth = 9; height = 18; id = "admin"; name = "armory"; roundstart_move = "cc_bay_1"; timid = 1; width = 19},/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "asclblast"; name = "Blast Door"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Gy" = (/obj/structure/chair{dir = 1},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"GK" = (/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end"},/obj/structure/grille,/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Hc" = (/obj/machinery/porta_turret{installation = /obj/item/gun/energy/gun},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"Hl" = (/obj/machinery/recharger/wallcharger{pixel_y = 25},/obj/machinery/recharger/wallcharger{pixel_y = 35},/obj/structure/chair/comfy/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"HN" = (/obj/structure/sign/poster/official/do_not_question,/obj/item/tank/emergency_oxygen/engi,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall3"},/area/shuttle/administration)
+"Ir" = (/obj/machinery/computer/shuttle/admin{name = "NRV Sparta shuttle console"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"IC" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall3"},/area/shuttle/administration)
+"JC" = (/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_mid"; tag = "icon-window5_mid"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Ke" = (/obj/machinery/door/window/brigdoor/southright{req_one_access_txt = "2;19"},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"Kh" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Ki" = (/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 4},/obj/item/clothing/suit/armor/bulletproof{pixel_x = 0; pixel_y = 0},/obj/structure/rack,/obj/item/clothing/head/helmet/alt,/obj/item/clothing/suit/armor/bulletproof{pixel_x = 0; pixel_y = 0},/obj/item/clothing/head/helmet/alt,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"KM" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall7"},/area/shuttle/administration)
+"Lh" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/gun/energy/ionrifle{pixel_x = 3; pixel_y = 3},/obj/item/gun/energy/ionrifle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"LK" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"LP" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall_s9"},/area/shuttle/administration)
+"Mi" = (/obj/structure/table/reinforced,/obj/machinery/recharger,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Mj" = (/obj/structure/table/reinforced,/obj/item/rcd_ammo{pixel_x = -3; pixel_y = 3},/obj/item/rcd/preloaded,/obj/item/rcd_ammo,/obj/item/rcd_ammo{pixel_x = 3; pixel_y = -3},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"Mo" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 8},/obj/item/clothing/suit/armor/bulletproof{pixel_x = 0; pixel_y = 0},/obj/item/clothing/head/helmet/alt,/obj/item/clothing/suit/armor/bulletproof{pixel_x = 0; pixel_y = 0},/obj/item/clothing/head/helmet/alt,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Mw" = (/obj/structure/table/reinforced,/obj/item/storage/box/donkpockets,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"MN" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall12"},/area/shuttle/administration)
+"MZ" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall3"; tag = "icon-swall3"},/area/shuttle/administration)
+"Ni" = (/obj/item/gun/projectile/shotgun/riot{pixel_x = -3; pixel_y = 3},/obj/item/gun/projectile/shotgun/riot,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/rack,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"NF" = (/obj/structure/sign/poster/official/here_for_your_safety,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall3"; tag = "icon-swall3"},/area/shuttle/administration)
+"NQ" = (/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Op" = (/obj/structure/chair/comfy/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Ou" = (/obj/machinery/autolathe/upgraded{hacked = 1},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"Pe" = (/obj/machinery/door/window/brigdoor/southright{req_one_access_txt = "2;19"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Pn" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 4},/obj/item/clothing/suit/armor/riot,/obj/item/clothing/suit/armor/riot{pixel_x = 3; pixel_y = -3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"PL" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall_s10"},/area/shuttle/administration)
+"PS" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 8},/obj/item/gun/energy/gun/nuclear{pixel_y = -3},/obj/item/gun/energy/gun/nuclear,/obj/item/gun/energy/gun/nuclear{pixel_y = 3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"PV" = (/obj/structure/rack,/obj/item/gun/energy/sniperrifle{pixel_y = -4},/obj/item/gun/energy/sniperrifle,/obj/item/gun/energy/sniperrifle{pixel_y = 3},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Ri" = (/obj/structure/shuttle/window{dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (EAST)"},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Ry" = (/obj/structure/shuttle/window{dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_mid"; tag = "icon-window5 (EAST)"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/space,/area/shuttle/administration)
+"RM" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall8"; tag = "icon-swall12"},/area/shuttle/administration)
+"RV" = (/obj/structure/shuttle/window{dir = 1; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (NORTH)"},/obj/structure/grille,/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"TC" = (/obj/structure/shuttle/window{dir = 1; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (NORTH)"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"TD" = (/obj/machinery/door/airlock/command{name = "Command Center"; req_access = null; req_access_txt = "19"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"TF" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/item/storage/fancy/donut_box,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"TJ" = (/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_mid"; tag = "icon-window5_mid"},/obj/structure/grille,/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Un" = (/obj/structure/table/reinforced,/obj/machinery/recharger/wallcharger{pixel_y = 25},/obj/machinery/recharger/wallcharger{pixel_y = 35},/obj/item/tank/emergency_oxygen/engi{pixel_x = 3; pixel_y = -3},/obj/item/tank/emergency_oxygen/engi,/obj/item/tank/emergency_oxygen/engi{pixel_x = -3; pixel_y = 3},/obj/machinery/light/spot{dir = 8; icon_state = "tube1"; tag = "icon-tube1 (WEST)"},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"Ur" = (/obj/machinery/porta_turret{installation = /obj/item/gun/energy/gun},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"UR" = (/obj/machinery/status_display,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall12"},/area/shuttle/administration)
+"UX" = (/obj/structure/fans/tiny,/obj/machinery/door/airlock/external,/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "asclblast"; name = "Blast Door"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Vc" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall_s5"},/area/shuttle/administration)
+"Vg" = (/obj/structure/table/reinforced,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"VC" = (/obj/machinery/door/airlock/shuttle{name = "Shuttle Armory"; req_access_txt = "3"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"VQ" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/item/gun/energy/gun/advtaser{pixel_x = 3; pixel_y = -3},/obj/item/gun/energy/gun/advtaser{pixel_x = 0; pixel_y = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"WV" = (/obj/structure/table/reinforced,/obj/item/restraints/handcuffs{pixel_x = 3; pixel_y = -3},/obj/item/restraints/handcuffs,/obj/item/restraints/handcuffs{pixel_x = -3; pixel_y = 3},/obj/machinery/light/spot{dir = 4; icon_state = "tube1"; tag = "icon-tube1 (EAST)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"XL" = (/obj/item/gun/projectile/shotgun/riot{pixel_x = -3; pixel_y = 3},/obj/item/gun/projectile/shotgun/riot,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/rack,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+
+(1,1,1) = {"
+vkMNNQJCtyMNzYRMUXGxuzzYMNNQeeigMNPLxZ
+MZUnmwmwmwbinGoYmwmwoYMZKhKhKhKhfFKMPL
+HNxmmwmwmwClnGmwmwmwmwBqwHdHDuFdKhuWpK
+ICMjmwmwmwvynGmwmwmwmwygeLMowGKiKhuWpK
+ICaPmwmwmwOuxGmwmwmwmwVCKhKhKhKhfFKMLP
+ICdPmwmwmwmwgdmwmwmwmwyHeLFTdfxFKhICxZ
+ICtxmwGyfomwmSUrmwmwHcyFKhNiGnXLKhICxZ
+KMMNMNMNzYMNmMkfEQEQaepawHKhKhKhfFKMPL
+wQeIuaqQMZcVxQvWmwmwirbmPVKhKhKhKhuWpK
+RyIrghKhTDKhKhalmwmwpQGsPSKhKhKhKhuWpK
+RydnghKhbmKhhNaImwmwpQRiFoKhKhKhsqKMLP
+bngjghKhRiKhKhLKmwmwpQMZwHKhKhKhWVICxZ
+KMMNFFURnIBnPeTFrbKeuYMZVQLhKhKhxUICxZ
+ICvAOpOpHlKhKhKhKhKhKhxKBcPnKhKhceKMPL
+ICKhKhKhKhKhKhKhKhKhKhVCKhKhKhKhjBuWpK
+IChNEaMweLKhKhKhKhKhKhNFrxKhKhKhjUuWpK
+ICDZVgMieLfQojfQoRDpojMZAHKhKhKhdeKMLP
+VcMNBjTJRVMNMNMNjnTCMNmMMNGKTJRVMNLPxZ
+"}
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index 4d6310041e5..dacc08dee31 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -133,3 +133,8 @@
 	suffix = "admin"
 	name = "NTV Argos"
 	description = "Default Admin ship. An older ship used for special operations."
+
+/datum/map_template/shuttle/admin/armory
+	suffix = "armory"
+	name = "NRV Sparta"
+	description = "Armory Shuttle, with plenty of guns to hand out and some general supplies."

From 911ae6da1806f702c396942f642c3289a7847097 Mon Sep 17 00:00:00 2001
From: TDSSS <32099540+TDSSS@users.noreply.github.com>
Date: Tue, 25 Aug 2020 21:09:57 +0200
Subject: [PATCH 2/9] Map converted

---
 _maps/map_files/shuttles/admin_armory.dmm | 826 ++++++++++++++++++----
 1 file changed, 669 insertions(+), 157 deletions(-)

diff --git a/_maps/map_files/shuttles/admin_armory.dmm b/_maps/map_files/shuttles/admin_armory.dmm
index b5a33c56490..6ed10136861 100644
--- a/_maps/map_files/shuttles/admin_armory.dmm
+++ b/_maps/map_files/shuttles/admin_armory.dmm
@@ -1,157 +1,669 @@
-"ae" = (/obj/structure/sign/securearea,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall4"; tag = "icon-swall14"},/area/shuttle/administration)
-"al" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/table/reinforced,/obj/item/folder,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"aI" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/recharger,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"aP" = (/obj/machinery/vending/security,/obj/machinery/light/spot{dir = 8; icon_state = "tube1"; tag = "icon-tube1 (WEST)"},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"bi" = (/obj/machinery/recharger/wallcharger{pixel_y = 25},/obj/machinery/recharger/wallcharger{pixel_y = 35},/obj/structure/table/reinforced,/obj/item/storage/firstaid,/obj/item/storage/firstaid/brute,/obj/item/storage/box/bodybags,/obj/item/storage/firstaid/surgery,/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"bm" = (/obj/structure/shuttle/window{dir = 8; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (WEST)"},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"bn" = (/obj/structure/shuttle/window{dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (EAST)"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/space,/area/shuttle/administration)
-"ce" = (/obj/machinery/autolathe/upgraded{hacked = 1},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"cV" = (/obj/structure/closet/emcloset,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"de" = (/obj/machinery/suit_storage_unit/security/secure,/obj/machinery/light/spot,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"df" = (/obj/structure/rack,/obj/item/storage/box/buck{pixel_x = -3; pixel_y = 3},/obj/item/storage/box/buck,/obj/structure/window/reinforced,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"dn" = (/obj/machinery/computer/camera_advanced/shuttle_docker/admin{name = "NRV Sparta navigation computer"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"dH" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/item/gun/energy/gun,/obj/item/gun/energy/gun{pixel_x = 3; pixel_y = -3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"dP" = (/obj/machinery/recharge_station/upgraded,/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"ee" = (/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_mid"; tag = "icon-window5_mid"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"eI" = (/obj/machinery/turretid/stun{check_access = 0; name = "Shuttle Turret Control"; pixel_y = 30},/obj/structure/table/reinforced,/obj/item/folder,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"eL" = (/obj/structure/chair{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"fo" = (/obj/structure/chair{dir = 1},/obj/machinery/light/spot,/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"fF" = (/obj/machinery/light/spot{dir = 4; icon_state = "tube1"; tag = "icon-tube1 (EAST)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"fQ" = (/obj/structure/chair/comfy/shuttle{dir = 1},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"gd" = (/obj/machinery/door/airlock/shuttle,/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"gh" = (/obj/structure/chair/comfy/shuttle{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"gj" = (/obj/machinery/computer/communications{name = "NRV Sparta Communications Console"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"hN" = (/obj/structure/chair{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"ig" = (/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/shuttle/window{dir = 1; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (NORTH)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"ir" = (/obj/structure/closet/emcloset,/obj/machinery/light/spot{dir = 1; icon_state = "tube1"; tag = "icon-tube1 (NORTH)"},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"jn" = (/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"jB" = (/obj/structure/table/reinforced,/obj/item/storage/lockbox/mindshield,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"jU" = (/obj/machinery/suit_storage_unit/security/secure,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"kf" = (/obj/structure/sign/securearea,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall8"; tag = "icon-swall12"},/area/shuttle/administration)
-"mw" = (/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"mM" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall13"},/area/shuttle/administration)
-"mS" = (/obj/structure/shuttle/window{dir = 8; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (WEST)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"nG" = (/obj/structure/shuttle/window{dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_mid"; tag = "icon-window5 (EAST)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"nI" = (/turf/simulated/shuttle/wall{icon_state = "swall8"},/area/shuttle/administration)
-"oj" = (/obj/structure/chair/comfy/shuttle{dir = 1},/obj/machinery/light/spot,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"oR" = (/obj/machinery/porta_turret{installation = /obj/item/gun/energy/gun},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"oY" = (/obj/structure/chair,/obj/machinery/light/spot{dir = 1; icon_state = "tube1"; tag = "icon-tube1 (NORTH)"},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"pa" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall11"},/area/shuttle/administration)
-"pK" = (/obj/structure/shuttle/engine/propulsion{dir = 4; icon_state = "propulsion"},/turf/simulated/shuttle/plating,/area/shuttle/administration)
-"pQ" = (/obj/structure/chair{dir = 8},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"qQ" = (/obj/machinery/recharger/wallcharger{pixel_y = 25},/obj/machinery/recharger/wallcharger{pixel_y = 35},/obj/machinery/light/spot{dir = 1; icon_state = "tube1"; tag = "icon-tube1 (NORTH)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"rb" = (/obj/machinery/door/window/brigdoor/southleft{req_one_access_txt = "2;19"},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"rx" = (/obj/machinery/mech_bay_recharge_port/upgraded/unsimulated,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"sq" = (/obj/structure/table/reinforced,/obj/item/kitchen/knife/combat{pixel_x = -3; pixel_y = 3},/obj/item/kitchen/knife/combat,/obj/item/kitchen/knife/combat{pixel_x = 3; pixel_y = -3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"tx" = (/obj/machinery/sleeper/upgraded{dir = 4},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"ty" = (/obj/structure/shuttle/window{dir = 1; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (NORTH)"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"ua" = (/obj/structure/chair{dir = 8},/obj/machinery/door_control{dir = 4; id = "Asclshutters"; name = "remote shutter control"; pixel_x = -5; pixel_y = 35; req_access = list(101); req_access_txt = "0"},/obj/machinery/keycard_auth{pixel_y = 24},/obj/machinery/door_control{dir = 2; id = "asclblast"; name = "blast door control"; pixel_x = 5; pixel_y = 35; pixel_z = 0; req_access = list(101); req_access_txt = "0"},/obj/structure/chair/comfy/shuttle{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"uz" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall4"; tag = "icon-swall14"},/area/shuttle/administration)
-"uW" = (/obj/structure/shuttle/engine/heater{dir = 4; icon_state = "heater"},/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/plating,/area/shuttle/administration)
-"uY" = (/obj/structure/window/reinforced,/obj/structure/table/reinforced,/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"vk" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall_s6"},/area/shuttle/administration)
-"vy" = (/obj/structure/table/reinforced,/obj/item/stack/sheet/metal/fifty,/obj/item/stack/sheet/glass/fifty,/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"vA" = (/obj/structure/chair/comfy/shuttle,/obj/machinery/light/spot{dir = 1; icon_state = "tube1"; tag = "icon-tube1 (NORTH)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"vW" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/storage/box/handcuffs,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"wG" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/item/clothing/suit/armor/bulletproof{pixel_x = 0; pixel_y = 0},/obj/item/clothing/head/helmet/alt,/obj/item/clothing/suit/armor/bulletproof{pixel_x = 0; pixel_y = 0},/obj/item/clothing/head/helmet/alt,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"wH" = (/obj/machinery/light/spot{dir = 8; icon_state = "tube1"; tag = "icon-tube1 (WEST)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"wQ" = (/obj/structure/shuttle/window{dir = 8; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (WEST)"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/space,/area/shuttle/administration)
-"xm" = (/obj/structure/table/reinforced,/obj/item/clothing/mask/breath{pixel_x = 3; pixel_y = -3},/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath{pixel_x = -3; pixel_y = 3},/obj/item/flashlight,/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"xF" = (/obj/structure/rack,/obj/item/storage/box/buck{pixel_x = -3; pixel_y = 3},/obj/item/storage/box/buck,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"xG" = (/obj/structure/shuttle/window{dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (EAST)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"xK" = (/obj/structure/sign/nosmoking_2,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall3"; tag = "icon-swall3"},/area/shuttle/administration)
-"xQ" = (/obj/structure/chair{dir = 4},/obj/machinery/light/spot{dir = 1; icon_state = "tube1"; tag = "icon-tube1 (NORTH)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"xU" = (/obj/structure/table/reinforced,/obj/item/stack/sheet/metal/fifty,/obj/item/stack/sheet/glass/fifty,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"xZ" = (/turf/space,/area/shuttle/administration)
-"yg" = (/obj/structure/table/reinforced,/obj/machinery/door/window/brigdoor/eastleft{name = "Armory"; req_access_txt = "3"},/obj/machinery/door/window/brigdoor/westleft{name = "Armory},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"yF" = (/obj/machinery/status_display,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall3"},/area/shuttle/administration)
-"yH" = (/obj/structure/table/reinforced,/obj/machinery/door/window/brigdoor/eastleft{name = "Armory"; req_access_txt = "3"},/obj/machinery/door/window/brigdoor/westleft{name = "Armory"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"zY" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall14"},/area/shuttle/administration)
-"AH" = (/obj/machinery/mech_bay_recharge_port/upgraded/unsimulated,/obj/machinery/light/spot,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Bc" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 8},/obj/item/shield/riot,/obj/item/shield/riot{pixel_x = 2; pixel_y = -4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Bj" = (/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Bn" = (/obj/machinery/door/window/brigdoor/southleft{req_one_access_txt = "2;19"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Bq" = (/obj/structure/sign/nosmoking_2,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall1"; tag = "icon-swall1"},/area/shuttle/administration)
-"Cl" = (/obj/structure/table/reinforced,/obj/item/storage/toolbox/emergency{pixel_x = -3; pixel_y = 3},/obj/item/storage/toolbox/mechanical,/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"Dp" = (/obj/machinery/porta_turret{installation = /obj/item/gun/energy/gun},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Du" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/item/gun/energy/gun,/obj/item/gun/energy/gun{pixel_x = 3; pixel_y = -3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"DZ" = (/obj/structure/chair{dir = 4},/obj/machinery/light/spot,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Ea" = (/obj/structure/table/reinforced,/obj/item/paper_bin/nanotrasen,/obj/item/pen,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"EQ" = (/obj/machinery/door/airlock/shuttle/glass,/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"Fd" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/gun/energy/gun,/obj/item/gun/energy/gun{pixel_x = 3; pixel_y = -3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Fo" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/item/gun/energy/immolator/multi{pixel_y = -3},/obj/item/gun/energy/immolator/multi,/obj/item/gun/energy/immolator/multi{pixel_y = 3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"FF" = (/obj/structure/sign/poster/official/enlist,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall12"},/area/shuttle/administration)
-"FT" = (/obj/structure/rack,/obj/item/storage/box/buck{pixel_x = -3; pixel_y = 3},/obj/item/storage/box/buck,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Gn" = (/obj/item/gun/projectile/shotgun/riot{pixel_x = -3; pixel_y = 3},/obj/item/gun/projectile/shotgun/riot,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/rack,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Gs" = (/obj/structure/shuttle/window{dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_mid"; tag = "icon-window5 (EAST)"},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Gx" = (/obj/structure/fans/tiny,/obj/machinery/door/airlock/external,/obj/docking_port/mobile{dir = 2; dwidth = 9; height = 18; id = "admin"; name = "armory"; roundstart_move = "cc_bay_1"; timid = 1; width = 19},/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "asclblast"; name = "Blast Door"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Gy" = (/obj/structure/chair{dir = 1},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"GK" = (/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end"},/obj/structure/grille,/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Hc" = (/obj/machinery/porta_turret{installation = /obj/item/gun/energy/gun},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"Hl" = (/obj/machinery/recharger/wallcharger{pixel_y = 25},/obj/machinery/recharger/wallcharger{pixel_y = 35},/obj/structure/chair/comfy/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"HN" = (/obj/structure/sign/poster/official/do_not_question,/obj/item/tank/emergency_oxygen/engi,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall3"},/area/shuttle/administration)
-"Ir" = (/obj/machinery/computer/shuttle/admin{name = "NRV Sparta shuttle console"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"IC" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall3"},/area/shuttle/administration)
-"JC" = (/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_mid"; tag = "icon-window5_mid"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Ke" = (/obj/machinery/door/window/brigdoor/southright{req_one_access_txt = "2;19"},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"Kh" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Ki" = (/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 4},/obj/item/clothing/suit/armor/bulletproof{pixel_x = 0; pixel_y = 0},/obj/structure/rack,/obj/item/clothing/head/helmet/alt,/obj/item/clothing/suit/armor/bulletproof{pixel_x = 0; pixel_y = 0},/obj/item/clothing/head/helmet/alt,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"KM" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall7"},/area/shuttle/administration)
-"Lh" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/gun/energy/ionrifle{pixel_x = 3; pixel_y = 3},/obj/item/gun/energy/ionrifle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"LK" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"LP" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall_s9"},/area/shuttle/administration)
-"Mi" = (/obj/structure/table/reinforced,/obj/machinery/recharger,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Mj" = (/obj/structure/table/reinforced,/obj/item/rcd_ammo{pixel_x = -3; pixel_y = 3},/obj/item/rcd/preloaded,/obj/item/rcd_ammo,/obj/item/rcd_ammo{pixel_x = 3; pixel_y = -3},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"Mo" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 8},/obj/item/clothing/suit/armor/bulletproof{pixel_x = 0; pixel_y = 0},/obj/item/clothing/head/helmet/alt,/obj/item/clothing/suit/armor/bulletproof{pixel_x = 0; pixel_y = 0},/obj/item/clothing/head/helmet/alt,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Mw" = (/obj/structure/table/reinforced,/obj/item/storage/box/donkpockets,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"MN" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall12"},/area/shuttle/administration)
-"MZ" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall3"; tag = "icon-swall3"},/area/shuttle/administration)
-"Ni" = (/obj/item/gun/projectile/shotgun/riot{pixel_x = -3; pixel_y = 3},/obj/item/gun/projectile/shotgun/riot,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/rack,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"NF" = (/obj/structure/sign/poster/official/here_for_your_safety,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall3"; tag = "icon-swall3"},/area/shuttle/administration)
-"NQ" = (/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Op" = (/obj/structure/chair/comfy/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Ou" = (/obj/machinery/autolathe/upgraded{hacked = 1},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"Pe" = (/obj/machinery/door/window/brigdoor/southright{req_one_access_txt = "2;19"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Pn" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 4},/obj/item/clothing/suit/armor/riot,/obj/item/clothing/suit/armor/riot{pixel_x = 3; pixel_y = -3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"PL" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall_s10"},/area/shuttle/administration)
-"PS" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 8},/obj/item/gun/energy/gun/nuclear{pixel_y = -3},/obj/item/gun/energy/gun/nuclear,/obj/item/gun/energy/gun/nuclear{pixel_y = 3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"PV" = (/obj/structure/rack,/obj/item/gun/energy/sniperrifle{pixel_y = -4},/obj/item/gun/energy/sniperrifle,/obj/item/gun/energy/sniperrifle{pixel_y = 3},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Ri" = (/obj/structure/shuttle/window{dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (EAST)"},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Ry" = (/obj/structure/shuttle/window{dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_mid"; tag = "icon-window5 (EAST)"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/space,/area/shuttle/administration)
-"RM" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall8"; tag = "icon-swall12"},/area/shuttle/administration)
-"RV" = (/obj/structure/shuttle/window{dir = 1; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (NORTH)"},/obj/structure/grille,/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"TC" = (/obj/structure/shuttle/window{dir = 1; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (NORTH)"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"TD" = (/obj/machinery/door/airlock/command{name = "Command Center"; req_access = null; req_access_txt = "19"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"TF" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/item/storage/fancy/donut_box,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"TJ" = (/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_mid"; tag = "icon-window5_mid"},/obj/structure/grille,/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Un" = (/obj/structure/table/reinforced,/obj/machinery/recharger/wallcharger{pixel_y = 25},/obj/machinery/recharger/wallcharger{pixel_y = 35},/obj/item/tank/emergency_oxygen/engi{pixel_x = 3; pixel_y = -3},/obj/item/tank/emergency_oxygen/engi,/obj/item/tank/emergency_oxygen/engi{pixel_x = -3; pixel_y = 3},/obj/machinery/light/spot{dir = 8; icon_state = "tube1"; tag = "icon-tube1 (WEST)"},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"Ur" = (/obj/machinery/porta_turret{installation = /obj/item/gun/energy/gun},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"UR" = (/obj/machinery/status_display,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall12"},/area/shuttle/administration)
-"UX" = (/obj/structure/fans/tiny,/obj/machinery/door/airlock/external,/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "asclblast"; name = "Blast Door"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Vc" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall_s5"},/area/shuttle/administration)
-"Vg" = (/obj/structure/table/reinforced,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"VC" = (/obj/machinery/door/airlock/shuttle{name = "Shuttle Armory"; req_access_txt = "3"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"VQ" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/item/gun/energy/gun/advtaser{pixel_x = 3; pixel_y = -3},/obj/item/gun/energy/gun/advtaser{pixel_x = 0; pixel_y = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"WV" = (/obj/structure/table/reinforced,/obj/item/restraints/handcuffs{pixel_x = 3; pixel_y = -3},/obj/item/restraints/handcuffs,/obj/item/restraints/handcuffs{pixel_x = -3; pixel_y = 3},/obj/machinery/light/spot{dir = 4; icon_state = "tube1"; tag = "icon-tube1 (EAST)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"XL" = (/obj/item/gun/projectile/shotgun/riot{pixel_x = -3; pixel_y = 3},/obj/item/gun/projectile/shotgun/riot,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/rack,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-
-(1,1,1) = {"
-vkMNNQJCtyMNzYRMUXGxuzzYMNNQeeigMNPLxZ
-MZUnmwmwmwbinGoYmwmwoYMZKhKhKhKhfFKMPL
-HNxmmwmwmwClnGmwmwmwmwBqwHdHDuFdKhuWpK
-ICMjmwmwmwvynGmwmwmwmwygeLMowGKiKhuWpK
-ICaPmwmwmwOuxGmwmwmwmwVCKhKhKhKhfFKMLP
-ICdPmwmwmwmwgdmwmwmwmwyHeLFTdfxFKhICxZ
-ICtxmwGyfomwmSUrmwmwHcyFKhNiGnXLKhICxZ
-KMMNMNMNzYMNmMkfEQEQaepawHKhKhKhfFKMPL
-wQeIuaqQMZcVxQvWmwmwirbmPVKhKhKhKhuWpK
-RyIrghKhTDKhKhalmwmwpQGsPSKhKhKhKhuWpK
-RydnghKhbmKhhNaImwmwpQRiFoKhKhKhsqKMLP
-bngjghKhRiKhKhLKmwmwpQMZwHKhKhKhWVICxZ
-KMMNFFURnIBnPeTFrbKeuYMZVQLhKhKhxUICxZ
-ICvAOpOpHlKhKhKhKhKhKhxKBcPnKhKhceKMPL
-ICKhKhKhKhKhKhKhKhKhKhVCKhKhKhKhjBuWpK
-IChNEaMweLKhKhKhKhKhKhNFrxKhKhKhjUuWpK
-ICDZVgMieLfQojfQoRDpojMZAHKhKhKhdeKMLP
-VcMNBjTJRVMNMNMNjnTCMNmMMNGKTJRVMNLPxZ
-"}
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ae" = (
+/obj/structure/sign/securearea,
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall4";
+	tag = "icon-swall14"
+	},
+/area/shuttle/administration)
+"al" = (
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/table/reinforced,
+/obj/item/folder,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"aI" = (
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/machinery/recharger,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"aP" = (
+/obj/machinery/vending/security,
+/obj/machinery/light/spot{
+	dir = 8;
+	icon_state = "tube1";
+	tag = "icon-tube1 (WEST)"
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"bi" = (
+/obj/machinery/recharger/wallcharger{
+	pixel_y = 25
+	},
+/obj/machinery/recharger/wallcharger{
+	pixel_y = 35
+	},
+/obj/structure/table/reinforced,
+/obj/item/storage/firstaid,
+/obj/item/storage/firstaid/brute,
+/obj/item/storage/box/bodybags,
+/obj/item/storage/firstaid/surgery,
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"bm" = (
+/obj/structure/shuttle/window{
+	dir = 8;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_end";
+	tag = "icon-window5_end (WEST)"
+	},
+/obj/structure/grille,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"bn" = (
+/obj/structure/shuttle/window{
+	dir = 4;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_end";
+	tag = "icon-window5_end (EAST)"
+	},
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 8;
+	icon_state = "open";
+	id_tag = "Asclshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
+/obj/structure/grille,
+/turf/space,
+/area/shuttle/administration)
+"ce" = (
+/obj/machinery/autolathe/upgraded{
+	hacked = 1
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"cV" = (
+/obj/structure/closet/emcloset,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"de" = (
+/obj/machinery/suit_storage_unit/security/secure,
+/obj/machinery/light/spot,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"df" = (
+/obj/structure/rack,
+/obj/item/storage/box/buck{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/storage/box/buck,
+/obj/structure/window/reinforced,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"dn" = (
+/obj/machinery/computer/camera_advanced/shuttle_docker/admin{
+	name = "NRV Sparta navigation computer"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"dH" = (
+/obj/structure/rack,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/item/gun/energy/gun,
+/obj/item/gun/energy/gun{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"dP" = (
+/obj/machinery/recharge_station/upgraded,
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"ee" = (
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 1;
+	icon_state = "open";
+	id_tag = "Asclshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
+/obj/structure/grille,
+/obj/structure/shuttle/window{
+	dir = 2;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_mid";
+	tag = "icon-window5_mid"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"eI" = (
+/obj/machinery/turretid/stun{
+	check_access = 0;
+	name = "Shuttle Turret Control";
+	pixel_y = 30
+	},
+/obj/structure/table/reinforced,
+/obj/item/folder,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"eL" = (
+/obj/structure/chair{
+	dir = 8
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"fo" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/obj/machinery/light/spot,
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"fF" = (
+/obj/machinery/light/spot{
+	dir = 4;
+	icon_state = "tube1";
+	tag = "icon-tube1 (EAST)"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"fQ" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"gd" = (
+/obj/machinery/door/airlock/shuttle,
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"gh" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"gj" = (
+/obj/machinery/computer/communications{
+	name = "NRV Sparta Communications Console"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"hN" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"ig" = (
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 1;
+	icon_state = "open";
+	id_tag = "Asclshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
+/obj/structure/grille,
+/obj/structure/shuttle/window{
+	dir = 1;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_end";
+	tag = "icon-window5_end (NORTH)"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"ir" = (
+/obj/structure/closet/emcloset,
+/obj/machinery/light/spot{
+	dir = 1;
+	icon_state = "tube1";
+	tag = "icon-tube1 (NORTH)"
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"jn" = (
+/obj/structure/shuttle/window{
+	dir = 2;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_end";
+	tag = "icon-window5_end"
+	},
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 2;
+	icon_state = "open";
+	id_tag = "Asclshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"jB" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/lockbox/mindshield,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"jU" = (
+/obj/machinery/suit_storage_unit/security/secure,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"kf" = (
+/obj/structure/sign/securearea,
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall8";
+	tag = "icon-swall12"
+	},
+/area/shuttle/administration)
+"mw" = (
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"mM" = (
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall13"
+	},
+/area/shuttle/administration)
+"mS" = (
+/obj/structure/shuttle/window{
+	dir = 8;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_end";
+	tag = "icon-window5_end (WEST)"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"nG" = (
+/obj/structure/shuttle/window{
+	dir = 4;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_mid";
+	tag = "icon-window5 (EAST)"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"nI" = (
+/turf/simulated/shuttle/wall{
+	icon_state = "swall8"
+	},
+/area/shuttle/administration)
+"oj" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/machinery/light/spot,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"oR" = (
+/obj/machinery/porta_turret{
+	installation = /obj/item/gun/energy/gun
+	},
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"oY" = (
+/obj/structure/chair,
+/obj/machinery/light/spot{
+	dir = 1;
+	icon_state = "tube1";
+	tag = "icon-tube1 (NORTH)"
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"pa" = (
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall11"
+	},
+/area/shuttle/administration)
+"pK" = (
+/obj/structure/shuttle/engine/propulsion{
+	dir = 4;
+	icon_state = "propulsion"
+	},
+/turf/simulated/shuttle/plating,
+/area/shuttle/administration)
+"pQ" = (
+/obj/structure/chair{
+	dir = 8
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"qQ" = (
+/obj/machinery/recharger/wallcharger{
+	pixel_y = 25
+	},
+/obj/machinery/recharger/wallcharger{
+	pixel_y = 35
+	},
+/obj/machinery/light/spot{
+	dir = 1;
+	icon_state = "tube1";
+	tag = "icon-tube1 (NORTH)"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"rb" = (
+/obj/machinery/door/window/brigdoor/southleft{
+	req_one_access_txt = "2;19"
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"rx" = (
+/obj/machinery/mech_bay_recharge_port/upgraded/unsimulated,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"sq" = (
+/obj/structure/table/reinforced,
+/obj/item/kitchen/knife/combat{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/kitchen/knife/combat,
+/obj/item/kitchen/knife/combat{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"tx" = (
+/obj/machinery/sleeper/upgraded{
+	dir = 4
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"ty" = (
+/obj/structure/shuttle/window{
+	dir = 1;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_end";
+	tag = "icon-window5_end (NORTH)"
+	},
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 1;
+	icon_state = "open";
+	id_tag = "Asclshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
+/obj/structure/grille,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"ua" = (
+/obj/structure/chair{
+	dir = 8
+	},
+/obj/machinery/door_control{
+	dir = 4;
+	id = "Asclshutters";
+	name = "remote shutter control";
+	pixel_x = -5;
+	pixel_y = 35;
+	req_access = list(101);
+	req_access_txt = "0"
+	},
+/obj/machinery/keycard_auth{
+	pixel_y = 24
+	},
+/obj/machinery/door_control{
+	dir = 2;
+	id = "asclblast";
+	name = "blast door control";
+	pixel_x = 5;
+	pixel_y = 35;
+	pixel_z = 0;
+	req_access = list(101);
+	req_access_txt = "0"
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"uz" = (
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall4";
+	tag = "icon-swall14"
+	},
+/area/shuttle/administration)
+"uW" = (
+/obj/structure/shuttle/engine/heater{
+	dir = 4;
+	icon_state = "heater"
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/simulated/shuttle/plating,
+/area/shuttle/administration)
+"uY" = (
+/obj/structure/window/reinforced,
+/obj/structure/table/reinforced,
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"vk" = (
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall_s6"
+	},
+/area/shuttle/administration)
+"vy" = (
+/obj/structure/table/reinforced,
+/obj/item/stack/sheet/metal/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"vA" = (
+/obj/structure/chair/comfy/shuttle,
+/obj/machinery/light/spot{
+	dir = 1;
+	icon_state = "tube1";
+	tag = "icon-tube1 (NORTH)"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"vW" = (
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/item/storage/box/handcuffs,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"wG" = (
+/obj/structure/rack,
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/obj/item/clothing/suit/armor/bulletproof{
+	pixel_x = 0;
+	pixel_y = 0
+	},
+/obj/item/clothing/head/helmet/alt,
+/obj/item/clothing/suit/armor/bulletproof{
+	pixel_x = 0;
+	pixel_y = 0
+	},
+/obj/item/clothing/head/helmet/alt,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"wH" = (
+/obj/machinery/light/spot{
+	dir = 8;
+	icon_state = "tube1";
+	tag = "icon-tube1 (WEST)"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"wQ" = (
+/obj/structure/shuttle/window{
+	dir = 8;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_end";
+	tag = "icon-window5_end (WEST)"
+	},
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 8;
+	icon_state = "open";
+	id_tag = "Asclshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
+/obj/structure/grille,
+/turf/space,
+/area/shuttle/administration)
+"xm" = (
+/obj/structure/table/reinforced,
+/obj/item/clothing/mask/breath{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/flashlight,
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"xF" = (
+/obj/structure/rack,
+/obj/item/storage/box/buck{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/storage/box/buck,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"xG" = (
+/obj/structure/shuttle/window{
+	dir = 4;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_end";
+	tag = "icon-window5_end (EAST)"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"xK" = (
+/obj/structure/sign/nosmoking_2,
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall3";
+	tag = "icon-swall3"
+	},
+/area/shuttle/administration)
+"xQ" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/machinery/light/spot{
+	dir = 1;
+	icon_state = "tube1";
+	tag = "icon-tube1 (NORTH)"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"xU" = (
+/obj/structure/table/reinforced,
+/obj/item/stack/sheet/metal/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"xZ" = (
+/turf/space,
+/area/shuttle/administration)

From 7a087074b8c56e438e8a1c57ddee5eeeeacf6761 Mon Sep 17 00:00:00 2001
From: TDSSS <32099540+TDSSS@users.noreply.github.com>
Date: Tue, 25 Aug 2020 21:46:52 +0200
Subject: [PATCH 3/9] unmapconverted because it's fucked lmao

---
 _maps/map_files/shuttles/admin_armory.dmm | 826 ++++------------------
 1 file changed, 157 insertions(+), 669 deletions(-)

diff --git a/_maps/map_files/shuttles/admin_armory.dmm b/_maps/map_files/shuttles/admin_armory.dmm
index 6ed10136861..b5a33c56490 100644
--- a/_maps/map_files/shuttles/admin_armory.dmm
+++ b/_maps/map_files/shuttles/admin_armory.dmm
@@ -1,669 +1,157 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"ae" = (
-/obj/structure/sign/securearea,
-/turf/simulated/shuttle/wall{
-	dir = 2;
-	icon_state = "swall4";
-	tag = "icon-swall14"
-	},
-/area/shuttle/administration)
-"al" = (
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/table/reinforced,
-/obj/item/folder,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"aI" = (
-/obj/structure/table/reinforced,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/machinery/recharger,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"aP" = (
-/obj/machinery/vending/security,
-/obj/machinery/light/spot{
-	dir = 8;
-	icon_state = "tube1";
-	tag = "icon-tube1 (WEST)"
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/administration)
-"bi" = (
-/obj/machinery/recharger/wallcharger{
-	pixel_y = 25
-	},
-/obj/machinery/recharger/wallcharger{
-	pixel_y = 35
-	},
-/obj/structure/table/reinforced,
-/obj/item/storage/firstaid,
-/obj/item/storage/firstaid/brute,
-/obj/item/storage/box/bodybags,
-/obj/item/storage/firstaid/surgery,
-/turf/simulated/shuttle/floor,
-/area/shuttle/administration)
-"bm" = (
-/obj/structure/shuttle/window{
-	dir = 8;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_end";
-	tag = "icon-window5_end (WEST)"
-	},
-/obj/structure/grille,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"bn" = (
-/obj/structure/shuttle/window{
-	dir = 4;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_end";
-	tag = "icon-window5_end (EAST)"
-	},
-/obj/machinery/door/poddoor/shutters{
-	density = 0;
-	dir = 8;
-	icon_state = "open";
-	id_tag = "Asclshutters";
-	name = "Blast Shutters";
-	opacity = 0
-	},
-/obj/structure/grille,
-/turf/space,
-/area/shuttle/administration)
-"ce" = (
-/obj/machinery/autolathe/upgraded{
-	hacked = 1
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"cV" = (
-/obj/structure/closet/emcloset,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"de" = (
-/obj/machinery/suit_storage_unit/security/secure,
-/obj/machinery/light/spot,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"df" = (
-/obj/structure/rack,
-/obj/item/storage/box/buck{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/storage/box/buck,
-/obj/structure/window/reinforced,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"dn" = (
-/obj/machinery/computer/camera_advanced/shuttle_docker/admin{
-	name = "NRV Sparta navigation computer"
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"dH" = (
-/obj/structure/rack,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/item/gun/energy/gun,
-/obj/item/gun/energy/gun{
-	pixel_x = 3;
-	pixel_y = -3
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"dP" = (
-/obj/machinery/recharge_station/upgraded,
-/turf/simulated/shuttle/floor,
-/area/shuttle/administration)
-"ee" = (
-/obj/machinery/door/poddoor/shutters{
-	density = 0;
-	dir = 1;
-	icon_state = "open";
-	id_tag = "Asclshutters";
-	name = "Blast Shutters";
-	opacity = 0
-	},
-/obj/structure/grille,
-/obj/structure/shuttle/window{
-	dir = 2;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_mid";
-	tag = "icon-window5_mid"
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"eI" = (
-/obj/machinery/turretid/stun{
-	check_access = 0;
-	name = "Shuttle Turret Control";
-	pixel_y = 30
-	},
-/obj/structure/table/reinforced,
-/obj/item/folder,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"eL" = (
-/obj/structure/chair{
-	dir = 8
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"fo" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/obj/machinery/light/spot,
-/turf/simulated/shuttle/floor,
-/area/shuttle/administration)
-"fF" = (
-/obj/machinery/light/spot{
-	dir = 4;
-	icon_state = "tube1";
-	tag = "icon-tube1 (EAST)"
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"fQ" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 1
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"gd" = (
-/obj/machinery/door/airlock/shuttle,
-/turf/simulated/shuttle/floor,
-/area/shuttle/administration)
-"gh" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 8
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"gj" = (
-/obj/machinery/computer/communications{
-	name = "NRV Sparta Communications Console"
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"hN" = (
-/obj/structure/chair{
-	dir = 4
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"ig" = (
-/obj/machinery/door/poddoor/shutters{
-	density = 0;
-	dir = 1;
-	icon_state = "open";
-	id_tag = "Asclshutters";
-	name = "Blast Shutters";
-	opacity = 0
-	},
-/obj/structure/grille,
-/obj/structure/shuttle/window{
-	dir = 1;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_end";
-	tag = "icon-window5_end (NORTH)"
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"ir" = (
-/obj/structure/closet/emcloset,
-/obj/machinery/light/spot{
-	dir = 1;
-	icon_state = "tube1";
-	tag = "icon-tube1 (NORTH)"
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/administration)
-"jn" = (
-/obj/structure/shuttle/window{
-	dir = 2;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_end";
-	tag = "icon-window5_end"
-	},
-/obj/machinery/door/poddoor/shutters{
-	density = 0;
-	dir = 2;
-	icon_state = "open";
-	id_tag = "Asclshutters";
-	name = "Blast Shutters";
-	opacity = 0
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"jB" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/lockbox/mindshield,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"jU" = (
-/obj/machinery/suit_storage_unit/security/secure,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"kf" = (
-/obj/structure/sign/securearea,
-/turf/simulated/shuttle/wall{
-	dir = 2;
-	icon_state = "swall8";
-	tag = "icon-swall12"
-	},
-/area/shuttle/administration)
-"mw" = (
-/turf/simulated/shuttle/floor,
-/area/shuttle/administration)
-"mM" = (
-/turf/simulated/shuttle/wall{
-	dir = 2;
-	icon_state = "swall13"
-	},
-/area/shuttle/administration)
-"mS" = (
-/obj/structure/shuttle/window{
-	dir = 8;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_end";
-	tag = "icon-window5_end (WEST)"
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"nG" = (
-/obj/structure/shuttle/window{
-	dir = 4;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_mid";
-	tag = "icon-window5 (EAST)"
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"nI" = (
-/turf/simulated/shuttle/wall{
-	icon_state = "swall8"
-	},
-/area/shuttle/administration)
-"oj" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 1
-	},
-/obj/machinery/light/spot,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"oR" = (
-/obj/machinery/porta_turret{
-	installation = /obj/item/gun/energy/gun
-	},
-/obj/structure/window/reinforced{
-	dir = 1;
-	layer = 2.9
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"oY" = (
-/obj/structure/chair,
-/obj/machinery/light/spot{
-	dir = 1;
-	icon_state = "tube1";
-	tag = "icon-tube1 (NORTH)"
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/administration)
-"pa" = (
-/turf/simulated/shuttle/wall{
-	dir = 2;
-	icon_state = "swall11"
-	},
-/area/shuttle/administration)
-"pK" = (
-/obj/structure/shuttle/engine/propulsion{
-	dir = 4;
-	icon_state = "propulsion"
-	},
-/turf/simulated/shuttle/plating,
-/area/shuttle/administration)
-"pQ" = (
-/obj/structure/chair{
-	dir = 8
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/administration)
-"qQ" = (
-/obj/machinery/recharger/wallcharger{
-	pixel_y = 25
-	},
-/obj/machinery/recharger/wallcharger{
-	pixel_y = 35
-	},
-/obj/machinery/light/spot{
-	dir = 1;
-	icon_state = "tube1";
-	tag = "icon-tube1 (NORTH)"
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"rb" = (
-/obj/machinery/door/window/brigdoor/southleft{
-	req_one_access_txt = "2;19"
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/administration)
-"rx" = (
-/obj/machinery/mech_bay_recharge_port/upgraded/unsimulated,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"sq" = (
-/obj/structure/table/reinforced,
-/obj/item/kitchen/knife/combat{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/kitchen/knife/combat,
-/obj/item/kitchen/knife/combat{
-	pixel_x = 3;
-	pixel_y = -3
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"tx" = (
-/obj/machinery/sleeper/upgraded{
-	dir = 4
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/administration)
-"ty" = (
-/obj/structure/shuttle/window{
-	dir = 1;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_end";
-	tag = "icon-window5_end (NORTH)"
-	},
-/obj/machinery/door/poddoor/shutters{
-	density = 0;
-	dir = 1;
-	icon_state = "open";
-	id_tag = "Asclshutters";
-	name = "Blast Shutters";
-	opacity = 0
-	},
-/obj/structure/grille,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"ua" = (
-/obj/structure/chair{
-	dir = 8
-	},
-/obj/machinery/door_control{
-	dir = 4;
-	id = "Asclshutters";
-	name = "remote shutter control";
-	pixel_x = -5;
-	pixel_y = 35;
-	req_access = list(101);
-	req_access_txt = "0"
-	},
-/obj/machinery/keycard_auth{
-	pixel_y = 24
-	},
-/obj/machinery/door_control{
-	dir = 2;
-	id = "asclblast";
-	name = "blast door control";
-	pixel_x = 5;
-	pixel_y = 35;
-	pixel_z = 0;
-	req_access = list(101);
-	req_access_txt = "0"
-	},
-/obj/structure/chair/comfy/shuttle{
-	dir = 8
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"uz" = (
-/turf/simulated/shuttle/wall{
-	dir = 2;
-	icon_state = "swall4";
-	tag = "icon-swall14"
-	},
-/area/shuttle/administration)
-"uW" = (
-/obj/structure/shuttle/engine/heater{
-	dir = 4;
-	icon_state = "heater"
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/simulated/shuttle/plating,
-/area/shuttle/administration)
-"uY" = (
-/obj/structure/window/reinforced,
-/obj/structure/table/reinforced,
-/turf/simulated/shuttle/floor,
-/area/shuttle/administration)
-"vk" = (
-/turf/simulated/shuttle/wall{
-	dir = 2;
-	icon_state = "swall_s6"
-	},
-/area/shuttle/administration)
-"vy" = (
-/obj/structure/table/reinforced,
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/turf/simulated/shuttle/floor,
-/area/shuttle/administration)
-"vA" = (
-/obj/structure/chair/comfy/shuttle,
-/obj/machinery/light/spot{
-	dir = 1;
-	icon_state = "tube1";
-	tag = "icon-tube1 (NORTH)"
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"vW" = (
-/obj/structure/table/reinforced,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/item/storage/box/handcuffs,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"wG" = (
-/obj/structure/rack,
-/obj/structure/window/reinforced{
-	dir = 1;
-	layer = 2.9
-	},
-/obj/item/clothing/suit/armor/bulletproof{
-	pixel_x = 0;
-	pixel_y = 0
-	},
-/obj/item/clothing/head/helmet/alt,
-/obj/item/clothing/suit/armor/bulletproof{
-	pixel_x = 0;
-	pixel_y = 0
-	},
-/obj/item/clothing/head/helmet/alt,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"wH" = (
-/obj/machinery/light/spot{
-	dir = 8;
-	icon_state = "tube1";
-	tag = "icon-tube1 (WEST)"
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"wQ" = (
-/obj/structure/shuttle/window{
-	dir = 8;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_end";
-	tag = "icon-window5_end (WEST)"
-	},
-/obj/machinery/door/poddoor/shutters{
-	density = 0;
-	dir = 8;
-	icon_state = "open";
-	id_tag = "Asclshutters";
-	name = "Blast Shutters";
-	opacity = 0
-	},
-/obj/structure/grille,
-/turf/space,
-/area/shuttle/administration)
-"xm" = (
-/obj/structure/table/reinforced,
-/obj/item/clothing/mask/breath{
-	pixel_x = 3;
-	pixel_y = -3
-	},
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/flashlight,
-/turf/simulated/shuttle/floor,
-/area/shuttle/administration)
-"xF" = (
-/obj/structure/rack,
-/obj/item/storage/box/buck{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/storage/box/buck,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"xG" = (
-/obj/structure/shuttle/window{
-	dir = 4;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_end";
-	tag = "icon-window5_end (EAST)"
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"xK" = (
-/obj/structure/sign/nosmoking_2,
-/turf/simulated/shuttle/wall{
-	dir = 2;
-	icon_state = "swall3";
-	tag = "icon-swall3"
-	},
-/area/shuttle/administration)
-"xQ" = (
-/obj/structure/chair{
-	dir = 4
-	},
-/obj/machinery/light/spot{
-	dir = 1;
-	icon_state = "tube1";
-	tag = "icon-tube1 (NORTH)"
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"xU" = (
-/obj/structure/table/reinforced,
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"xZ" = (
-/turf/space,
-/area/shuttle/administration)
+"ae" = (/obj/structure/sign/securearea,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall4"; tag = "icon-swall14"},/area/shuttle/administration)
+"al" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/table/reinforced,/obj/item/folder,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"aI" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/recharger,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"aP" = (/obj/machinery/vending/security,/obj/machinery/light/spot{dir = 8; icon_state = "tube1"; tag = "icon-tube1 (WEST)"},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"bi" = (/obj/machinery/recharger/wallcharger{pixel_y = 25},/obj/machinery/recharger/wallcharger{pixel_y = 35},/obj/structure/table/reinforced,/obj/item/storage/firstaid,/obj/item/storage/firstaid/brute,/obj/item/storage/box/bodybags,/obj/item/storage/firstaid/surgery,/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"bm" = (/obj/structure/shuttle/window{dir = 8; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (WEST)"},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"bn" = (/obj/structure/shuttle/window{dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (EAST)"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/space,/area/shuttle/administration)
+"ce" = (/obj/machinery/autolathe/upgraded{hacked = 1},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"cV" = (/obj/structure/closet/emcloset,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"de" = (/obj/machinery/suit_storage_unit/security/secure,/obj/machinery/light/spot,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"df" = (/obj/structure/rack,/obj/item/storage/box/buck{pixel_x = -3; pixel_y = 3},/obj/item/storage/box/buck,/obj/structure/window/reinforced,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"dn" = (/obj/machinery/computer/camera_advanced/shuttle_docker/admin{name = "NRV Sparta navigation computer"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"dH" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/item/gun/energy/gun,/obj/item/gun/energy/gun{pixel_x = 3; pixel_y = -3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"dP" = (/obj/machinery/recharge_station/upgraded,/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"ee" = (/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_mid"; tag = "icon-window5_mid"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"eI" = (/obj/machinery/turretid/stun{check_access = 0; name = "Shuttle Turret Control"; pixel_y = 30},/obj/structure/table/reinforced,/obj/item/folder,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"eL" = (/obj/structure/chair{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"fo" = (/obj/structure/chair{dir = 1},/obj/machinery/light/spot,/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"fF" = (/obj/machinery/light/spot{dir = 4; icon_state = "tube1"; tag = "icon-tube1 (EAST)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"fQ" = (/obj/structure/chair/comfy/shuttle{dir = 1},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"gd" = (/obj/machinery/door/airlock/shuttle,/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"gh" = (/obj/structure/chair/comfy/shuttle{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"gj" = (/obj/machinery/computer/communications{name = "NRV Sparta Communications Console"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"hN" = (/obj/structure/chair{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"ig" = (/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/shuttle/window{dir = 1; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (NORTH)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"ir" = (/obj/structure/closet/emcloset,/obj/machinery/light/spot{dir = 1; icon_state = "tube1"; tag = "icon-tube1 (NORTH)"},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"jn" = (/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"jB" = (/obj/structure/table/reinforced,/obj/item/storage/lockbox/mindshield,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"jU" = (/obj/machinery/suit_storage_unit/security/secure,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"kf" = (/obj/structure/sign/securearea,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall8"; tag = "icon-swall12"},/area/shuttle/administration)
+"mw" = (/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"mM" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall13"},/area/shuttle/administration)
+"mS" = (/obj/structure/shuttle/window{dir = 8; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (WEST)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"nG" = (/obj/structure/shuttle/window{dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_mid"; tag = "icon-window5 (EAST)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"nI" = (/turf/simulated/shuttle/wall{icon_state = "swall8"},/area/shuttle/administration)
+"oj" = (/obj/structure/chair/comfy/shuttle{dir = 1},/obj/machinery/light/spot,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"oR" = (/obj/machinery/porta_turret{installation = /obj/item/gun/energy/gun},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"oY" = (/obj/structure/chair,/obj/machinery/light/spot{dir = 1; icon_state = "tube1"; tag = "icon-tube1 (NORTH)"},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"pa" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall11"},/area/shuttle/administration)
+"pK" = (/obj/structure/shuttle/engine/propulsion{dir = 4; icon_state = "propulsion"},/turf/simulated/shuttle/plating,/area/shuttle/administration)
+"pQ" = (/obj/structure/chair{dir = 8},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"qQ" = (/obj/machinery/recharger/wallcharger{pixel_y = 25},/obj/machinery/recharger/wallcharger{pixel_y = 35},/obj/machinery/light/spot{dir = 1; icon_state = "tube1"; tag = "icon-tube1 (NORTH)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"rb" = (/obj/machinery/door/window/brigdoor/southleft{req_one_access_txt = "2;19"},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"rx" = (/obj/machinery/mech_bay_recharge_port/upgraded/unsimulated,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"sq" = (/obj/structure/table/reinforced,/obj/item/kitchen/knife/combat{pixel_x = -3; pixel_y = 3},/obj/item/kitchen/knife/combat,/obj/item/kitchen/knife/combat{pixel_x = 3; pixel_y = -3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"tx" = (/obj/machinery/sleeper/upgraded{dir = 4},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"ty" = (/obj/structure/shuttle/window{dir = 1; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (NORTH)"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"ua" = (/obj/structure/chair{dir = 8},/obj/machinery/door_control{dir = 4; id = "Asclshutters"; name = "remote shutter control"; pixel_x = -5; pixel_y = 35; req_access = list(101); req_access_txt = "0"},/obj/machinery/keycard_auth{pixel_y = 24},/obj/machinery/door_control{dir = 2; id = "asclblast"; name = "blast door control"; pixel_x = 5; pixel_y = 35; pixel_z = 0; req_access = list(101); req_access_txt = "0"},/obj/structure/chair/comfy/shuttle{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"uz" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall4"; tag = "icon-swall14"},/area/shuttle/administration)
+"uW" = (/obj/structure/shuttle/engine/heater{dir = 4; icon_state = "heater"},/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/plating,/area/shuttle/administration)
+"uY" = (/obj/structure/window/reinforced,/obj/structure/table/reinforced,/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"vk" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall_s6"},/area/shuttle/administration)
+"vy" = (/obj/structure/table/reinforced,/obj/item/stack/sheet/metal/fifty,/obj/item/stack/sheet/glass/fifty,/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"vA" = (/obj/structure/chair/comfy/shuttle,/obj/machinery/light/spot{dir = 1; icon_state = "tube1"; tag = "icon-tube1 (NORTH)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"vW" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/storage/box/handcuffs,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"wG" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/item/clothing/suit/armor/bulletproof{pixel_x = 0; pixel_y = 0},/obj/item/clothing/head/helmet/alt,/obj/item/clothing/suit/armor/bulletproof{pixel_x = 0; pixel_y = 0},/obj/item/clothing/head/helmet/alt,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"wH" = (/obj/machinery/light/spot{dir = 8; icon_state = "tube1"; tag = "icon-tube1 (WEST)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"wQ" = (/obj/structure/shuttle/window{dir = 8; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (WEST)"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/space,/area/shuttle/administration)
+"xm" = (/obj/structure/table/reinforced,/obj/item/clothing/mask/breath{pixel_x = 3; pixel_y = -3},/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath{pixel_x = -3; pixel_y = 3},/obj/item/flashlight,/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"xF" = (/obj/structure/rack,/obj/item/storage/box/buck{pixel_x = -3; pixel_y = 3},/obj/item/storage/box/buck,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"xG" = (/obj/structure/shuttle/window{dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (EAST)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"xK" = (/obj/structure/sign/nosmoking_2,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall3"; tag = "icon-swall3"},/area/shuttle/administration)
+"xQ" = (/obj/structure/chair{dir = 4},/obj/machinery/light/spot{dir = 1; icon_state = "tube1"; tag = "icon-tube1 (NORTH)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"xU" = (/obj/structure/table/reinforced,/obj/item/stack/sheet/metal/fifty,/obj/item/stack/sheet/glass/fifty,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"xZ" = (/turf/space,/area/shuttle/administration)
+"yg" = (/obj/structure/table/reinforced,/obj/machinery/door/window/brigdoor/eastleft{name = "Armory"; req_access_txt = "3"},/obj/machinery/door/window/brigdoor/westleft{name = "Armory},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"yF" = (/obj/machinery/status_display,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall3"},/area/shuttle/administration)
+"yH" = (/obj/structure/table/reinforced,/obj/machinery/door/window/brigdoor/eastleft{name = "Armory"; req_access_txt = "3"},/obj/machinery/door/window/brigdoor/westleft{name = "Armory"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"zY" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall14"},/area/shuttle/administration)
+"AH" = (/obj/machinery/mech_bay_recharge_port/upgraded/unsimulated,/obj/machinery/light/spot,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Bc" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 8},/obj/item/shield/riot,/obj/item/shield/riot{pixel_x = 2; pixel_y = -4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Bj" = (/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Bn" = (/obj/machinery/door/window/brigdoor/southleft{req_one_access_txt = "2;19"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Bq" = (/obj/structure/sign/nosmoking_2,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall1"; tag = "icon-swall1"},/area/shuttle/administration)
+"Cl" = (/obj/structure/table/reinforced,/obj/item/storage/toolbox/emergency{pixel_x = -3; pixel_y = 3},/obj/item/storage/toolbox/mechanical,/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"Dp" = (/obj/machinery/porta_turret{installation = /obj/item/gun/energy/gun},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Du" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/item/gun/energy/gun,/obj/item/gun/energy/gun{pixel_x = 3; pixel_y = -3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"DZ" = (/obj/structure/chair{dir = 4},/obj/machinery/light/spot,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Ea" = (/obj/structure/table/reinforced,/obj/item/paper_bin/nanotrasen,/obj/item/pen,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"EQ" = (/obj/machinery/door/airlock/shuttle/glass,/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"Fd" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/gun/energy/gun,/obj/item/gun/energy/gun{pixel_x = 3; pixel_y = -3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Fo" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/item/gun/energy/immolator/multi{pixel_y = -3},/obj/item/gun/energy/immolator/multi,/obj/item/gun/energy/immolator/multi{pixel_y = 3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"FF" = (/obj/structure/sign/poster/official/enlist,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall12"},/area/shuttle/administration)
+"FT" = (/obj/structure/rack,/obj/item/storage/box/buck{pixel_x = -3; pixel_y = 3},/obj/item/storage/box/buck,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Gn" = (/obj/item/gun/projectile/shotgun/riot{pixel_x = -3; pixel_y = 3},/obj/item/gun/projectile/shotgun/riot,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/rack,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Gs" = (/obj/structure/shuttle/window{dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_mid"; tag = "icon-window5 (EAST)"},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Gx" = (/obj/structure/fans/tiny,/obj/machinery/door/airlock/external,/obj/docking_port/mobile{dir = 2; dwidth = 9; height = 18; id = "admin"; name = "armory"; roundstart_move = "cc_bay_1"; timid = 1; width = 19},/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "asclblast"; name = "Blast Door"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Gy" = (/obj/structure/chair{dir = 1},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"GK" = (/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end"},/obj/structure/grille,/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Hc" = (/obj/machinery/porta_turret{installation = /obj/item/gun/energy/gun},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"Hl" = (/obj/machinery/recharger/wallcharger{pixel_y = 25},/obj/machinery/recharger/wallcharger{pixel_y = 35},/obj/structure/chair/comfy/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"HN" = (/obj/structure/sign/poster/official/do_not_question,/obj/item/tank/emergency_oxygen/engi,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall3"},/area/shuttle/administration)
+"Ir" = (/obj/machinery/computer/shuttle/admin{name = "NRV Sparta shuttle console"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"IC" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall3"},/area/shuttle/administration)
+"JC" = (/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_mid"; tag = "icon-window5_mid"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Ke" = (/obj/machinery/door/window/brigdoor/southright{req_one_access_txt = "2;19"},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"Kh" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Ki" = (/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 4},/obj/item/clothing/suit/armor/bulletproof{pixel_x = 0; pixel_y = 0},/obj/structure/rack,/obj/item/clothing/head/helmet/alt,/obj/item/clothing/suit/armor/bulletproof{pixel_x = 0; pixel_y = 0},/obj/item/clothing/head/helmet/alt,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"KM" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall7"},/area/shuttle/administration)
+"Lh" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/gun/energy/ionrifle{pixel_x = 3; pixel_y = 3},/obj/item/gun/energy/ionrifle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"LK" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"LP" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall_s9"},/area/shuttle/administration)
+"Mi" = (/obj/structure/table/reinforced,/obj/machinery/recharger,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Mj" = (/obj/structure/table/reinforced,/obj/item/rcd_ammo{pixel_x = -3; pixel_y = 3},/obj/item/rcd/preloaded,/obj/item/rcd_ammo,/obj/item/rcd_ammo{pixel_x = 3; pixel_y = -3},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"Mo" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 8},/obj/item/clothing/suit/armor/bulletproof{pixel_x = 0; pixel_y = 0},/obj/item/clothing/head/helmet/alt,/obj/item/clothing/suit/armor/bulletproof{pixel_x = 0; pixel_y = 0},/obj/item/clothing/head/helmet/alt,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Mw" = (/obj/structure/table/reinforced,/obj/item/storage/box/donkpockets,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"MN" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall12"},/area/shuttle/administration)
+"MZ" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall3"; tag = "icon-swall3"},/area/shuttle/administration)
+"Ni" = (/obj/item/gun/projectile/shotgun/riot{pixel_x = -3; pixel_y = 3},/obj/item/gun/projectile/shotgun/riot,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/rack,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"NF" = (/obj/structure/sign/poster/official/here_for_your_safety,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall3"; tag = "icon-swall3"},/area/shuttle/administration)
+"NQ" = (/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Op" = (/obj/structure/chair/comfy/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Ou" = (/obj/machinery/autolathe/upgraded{hacked = 1},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"Pe" = (/obj/machinery/door/window/brigdoor/southright{req_one_access_txt = "2;19"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Pn" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 4},/obj/item/clothing/suit/armor/riot,/obj/item/clothing/suit/armor/riot{pixel_x = 3; pixel_y = -3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"PL" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall_s10"},/area/shuttle/administration)
+"PS" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 8},/obj/item/gun/energy/gun/nuclear{pixel_y = -3},/obj/item/gun/energy/gun/nuclear,/obj/item/gun/energy/gun/nuclear{pixel_y = 3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"PV" = (/obj/structure/rack,/obj/item/gun/energy/sniperrifle{pixel_y = -4},/obj/item/gun/energy/sniperrifle,/obj/item/gun/energy/sniperrifle{pixel_y = 3},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Ri" = (/obj/structure/shuttle/window{dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (EAST)"},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Ry" = (/obj/structure/shuttle/window{dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_mid"; tag = "icon-window5 (EAST)"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/space,/area/shuttle/administration)
+"RM" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall8"; tag = "icon-swall12"},/area/shuttle/administration)
+"RV" = (/obj/structure/shuttle/window{dir = 1; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (NORTH)"},/obj/structure/grille,/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"TC" = (/obj/structure/shuttle/window{dir = 1; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (NORTH)"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"TD" = (/obj/machinery/door/airlock/command{name = "Command Center"; req_access = null; req_access_txt = "19"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"TF" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/item/storage/fancy/donut_box,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"TJ" = (/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_mid"; tag = "icon-window5_mid"},/obj/structure/grille,/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Un" = (/obj/structure/table/reinforced,/obj/machinery/recharger/wallcharger{pixel_y = 25},/obj/machinery/recharger/wallcharger{pixel_y = 35},/obj/item/tank/emergency_oxygen/engi{pixel_x = 3; pixel_y = -3},/obj/item/tank/emergency_oxygen/engi,/obj/item/tank/emergency_oxygen/engi{pixel_x = -3; pixel_y = 3},/obj/machinery/light/spot{dir = 8; icon_state = "tube1"; tag = "icon-tube1 (WEST)"},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"Ur" = (/obj/machinery/porta_turret{installation = /obj/item/gun/energy/gun},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor,/area/shuttle/administration)
+"UR" = (/obj/machinery/status_display,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall12"},/area/shuttle/administration)
+"UX" = (/obj/structure/fans/tiny,/obj/machinery/door/airlock/external,/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "asclblast"; name = "Blast Door"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"Vc" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall_s5"},/area/shuttle/administration)
+"Vg" = (/obj/structure/table/reinforced,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"VC" = (/obj/machinery/door/airlock/shuttle{name = "Shuttle Armory"; req_access_txt = "3"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"VQ" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/item/gun/energy/gun/advtaser{pixel_x = 3; pixel_y = -3},/obj/item/gun/energy/gun/advtaser{pixel_x = 0; pixel_y = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"WV" = (/obj/structure/table/reinforced,/obj/item/restraints/handcuffs{pixel_x = 3; pixel_y = -3},/obj/item/restraints/handcuffs,/obj/item/restraints/handcuffs{pixel_x = -3; pixel_y = 3},/obj/machinery/light/spot{dir = 4; icon_state = "tube1"; tag = "icon-tube1 (EAST)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+"XL" = (/obj/item/gun/projectile/shotgun/riot{pixel_x = -3; pixel_y = 3},/obj/item/gun/projectile/shotgun/riot,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/rack,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+
+(1,1,1) = {"
+vkMNNQJCtyMNzYRMUXGxuzzYMNNQeeigMNPLxZ
+MZUnmwmwmwbinGoYmwmwoYMZKhKhKhKhfFKMPL
+HNxmmwmwmwClnGmwmwmwmwBqwHdHDuFdKhuWpK
+ICMjmwmwmwvynGmwmwmwmwygeLMowGKiKhuWpK
+ICaPmwmwmwOuxGmwmwmwmwVCKhKhKhKhfFKMLP
+ICdPmwmwmwmwgdmwmwmwmwyHeLFTdfxFKhICxZ
+ICtxmwGyfomwmSUrmwmwHcyFKhNiGnXLKhICxZ
+KMMNMNMNzYMNmMkfEQEQaepawHKhKhKhfFKMPL
+wQeIuaqQMZcVxQvWmwmwirbmPVKhKhKhKhuWpK
+RyIrghKhTDKhKhalmwmwpQGsPSKhKhKhKhuWpK
+RydnghKhbmKhhNaImwmwpQRiFoKhKhKhsqKMLP
+bngjghKhRiKhKhLKmwmwpQMZwHKhKhKhWVICxZ
+KMMNFFURnIBnPeTFrbKeuYMZVQLhKhKhxUICxZ
+ICvAOpOpHlKhKhKhKhKhKhxKBcPnKhKhceKMPL
+ICKhKhKhKhKhKhKhKhKhKhVCKhKhKhKhjBuWpK
+IChNEaMweLKhKhKhKhKhKhNFrxKhKhKhjUuWpK
+ICDZVgMieLfQojfQoRDpojMZAHKhKhKhdeKMLP
+VcMNBjTJRVMNMNMNjnTCMNmMMNGKTJRVMNLPxZ
+"}

From 18fdbf500aca8920d63978d5555c9fc74dfd24fe Mon Sep 17 00:00:00 2001
From: TDSSS <32099540+TDSSS@users.noreply.github.com>
Date: Tue, 25 Aug 2020 21:50:08 +0200
Subject: [PATCH 4/9] Map now successfully converted

---
 _maps/map_files/shuttles/admin_armory.dmm | 2055 +++++++++++++++++++--
 1 file changed, 1901 insertions(+), 154 deletions(-)

diff --git a/_maps/map_files/shuttles/admin_armory.dmm b/_maps/map_files/shuttles/admin_armory.dmm
index b5a33c56490..ebc28f87bb7 100644
--- a/_maps/map_files/shuttles/admin_armory.dmm
+++ b/_maps/map_files/shuttles/admin_armory.dmm
@@ -1,157 +1,1904 @@
-"ae" = (/obj/structure/sign/securearea,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall4"; tag = "icon-swall14"},/area/shuttle/administration)
-"al" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/table/reinforced,/obj/item/folder,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"aI" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/recharger,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"aP" = (/obj/machinery/vending/security,/obj/machinery/light/spot{dir = 8; icon_state = "tube1"; tag = "icon-tube1 (WEST)"},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"bi" = (/obj/machinery/recharger/wallcharger{pixel_y = 25},/obj/machinery/recharger/wallcharger{pixel_y = 35},/obj/structure/table/reinforced,/obj/item/storage/firstaid,/obj/item/storage/firstaid/brute,/obj/item/storage/box/bodybags,/obj/item/storage/firstaid/surgery,/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"bm" = (/obj/structure/shuttle/window{dir = 8; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (WEST)"},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"bn" = (/obj/structure/shuttle/window{dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (EAST)"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/space,/area/shuttle/administration)
-"ce" = (/obj/machinery/autolathe/upgraded{hacked = 1},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"cV" = (/obj/structure/closet/emcloset,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"de" = (/obj/machinery/suit_storage_unit/security/secure,/obj/machinery/light/spot,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"df" = (/obj/structure/rack,/obj/item/storage/box/buck{pixel_x = -3; pixel_y = 3},/obj/item/storage/box/buck,/obj/structure/window/reinforced,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"dn" = (/obj/machinery/computer/camera_advanced/shuttle_docker/admin{name = "NRV Sparta navigation computer"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"dH" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/item/gun/energy/gun,/obj/item/gun/energy/gun{pixel_x = 3; pixel_y = -3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"dP" = (/obj/machinery/recharge_station/upgraded,/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"ee" = (/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_mid"; tag = "icon-window5_mid"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"eI" = (/obj/machinery/turretid/stun{check_access = 0; name = "Shuttle Turret Control"; pixel_y = 30},/obj/structure/table/reinforced,/obj/item/folder,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"eL" = (/obj/structure/chair{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"fo" = (/obj/structure/chair{dir = 1},/obj/machinery/light/spot,/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"fF" = (/obj/machinery/light/spot{dir = 4; icon_state = "tube1"; tag = "icon-tube1 (EAST)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"fQ" = (/obj/structure/chair/comfy/shuttle{dir = 1},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"gd" = (/obj/machinery/door/airlock/shuttle,/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"gh" = (/obj/structure/chair/comfy/shuttle{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"gj" = (/obj/machinery/computer/communications{name = "NRV Sparta Communications Console"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"hN" = (/obj/structure/chair{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"ig" = (/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/shuttle/window{dir = 1; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (NORTH)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"ir" = (/obj/structure/closet/emcloset,/obj/machinery/light/spot{dir = 1; icon_state = "tube1"; tag = "icon-tube1 (NORTH)"},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"jn" = (/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"jB" = (/obj/structure/table/reinforced,/obj/item/storage/lockbox/mindshield,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"jU" = (/obj/machinery/suit_storage_unit/security/secure,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"kf" = (/obj/structure/sign/securearea,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall8"; tag = "icon-swall12"},/area/shuttle/administration)
-"mw" = (/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"mM" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall13"},/area/shuttle/administration)
-"mS" = (/obj/structure/shuttle/window{dir = 8; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (WEST)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"nG" = (/obj/structure/shuttle/window{dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_mid"; tag = "icon-window5 (EAST)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"nI" = (/turf/simulated/shuttle/wall{icon_state = "swall8"},/area/shuttle/administration)
-"oj" = (/obj/structure/chair/comfy/shuttle{dir = 1},/obj/machinery/light/spot,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"oR" = (/obj/machinery/porta_turret{installation = /obj/item/gun/energy/gun},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"oY" = (/obj/structure/chair,/obj/machinery/light/spot{dir = 1; icon_state = "tube1"; tag = "icon-tube1 (NORTH)"},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"pa" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall11"},/area/shuttle/administration)
-"pK" = (/obj/structure/shuttle/engine/propulsion{dir = 4; icon_state = "propulsion"},/turf/simulated/shuttle/plating,/area/shuttle/administration)
-"pQ" = (/obj/structure/chair{dir = 8},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"qQ" = (/obj/machinery/recharger/wallcharger{pixel_y = 25},/obj/machinery/recharger/wallcharger{pixel_y = 35},/obj/machinery/light/spot{dir = 1; icon_state = "tube1"; tag = "icon-tube1 (NORTH)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"rb" = (/obj/machinery/door/window/brigdoor/southleft{req_one_access_txt = "2;19"},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"rx" = (/obj/machinery/mech_bay_recharge_port/upgraded/unsimulated,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"sq" = (/obj/structure/table/reinforced,/obj/item/kitchen/knife/combat{pixel_x = -3; pixel_y = 3},/obj/item/kitchen/knife/combat,/obj/item/kitchen/knife/combat{pixel_x = 3; pixel_y = -3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"tx" = (/obj/machinery/sleeper/upgraded{dir = 4},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"ty" = (/obj/structure/shuttle/window{dir = 1; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (NORTH)"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"ua" = (/obj/structure/chair{dir = 8},/obj/machinery/door_control{dir = 4; id = "Asclshutters"; name = "remote shutter control"; pixel_x = -5; pixel_y = 35; req_access = list(101); req_access_txt = "0"},/obj/machinery/keycard_auth{pixel_y = 24},/obj/machinery/door_control{dir = 2; id = "asclblast"; name = "blast door control"; pixel_x = 5; pixel_y = 35; pixel_z = 0; req_access = list(101); req_access_txt = "0"},/obj/structure/chair/comfy/shuttle{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"uz" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall4"; tag = "icon-swall14"},/area/shuttle/administration)
-"uW" = (/obj/structure/shuttle/engine/heater{dir = 4; icon_state = "heater"},/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/plating,/area/shuttle/administration)
-"uY" = (/obj/structure/window/reinforced,/obj/structure/table/reinforced,/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"vk" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall_s6"},/area/shuttle/administration)
-"vy" = (/obj/structure/table/reinforced,/obj/item/stack/sheet/metal/fifty,/obj/item/stack/sheet/glass/fifty,/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"vA" = (/obj/structure/chair/comfy/shuttle,/obj/machinery/light/spot{dir = 1; icon_state = "tube1"; tag = "icon-tube1 (NORTH)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"vW" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/storage/box/handcuffs,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"wG" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/item/clothing/suit/armor/bulletproof{pixel_x = 0; pixel_y = 0},/obj/item/clothing/head/helmet/alt,/obj/item/clothing/suit/armor/bulletproof{pixel_x = 0; pixel_y = 0},/obj/item/clothing/head/helmet/alt,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"wH" = (/obj/machinery/light/spot{dir = 8; icon_state = "tube1"; tag = "icon-tube1 (WEST)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"wQ" = (/obj/structure/shuttle/window{dir = 8; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (WEST)"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/space,/area/shuttle/administration)
-"xm" = (/obj/structure/table/reinforced,/obj/item/clothing/mask/breath{pixel_x = 3; pixel_y = -3},/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath{pixel_x = -3; pixel_y = 3},/obj/item/flashlight,/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"xF" = (/obj/structure/rack,/obj/item/storage/box/buck{pixel_x = -3; pixel_y = 3},/obj/item/storage/box/buck,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"xG" = (/obj/structure/shuttle/window{dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (EAST)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"xK" = (/obj/structure/sign/nosmoking_2,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall3"; tag = "icon-swall3"},/area/shuttle/administration)
-"xQ" = (/obj/structure/chair{dir = 4},/obj/machinery/light/spot{dir = 1; icon_state = "tube1"; tag = "icon-tube1 (NORTH)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"xU" = (/obj/structure/table/reinforced,/obj/item/stack/sheet/metal/fifty,/obj/item/stack/sheet/glass/fifty,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"xZ" = (/turf/space,/area/shuttle/administration)
-"yg" = (/obj/structure/table/reinforced,/obj/machinery/door/window/brigdoor/eastleft{name = "Armory"; req_access_txt = "3"},/obj/machinery/door/window/brigdoor/westleft{name = "Armory},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"yF" = (/obj/machinery/status_display,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall3"},/area/shuttle/administration)
-"yH" = (/obj/structure/table/reinforced,/obj/machinery/door/window/brigdoor/eastleft{name = "Armory"; req_access_txt = "3"},/obj/machinery/door/window/brigdoor/westleft{name = "Armory"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"zY" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall14"},/area/shuttle/administration)
-"AH" = (/obj/machinery/mech_bay_recharge_port/upgraded/unsimulated,/obj/machinery/light/spot,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Bc" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 8},/obj/item/shield/riot,/obj/item/shield/riot{pixel_x = 2; pixel_y = -4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Bj" = (/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Bn" = (/obj/machinery/door/window/brigdoor/southleft{req_one_access_txt = "2;19"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Bq" = (/obj/structure/sign/nosmoking_2,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall1"; tag = "icon-swall1"},/area/shuttle/administration)
-"Cl" = (/obj/structure/table/reinforced,/obj/item/storage/toolbox/emergency{pixel_x = -3; pixel_y = 3},/obj/item/storage/toolbox/mechanical,/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"Dp" = (/obj/machinery/porta_turret{installation = /obj/item/gun/energy/gun},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Du" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/item/gun/energy/gun,/obj/item/gun/energy/gun{pixel_x = 3; pixel_y = -3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"DZ" = (/obj/structure/chair{dir = 4},/obj/machinery/light/spot,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Ea" = (/obj/structure/table/reinforced,/obj/item/paper_bin/nanotrasen,/obj/item/pen,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"EQ" = (/obj/machinery/door/airlock/shuttle/glass,/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"Fd" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/gun/energy/gun,/obj/item/gun/energy/gun{pixel_x = 3; pixel_y = -3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Fo" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/item/gun/energy/immolator/multi{pixel_y = -3},/obj/item/gun/energy/immolator/multi,/obj/item/gun/energy/immolator/multi{pixel_y = 3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"FF" = (/obj/structure/sign/poster/official/enlist,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall12"},/area/shuttle/administration)
-"FT" = (/obj/structure/rack,/obj/item/storage/box/buck{pixel_x = -3; pixel_y = 3},/obj/item/storage/box/buck,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Gn" = (/obj/item/gun/projectile/shotgun/riot{pixel_x = -3; pixel_y = 3},/obj/item/gun/projectile/shotgun/riot,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/rack,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Gs" = (/obj/structure/shuttle/window{dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_mid"; tag = "icon-window5 (EAST)"},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Gx" = (/obj/structure/fans/tiny,/obj/machinery/door/airlock/external,/obj/docking_port/mobile{dir = 2; dwidth = 9; height = 18; id = "admin"; name = "armory"; roundstart_move = "cc_bay_1"; timid = 1; width = 19},/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "asclblast"; name = "Blast Door"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Gy" = (/obj/structure/chair{dir = 1},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"GK" = (/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end"},/obj/structure/grille,/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Hc" = (/obj/machinery/porta_turret{installation = /obj/item/gun/energy/gun},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"Hl" = (/obj/machinery/recharger/wallcharger{pixel_y = 25},/obj/machinery/recharger/wallcharger{pixel_y = 35},/obj/structure/chair/comfy/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"HN" = (/obj/structure/sign/poster/official/do_not_question,/obj/item/tank/emergency_oxygen/engi,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall3"},/area/shuttle/administration)
-"Ir" = (/obj/machinery/computer/shuttle/admin{name = "NRV Sparta shuttle console"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"IC" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall3"},/area/shuttle/administration)
-"JC" = (/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_mid"; tag = "icon-window5_mid"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Ke" = (/obj/machinery/door/window/brigdoor/southright{req_one_access_txt = "2;19"},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"Kh" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Ki" = (/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 4},/obj/item/clothing/suit/armor/bulletproof{pixel_x = 0; pixel_y = 0},/obj/structure/rack,/obj/item/clothing/head/helmet/alt,/obj/item/clothing/suit/armor/bulletproof{pixel_x = 0; pixel_y = 0},/obj/item/clothing/head/helmet/alt,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"KM" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall7"},/area/shuttle/administration)
-"Lh" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/gun/energy/ionrifle{pixel_x = 3; pixel_y = 3},/obj/item/gun/energy/ionrifle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"LK" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"LP" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall_s9"},/area/shuttle/administration)
-"Mi" = (/obj/structure/table/reinforced,/obj/machinery/recharger,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Mj" = (/obj/structure/table/reinforced,/obj/item/rcd_ammo{pixel_x = -3; pixel_y = 3},/obj/item/rcd/preloaded,/obj/item/rcd_ammo,/obj/item/rcd_ammo{pixel_x = 3; pixel_y = -3},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"Mo" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 8},/obj/item/clothing/suit/armor/bulletproof{pixel_x = 0; pixel_y = 0},/obj/item/clothing/head/helmet/alt,/obj/item/clothing/suit/armor/bulletproof{pixel_x = 0; pixel_y = 0},/obj/item/clothing/head/helmet/alt,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Mw" = (/obj/structure/table/reinforced,/obj/item/storage/box/donkpockets,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"MN" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall12"},/area/shuttle/administration)
-"MZ" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall3"; tag = "icon-swall3"},/area/shuttle/administration)
-"Ni" = (/obj/item/gun/projectile/shotgun/riot{pixel_x = -3; pixel_y = 3},/obj/item/gun/projectile/shotgun/riot,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/rack,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"NF" = (/obj/structure/sign/poster/official/here_for_your_safety,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall3"; tag = "icon-swall3"},/area/shuttle/administration)
-"NQ" = (/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Op" = (/obj/structure/chair/comfy/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Ou" = (/obj/machinery/autolathe/upgraded{hacked = 1},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"Pe" = (/obj/machinery/door/window/brigdoor/southright{req_one_access_txt = "2;19"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Pn" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 4},/obj/item/clothing/suit/armor/riot,/obj/item/clothing/suit/armor/riot{pixel_x = 3; pixel_y = -3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"PL" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall_s10"},/area/shuttle/administration)
-"PS" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 8},/obj/item/gun/energy/gun/nuclear{pixel_y = -3},/obj/item/gun/energy/gun/nuclear,/obj/item/gun/energy/gun/nuclear{pixel_y = 3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"PV" = (/obj/structure/rack,/obj/item/gun/energy/sniperrifle{pixel_y = -4},/obj/item/gun/energy/sniperrifle,/obj/item/gun/energy/sniperrifle{pixel_y = 3},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Ri" = (/obj/structure/shuttle/window{dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (EAST)"},/obj/structure/grille,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Ry" = (/obj/structure/shuttle/window{dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_mid"; tag = "icon-window5 (EAST)"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/turf/space,/area/shuttle/administration)
-"RM" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall8"; tag = "icon-swall12"},/area/shuttle/administration)
-"RV" = (/obj/structure/shuttle/window{dir = 1; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (NORTH)"},/obj/structure/grille,/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"TC" = (/obj/structure/shuttle/window{dir = 1; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; tag = "icon-window5_end (NORTH)"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"TD" = (/obj/machinery/door/airlock/command{name = "Command Center"; req_access = null; req_access_txt = "19"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"TF" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/item/storage/fancy/donut_box,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"TJ" = (/obj/structure/shuttle/window{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_mid"; tag = "icon-window5_mid"},/obj/structure/grille,/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "open"; id_tag = "Asclshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Un" = (/obj/structure/table/reinforced,/obj/machinery/recharger/wallcharger{pixel_y = 25},/obj/machinery/recharger/wallcharger{pixel_y = 35},/obj/item/tank/emergency_oxygen/engi{pixel_x = 3; pixel_y = -3},/obj/item/tank/emergency_oxygen/engi,/obj/item/tank/emergency_oxygen/engi{pixel_x = -3; pixel_y = 3},/obj/machinery/light/spot{dir = 8; icon_state = "tube1"; tag = "icon-tube1 (WEST)"},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"Ur" = (/obj/machinery/porta_turret{installation = /obj/item/gun/energy/gun},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor,/area/shuttle/administration)
-"UR" = (/obj/machinery/status_display,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall12"},/area/shuttle/administration)
-"UX" = (/obj/structure/fans/tiny,/obj/machinery/door/airlock/external,/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "asclblast"; name = "Blast Door"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"Vc" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall_s5"},/area/shuttle/administration)
-"Vg" = (/obj/structure/table/reinforced,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"VC" = (/obj/machinery/door/airlock/shuttle{name = "Shuttle Armory"; req_access_txt = "3"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"VQ" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/item/gun/energy/gun/advtaser{pixel_x = 3; pixel_y = -3},/obj/item/gun/energy/gun/advtaser{pixel_x = 0; pixel_y = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"WV" = (/obj/structure/table/reinforced,/obj/item/restraints/handcuffs{pixel_x = 3; pixel_y = -3},/obj/item/restraints/handcuffs,/obj/item/restraints/handcuffs{pixel_x = -3; pixel_y = 3},/obj/machinery/light/spot{dir = 4; icon_state = "tube1"; tag = "icon-tube1 (EAST)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
-"XL" = (/obj/item/gun/projectile/shotgun/riot{pixel_x = -3; pixel_y = 3},/obj/item/gun/projectile/shotgun/riot,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/rack,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration)
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ae" = (
+/obj/structure/sign/securearea,
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall4";
+	tag = "icon-swall14"
+	},
+/area/shuttle/administration)
+"al" = (
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/table/reinforced,
+/obj/item/folder,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"aI" = (
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/machinery/recharger,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"aP" = (
+/obj/machinery/vending/security,
+/obj/machinery/light/spot{
+	dir = 8;
+	icon_state = "tube1";
+	tag = "icon-tube1 (WEST)"
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"bi" = (
+/obj/machinery/recharger/wallcharger{
+	pixel_y = 25
+	},
+/obj/machinery/recharger/wallcharger{
+	pixel_y = 35
+	},
+/obj/structure/table/reinforced,
+/obj/item/storage/firstaid,
+/obj/item/storage/firstaid/brute,
+/obj/item/storage/box/bodybags,
+/obj/item/storage/firstaid/surgery,
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"bm" = (
+/obj/structure/shuttle/window{
+	dir = 8;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_end";
+	tag = "icon-window5_end (WEST)"
+	},
+/obj/structure/grille,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"bn" = (
+/obj/structure/shuttle/window{
+	dir = 4;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_end";
+	tag = "icon-window5_end (EAST)"
+	},
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 8;
+	icon_state = "open";
+	id_tag = "Asclshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
+/obj/structure/grille,
+/turf/space,
+/area/shuttle/administration)
+"ce" = (
+/obj/machinery/autolathe/upgraded{
+	hacked = 1
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"cV" = (
+/obj/structure/closet/emcloset,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"de" = (
+/obj/machinery/suit_storage_unit/security/secure,
+/obj/machinery/light/spot,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"df" = (
+/obj/structure/rack,
+/obj/item/storage/box/buck{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/storage/box/buck,
+/obj/structure/window/reinforced,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"dn" = (
+/obj/machinery/computer/camera_advanced/shuttle_docker/admin{
+	name = "NRV Sparta navigation computer"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"dH" = (
+/obj/structure/rack,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/item/gun/energy/gun,
+/obj/item/gun/energy/gun{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"dP" = (
+/obj/machinery/recharge_station/upgraded,
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"ee" = (
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 1;
+	icon_state = "open";
+	id_tag = "Asclshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
+/obj/structure/grille,
+/obj/structure/shuttle/window{
+	dir = 2;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_mid";
+	tag = "icon-window5_mid"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"eI" = (
+/obj/machinery/turretid/stun{
+	check_access = 0;
+	name = "Shuttle Turret Control";
+	pixel_y = 30
+	},
+/obj/structure/table/reinforced,
+/obj/item/folder,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"eL" = (
+/obj/structure/chair{
+	dir = 8
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"fo" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/obj/machinery/light/spot,
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"fF" = (
+/obj/machinery/light/spot{
+	dir = 4;
+	icon_state = "tube1";
+	tag = "icon-tube1 (EAST)"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"fQ" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"gd" = (
+/obj/machinery/door/airlock/shuttle,
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"gh" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"gj" = (
+/obj/machinery/computer/communications{
+	name = "NRV Sparta Communications Console"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"hN" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"ig" = (
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 1;
+	icon_state = "open";
+	id_tag = "Asclshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
+/obj/structure/grille,
+/obj/structure/shuttle/window{
+	dir = 1;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_end";
+	tag = "icon-window5_end (NORTH)"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"ir" = (
+/obj/structure/closet/emcloset,
+/obj/machinery/light/spot{
+	dir = 1;
+	icon_state = "tube1";
+	tag = "icon-tube1 (NORTH)"
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"jn" = (
+/obj/structure/shuttle/window{
+	dir = 2;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_end";
+	tag = "icon-window5_end"
+	},
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 2;
+	icon_state = "open";
+	id_tag = "Asclshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"jB" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/lockbox/mindshield,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"jU" = (
+/obj/machinery/suit_storage_unit/security/secure,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"kf" = (
+/obj/structure/sign/securearea,
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall8";
+	tag = "icon-swall12"
+	},
+/area/shuttle/administration)
+"mw" = (
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"mM" = (
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall13"
+	},
+/area/shuttle/administration)
+"mS" = (
+/obj/structure/shuttle/window{
+	dir = 8;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_end";
+	tag = "icon-window5_end (WEST)"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"nG" = (
+/obj/structure/shuttle/window{
+	dir = 4;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_mid";
+	tag = "icon-window5 (EAST)"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"nI" = (
+/turf/simulated/shuttle/wall{
+	icon_state = "swall8"
+	},
+/area/shuttle/administration)
+"oj" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/machinery/light/spot,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"oR" = (
+/obj/machinery/porta_turret{
+	installation = /obj/item/gun/energy/gun
+	},
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"oY" = (
+/obj/structure/chair,
+/obj/machinery/light/spot{
+	dir = 1;
+	icon_state = "tube1";
+	tag = "icon-tube1 (NORTH)"
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"pa" = (
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall11"
+	},
+/area/shuttle/administration)
+"pK" = (
+/obj/structure/shuttle/engine/propulsion{
+	dir = 4;
+	icon_state = "propulsion"
+	},
+/turf/simulated/shuttle/plating,
+/area/shuttle/administration)
+"pQ" = (
+/obj/structure/chair{
+	dir = 8
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"qQ" = (
+/obj/machinery/recharger/wallcharger{
+	pixel_y = 25
+	},
+/obj/machinery/recharger/wallcharger{
+	pixel_y = 35
+	},
+/obj/machinery/light/spot{
+	dir = 1;
+	icon_state = "tube1";
+	tag = "icon-tube1 (NORTH)"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"rb" = (
+/obj/machinery/door/window/brigdoor/southleft{
+	req_one_access_txt = "2;19"
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"rx" = (
+/obj/machinery/mech_bay_recharge_port/upgraded/unsimulated,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"sq" = (
+/obj/structure/table/reinforced,
+/obj/item/kitchen/knife/combat{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/kitchen/knife/combat,
+/obj/item/kitchen/knife/combat{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"tx" = (
+/obj/machinery/sleeper/upgraded{
+	dir = 4
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"ty" = (
+/obj/structure/shuttle/window{
+	dir = 1;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_end";
+	tag = "icon-window5_end (NORTH)"
+	},
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 1;
+	icon_state = "open";
+	id_tag = "Asclshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
+/obj/structure/grille,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"ua" = (
+/obj/structure/chair{
+	dir = 8
+	},
+/obj/machinery/door_control{
+	dir = 4;
+	id = "Asclshutters";
+	name = "remote shutter control";
+	pixel_x = -5;
+	pixel_y = 35;
+	req_access = list(101);
+	req_access_txt = "0"
+	},
+/obj/machinery/keycard_auth{
+	pixel_y = 24
+	},
+/obj/machinery/door_control{
+	dir = 2;
+	id = "asclblast";
+	name = "blast door control";
+	pixel_x = 5;
+	pixel_y = 35;
+	pixel_z = 0;
+	req_access = list(101);
+	req_access_txt = "0"
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"uz" = (
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall4";
+	tag = "icon-swall14"
+	},
+/area/shuttle/administration)
+"uW" = (
+/obj/structure/shuttle/engine/heater{
+	dir = 4;
+	icon_state = "heater"
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/simulated/shuttle/plating,
+/area/shuttle/administration)
+"uY" = (
+/obj/structure/window/reinforced,
+/obj/structure/table/reinforced,
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"vk" = (
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall_s6"
+	},
+/area/shuttle/administration)
+"vy" = (
+/obj/structure/table/reinforced,
+/obj/item/stack/sheet/metal/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"vA" = (
+/obj/structure/chair/comfy/shuttle,
+/obj/machinery/light/spot{
+	dir = 1;
+	icon_state = "tube1";
+	tag = "icon-tube1 (NORTH)"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"vW" = (
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/item/storage/box/handcuffs,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"wG" = (
+/obj/structure/rack,
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/obj/item/clothing/suit/armor/bulletproof{
+	pixel_x = 0;
+	pixel_y = 0
+	},
+/obj/item/clothing/head/helmet/alt,
+/obj/item/clothing/suit/armor/bulletproof{
+	pixel_x = 0;
+	pixel_y = 0
+	},
+/obj/item/clothing/head/helmet/alt,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"wH" = (
+/obj/machinery/light/spot{
+	dir = 8;
+	icon_state = "tube1";
+	tag = "icon-tube1 (WEST)"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"wQ" = (
+/obj/structure/shuttle/window{
+	dir = 8;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_end";
+	tag = "icon-window5_end (WEST)"
+	},
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 8;
+	icon_state = "open";
+	id_tag = "Asclshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
+/obj/structure/grille,
+/turf/space,
+/area/shuttle/administration)
+"xm" = (
+/obj/structure/table/reinforced,
+/obj/item/clothing/mask/breath{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/flashlight,
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"xF" = (
+/obj/structure/rack,
+/obj/item/storage/box/buck{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/storage/box/buck,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"xG" = (
+/obj/structure/shuttle/window{
+	dir = 4;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_end";
+	tag = "icon-window5_end (EAST)"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"xK" = (
+/obj/structure/sign/nosmoking_2,
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall3";
+	tag = "icon-swall3"
+	},
+/area/shuttle/administration)
+"xQ" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/machinery/light/spot{
+	dir = 1;
+	icon_state = "tube1";
+	tag = "icon-tube1 (NORTH)"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"xU" = (
+/obj/structure/table/reinforced,
+/obj/item/stack/sheet/metal/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"xZ" = (
+/turf/space,
+/area/shuttle/administration)
+"yg" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/brigdoor/eastleft{
+	name = "Armory";
+	req_access_txt = "3"
+	},
+/obj/machinery/door/window/brigdoor/westleft{
+	name = "Armory"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"yF" = (
+/obj/machinery/status_display,
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall3"
+	},
+/area/shuttle/administration)
+"zY" = (
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall14"
+	},
+/area/shuttle/administration)
+"AH" = (
+/obj/machinery/mech_bay_recharge_port/upgraded/unsimulated,
+/obj/machinery/light/spot,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"Bc" = (
+/obj/structure/rack,
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/item/shield/riot,
+/obj/item/shield/riot{
+	pixel_x = 2;
+	pixel_y = -4
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"Bj" = (
+/obj/structure/shuttle/window{
+	dir = 2;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_end";
+	tag = "icon-window5_end"
+	},
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 2;
+	icon_state = "open";
+	id_tag = "Asclshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
+/obj/structure/grille,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"Bn" = (
+/obj/machinery/door/window/brigdoor/southleft{
+	req_one_access_txt = "2;19"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"Bq" = (
+/obj/structure/sign/nosmoking_2,
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall1";
+	tag = "icon-swall1"
+	},
+/area/shuttle/administration)
+"Cl" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/toolbox/emergency{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/storage/toolbox/mechanical,
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"Dp" = (
+/obj/machinery/porta_turret{
+	installation = /obj/item/gun/energy/gun
+	},
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"Du" = (
+/obj/structure/rack,
+/obj/structure/window/reinforced,
+/obj/item/gun/energy/gun,
+/obj/item/gun/energy/gun{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"DZ" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/machinery/light/spot,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"Ea" = (
+/obj/structure/table/reinforced,
+/obj/item/paper_bin/nanotrasen,
+/obj/item/pen,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"EQ" = (
+/obj/machinery/door/airlock/shuttle/glass,
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"Fd" = (
+/obj/structure/rack,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/item/gun/energy/gun,
+/obj/item/gun/energy/gun{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"Fo" = (
+/obj/structure/rack,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/item/gun/energy/immolator/multi{
+	pixel_y = -3
+	},
+/obj/item/gun/energy/immolator/multi,
+/obj/item/gun/energy/immolator/multi{
+	pixel_y = 3
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"FF" = (
+/obj/structure/sign/poster/official/enlist,
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall12"
+	},
+/area/shuttle/administration)
+"FT" = (
+/obj/structure/rack,
+/obj/item/storage/box/buck{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/storage/box/buck,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"Gn" = (
+/obj/item/gun/projectile/shotgun/riot{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/gun/projectile/shotgun/riot,
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/obj/structure/rack,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"Gs" = (
+/obj/structure/shuttle/window{
+	dir = 4;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_mid";
+	tag = "icon-window5 (EAST)"
+	},
+/obj/structure/grille,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"Gx" = (
+/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/external,
+/obj/docking_port/mobile{
+	dir = 2;
+	dwidth = 9;
+	height = 18;
+	id = "admin";
+	name = "armory";
+	roundstart_move = "cc_bay_1";
+	timid = 1;
+	width = 19
+	},
+/obj/machinery/door/poddoor{
+	density = 0;
+	icon_state = "open";
+	id_tag = "asclblast";
+	name = "Blast Door";
+	opacity = 0
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"Gy" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"GK" = (
+/obj/structure/shuttle/window{
+	dir = 2;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_end";
+	tag = "icon-window5_end"
+	},
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 2;
+	icon_state = "open";
+	id_tag = "Asclshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"Hc" = (
+/obj/machinery/porta_turret{
+	installation = /obj/item/gun/energy/gun
+	},
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"Hl" = (
+/obj/machinery/recharger/wallcharger{
+	pixel_y = 25
+	},
+/obj/machinery/recharger/wallcharger{
+	pixel_y = 35
+	},
+/obj/structure/chair/comfy/shuttle,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"HN" = (
+/obj/structure/sign/poster/official/do_not_question,
+/obj/item/tank/emergency_oxygen/engi,
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall3"
+	},
+/area/shuttle/administration)
+"Ir" = (
+/obj/machinery/computer/shuttle/admin{
+	name = "NRV Sparta shuttle console"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"IC" = (
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall3"
+	},
+/area/shuttle/administration)
+"JC" = (
+/obj/structure/shuttle/window{
+	dir = 2;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_mid";
+	tag = "icon-window5_mid"
+	},
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 1;
+	icon_state = "open";
+	id_tag = "Asclshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
+/obj/structure/grille,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"Ke" = (
+/obj/machinery/door/window/brigdoor/southright{
+	req_one_access_txt = "2;19"
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"Kh" = (
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"Ki" = (
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/item/clothing/suit/armor/bulletproof{
+	pixel_x = 0;
+	pixel_y = 0
+	},
+/obj/structure/rack,
+/obj/item/clothing/head/helmet/alt,
+/obj/item/clothing/suit/armor/bulletproof{
+	pixel_x = 0;
+	pixel_y = 0
+	},
+/obj/item/clothing/head/helmet/alt,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"KM" = (
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall7"
+	},
+/area/shuttle/administration)
+"Lh" = (
+/obj/structure/rack,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/item/gun/energy/ionrifle{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/gun/energy/ionrifle,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"LK" = (
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"LP" = (
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall_s9"
+	},
+/area/shuttle/administration)
+"Mi" = (
+/obj/structure/table/reinforced,
+/obj/machinery/recharger,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"Mj" = (
+/obj/structure/table/reinforced,
+/obj/item/rcd_ammo{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/rcd/preloaded,
+/obj/item/rcd_ammo,
+/obj/item/rcd_ammo{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"Mo" = (
+/obj/structure/rack,
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/item/clothing/suit/armor/bulletproof{
+	pixel_x = 0;
+	pixel_y = 0
+	},
+/obj/item/clothing/head/helmet/alt,
+/obj/item/clothing/suit/armor/bulletproof{
+	pixel_x = 0;
+	pixel_y = 0
+	},
+/obj/item/clothing/head/helmet/alt,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"Mw" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/box/donkpockets,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"MN" = (
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall12"
+	},
+/area/shuttle/administration)
+"MZ" = (
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall3";
+	tag = "icon-swall3"
+	},
+/area/shuttle/administration)
+"Ni" = (
+/obj/item/gun/projectile/shotgun/riot{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/gun/projectile/shotgun/riot,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/obj/structure/rack,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"NF" = (
+/obj/structure/sign/poster/official/here_for_your_safety,
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall3";
+	tag = "icon-swall3"
+	},
+/area/shuttle/administration)
+"NQ" = (
+/obj/structure/shuttle/window{
+	dir = 2;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_end";
+	tag = "icon-window5_end"
+	},
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 1;
+	icon_state = "open";
+	id_tag = "Asclshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
+/obj/structure/grille,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"Op" = (
+/obj/structure/chair/comfy/shuttle,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"Ou" = (
+/obj/machinery/autolathe/upgraded{
+	hacked = 1
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"Pe" = (
+/obj/machinery/door/window/brigdoor/southright{
+	req_one_access_txt = "2;19"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"Pn" = (
+/obj/structure/rack,
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/item/clothing/suit/armor/riot,
+/obj/item/clothing/suit/armor/riot{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"PL" = (
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall_s10"
+	},
+/area/shuttle/administration)
+"PS" = (
+/obj/structure/rack,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/item/gun/energy/gun/nuclear{
+	pixel_y = -3
+	},
+/obj/item/gun/energy/gun/nuclear,
+/obj/item/gun/energy/gun/nuclear{
+	pixel_y = 3
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"PV" = (
+/obj/structure/rack,
+/obj/item/gun/energy/sniperrifle{
+	pixel_y = -4
+	},
+/obj/item/gun/energy/sniperrifle,
+/obj/item/gun/energy/sniperrifle{
+	pixel_y = 3
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"Ri" = (
+/obj/structure/shuttle/window{
+	dir = 4;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_end";
+	tag = "icon-window5_end (EAST)"
+	},
+/obj/structure/grille,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"Ry" = (
+/obj/structure/shuttle/window{
+	dir = 4;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_mid";
+	tag = "icon-window5 (EAST)"
+	},
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 8;
+	icon_state = "open";
+	id_tag = "Asclshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
+/obj/structure/grille,
+/turf/space,
+/area/shuttle/administration)
+"RM" = (
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall8";
+	tag = "icon-swall12"
+	},
+/area/shuttle/administration)
+"RV" = (
+/obj/structure/shuttle/window{
+	dir = 1;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_end";
+	tag = "icon-window5_end (NORTH)"
+	},
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 2;
+	icon_state = "open";
+	id_tag = "Asclshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"TC" = (
+/obj/structure/shuttle/window{
+	dir = 1;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_end";
+	tag = "icon-window5_end (NORTH)"
+	},
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 2;
+	icon_state = "open";
+	id_tag = "Asclshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"TD" = (
+/obj/machinery/door/airlock/command{
+	name = "Command Center";
+	req_access = null;
+	req_access_txt = "19"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"TF" = (
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/window/reinforced,
+/obj/item/storage/fancy/donut_box,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"TJ" = (
+/obj/structure/shuttle/window{
+	dir = 2;
+	icon = 'icons/turf/shuttle.dmi';
+	icon_state = "window5_mid";
+	tag = "icon-window5_mid"
+	},
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 2;
+	icon_state = "open";
+	id_tag = "Asclshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"Un" = (
+/obj/structure/table/reinforced,
+/obj/machinery/recharger/wallcharger{
+	pixel_y = 25
+	},
+/obj/machinery/recharger/wallcharger{
+	pixel_y = 35
+	},
+/obj/item/tank/emergency_oxygen/engi{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/obj/item/tank/emergency_oxygen/engi,
+/obj/item/tank/emergency_oxygen/engi{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/machinery/light/spot{
+	dir = 8;
+	icon_state = "tube1";
+	tag = "icon-tube1 (WEST)"
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"Ur" = (
+/obj/machinery/porta_turret{
+	installation = /obj/item/gun/energy/gun
+	},
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"UR" = (
+/obj/machinery/status_display,
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall12"
+	},
+/area/shuttle/administration)
+"UX" = (
+/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/external,
+/obj/machinery/door/poddoor{
+	density = 0;
+	icon_state = "open";
+	id_tag = "asclblast";
+	name = "Blast Door";
+	opacity = 0
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"Vc" = (
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall_s5"
+	},
+/area/shuttle/administration)
+"Vg" = (
+/obj/structure/table/reinforced,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"VC" = (
+/obj/machinery/door/airlock/shuttle{
+	name = "Shuttle Armory";
+	req_access_txt = "3"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"VQ" = (
+/obj/structure/rack,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/item/gun/energy/gun/advtaser{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/obj/item/gun/energy/gun/advtaser{
+	pixel_x = 0;
+	pixel_y = 0
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"WV" = (
+/obj/structure/table/reinforced,
+/obj/item/restraints/handcuffs{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/obj/item/restraints/handcuffs,
+/obj/item/restraints/handcuffs{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/machinery/light/spot{
+	dir = 4;
+	icon_state = "tube1";
+	tag = "icon-tube1 (EAST)"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"XL" = (
+/obj/item/gun/projectile/shotgun/riot{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/gun/projectile/shotgun/riot,
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/obj/structure/rack,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
 
 (1,1,1) = {"
-vkMNNQJCtyMNzYRMUXGxuzzYMNNQeeigMNPLxZ
-MZUnmwmwmwbinGoYmwmwoYMZKhKhKhKhfFKMPL
-HNxmmwmwmwClnGmwmwmwmwBqwHdHDuFdKhuWpK
-ICMjmwmwmwvynGmwmwmwmwygeLMowGKiKhuWpK
-ICaPmwmwmwOuxGmwmwmwmwVCKhKhKhKhfFKMLP
-ICdPmwmwmwmwgdmwmwmwmwyHeLFTdfxFKhICxZ
-ICtxmwGyfomwmSUrmwmwHcyFKhNiGnXLKhICxZ
-KMMNMNMNzYMNmMkfEQEQaepawHKhKhKhfFKMPL
-wQeIuaqQMZcVxQvWmwmwirbmPVKhKhKhKhuWpK
-RyIrghKhTDKhKhalmwmwpQGsPSKhKhKhKhuWpK
-RydnghKhbmKhhNaImwmwpQRiFoKhKhKhsqKMLP
-bngjghKhRiKhKhLKmwmwpQMZwHKhKhKhWVICxZ
-KMMNFFURnIBnPeTFrbKeuYMZVQLhKhKhxUICxZ
-ICvAOpOpHlKhKhKhKhKhKhxKBcPnKhKhceKMPL
-ICKhKhKhKhKhKhKhKhKhKhVCKhKhKhKhjBuWpK
-IChNEaMweLKhKhKhKhKhKhNFrxKhKhKhjUuWpK
-ICDZVgMieLfQojfQoRDpojMZAHKhKhKhdeKMLP
-VcMNBjTJRVMNMNMNjnTCMNmMMNGKTJRVMNLPxZ
+vk
+MZ
+HN
+IC
+IC
+IC
+IC
+KM
+wQ
+Ry
+Ry
+bn
+KM
+IC
+IC
+IC
+IC
+Vc
+"}
+(2,1,1) = {"
+MN
+Un
+xm
+Mj
+aP
+dP
+tx
+MN
+eI
+Ir
+dn
+gj
+MN
+vA
+Kh
+hN
+DZ
+MN
+"}
+(3,1,1) = {"
+NQ
+mw
+mw
+mw
+mw
+mw
+mw
+MN
+ua
+gh
+gh
+gh
+FF
+Op
+Kh
+Ea
+Vg
+Bj
+"}
+(4,1,1) = {"
+JC
+mw
+mw
+mw
+mw
+mw
+Gy
+MN
+qQ
+Kh
+Kh
+Kh
+UR
+Op
+Kh
+Mw
+Mi
+TJ
+"}
+(5,1,1) = {"
+ty
+mw
+mw
+mw
+mw
+mw
+fo
+zY
+MZ
+TD
+bm
+Ri
+nI
+Hl
+Kh
+eL
+eL
+RV
+"}
+(6,1,1) = {"
+MN
+bi
+Cl
+vy
+Ou
+mw
+mw
+MN
+cV
+Kh
+Kh
+Kh
+Bn
+Kh
+Kh
+Kh
+fQ
+MN
+"}
+(7,1,1) = {"
+zY
+nG
+nG
+nG
+xG
+gd
+mS
+mM
+xQ
+Kh
+hN
+Kh
+Pe
+Kh
+Kh
+Kh
+oj
+MN
+"}
+(8,1,1) = {"
+RM
+oY
+mw
+mw
+mw
+mw
+Ur
+kf
+vW
+al
+aI
+LK
+TF
+Kh
+Kh
+Kh
+fQ
+MN
+"}
+(9,1,1) = {"
+UX
+mw
+mw
+mw
+mw
+mw
+mw
+EQ
+mw
+mw
+mw
+mw
+rb
+Kh
+Kh
+Kh
+oR
+jn
+"}
+(10,1,1) = {"
+Gx
+mw
+mw
+mw
+mw
+mw
+mw
+EQ
+mw
+mw
+mw
+mw
+Ke
+Kh
+Kh
+Kh
+Dp
+TC
+"}
+(11,1,1) = {"
+uz
+oY
+mw
+mw
+mw
+mw
+Hc
+ae
+ir
+pQ
+pQ
+pQ
+uY
+Kh
+Kh
+Kh
+oj
+MN
+"}
+(12,1,1) = {"
+zY
+MZ
+Bq
+yg
+VC
+yg
+yF
+pa
+bm
+Gs
+Ri
+MZ
+MZ
+xK
+VC
+NF
+MZ
+mM
+"}
+(13,1,1) = {"
+MN
+Kh
+wH
+eL
+Kh
+eL
+Kh
+wH
+PV
+PS
+Fo
+wH
+VQ
+Bc
+Kh
+rx
+AH
+MN
+"}
+(14,1,1) = {"
+NQ
+Kh
+dH
+Mo
+Kh
+FT
+Ni
+Kh
+Kh
+Kh
+Kh
+Kh
+Lh
+Pn
+Kh
+Kh
+Kh
+GK
+"}
+(15,1,1) = {"
+ee
+Kh
+Du
+wG
+Kh
+df
+Gn
+Kh
+Kh
+Kh
+Kh
+Kh
+Kh
+Kh
+Kh
+Kh
+Kh
+TJ
+"}
+(16,1,1) = {"
+ig
+Kh
+Fd
+Ki
+Kh
+xF
+XL
+Kh
+Kh
+Kh
+Kh
+Kh
+Kh
+Kh
+Kh
+Kh
+Kh
+RV
+"}
+(17,1,1) = {"
+MN
+fF
+Kh
+Kh
+fF
+Kh
+Kh
+fF
+Kh
+Kh
+sq
+WV
+xU
+ce
+jB
+jU
+de
+MN
+"}
+(18,1,1) = {"
+PL
+KM
+uW
+uW
+KM
+IC
+IC
+KM
+uW
+uW
+KM
+IC
+IC
+KM
+uW
+uW
+KM
+LP
+"}
+(19,1,1) = {"
+xZ
+PL
+pK
+pK
+LP
+xZ
+xZ
+PL
+pK
+pK
+LP
+xZ
+xZ
+PL
+pK
+pK
+LP
+xZ
 "}

From f2e76730a3ae89773f0a4534fa791f3f127ab81a Mon Sep 17 00:00:00 2001
From: TDSSS <32099540+TDSSS@users.noreply.github.com>
Date: Tue, 25 Aug 2020 22:32:53 +0200
Subject: [PATCH 5/9] Changes, improvements

---
 _maps/map_files/shuttles/admin_armory.dmm | 40 +++++++++++------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/_maps/map_files/shuttles/admin_armory.dmm b/_maps/map_files/shuttles/admin_armory.dmm
index ebc28f87bb7..cb2dbdde2c3 100644
--- a/_maps/map_files/shuttles/admin_armory.dmm
+++ b/_maps/map_files/shuttles/admin_armory.dmm
@@ -166,8 +166,7 @@
 	name = "Shuttle Turret Control";
 	pixel_y = 30
 	},
-/obj/structure/table/reinforced,
-/obj/item/folder,
+/obj/machinery/computer/camera_advanced,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -413,7 +412,7 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/administration)
 "rx" = (
-/obj/machinery/mech_bay_recharge_port/upgraded/unsimulated,
+/obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -597,16 +596,16 @@
 /area/shuttle/administration)
 "xm" = (
 /obj/structure/table/reinforced,
-/obj/item/clothing/mask/breath{
+/obj/item/rcd/preloaded,
+/obj/item/rcd_ammo,
+/obj/item/rcd_ammo{
 	pixel_x = 3;
 	pixel_y = -3
 	},
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath{
+/obj/item/rcd_ammo{
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/flashlight,
 /turf/simulated/shuttle/floor,
 /area/shuttle/administration)
 "xF" = (
@@ -694,8 +693,8 @@
 	},
 /area/shuttle/administration)
 "AH" = (
-/obj/machinery/mech_bay_recharge_port/upgraded/unsimulated,
 /obj/machinery/light/spot,
+/obj/structure/dispenser/oxygen,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -1087,17 +1086,7 @@
 	},
 /area/shuttle/administration)
 "Mj" = (
-/obj/structure/table/reinforced,
-/obj/item/rcd_ammo{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/rcd/preloaded,
-/obj/item/rcd_ammo,
-/obj/item/rcd_ammo{
-	pixel_x = 3;
-	pixel_y = -3
-	},
+/obj/machinery/vending/medical,
 /turf/simulated/shuttle/floor,
 /area/shuttle/administration)
 "Mo" = (
@@ -1408,6 +1397,15 @@
 	icon_state = "tube1";
 	tag = "icon-tube1 (WEST)"
 	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath{
+	pixel_x = 3;
+	pixel_y = -3
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/administration)
 "Ur" = (
@@ -1851,8 +1849,8 @@ fF
 Kh
 Kh
 fF
-Kh
-Kh
+Mi
+Mi
 sq
 WV
 xU

From 4a2be7129a9e80b6a5463e4ac7f8a7f42a52df59 Mon Sep 17 00:00:00 2001
From: TDSSS <32099540+TDSSS@users.noreply.github.com>
Date: Wed, 26 Aug 2020 17:14:13 +0200
Subject: [PATCH 6/9] Numerous improvements

---
 _maps/map_files/shuttles/admin_armory.dmm | 622 +++++++---------------
 1 file changed, 205 insertions(+), 417 deletions(-)

diff --git a/_maps/map_files/shuttles/admin_armory.dmm b/_maps/map_files/shuttles/admin_armory.dmm
index cb2dbdde2c3..7f76619abda 100644
--- a/_maps/map_files/shuttles/admin_armory.dmm
+++ b/_maps/map_files/shuttles/admin_armory.dmm
@@ -37,12 +37,6 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/administration)
 "bi" = (
-/obj/machinery/recharger/wallcharger{
-	pixel_y = 25
-	},
-/obj/machinery/recharger/wallcharger{
-	pixel_y = 35
-	},
 /obj/structure/table/reinforced,
 /obj/item/storage/firstaid,
 /obj/item/storage/firstaid/brute,
@@ -51,35 +45,16 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/administration)
 "bm" = (
-/obj/structure/shuttle/window{
-	dir = 8;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_end";
-	tag = "icon-window5_end (WEST)"
-	},
 /obj/structure/grille,
+/obj/machinery/door/poddoor/shutters/preopen{
+	dir = 8;
+	id_tag = "adminarmoryshutters"
+	},
+/obj/structure/window/full/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
-"bn" = (
-/obj/structure/shuttle/window{
-	dir = 4;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_end";
-	tag = "icon-window5_end (EAST)"
-	},
-/obj/machinery/door/poddoor/shutters{
-	density = 0;
-	dir = 8;
-	icon_state = "open";
-	id_tag = "Asclshutters";
-	name = "Blast Shutters";
-	opacity = 0
-	},
-/obj/structure/grille,
-/turf/space,
-/area/shuttle/administration)
 "ce" = (
 /obj/machinery/autolathe/upgraded{
 	hacked = 1
@@ -88,6 +63,14 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
+"cL" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
 "cV" = (
 /obj/structure/closet/emcloset,
 /turf/simulated/shuttle/floor{
@@ -140,26 +123,6 @@
 /obj/machinery/recharge_station/upgraded,
 /turf/simulated/shuttle/floor,
 /area/shuttle/administration)
-"ee" = (
-/obj/machinery/door/poddoor/shutters{
-	density = 0;
-	dir = 1;
-	icon_state = "open";
-	id_tag = "Asclshutters";
-	name = "Blast Shutters";
-	opacity = 0
-	},
-/obj/structure/grille,
-/obj/structure/shuttle/window{
-	dir = 2;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_mid";
-	tag = "icon-window5_mid"
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
 "eI" = (
 /obj/machinery/turretid/stun{
 	check_access = 0;
@@ -224,29 +187,15 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
-"hN" = (
-/obj/structure/chair{
-	dir = 4
-	},
+"gm" = (
+/obj/machinery/suit_storage_unit/standard_unit,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
-"ig" = (
-/obj/machinery/door/poddoor/shutters{
-	density = 0;
-	dir = 1;
-	icon_state = "open";
-	id_tag = "Asclshutters";
-	name = "Blast Shutters";
-	opacity = 0
-	},
-/obj/structure/grille,
-/obj/structure/shuttle/window{
-	dir = 1;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_end";
-	tag = "icon-window5_end (NORTH)"
+"hN" = (
+/obj/structure/chair{
+	dir = 4
 	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
@@ -262,12 +211,6 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/administration)
 "jn" = (
-/obj/structure/shuttle/window{
-	dir = 2;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_end";
-	tag = "icon-window5_end"
-	},
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
 	dir = 2;
@@ -276,6 +219,8 @@
 	name = "Blast Shutters";
 	opacity = 0
 	},
+/obj/structure/grille,
+/obj/structure/window/full/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -310,33 +255,43 @@
 	icon_state = "swall13"
 	},
 /area/shuttle/administration)
-"mS" = (
-/obj/structure/shuttle/window{
-	dir = 8;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_end";
-	tag = "icon-window5_end (WEST)"
+"mN" = (
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 2;
+	icon_state = "open";
+	id_tag = "Asclshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
+/obj/structure/window/full/shuttle,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"mY" = (
+/obj/machinery/light/spot,
+/obj/machinery/porta_turret{
+	installation = /obj/item/gun/energy/gun
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
 	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
 "nG" = (
-/obj/structure/shuttle/window{
-	dir = 4;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_mid";
-	tag = "icon-window5 (EAST)"
-	},
+/obj/structure/window/full/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
-"nI" = (
-/turf/simulated/shuttle/wall{
-	icon_state = "swall8"
-	},
-/area/shuttle/administration)
 "oj" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 1
@@ -346,21 +301,28 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
-"oR" = (
-/obj/machinery/porta_turret{
-	installation = /obj/item/gun/energy/gun
+"on" = (
+/obj/machinery/light/spot{
+	dir = 8;
+	tag = "icon-tube1 (WEST)"
 	},
-/obj/structure/window/reinforced{
-	dir = 1;
-	layer = 2.9
-	},
-/obj/structure/window/reinforced{
-	dir = 8
+/obj/machinery/door_control{
+	id = "adminarmoryshutters";
+	name = "Armory Internal Shutters";
+	pixel_x = -26;
+	req_access_txt = "3"
 	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
+"oD" = (
+/obj/structure/sign/securearea,
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall12"
+	},
+/area/shuttle/administration)
 "oY" = (
 /obj/structure/chair,
 /obj/machinery/light/spot{
@@ -401,6 +363,12 @@
 	icon_state = "tube1";
 	tag = "icon-tube1 (NORTH)"
 	},
+/obj/machinery/door_control{
+	id = "adminshuttlebridge";
+	name = "Bridge Privacy Shutters";
+	pixel_x = 25;
+	req_access_txt = "19"
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -411,12 +379,6 @@
 	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/administration)
-"rx" = (
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
 "sq" = (
 /obj/structure/table/reinforced,
 /obj/item/kitchen/knife/combat{
@@ -438,26 +400,6 @@
 	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/administration)
-"ty" = (
-/obj/structure/shuttle/window{
-	dir = 1;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_end";
-	tag = "icon-window5_end (NORTH)"
-	},
-/obj/machinery/door/poddoor/shutters{
-	density = 0;
-	dir = 1;
-	icon_state = "open";
-	id_tag = "Asclshutters";
-	name = "Blast Shutters";
-	opacity = 0
-	},
-/obj/structure/grille,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
 "ua" = (
 /obj/structure/chair{
 	dir = 8
@@ -465,24 +407,21 @@
 /obj/machinery/door_control{
 	dir = 4;
 	id = "Asclshutters";
-	name = "remote shutter control";
+	name = "External Window Shutter Control";
 	pixel_x = -5;
 	pixel_y = 35;
-	req_access = list(101);
-	req_access_txt = "0"
+	req_access_txt = "19"
 	},
 /obj/machinery/keycard_auth{
 	pixel_y = 24
 	},
 /obj/machinery/door_control{
-	dir = 2;
 	id = "asclblast";
-	name = "blast door control";
+	name = "Airlock Blast Door Control";
 	pixel_x = 5;
 	pixel_y = 35;
-	pixel_z = 0;
-	req_access = list(101);
-	req_access_txt = "0"
+	req_access = null;
+	req_access_txt = "19"
 	},
 /obj/structure/chair/comfy/shuttle{
 	dir = 8
@@ -526,12 +465,12 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/administration)
 "vA" = (
-/obj/structure/chair/comfy/shuttle,
 /obj/machinery/light/spot{
 	dir = 1;
 	icon_state = "tube1";
 	tag = "icon-tube1 (NORTH)"
 	},
+/obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -546,6 +485,16 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
+"wn" = (
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id_tag = "adminshuttlebridge"
+	},
+/obj/structure/window/full/shuttle,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
 "wG" = (
 /obj/structure/rack,
 /obj/structure/window/reinforced{
@@ -577,12 +526,6 @@
 	},
 /area/shuttle/administration)
 "wQ" = (
-/obj/structure/shuttle/window{
-	dir = 8;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_end";
-	tag = "icon-window5_end (WEST)"
-	},
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
 	dir = 8;
@@ -592,6 +535,7 @@
 	opacity = 0
 	},
 /obj/structure/grille,
+/obj/structure/window/full/shuttle,
 /turf/space,
 /area/shuttle/administration)
 "xm" = (
@@ -623,17 +567,6 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
-"xG" = (
-/obj/structure/shuttle/window{
-	dir = 4;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_end";
-	tag = "icon-window5_end (EAST)"
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
 "xK" = (
 /obj/structure/sign/nosmoking_2,
 /turf/simulated/shuttle/wall{
@@ -675,6 +608,10 @@
 /obj/machinery/door/window/brigdoor/westleft{
 	name = "Armory"
 	},
+/obj/machinery/door/poddoor/shutters/preopen{
+	dir = 8;
+	id_tag = "adminarmoryshutters"
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -686,6 +623,12 @@
 	icon_state = "swall3"
 	},
 /area/shuttle/administration)
+"yJ" = (
+/obj/machinery/recharger/wallcharger{
+	pixel_y = 25
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
 "zY" = (
 /turf/simulated/shuttle/wall{
 	dir = 2;
@@ -694,7 +637,16 @@
 /area/shuttle/administration)
 "AH" = (
 /obj/machinery/light/spot,
-/obj/structure/dispenser/oxygen,
+/obj/machinery/porta_turret{
+	installation = /obj/item/gun/energy/gun
+	},
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -718,21 +670,17 @@
 	},
 /area/shuttle/administration)
 "Bj" = (
-/obj/structure/shuttle/window{
-	dir = 2;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_end";
-	tag = "icon-window5_end"
+/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/external{
+	req_one_access_txt = "2;19"
 	},
-/obj/machinery/door/poddoor/shutters{
+/obj/machinery/door/poddoor{
 	density = 0;
-	dir = 2;
 	icon_state = "open";
-	id_tag = "Asclshutters";
-	name = "Blast Shutters";
+	id_tag = "asclblast";
+	name = "Blast Door";
 	opacity = 0
 	},
-/obj/structure/grille,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -762,21 +710,6 @@
 /obj/item/storage/toolbox/mechanical,
 /turf/simulated/shuttle/floor,
 /area/shuttle/administration)
-"Dp" = (
-/obj/machinery/porta_turret{
-	installation = /obj/item/gun/energy/gun
-	},
-/obj/structure/window/reinforced{
-	dir = 1;
-	layer = 2.9
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
 "Du" = (
 /obj/structure/rack,
 /obj/structure/window/reinforced,
@@ -790,18 +723,8 @@
 	},
 /area/shuttle/administration)
 "DZ" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/machinery/light/spot,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"Ea" = (
-/obj/structure/table/reinforced,
-/obj/item/paper_bin/nanotrasen,
-/obj/item/pen,
+/obj/structure/closet/emcloset,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -879,18 +802,6 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
-"Gs" = (
-/obj/structure/shuttle/window{
-	dir = 4;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_mid";
-	tag = "icon-window5 (EAST)"
-	},
-/obj/structure/grille,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
 "Gx" = (
 /obj/structure/fans/tiny,
 /obj/machinery/door/airlock/external,
@@ -921,26 +832,6 @@
 	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/administration)
-"GK" = (
-/obj/structure/shuttle/window{
-	dir = 2;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_end";
-	tag = "icon-window5_end"
-	},
-/obj/structure/grille,
-/obj/machinery/door/poddoor/shutters{
-	density = 0;
-	dir = 2;
-	icon_state = "open";
-	id_tag = "Asclshutters";
-	name = "Blast Shutters";
-	opacity = 0
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
 "Hc" = (
 /obj/machinery/porta_turret{
 	installation = /obj/item/gun/energy/gun
@@ -954,18 +845,6 @@
 	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/administration)
-"Hl" = (
-/obj/machinery/recharger/wallcharger{
-	pixel_y = 25
-	},
-/obj/machinery/recharger/wallcharger{
-	pixel_y = 35
-	},
-/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
 "HN" = (
 /obj/structure/sign/poster/official/do_not_question,
 /obj/item/tank/emergency_oxygen/engi,
@@ -982,32 +861,24 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
+"IA" = (
+/obj/structure/table/reinforced,
+/obj/machinery/recharger{
+	pixel_x = -5
+	},
+/obj/machinery/recharger{
+	pixel_x = 8
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
 "IC" = (
 /turf/simulated/shuttle/wall{
 	dir = 2;
 	icon_state = "swall3"
 	},
 /area/shuttle/administration)
-"JC" = (
-/obj/structure/shuttle/window{
-	dir = 2;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_mid";
-	tag = "icon-window5_mid"
-	},
-/obj/machinery/door/poddoor/shutters{
-	density = 0;
-	dir = 1;
-	icon_state = "open";
-	id_tag = "Asclshutters";
-	name = "Blast Shutters";
-	opacity = 0
-	},
-/obj/structure/grille,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
 "Ke" = (
 /obj/machinery/door/window/brigdoor/southright{
 	req_one_access_txt = "2;19"
@@ -1064,10 +935,10 @@
 	},
 /area/shuttle/administration)
 "LK" = (
-/obj/structure/table/reinforced,
 /obj/structure/window/reinforced{
 	dir = 4
 	},
+/obj/machinery/computer/secure_data,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -1112,13 +983,6 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
-"Mw" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/box/donkpockets,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
 "MN" = (
 /turf/simulated/shuttle/wall{
 	dir = 2;
@@ -1159,12 +1023,6 @@
 	},
 /area/shuttle/administration)
 "NQ" = (
-/obj/structure/shuttle/window{
-	dir = 2;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_end";
-	tag = "icon-window5_end"
-	},
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
 	dir = 1;
@@ -1174,12 +1032,13 @@
 	opacity = 0
 	},
 /obj/structure/grille,
+/obj/structure/window/full/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
 "Op" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/dispenser/oxygen,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -1258,36 +1117,14 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
-"Ri" = (
-/obj/structure/shuttle/window{
-	dir = 4;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_end";
-	tag = "icon-window5_end (EAST)"
+"Qk" = (
+/obj/structure/sign/vacuum{
+	pixel_x = -32
 	},
-/obj/structure/grille,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
-"Ry" = (
-/obj/structure/shuttle/window{
-	dir = 4;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_mid";
-	tag = "icon-window5 (EAST)"
-	},
-/obj/machinery/door/poddoor/shutters{
-	density = 0;
-	dir = 8;
-	icon_state = "open";
-	id_tag = "Asclshutters";
-	name = "Blast Shutters";
-	opacity = 0
-	},
-/obj/structure/grille,
-/turf/space,
-/area/shuttle/administration)
 "RM" = (
 /turf/simulated/shuttle/wall{
 	dir = 2;
@@ -1295,45 +1132,6 @@
 	tag = "icon-swall12"
 	},
 /area/shuttle/administration)
-"RV" = (
-/obj/structure/shuttle/window{
-	dir = 1;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_end";
-	tag = "icon-window5_end (NORTH)"
-	},
-/obj/structure/grille,
-/obj/machinery/door/poddoor/shutters{
-	density = 0;
-	dir = 2;
-	icon_state = "open";
-	id_tag = "Asclshutters";
-	name = "Blast Shutters";
-	opacity = 0
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"TC" = (
-/obj/structure/shuttle/window{
-	dir = 1;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_end";
-	tag = "icon-window5_end (NORTH)"
-	},
-/obj/machinery/door/poddoor/shutters{
-	density = 0;
-	dir = 2;
-	icon_state = "open";
-	id_tag = "Asclshutters";
-	name = "Blast Shutters";
-	opacity = 0
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
 "TD" = (
 /obj/machinery/door/airlock/command{
 	name = "Command Center";
@@ -1355,34 +1153,8 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
-"TJ" = (
-/obj/structure/shuttle/window{
-	dir = 2;
-	icon = 'icons/turf/shuttle.dmi';
-	icon_state = "window5_mid";
-	tag = "icon-window5_mid"
-	},
-/obj/structure/grille,
-/obj/machinery/door/poddoor/shutters{
-	density = 0;
-	dir = 2;
-	icon_state = "open";
-	id_tag = "Asclshutters";
-	name = "Blast Shutters";
-	opacity = 0
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
 "Un" = (
 /obj/structure/table/reinforced,
-/obj/machinery/recharger/wallcharger{
-	pixel_y = 25
-	},
-/obj/machinery/recharger/wallcharger{
-	pixel_y = 35
-	},
 /obj/item/tank/emergency_oxygen/engi{
 	pixel_x = 3;
 	pixel_y = -3
@@ -1448,8 +1220,8 @@
 	icon_state = "swall_s5"
 	},
 /area/shuttle/administration)
-"Vg" = (
-/obj/structure/table/reinforced,
+"Ve" = (
+/obj/machinery/door/airlock/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -1519,6 +1291,22 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
+"ZX" = (
+/obj/machinery/porta_turret{
+	installation = /obj/item/gun/energy/gun
+	},
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
 
 (1,1,1) = {"
 vk
@@ -1530,9 +1318,9 @@ IC
 IC
 KM
 wQ
-Ry
-Ry
-bn
+wQ
+wQ
+wQ
 KM
 IC
 IC
@@ -1555,14 +1343,14 @@ dn
 gj
 MN
 vA
-Kh
-hN
+cL
+cL
 DZ
-MN
+oD
 "}
 (3,1,1) = {"
-NQ
-mw
+MN
+yJ
 mw
 mw
 mw
@@ -1576,13 +1364,13 @@ gh
 FF
 Op
 Kh
-Ea
-Vg
+Kh
+Kh
 Bj
 "}
 (4,1,1) = {"
-JC
-mw
+MN
+yJ
 mw
 mw
 mw
@@ -1594,15 +1382,15 @@ Kh
 Kh
 Kh
 UR
-Op
+gm
 Kh
-Mw
-Mi
-TJ
+Kh
+Kh
+Bj
 "}
 (5,1,1) = {"
-ty
-mw
+MN
+yJ
 mw
 mw
 mw
@@ -1611,14 +1399,14 @@ fo
 zY
 MZ
 TD
-bm
-Ri
-nI
-Hl
-Kh
-eL
-eL
-RV
+wn
+wn
+pa
+MZ
+Ve
+nG
+nG
+oD
 "}
 (6,1,1) = {"
 MN
@@ -1634,10 +1422,10 @@ Kh
 Kh
 Kh
 Bn
+Qk
 Kh
-Kh
-Kh
-fQ
+Mi
+Mi
 MN
 "}
 (7,1,1) = {"
@@ -1645,10 +1433,10 @@ zY
 nG
 nG
 nG
-xG
+nG
 gd
-mS
-mM
+nG
+MN
 xQ
 Kh
 hN
@@ -1678,7 +1466,7 @@ Kh
 Kh
 Kh
 fQ
-MN
+mN
 "}
 (9,1,1) = {"
 UX
@@ -1697,7 +1485,7 @@ rb
 Kh
 Kh
 Kh
-oR
+fQ
 jn
 "}
 (10,1,1) = {"
@@ -1717,8 +1505,8 @@ Ke
 Kh
 Kh
 Kh
-Dp
-TC
+Kh
+jn
 "}
 (11,1,1) = {"
 uz
@@ -1737,7 +1525,7 @@ uY
 Kh
 Kh
 Kh
-oj
+mY
 MN
 "}
 (12,1,1) = {"
@@ -1750,8 +1538,8 @@ yg
 yF
 pa
 bm
-Gs
-Ri
+bm
+bm
 MZ
 MZ
 xK
@@ -1768,7 +1556,7 @@ eL
 Kh
 eL
 Kh
-wH
+on
 PV
 PS
 Fo
@@ -1776,7 +1564,7 @@ wH
 VQ
 Bc
 Kh
-rx
+Kh
 AH
 MN
 "}
@@ -1784,10 +1572,10 @@ MN
 NQ
 Kh
 dH
-Mo
+Ni
 Kh
 FT
-Ni
+Mo
 Kh
 Kh
 Kh
@@ -1798,17 +1586,16 @@ Pn
 Kh
 Kh
 Kh
-GK
+mN
 "}
 (15,1,1) = {"
-ee
+NQ
 Kh
 Du
-wG
-Kh
-df
 Gn
 Kh
+df
+wG
 Kh
 Kh
 Kh
@@ -1818,17 +1605,17 @@ Kh
 Kh
 Kh
 Kh
-TJ
+Kh
+mN
 "}
 (16,1,1) = {"
-ig
+NQ
 Kh
 Fd
-Ki
-Kh
-xF
 XL
 Kh
+xF
+Ki
 Kh
 Kh
 Kh
@@ -1838,7 +1625,8 @@ Kh
 Kh
 Kh
 Kh
-RV
+Kh
+mN
 "}
 (17,1,1) = {"
 MN
@@ -1849,8 +1637,8 @@ fF
 Kh
 Kh
 fF
-Mi
-Mi
+ZX
+IA
 sq
 WV
 xU

From c9b076e9570388072c33f33c858fca7a4b3d409a Mon Sep 17 00:00:00 2001
From: TDSSS <32099540+TDSSS@users.noreply.github.com>
Date: Wed, 26 Aug 2020 17:28:28 +0200
Subject: [PATCH 7/9] Minor changes

---
 _maps/map_files/shuttles/admin_armory.dmm | 263 +++++++++++-----------
 1 file changed, 132 insertions(+), 131 deletions(-)

diff --git a/_maps/map_files/shuttles/admin_armory.dmm b/_maps/map_files/shuttles/admin_armory.dmm
index 7f76619abda..9a556e22a9e 100644
--- a/_maps/map_files/shuttles/admin_armory.dmm
+++ b/_maps/map_files/shuttles/admin_armory.dmm
@@ -63,7 +63,7 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
-"cL" = (
+"cl" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
@@ -187,12 +187,6 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
-"gm" = (
-/obj/machinery/suit_storage_unit/standard_unit,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
 "hN" = (
 /obj/structure/chair{
 	dir = 4
@@ -210,6 +204,22 @@
 	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/administration)
+"iz" = (
+/obj/machinery/porta_turret{
+	installation = /obj/item/gun/energy/gun
+	},
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
 "jn" = (
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
@@ -246,16 +256,7 @@
 	tag = "icon-swall12"
 	},
 /area/shuttle/administration)
-"mw" = (
-/turf/simulated/shuttle/floor,
-/area/shuttle/administration)
-"mM" = (
-/turf/simulated/shuttle/wall{
-	dir = 2;
-	icon_state = "swall13"
-	},
-/area/shuttle/administration)
-"mN" = (
+"mq" = (
 /obj/structure/grille,
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
@@ -270,24 +271,18 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
-"mY" = (
-/obj/machinery/light/spot,
-/obj/machinery/porta_turret{
-	installation = /obj/item/gun/energy/gun
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 1;
-	layer = 2.9
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
+"mw" = (
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
+"mM" = (
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall13"
 	},
 /area/shuttle/administration)
 "nG" = (
 /obj/structure/window/full/shuttle,
+/obj/structure/grille,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -301,28 +296,6 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
-"on" = (
-/obj/machinery/light/spot{
-	dir = 8;
-	tag = "icon-tube1 (WEST)"
-	},
-/obj/machinery/door_control{
-	id = "adminarmoryshutters";
-	name = "Armory Internal Shutters";
-	pixel_x = -26;
-	req_access_txt = "3"
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
-"oD" = (
-/obj/structure/sign/securearea,
-/turf/simulated/shuttle/wall{
-	dir = 2;
-	icon_state = "swall12"
-	},
-/area/shuttle/administration)
 "oY" = (
 /obj/structure/chair,
 /obj/machinery/light/spot{
@@ -379,6 +352,16 @@
 	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/administration)
+"rW" = (
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id_tag = "adminshuttlebridge"
+	},
+/obj/structure/window/full/shuttle,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
 "sq" = (
 /obj/structure/table/reinforced,
 /obj/item/kitchen/knife/combat{
@@ -485,16 +468,6 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
-"wn" = (
-/obj/structure/grille,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id_tag = "adminshuttlebridge"
-	},
-/obj/structure/window/full/shuttle,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
 "wG" = (
 /obj/structure/rack,
 /obj/structure/window/reinforced{
@@ -567,6 +540,12 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
+"xH" = (
+/obj/machinery/door/airlock/shuttle,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
 "xK" = (
 /obj/structure/sign/nosmoking_2,
 /turf/simulated/shuttle/wall{
@@ -616,6 +595,18 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
+"yu" = (
+/obj/structure/table/reinforced,
+/obj/machinery/recharger{
+	pixel_x = -5
+	},
+/obj/machinery/recharger{
+	pixel_x = 8
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
 "yF" = (
 /obj/machinery/status_display,
 /turf/simulated/shuttle/wall{
@@ -623,12 +614,6 @@
 	icon_state = "swall3"
 	},
 /area/shuttle/administration)
-"yJ" = (
-/obj/machinery/recharger/wallcharger{
-	pixel_y = 25
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/administration)
 "zY" = (
 /turf/simulated/shuttle/wall{
 	dir = 2;
@@ -701,6 +686,22 @@
 	tag = "icon-swall1"
 	},
 /area/shuttle/administration)
+"BZ" = (
+/obj/machinery/light/spot,
+/obj/machinery/porta_turret{
+	installation = /obj/item/gun/energy/gun
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
 "Cl" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/toolbox/emergency{
@@ -729,6 +730,13 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
+"Eq" = (
+/obj/structure/sign/securearea,
+/turf/simulated/shuttle/wall{
+	dir = 2;
+	icon_state = "swall12"
+	},
+/area/shuttle/administration)
 "EQ" = (
 /obj/machinery/door/airlock/shuttle/glass,
 /turf/simulated/shuttle/floor,
@@ -787,6 +795,14 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
+"Gf" = (
+/obj/structure/sign/vacuum{
+	pixel_x = -32
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
 "Gn" = (
 /obj/item/gun/projectile/shotgun/riot{
 	pixel_x = -3;
@@ -861,24 +877,18 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
-"IA" = (
-/obj/structure/table/reinforced,
-/obj/machinery/recharger{
-	pixel_x = -5
-	},
-/obj/machinery/recharger{
-	pixel_x = 8
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
 "IC" = (
 /turf/simulated/shuttle/wall{
 	dir = 2;
 	icon_state = "swall3"
 	},
 /area/shuttle/administration)
+"Jt" = (
+/obj/machinery/suit_storage_unit/standard_unit,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
 "Ke" = (
 /obj/machinery/door/window/brigdoor/southright{
 	req_one_access_txt = "2;19"
@@ -1014,6 +1024,12 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
+"Ns" = (
+/obj/machinery/recharger/wallcharger{
+	pixel_y = 25
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/administration)
 "NF" = (
 /obj/structure/sign/poster/official/here_for_your_safety,
 /turf/simulated/shuttle/wall{
@@ -1081,6 +1097,21 @@
 	icon_state = "swall_s10"
 	},
 /area/shuttle/administration)
+"PR" = (
+/obj/machinery/light/spot{
+	dir = 8;
+	tag = "icon-tube1 (WEST)"
+	},
+/obj/machinery/door_control{
+	id = "adminarmoryshutters";
+	name = "Armory Internal Shutters";
+	pixel_x = -26;
+	req_access_txt = "3"
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
 "PS" = (
 /obj/structure/rack,
 /obj/structure/window/reinforced{
@@ -1117,14 +1148,6 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
-"Qk" = (
-/obj/structure/sign/vacuum{
-	pixel_x = -32
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
 "RM" = (
 /turf/simulated/shuttle/wall{
 	dir = 2;
@@ -1220,12 +1243,6 @@
 	icon_state = "swall_s5"
 	},
 /area/shuttle/administration)
-"Ve" = (
-/obj/machinery/door/airlock/shuttle,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
 "VC" = (
 /obj/machinery/door/airlock/shuttle{
 	name = "Shuttle Armory";
@@ -1291,22 +1308,6 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
-"ZX" = (
-/obj/machinery/porta_turret{
-	installation = /obj/item/gun/energy/gun
-	},
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 1;
-	layer = 2.9
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
 
 (1,1,1) = {"
 vk
@@ -1343,14 +1344,14 @@ dn
 gj
 MN
 vA
-cL
-cL
+cl
+cl
 DZ
-oD
+Eq
 "}
 (3,1,1) = {"
 MN
-yJ
+Ns
 mw
 mw
 mw
@@ -1370,7 +1371,7 @@ Bj
 "}
 (4,1,1) = {"
 MN
-yJ
+Ns
 mw
 mw
 mw
@@ -1382,7 +1383,7 @@ Kh
 Kh
 Kh
 UR
-gm
+Jt
 Kh
 Kh
 Kh
@@ -1390,7 +1391,7 @@ Bj
 "}
 (5,1,1) = {"
 MN
-yJ
+Ns
 mw
 mw
 mw
@@ -1399,14 +1400,14 @@ fo
 zY
 MZ
 TD
-wn
-wn
+rW
+rW
 pa
 MZ
-Ve
+xH
 nG
 nG
-oD
+Eq
 "}
 (6,1,1) = {"
 MN
@@ -1422,7 +1423,7 @@ Kh
 Kh
 Kh
 Bn
-Qk
+Gf
 Kh
 Mi
 Mi
@@ -1466,7 +1467,7 @@ Kh
 Kh
 Kh
 fQ
-mN
+mq
 "}
 (9,1,1) = {"
 UX
@@ -1525,7 +1526,7 @@ uY
 Kh
 Kh
 Kh
-mY
+BZ
 MN
 "}
 (12,1,1) = {"
@@ -1556,7 +1557,7 @@ eL
 Kh
 eL
 Kh
-on
+PR
 PV
 PS
 Fo
@@ -1586,7 +1587,7 @@ Pn
 Kh
 Kh
 Kh
-mN
+mq
 "}
 (15,1,1) = {"
 NQ
@@ -1606,7 +1607,7 @@ Kh
 Kh
 Kh
 Kh
-mN
+mq
 "}
 (16,1,1) = {"
 NQ
@@ -1626,7 +1627,7 @@ Kh
 Kh
 Kh
 Kh
-mN
+mq
 "}
 (17,1,1) = {"
 MN
@@ -1637,8 +1638,8 @@ fF
 Kh
 Kh
 fF
-ZX
-IA
+iz
+yu
 sq
 WV
 xU

From ada7ddb605645fac38d085229cb9a538dca87334 Mon Sep 17 00:00:00 2001
From: TDSSS <32099540+TDSSS@users.noreply.github.com>
Date: Thu, 27 Aug 2020 14:49:52 +0200
Subject: [PATCH 8/9] shotguns come preloaded with buckshot now

---
 _maps/map_files/shuttles/admin_armory.dmm     | 30 +++++++++----------
 .../projectiles/ammunition/magazines.dm       |  3 ++
 .../projectiles/guns/projectile/shotgun.dm    |  2 ++
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/_maps/map_files/shuttles/admin_armory.dmm b/_maps/map_files/shuttles/admin_armory.dmm
index 9a556e22a9e..8c9af5ea17e 100644
--- a/_maps/map_files/shuttles/admin_armory.dmm
+++ b/_maps/map_files/shuttles/admin_armory.dmm
@@ -804,16 +804,16 @@
 	},
 /area/shuttle/administration)
 "Gn" = (
-/obj/item/gun/projectile/shotgun/riot{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/gun/projectile/shotgun/riot,
 /obj/structure/window/reinforced{
 	dir = 1;
 	layer = 2.9
 	},
 /obj/structure/rack,
+/obj/item/gun/projectile/shotgun/riot/buckshot{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/gun/projectile/shotgun/riot/buckshot,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -1007,11 +1007,6 @@
 	},
 /area/shuttle/administration)
 "Ni" = (
-/obj/item/gun/projectile/shotgun/riot{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/gun/projectile/shotgun/riot,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
@@ -1020,6 +1015,11 @@
 	layer = 2.9
 	},
 /obj/structure/rack,
+/obj/item/gun/projectile/shotgun/riot/buckshot{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/gun/projectile/shotgun/riot/buckshot,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -1291,11 +1291,6 @@
 	},
 /area/shuttle/administration)
 "XL" = (
-/obj/item/gun/projectile/shotgun/riot{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/gun/projectile/shotgun/riot,
 /obj/structure/window/reinforced{
 	dir = 1;
 	layer = 2.9
@@ -1304,6 +1299,11 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
+/obj/item/gun/projectile/shotgun/riot/buckshot{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/gun/projectile/shotgun/riot/buckshot,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
index 8cb48f8e36a..c59e5890331 100644
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -133,6 +133,9 @@
 /obj/item/ammo_box/magazine/internal/shot/riot/short
 	max_ammo = 3
 
+/obj/item/ammo_box/magazine/internal/shot/riot/buckshot
+	ammo_type = /obj/item/ammo_casing/shotgun/buckshot
+
 /obj/item/ammo_box/magazine/internal/grenadelauncher
 	name = "grenade launcher internal magazine"
 	ammo_type = /obj/item/ammo_casing/a40mm
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index 17a55722d2c..6c11fda5fd7 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -197,6 +197,8 @@
 	..()
 	post_sawoff()
 
+/obj/item/gun/projectile/shotgun/riot/buckshot	//comes pre-loaded with buckshot rather than rubber
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/riot/buckshot
 
 
 ///////////////////////

From bb90241284846d5aeba66fcac32ba0d0333922f1 Mon Sep 17 00:00:00 2001
From: TDSSS <32099540+TDSSS@users.noreply.github.com>
Date: Thu, 27 Aug 2020 14:57:59 +0200
Subject: [PATCH 9/9] Less risk of armory leaking now

---
 _maps/map_files/shuttles/admin_armory.dmm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_maps/map_files/shuttles/admin_armory.dmm b/_maps/map_files/shuttles/admin_armory.dmm
index 8c9af5ea17e..837f867a52b 100644
--- a/_maps/map_files/shuttles/admin_armory.dmm
+++ b/_maps/map_files/shuttles/admin_armory.dmm
@@ -425,7 +425,7 @@
 	dir = 4;
 	icon_state = "heater"
 	},
-/obj/structure/window/reinforced{
+/obj/structure/window/plasmareinforced{
 	dir = 8
 	},
 /turf/simulated/shuttle/plating,