diff --git a/maps/torch_fd/torch1_deck5.dmm b/maps/torch_fd/torch1_deck5.dmm index 5211dd8d34342..ed17f221f616a 100644 --- a/maps/torch_fd/torch1_deck5.dmm +++ b/maps/torch_fd/torch1_deck5.dmm @@ -124,7 +124,7 @@ "cu" = (/obj/floor_decal/techfloor{dir = 8},/obj/floor_decal/techfloor{dir = 4},/obj/machinery/door/airlock/hatch,/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/techfloor/grid,/area/exploration_shuttle/power) "cv" = (/obj/structure/bed/chair/shuttle/blue{dir = 4},/obj/floor_decal/corner/purple_dark/border{dir = 9},/obj/machinery/camera/network/fifth_deck{dir = 4},/obj/machinery/button/alternate/door/bolts{id_tag = "charon_cockpit"; name = "Emergency Cockpit Release"; pixel_x = -25; req_access = list("ACCESS_EXPLO_HELM")},/turf/simulated/floor/tiled/dark/monotile,/area/exploration_shuttle/airlock) "cw" = (/obj/floor_decal/corner/purple_dark/border{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark/monotile,/area/exploration_shuttle/airlock) -"cx" = (/obj/floor_decal/corner/mauve/mono,/obj/floor_decal/industrial/outline/yellow,/obj/machinery/light{dir = 8},/obj/structure/closet/secure_closet/explorer/medic,/obj/item/material/hatchet/machete,/turf/simulated/floor/tiled/monotile,/area/quartermaster/exploration) +"cx" = (/obj/floor_decal/corner/mauve/mono,/obj/floor_decal/industrial/outline/yellow,/obj/machinery/light{dir = 8},/obj/structure/closet/secure_closet/explorer/medic,/obj/item/material/hatchet/machete,/obj/item/storage/firstaid/individual/military,/turf/simulated/floor/tiled/monotile,/area/quartermaster/exploration) "cy" = (/obj/floor_decal/industrial/warning/corner,/turf/simulated/floor/tiled/monotile,/area/quartermaster/hangar) "cz" = (/obj/floor_decal/industrial/warning/corner,/obj/floor_decal/corner/purple_dark/border{dir = 1},/obj/machinery/computer/modular/preset/medical,/turf/simulated/floor/tiled/dark/monotile,/area/exploration_shuttle/airlock) "cA" = (/obj/overmap/visitable/ship/landable/guppy,/obj/machinery/atmospherics/pipe/manifold/visible{dir = 8},/obj/structure/cable/cyan,/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/machinery/power/terminal{dir = 8},/obj/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled/techfloor/grid,/area/guppy_hangar/start) @@ -365,7 +365,7 @@ "hj" = (/obj/floor_decal/corner_techfloor_gray{dir = 9},/obj/floor_decal/borderfloorblack/corner,/obj/floor_decal/corner_techfloor_gray{dir = 4},/obj/floor_decal/industrial/warning{dir = 8},/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/portables_connector,/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/tiled/steel_ridged,/area/butterfly_hangar) "hk" = (/obj/floor_decal/industrial/outline/yellow,/obj/machinery/mining/brace{dir = 8},/turf/simulated/floor/tiled/dark/monotile,/area/quartermaster/expedition/storage) "hl" = (/obj/wallframe_spawn/no_grille,/turf/simulated/floor/plating,/area/quartermaster/exploration) -"hm" = (/obj/structure/closet/secure_closet/pilot,/obj/floor_decal/industrial/outline/yellow,/obj/structure/sign/ecplaque{pixel_y = 30},/obj/item/material/hatchet/machete,/obj/machinery/camera/network/fifth_deck{c_tag = "Pilot's Lounge"; dir = 4},/turf/simulated/floor/tiled/dark/monotile,/area/command/pilot) +"hm" = (/obj/structure/closet/secure_closet/pilot,/obj/floor_decal/industrial/outline/yellow,/obj/structure/sign/ecplaque{pixel_y = 30},/obj/item/material/hatchet/machete,/obj/machinery/camera/network/fifth_deck{c_tag = "Pilot's Lounge"; dir = 4},/obj/item/storage/firstaid/individual/military,/turf/simulated/floor/tiled/dark/monotile,/area/command/pilot) "hn" = (/obj/floor_decal/industrial/outline/yellow,/obj/machinery/suspension_gen,/turf/simulated/floor/tiled/dark/monotile,/area/quartermaster/expedition/storage) "ho" = (/obj/random/junk,/obj/structure/catwalk,/turf/simulated/floor/plating,/area/maintenance/fifthdeck/aftstarboard) "hp" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/plating,/area/maintenance/fifthdeck/aftstarboard) @@ -376,7 +376,7 @@ "hu" = (/obj/structure/railing/mapped,/turf/simulated/floor/tiled/monotile,/area/hallway/primary/fifthdeck/fore) "hv" = (/obj/floor_decal/corner/brown/half{dir = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/monotile,/area/hallway/primary/fifthdeck/fore) "hw" = (/obj/floor_decal/corner/mauve{dir = 5},/turf/simulated/floor/tiled,/area/quartermaster/exploration) -"hx" = (/obj/machinery/firealarm{pixel_y = 24},/obj/floor_decal/corner/mauve/mono,/obj/structure/closet/secure_closet/explorer,/obj/floor_decal/industrial/outline/yellow,/obj/item/material/hatchet/machete,/turf/simulated/floor/tiled/monotile,/area/quartermaster/exploration) +"hx" = (/obj/machinery/firealarm{pixel_y = 24},/obj/floor_decal/corner/mauve/mono,/obj/structure/closet/secure_closet/explorer,/obj/floor_decal/industrial/outline/yellow,/obj/item/material/hatchet/machete,/obj/item/storage/firstaid/individual/military,/turf/simulated/floor/tiled/monotile,/area/quartermaster/exploration) "hy" = (/turf/simulated/floor/wood/walnut,/area/vacant/bar) "hz" = (/turf/simulated/floor/tiled,/area/quartermaster/exploration) "hA" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/random/trash,/obj/structure/railing/mapped{dir = 4; icon_state = "railing0-1"},/turf/simulated/floor/plating,/area/maintenance/fifthdeck/aftstarboard) @@ -513,9 +513,9 @@ "ke" = (/obj/machinery/atmospherics/pipe/simple/hidden/fuel{dir = 9},/obj/paint/green,/turf/simulated/wall/titanium,/area/butterfly_hangar) "kf" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/quartermaster/exploration) "kg" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled,/area/quartermaster/exploration) -"kh" = (/obj/floor_decal/corner/mauve/mono,/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/floor_decal/industrial/outline/yellow,/obj/structure/closet/secure_closet/explorer/engineer,/obj/item/material/hatchet/machete,/turf/simulated/floor/tiled/monotile,/area/quartermaster/exploration) +"kh" = (/obj/floor_decal/corner/mauve/mono,/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/floor_decal/industrial/outline/yellow,/obj/structure/closet/secure_closet/explorer/engineer,/obj/item/material/hatchet/machete,/obj/item/storage/firstaid/individual/military,/turf/simulated/floor/tiled/monotile,/area/quartermaster/exploration) "ki" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/exploration) -"kj" = (/obj/floor_decal/corner/mauve/mono,/obj/structure/closet/secure_closet/explorer,/obj/floor_decal/industrial/outline/yellow,/obj/item/material/hatchet/machete,/turf/simulated/floor/tiled/monotile,/area/quartermaster/exploration) +"kj" = (/obj/floor_decal/corner/mauve/mono,/obj/structure/closet/secure_closet/explorer,/obj/floor_decal/industrial/outline/yellow,/obj/item/material/hatchet/machete,/obj/item/storage/firstaid/individual/military,/turf/simulated/floor/tiled/monotile,/area/quartermaster/exploration) "kk" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/quartermaster/exploration) "kl" = (/turf/unsimulated/mask,/area/hallway/primary/fifthdeck/fore) "km" = (/obj/floor_decal/corner_techfloor_gray{dir = 9},/obj/floor_decal/borderfloorblack{dir = 4},/obj/floor_decal/industrial/warning{dir = 8},/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/structure/handrail{dir = 4},/obj/machinery/atmospherics/pipe/simple/visible/fuel,/turf/simulated/floor/tiled/steel_ridged,/area/butterfly_hangar) diff --git a/maps/torch_fd/torch2_deck4.dmm b/maps/torch_fd/torch2_deck4.dmm index 97da03475f5dc..d62a7013a1747 100644 --- a/maps/torch_fd/torch2_deck4.dmm +++ b/maps/torch_fd/torch2_deck4.dmm @@ -1682,7 +1682,7 @@ "Gy" = (/obj/shuttle_landmark/torch/deck1/butterfly,/turf/space,/area/space) "Gz" = (/obj/landmark/test/space_turf,/turf/space,/area/space) "Hj" = (/obj/floor_decal/techfloor{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/quartermaster/storage/upper) -"Sj" = (/obj/floor_decal/techfloor{dir = 1},/obj/structure/closet/crate/secure/weapon{req_access = list("ACCESS_QUARTERMASTER")},/obj/item/gun/energy/k342,/obj/item/gun/energy/k342,/obj/item/gun/energy/k342,/obj/item/gun/energy/k342,/obj/item/gun/energy/k342,/obj/item/cell/device/high,/obj/item/cell/device/high,/obj/item/cell/device/high,/obj/item/cell/device/high,/obj/item/cell/device/high,/obj/item/cell/device/high,/obj/item/cell/device/high,/obj/item/cell/device/high,/obj/item/cell/device/high,/turf/simulated/floor/tiled/techfloor,/area/quartermaster/storage/upper) +"Sj" = (/obj/floor_decal/techfloor{dir = 1},/obj/structure/closet/crate/secure/weapon{req_access = list("ACCESS_QUARTERMASTER")},/obj/item/gun/energy/k342,/obj/item/gun/energy/k342,/obj/item/gun/energy/k342,/obj/item/gun/energy/k342,/obj/item/gun/energy/k342,/obj/item/cell/guncell,/obj/item/cell/guncell,/obj/item/cell/guncell,/obj/item/cell/guncell,/obj/item/cell/guncell,/obj/item/cell/guncell,/obj/item/cell/guncell,/obj/item/cell/guncell,/obj/item/cell/guncell,/turf/simulated/floor/tiled/techfloor,/area/quartermaster/storage/upper) (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/maps/torch_fd/torch5_deck1.dmm b/maps/torch_fd/torch5_deck1.dmm index 50e2a86ae0fdf..2d5eebb4965cf 100644 --- a/maps/torch_fd/torch5_deck1.dmm +++ b/maps/torch_fd/torch5_deck1.dmm @@ -864,7 +864,7 @@ "aCp" = (/obj/machinery/tele_pad,/obj/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/techfloor/grid,/area/teleporter/firstdeck) "aCq" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/fuel,/obj/floor_decal/corner/blue/mono,/turf/simulated/floor/tiled/monotile,/area/hallway/primary/firstdeck/aft) "aCr" = (/obj/floor_decal/corner/blue/mono,/obj/structure/closet/emcloset,/obj/floor_decal/industrial/outline/yellow,/obj/machinery/light,/turf/simulated/floor/tiled/monotile,/area/hallway/primary/firstdeck/aft) -"aCu" = (/obj/floor_decal/corner/red/mono,/obj/floor_decal/industrial/outline/yellow,/obj/structure/closet/secure_closet/security_torch,/turf/simulated/floor/tiled/monotile,/area/security/locker) +"aCu" = (/obj/floor_decal/corner/red/mono,/obj/floor_decal/industrial/outline/yellow,/obj/structure/closet/secure_closet/security_torch,/obj/item/storage/firstaid/individual/military,/obj/item/cell/guncell,/obj/item/cell/guncell,/obj/item/cell/guncell,/turf/simulated/floor/tiled/monotile,/area/security/locker) "aCv" = (/obj/wallframe_spawn/reinforced,/turf/simulated/floor/plating,/area/security/locker) "aCx" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled,/area/security/wing) "aCy" = (/obj/machinery/door/airlock/glass/security{name = "Security Processing"},/obj/machinery/door/firedoor,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/steel_ridged,/area/security/processing) @@ -960,7 +960,7 @@ "aJl" = (/obj/machinery/suit_storage_unit/standard_unit,/obj/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/techfloor/grid,/area/command/armoury) "aJm" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/techfloor/grid,/area/command/armoury) "aJn" = (/obj/floor_decal/corner/red/half{dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/landmark{name = "lightsout"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/monotile,/area/security/wing) -"aJo" = (/obj/floor_decal/industrial/outline/grey,/obj/structure/closet/secure_closet/brigchief,/obj/item/device/radio,/obj/item/crowbar,/obj/item/clothing/mask/gas/half,/obj/floor_decal/industrial/hatch/yellow,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/light,/obj/machinery/power/apc{name = "south bump"; pixel_y = -28},/obj/structure/cable/green,/turf/simulated/floor/tiled/dark/monotile,/area/security/bo) +"aJo" = (/obj/floor_decal/industrial/outline/grey,/obj/structure/closet/secure_closet/brigchief,/obj/item/device/radio,/obj/item/crowbar,/obj/item/clothing/mask/gas/half,/obj/floor_decal/industrial/hatch/yellow,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/light,/obj/machinery/power/apc{name = "south bump"; pixel_y = -28},/obj/structure/cable/green,/obj/item/cell/guncell,/obj/item/cell/guncell,/obj/item/cell/guncell,/obj/item/storage/firstaid/individual/military,/turf/simulated/floor/tiled/dark/monotile,/area/security/bo) "aJp" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/obj/floor_decal/industrial/hatch/yellow,/obj/machinery/alarm{dir = 1; pixel_y = -24},/turf/simulated/floor/tiled/dark/monotile,/area/security/bo) "aJq" = (/obj/machinery/photocopier,/obj/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark/monotile,/area/security/bo) "aJr" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/machinery/light,/turf/simulated/floor/tiled,/area/security/processing) @@ -1015,7 +1015,7 @@ "aLS" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/plating,/area/maintenance/firstdeck/foreport) "aLT" = (/obj/machinery/atmospherics/unary/tank/air{dir = 8},/obj/floor_decal/industrial/warning{dir = 9; icon_state = "warning"},/turf/simulated/floor/plating,/area/maintenance/firstdeck/foreport) "aMy" = (/obj/structure/closet,/obj/random/action_figure,/obj/random/tech_supply,/obj/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/techfloor,/area/maintenance/firstdeck/aftport) -"aMB" = (/obj/floor_decal/industrial/outline/grey,/obj/structure/closet/crate/medical,/obj/item/storage/firstaid/fire{pixel_x = -4; pixel_y = -4},/obj/item/storage/firstaid/toxin{pixel_x = -2; pixel_y = -2},/obj/item/storage/firstaid/regular,/obj/item/storage/firstaid/o2{pixel_x = 2; pixel_y = 2},/obj/item/storage/firstaid/adv{pixel_x = 4; pixel_y = 4},/obj/item/stack/nanopaste,/obj/item/bodybag/rescue/loaded,/turf/simulated/floor/tiled/techfloor/grid,/area/command/armoury) +"aMB" = (/obj/floor_decal/industrial/outline/grey,/obj/structure/closet/crate/medical,/obj/item/storage/firstaid/fire{pixel_x = -4; pixel_y = -4},/obj/item/storage/firstaid/toxin{pixel_x = -2; pixel_y = -2},/obj/item/storage/firstaid/regular,/obj/item/storage/firstaid/o2{pixel_x = 2; pixel_y = 2},/obj/item/storage/firstaid/adv{pixel_x = 4; pixel_y = 4},/obj/item/stack/nanopaste,/obj/item/bodybag/rescue/loaded,/obj/item/storage/firstaid/individual/military,/obj/item/storage/firstaid/individual/military,/obj/item/storage/firstaid/individual/military,/obj/item/storage/firstaid/individual/military,/obj/item/storage/firstaid/individual/military,/obj/item/storage/firstaid/individual/military,/turf/simulated/floor/tiled/techfloor/grid,/area/command/armoury) "aMC" = (/obj/machinery/light,/turf/simulated/floor/tiled/dark,/area/security/storage) "aMD" = (/obj/floor_decal/corner/red/three_quarters,/obj/item/device/radio/intercom/department/security{dir = 4; pixel_x = -21},/turf/simulated/floor/tiled,/area/security/wing) "aME" = (/obj/floor_decal/corner/red{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/security/wing) @@ -1758,7 +1758,7 @@ "iyb" = (/obj/structure/table/steel,/obj/floor_decal/corner/yellow{dir = 5},/obj/machinery/recharger/wallcharger{pixel_y = 24},/obj/machinery/camera/network/engineering{c_tag = "Engineering - Robotics Office"},/obj/item/book/manual/ripley_build_and_repair,/obj/item/book/manual/robotics_cyborgs,/turf/simulated/floor/tiled,/area/assembly/robotics/office) "izb" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/dark,/area/rnd/rnd_sec) "izd" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan,/obj/machinery/meter,/obj/wallframe_spawn/reinforced_phoron,/obj/machinery/door/firedoor,/turf/simulated/floor/tiled/techfloor,/area/thruster/d1starboard) -"iAS" = (/obj/structure/table/rack,/obj/floor_decal/industrial/outline/grey,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/cell/device/high,/obj/item/cell/device/high,/obj/item/cell/device/high,/obj/item/cell/device/high,/obj/item/cell/device/high,/obj/item/cell/device/high,/obj/item/gun/energy/k342,/obj/item/gun/energy/k342,/turf/simulated/floor/tiled/techfloor/grid,/area/command/armoury/tactical) +"iAS" = (/obj/structure/table/rack,/obj/floor_decal/industrial/outline/grey,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/gun/energy/k342,/obj/item/gun/energy/k342,/obj/item/cell/guncell,/obj/item/cell/guncell,/obj/item/cell/guncell,/obj/item/cell/guncell,/obj/item/cell/guncell,/obj/item/cell/guncell,/turf/simulated/floor/tiled/techfloor/grid,/area/command/armoury/tactical) "iAZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/catwalk_plated,/turf/simulated/floor/plating,/area/hallway/primary/firstdeck/fore) "iBb" = (/obj/structure/table/steel,/obj/machinery/cell_charger,/obj/random/powercell,/obj/random/powercell,/obj/random/powercell,/obj/item/screwdriver{pixel_y = 15},/obj/machinery/light{dir = 1},/obj/item/device/radio/intercom{dir = 4; pixel_x = -21},/turf/simulated/floor/tiled/dark/monotile,/area/command/armoury) "iBT" = (/turf/simulated/floor/reinforced/hydrogen,/area/thruster/d1port) @@ -2154,7 +2154,7 @@ "ohA" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/catwalk,/turf/simulated/floor/plating,/area/maintenance/firstdeck/foreport) "oib" = (/obj/machinery/papershredder,/obj/floor_decal/corner/research/mono,/obj/structure/sign/ecplaque{pixel_x = 1; pixel_y = 32},/turf/simulated/floor/tiled/dark/monotile,/area/rnd/office) "ojb" = (/obj/structure/table/standard,/obj/floor_decal/corner/research/mono,/turf/simulated/floor/tiled/dark/monotile,/area/rnd/office) -"okp" = (/obj/floor_decal/corner/red/mono,/obj/floor_decal/industrial/outline/yellow,/obj/structure/closet/secure_closet/security_torch,/obj/machinery/camera/network/security{c_tag = "Security Wing - Locker Room"; dir = 8},/obj/machinery/firealarm{dir = 4; pixel_x = 26},/obj/machinery/light_switch{pixel_x = 22; pixel_y = -10},/turf/simulated/floor/tiled/monotile,/area/security/locker) +"okp" = (/obj/floor_decal/corner/red/mono,/obj/floor_decal/industrial/outline/yellow,/obj/structure/closet/secure_closet/security_torch,/obj/machinery/camera/network/security{c_tag = "Security Wing - Locker Room"; dir = 8},/obj/machinery/firealarm{dir = 4; pixel_x = 26},/obj/machinery/light_switch{pixel_x = 22; pixel_y = -10},/obj/item/storage/firstaid/individual/military,/obj/item/cell/guncell,/obj/item/cell/guncell,/obj/item/cell/guncell,/turf/simulated/floor/tiled/monotile,/area/security/locker) "omb" = (/obj/machinery/light{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/bed/chair/padded/blue,/obj/floor_decal/corner/paleblue{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/exam_room) "onM" = (/obj/floor_decal/corner/blue,/turf/simulated/floor/tiled/dark,/area/command/armoury) "oox" = (/obj/floor_decal/corner/paleblue{dir = 5},/obj/machinery/firealarm{pixel_y = 20},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/aft) @@ -2242,7 +2242,7 @@ "pvb" = (/obj/machinery/atmospherics/pipe/simple/hidden/universal,/obj/machinery/smartfridge,/turf/simulated/floor/plating,/area/rnd/xenobiology/xenoflora) "pwb" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/glass/research{name = "Xenoflora Laboratory"},/obj/machinery/door/firedoor,/turf/simulated/floor/tiled/white/monotile,/area/rnd/xenobiology/xenoflora) "pxb" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/visible/fuel,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/catwalk,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftport) -"pxv" = (/obj/floor_decal/industrial/outline/grey,/obj/structure/closet/crate/medical,/obj/item/storage/firstaid/regular,/obj/item/storage/firstaid/fire{pixel_x = -4; pixel_y = -4},/turf/simulated/floor/tiled/dark/monotile,/area/security/storage) +"pxv" = (/obj/floor_decal/industrial/outline/grey,/obj/structure/closet/crate/medical,/obj/item/storage/firstaid/regular,/obj/item/storage/firstaid/fire{pixel_x = -4; pixel_y = -4},/obj/item/storage/firstaid/individual/military,/obj/item/storage/firstaid/individual/military,/obj/item/storage/firstaid/individual/military,/obj/item/storage/firstaid/individual/military,/turf/simulated/floor/tiled/dark/monotile,/area/security/storage) "pyb" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/railing/mapped{dir = 8; icon_state = "railing0-1"},/obj/structure/railing/mapped,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftport) "pyg" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/airlock/glass/security{id_tag = "prisonexit"; name = "Brig Entry"},/obj/machinery/door/firedoor,/turf/simulated/floor/tiled/steel_ridged,/area/security/brig) "pzH" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled,/area/security/detectives_office)