diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 077df4c2c8..50695c3009 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -63,12 +63,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) -"aae" = ( -/obj/structure/table/wood, -/obj/item/stamp/hos, -/obj/item/storage/secure/briefcase/permits, -/turf/open/floor/carpet, -/area/command/heads_quarters/hos) "aaf" = ( /obj/structure/lattice, /turf/open/space, @@ -78,27 +72,6 @@ /obj/structure/lattice, /turf/open/space, /area/space/nearstation) -"aah" = ( -/obj/item/folder/red{ - pixel_y = 3 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/table/glass, -/obj/item/folder/red{ - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/item/storage/secure/briefcase/permits, -/turf/open/floor/plasteel/dark, -/area/command/bridge) "aai" = ( /obj/structure/grille/broken, /obj/structure/lattice, @@ -108,37 +81,6 @@ /obj/structure/grille, /turf/open/space, /area/space/nearstation) -"aak" = ( -/obj/structure/table/wood, -/obj/item/folder/blue, -/obj/machinery/door/window{ - base_state = "right"; - icon_state = "right"; - name = "Captain's Desk"; - req_access_txt = "20" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/segment, -/obj/item/stamp/captain, -/obj/item/storage/secure/briefcase/permits, -/turf/open/floor/wood, -/area/command/heads_quarters/captain/private) -"aal" = ( -/obj/machinery/camera{ - c_tag = "Head of Personnel's Office"; - dir = 1 - }, -/obj/structure/table/wood, -/obj/item/storage/box/PDAs{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/storage/box/silver_ids, -/obj/item/storage/box/ids, -/obj/machinery/light, -/obj/item/storage/secure/briefcase/permits, -/turf/open/floor/wood, -/area/command/heads_quarters/hop) "aav" = ( /turf/open/space, /area/space/station_ruins) @@ -2632,29 +2574,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) -"ahI" = ( -/obj/machinery/button/door{ - id = "armory"; - name = "Armory Shutters"; - pixel_x = 28; - req_access_txt = "3" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/rack, -/obj/item/storage/fancy/donut_box, -/obj/item/clothing/suit/brigdoc/armor, -/obj/item/clothing/head/helmet/brigdoc, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) "ahP" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ @@ -3185,6 +3104,13 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) +"ajD" = ( +/obj/structure/chair/comfy/black{ + dir = 4 + }, +/obj/effect/landmark/start/bridgeofficer, +/turf/open/floor/carpet, +/area/command/bridge) "ajL" = ( /obj/structure/table, /obj/machinery/light/small{ @@ -3413,23 +3339,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) -"akt" = ( -/obj/structure/table, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/mask/surgical, -/obj/item/reagent_containers/spray/cleaner, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/item/storage/backpack/duffelbag/sec/surgery, -/turf/open/floor/plasteel/white, -/area/security/brig) "aku" = ( /obj/structure/table, /obj/item/radio/intercom{ @@ -3469,20 +3378,6 @@ }, /turf/open/floor/plasteel/white, /area/security/brig) -"akw" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/structure/closet/secure_closet/brigdoc, -/turf/open/floor/plasteel/white, -/area/security/brig) "akx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable/yellow{ @@ -3896,13 +3791,6 @@ }, /turf/open/floor/plasteel/white, /area/security/brig) -"alO" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, -/obj/effect/landmark/start/brigdoc, -/turf/open/floor/plasteel/white, -/area/security/brig) "alP" = ( /obj/machinery/door/window/westleft{ dir = 4; @@ -4916,6 +4804,17 @@ }, /turf/open/floor/plating, /area/security/warden) +"aoD" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/vending/wardrobe/hos_wardrobe, +/turf/open/floor/carpet, +/area/command/heads_quarters/hos) "aoL" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -6016,19 +5915,6 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) -"ass" = ( -/obj/machinery/newscaster/security_unit{ - pixel_y = -30 - }, -/obj/item/folder/red, -/obj/item/folder/red, -/obj/structure/table, -/obj/item/book/manual/splurt_space_law{ - pixel_x = -3; - pixel_y = 5 - }, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) "ast" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -9164,19 +9050,6 @@ }, /turf/open/floor/plasteel, /area/security/prison) -"aDt" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/requests_console{ - department = "Atmospherics"; - departmentType = 4; - name = "Atmos RC"; - pixel_x = 30 - }, -/obj/machinery/vending/wardrobe/atmos_wardrobe, -/turf/open/floor/plasteel/dark/corner, -/area/engineering/atmos) "aDu" = ( /turf/closed/wall, /area/hallway/primary/fore) @@ -9348,19 +9221,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/brig) -"aDI" = ( -/obj/machinery/requests_console{ - department = "Detective's office"; - pixel_x = -30 - }, -/obj/structure/table/wood, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/item/book/manual/splurt_space_law, -/obj/item/camera/detective, -/turf/open/floor/plasteel/grimy, -/area/security/detectives_office) "aDJ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -9963,12 +9823,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore) -"aGD" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/engineering/atmos) "aGE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -10428,17 +10282,6 @@ }, /turf/open/floor/plasteel, /area/security/courtroom) -"aKb" = ( -/obj/structure/table/wood, -/obj/item/book/manual/splurt_space_law, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/courtroom) "aKc" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -11934,30 +11777,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/courtroom) -"aUJ" = ( -/obj/structure/table, -/obj/item/book/manual/splurt_space_law{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj/item/book/manual/splurt_space_law{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/item/book/manual/splurt_space_law{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, -/turf/open/floor/plasteel/dark, -/area/security/courtroom) "aUU" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -12741,21 +12560,6 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint/supply) -"aXp" = ( -/obj/item/book/manual/splurt_space_law, -/obj/machinery/newscaster{ - pixel_y = -32 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/checkpoint/supply) "aXq" = ( /obj/machinery/computer/secure_data{ dir = 8 @@ -14275,23 +14079,6 @@ /obj/effect/landmark/start/depsec/engineering, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) -"bbD" = ( -/obj/structure/table, -/obj/item/book/manual/splurt_space_law, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/requests_console{ - department = "Security"; - departmentType = 5; - pixel_x = 30 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/checkpoint/engineering) "bbF" = ( /obj/structure/showcase/cyborg/old{ dir = 4; @@ -14528,29 +14315,6 @@ }, /turf/closed/wall, /area/security/checkpoint/customs) -"bcX" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, -/obj/structure/table/reinforced, -/obj/item/book/manual/splurt_space_law{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/machinery/light_switch{ - pixel_y = 26 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/checkpoint/customs) "bcZ" = ( /obj/item/radio/intercom{ name = "Station Intercom (General)"; @@ -19192,18 +18956,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"bxb" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/plasteel/dark/corner, -/area/hallway/primary/starboard) "bxn" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -19506,6 +19258,19 @@ dir = 1 }, /area/hallway/primary/starboard) +"byQ" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 24 + }, +/turf/open/floor/plasteel/dark/corner, +/area/hallway/primary/starboard) "bzi" = ( /obj/structure/lattice, /obj/structure/grille, @@ -20389,6 +20154,12 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"bDK" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/closed/wall, +/area/command/blueshielquarters) "bDM" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 @@ -21243,16 +21014,17 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"bHn" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +"bHo" = ( +/obj/machinery/light/small{ + dir = 4 }, -/obj/machinery/navbeacon{ - codes_txt = "patrol;next_patrol=14-Starboard-Central"; - location = "13.2-Tcommstore" +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel/dark/corner, /area/hallway/primary/starboard) "bHr" = ( /obj/structure/disposalpipe/segment, @@ -21639,6 +21411,12 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/hallway/secondary/command) +"bKa" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/command/blueshielquarters) "bKb" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -24524,33 +24302,6 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint/medical) -"bYZ" = ( -/obj/item/pen, -/obj/structure/table/reinforced, -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = 30 - }, -/obj/item/folder/red, -/obj/item/book/manual/splurt_space_law{ - pixel_x = 3; - pixel_y = 4 - }, -/obj/machinery/newscaster/security_unit{ - pixel_y = 32 - }, -/obj/item/screwdriver{ - pixel_y = 10 - }, -/obj/item/radio/off, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/checkpoint/medical) "bZa" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -24706,6 +24457,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, /area/maintenance/disposal/incinerator) +"bZD" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/atmos{ + name = "Turbine Access"; + req_access_txt = "32" + }, +/turf/open/floor/plating, +/area/maintenance/disposal/incinerator) "bZE" = ( /turf/closed/wall, /area/maintenance/disposal/incinerator) @@ -25312,6 +25074,44 @@ }, /turf/closed/wall, /area/maintenance/disposal/incinerator) +"caY" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/disposal/incinerator) +"caZ" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/structure/sign/warning/deathsposal{ + pixel_y = 32 + }, +/obj/machinery/camera{ + c_tag = "Atmospherics - Incinerator"; + name = "atmospherics camera" + }, +/turf/open/floor/plating, +/area/maintenance/disposal/incinerator) +"cba" = ( +/obj/machinery/power/smes{ + capacity = 9e+006; + charge = 10000 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/maintenance/disposal/incinerator) "cbp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 @@ -25761,25 +25561,6 @@ /obj/effect/landmark/start/depsec/science, /turf/open/floor/plasteel, /area/security/checkpoint/science/research) -"ccn" = ( -/obj/machinery/computer/secure_data{ - dir = 8 - }, -/obj/item/book/manual/splurt_space_law, -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching the RD's goons from the safety of his office."; - dir = 8; - name = "Research Monitor"; - network = list("rd"); - pixel_x = 28; - pixel_y = 2 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/checkpoint/science/research) "ccq" = ( /obj/structure/table, /obj/item/book/manual/hydroponics_pod_people, @@ -25895,6 +25676,18 @@ }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) +"ccK" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 6 + }, +/turf/open/floor/plating, +/area/maintenance/disposal/incinerator) "ccU" = ( /obj/structure/table/wood/poker, /obj/item/toy/cards/deck{ @@ -42262,6 +42055,21 @@ }, /turf/open/floor/plasteel/dark, /area/medical/virology) +"cMN" = ( +/obj/item/book/manual/splurt_space_law, +/obj/machinery/newscaster{ + pixel_y = -32 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/security/checkpoint/supply) "cMQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -42900,36 +42708,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) -"cOz" = ( -/obj/structure/table, -/obj/machinery/newscaster/security_unit{ - pixel_x = 29; - pixel_y = 1 - }, -/obj/machinery/camera{ - c_tag = "Departure Lounge - Security Post"; - dir = 1 - }, -/obj/item/book/manual/splurt_space_law{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/taperecorder{ - pixel_x = 4 - }, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -32 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/exit/departure_lounge) "cOA" = ( /obj/structure/rack, /obj/item/clothing/mask/gas, @@ -44710,6 +44488,19 @@ /obj/structure/closet/emcloset, /turf/open/floor/plasteel/dark, /area/hallway/primary/central) +"cVp" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/requests_console{ + department = "Atmospherics"; + departmentType = 4; + name = "Atmos RC"; + pixel_x = 30 + }, +/obj/machinery/vending/wardrobe/atmos_wardrobe, +/turf/open/floor/plasteel/dark/corner, +/area/engineering/atmos) "cVx" = ( /obj/docking_port/stationary{ dir = 8; @@ -44784,22 +44575,18 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/aisat/exterior) -"cWa" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "cWc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, /turf/open/floor/carpet, /area/service/theater) +"cWn" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "cWA" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, @@ -45085,18 +44872,6 @@ }, /turf/open/floor/plating, /area/engineering/atmos) -"dak" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 6 - }, -/turf/open/floor/plating, -/area/maintenance/disposal/incinerator) "dal" = ( /obj/machinery/status_display/evac{ pixel_y = 32 @@ -46546,6 +46321,17 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/space, /area/space/nearstation) +"dgX" = ( +/obj/structure/table/wood, +/obj/item/book/manual/splurt_space_law{ + pixel_y = 3 + }, +/obj/item/radio/intercom{ + name = "Station Intercom (General)"; + pixel_y = 28 + }, +/turf/open/floor/plasteel/dark, +/area/command/bridge) "dha" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -47795,6 +47581,13 @@ /obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/aisat/exterior) +"dtk" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/suit_storage_unit/atmos, +/turf/open/floor/plasteel/dark/corner, +/area/engineering/atmos) "dtl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ @@ -48373,19 +48166,6 @@ icon_state = "platingdmg3" }, /area/maintenance/starboard/aft) -"dAr" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 - }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, -/turf/open/floor/plasteel/dark/corner, -/area/hallway/primary/starboard) "dAw" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -48794,6 +48574,10 @@ }, /turf/open/floor/plasteel/cafeteria, /area/service/kitchen) +"dDi" = ( +/obj/machinery/photocopier, +/turf/open/floor/wood, +/area/command/blueshieldoffice) "dDj" = ( /obj/structure/lattice, /obj/item/shard, @@ -49093,28 +48877,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/eva) -"dIo" = ( -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/obj/machinery/light/small, -/obj/machinery/camera{ - c_tag = "MiniSat Exterior Access"; - dir = 1; - network = list("minisat") - }, -/obj/machinery/power/apc{ - areastring = "/area/ai_monitored/aisat/exterior"; - name = "MiniSat Exterior APC"; - pixel_y = -24 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/aisat/exterior) "dIG" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line{ @@ -49337,6 +49099,13 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"dRb" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "dRx" = ( /obj/structure/closet/crate{ icon_state = "crateopen" @@ -49349,6 +49118,12 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/cargo/storage) +"dRA" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/wood, +/area/command/blueshieldoffice) "dRF" = ( /obj/machinery/door/poddoor/shutters{ id = "qm_warehouse"; @@ -49778,21 +49553,18 @@ }, /turf/open/floor/plating, /area/construction/storage_wing) +"eco" = ( +/obj/machinery/computer/med_data{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/command/blueshieldoffice) "edG" = ( /turf/closed/wall, /area/commons/cryopod) -"edM" = ( -/obj/structure/sink{ - pixel_y = 25 - }, -/obj/structure/mirror{ - pixel_y = 32 - }, -/obj/structure/toilet/secret/low_loot{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/command/blueshielquarters) "edY" = ( /obj/structure/window, /turf/open/floor/plasteel/cafeteria, @@ -49806,23 +49578,6 @@ }, /turf/open/floor/plasteel, /area/construction/storage_wing) -"eeL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/camera{ - c_tag = "Atmospherics - Entrance" - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) -"efp" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 28 - }, -/turf/open/floor/carpet, -/area/command/blueshielquarters) "efB" = ( /obj/machinery/shieldwallgen, /obj/structure/window/reinforced{ @@ -50472,22 +50227,6 @@ }, /turf/open/floor/wood, /area/service/library) -"eyO" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -22 - }, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = -29; - pixel_y = 23 - }, -/obj/structure/closet/secure_closet/hosnew, -/turf/open/floor/plasteel/dark, -/area/command/heads_quarters/hos) "eyR" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -50640,17 +50379,6 @@ }, /turf/open/floor/plating, /area/engineering/atmos) -"eBu" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Blueshield"; - req_access_txt = "72" - }, -/turf/open/floor/wood, -/area/command/blueshieldoffice) "eBD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{ dir = 1 @@ -50967,12 +50695,6 @@ }, /turf/open/floor/plasteel, /area/cargo/storage) -"eJY" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "eKo" = ( /obj/structure/window/reinforced{ dir = 8 @@ -51116,6 +50838,13 @@ /obj/item/pipe_dispenser, /turf/open/floor/plasteel, /area/engineering/main) +"eOz" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/aisat/exterior) "eOC" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -51165,15 +50894,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/carpet, /area/service/library) -"ePx" = ( -/obj/machinery/computer/med_data{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/command/blueshieldoffice) "ePC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 @@ -51335,13 +51055,6 @@ /obj/item/clothing/mask/fakemoustache, /turf/open/floor/wood, /area/service/theater) -"eTH" = ( -/obj/machinery/status_display/evac{ - pixel_y = 32 - }, -/obj/machinery/photocopier, -/turf/open/floor/wood, -/area/command/heads_quarters/hop) "eTP" = ( /obj/machinery/light{ dir = 8 @@ -51713,10 +51426,6 @@ }, /turf/open/floor/plasteel, /area/science/mixing) -"fcp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/wood, -/area/command/blueshielquarters) "fcU" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -51936,19 +51645,6 @@ }, /turf/open/floor/plasteel/dark, /area/commons/dorms) -"fjC" = ( -/obj/structure/chair/office/dark{ - dir = 4 - }, -/obj/effect/landmark/start/atmospheric_technician, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "fkj" = ( /obj/item/folder/blue, /obj/structure/table/glass, @@ -51972,16 +51668,6 @@ }, /turf/open/floor/wood, /area/service/theater) -"fky" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "fkF" = ( /obj/structure/window/reinforced, /obj/machinery/door/window/eastright{ @@ -51992,6 +51678,19 @@ }, /turf/open/floor/plasteel/dark, /area/commons/fitness/recreation) +"fkJ" = ( +/obj/structure/table/wood, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/item/multitool, +/obj/machinery/camera{ + c_tag = "Blueshield"; + dir = 4 + }, +/turf/open/floor/carpet, +/area/command/blueshieldoffice) "flE" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 @@ -52021,6 +51720,21 @@ }, /turf/open/floor/plating, /area/command/heads_quarters/hos) +"fnk" = ( +/obj/structure/table/wood, +/obj/item/folder/blue, +/obj/machinery/door/window{ + base_state = "right"; + icon_state = "right"; + name = "Captain's Desk"; + req_access_txt = "20" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/disposalpipe/segment, +/obj/item/stamp/captain, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/wood, +/area/command/heads_quarters/captain/private) "fnl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, @@ -52043,6 +51757,28 @@ }, /turf/open/floor/plasteel/white, /area/medical/treatment_center) +"fnW" = ( +/obj/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/obj/machinery/light/small, +/obj/machinery/camera{ + c_tag = "MiniSat Exterior Access"; + dir = 1; + network = list("minisat") + }, +/obj/machinery/power/apc{ + areastring = "/area/ai_monitored/aisat/exterior"; + name = "MiniSat Exterior APC"; + pixel_y = -24 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/aisat/exterior) "foj" = ( /obj/machinery/power/smes{ charge = 5e+006 @@ -52077,6 +51813,16 @@ /obj/structure/loot_pile/maint, /turf/open/floor/plating, /area/maintenance/port/aft) +"fpg" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/pipedispenser/disposal, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "fpr" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -52099,10 +51845,6 @@ }, /turf/open/floor/plasteel/dark, /area/command/heads_quarters/ce) -"fpx" = ( -/obj/machinery/vending/wardrobe/bridgeofficer_wardrobe, -/turf/open/floor/carpet, -/area/command/bridge) "fpF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/chair/stool, @@ -52164,26 +51906,6 @@ }, /turf/open/floor/plasteel/dark, /area/commons/fitness/recreation) -"fsX" = ( -/obj/structure/table/wood, -/obj/item/book/manual/splurt_space_law, -/obj/machinery/power/apc{ - areastring = "/area/command/heads_quarters/captain/private"; - dir = 8; - name = "Captain's Quarters APC"; - pixel_x = -25 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/item/paper/fluff/gateway, -/obj/item/coin/plasma, -/obj/item/melee/chainofcommand, -/turf/open/floor/wood, -/area/command/heads_quarters/captain/private) "fti" = ( /obj/structure/table, /obj/item/stack/rods/fifty, @@ -52225,6 +51947,10 @@ "fvo" = ( /turf/closed/wall, /area/service/chapel/main) +"fvS" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/wood, +/area/command/blueshieldoffice) "fvV" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -52551,6 +52277,11 @@ }, /turf/open/floor/plasteel, /area/cargo/miningoffice) +"fFx" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green, +/turf/open/floor/carpet, +/area/command/blueshieldoffice) "fFM" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -52563,6 +52294,10 @@ }, /turf/open/floor/plasteel/white, /area/science/circuit) +"fFR" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/engineering/atmos) "fFY" = ( /obj/structure/cable, /obj/structure/lattice/catwalk, @@ -52802,6 +52537,31 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/command/heads_quarters/ce) +"fNf" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) +"fNh" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/camera{ + c_tag = "Atmospherics - Entrance" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "fNk" = ( /obj/machinery/vending/wardrobe/hydro_wardrobe, /turf/open/floor/plasteel, @@ -52824,21 +52584,10 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/aisat/exterior) -"fNX" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, -/obj/structure/sign/warning/deathsposal{ - pixel_y = 32 - }, -/obj/machinery/camera{ - c_tag = "Atmospherics - Incinerator"; - name = "atmospherics camera" - }, -/turf/open/floor/plating, -/area/maintenance/disposal/incinerator) +"fNJ" = ( +/obj/structure/closet/secure_closet/bridgesec, +/turf/open/floor/carpet, +/area/command/bridge) "fOe" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -52965,6 +52714,10 @@ }, /turf/open/floor/plasteel, /area/commons/fitness/pool) +"fTP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/wood, +/area/command/blueshielquarters) "fTZ" = ( /obj/machinery/conveyor/inverted{ dir = 10; @@ -53127,6 +52880,12 @@ }, /turf/open/floor/plasteel, /area/service/hydroponics) +"fYL" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/engineering/atmos) "fZR" = ( /obj/machinery/seed_extractor, /obj/effect/turf_decal/stripes/line{ @@ -53162,6 +52921,24 @@ }, /turf/open/floor/plasteel/dark, /area/service/chapel/office) +"gaV" = ( +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/obj/machinery/pipedispenser, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/camera{ + c_tag = "Atmospherics - Entrance"; + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "gbt" = ( /obj/structure/cable{ icon_state = "4-8" @@ -53258,13 +53035,6 @@ }, /turf/open/floor/wood, /area/command/heads_quarters/hop) -"gdH" = ( -/obj/structure/curtain, -/obj/machinery/shower{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/command/blueshielquarters) "gdJ" = ( /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -30 @@ -53638,6 +53408,12 @@ }, /turf/open/floor/plasteel/white, /area/science/circuit) +"gom" = ( +/obj/item/hilbertshotel/ghostdojo{ + pixel_y = 16 + }, +/turf/open/floor/carpet, +/area/hallway/primary/port) "goF" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/structure/extinguisher_cabinet{ @@ -53725,6 +53501,15 @@ }, /turf/open/floor/plating, /area/security/prison/upper) +"grX" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "gsp" = ( /turf/open/floor/carpet, /area/commons/dorms) @@ -53819,10 +53604,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/cargo/sorting) -"gul" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/engineering/atmos) "guM" = ( /obj/structure/window/reinforced{ dir = 1; @@ -54171,12 +53952,6 @@ }, /turf/open/floor/carpet, /area/command/heads_quarters/captain/private) -"gCM" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/command/blueshielquarters) "gCY" = ( /obj/effect/landmark/start/head_of_personnel, /obj/structure/chair/office/dark{ @@ -54285,6 +54060,22 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/commons/dorms) +"gGc" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/button/door{ + id = "atmos"; + name = "Atmospherics Lockdown"; + pixel_x = 26; + req_access_txt = "24" + }, +/turf/open/floor/plasteel/dark/corner, +/area/engineering/atmos) "gGH" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -54405,17 +54196,6 @@ }, /turf/open/floor/plasteel, /area/commons/locker) -"gLI" = ( -/obj/structure/table/reinforced, -/obj/item/book/manual/splurt_space_law{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/item/taperecorder{ - pixel_x = -4 - }, -/turf/open/floor/plasteel, -/area/security/office) "gLN" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 @@ -54473,17 +54253,6 @@ /obj/item/reagent_containers/food/drinks/flask/gold, /turf/open/floor/carpet, /area/command/heads_quarters/captain/private) -"gPr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/atmos{ - name = "Turbine Access"; - req_access_txt = "32" - }, -/turf/open/floor/plating, -/area/maintenance/disposal/incinerator) "gPs" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -54872,6 +54641,16 @@ }, /turf/open/floor/engine, /area/engineering/main) +"hdJ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/suit_storage_unit/atmos, +/turf/open/floor/plasteel/dark/corner, +/area/engineering/atmos) "hdR" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -55213,6 +54992,11 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/science/robotics/lab) +"hov" = ( +/obj/structure/table/wood, +/obj/item/book/manual/splurt_space_law, +/turf/open/floor/carpet, +/area/command/blueshieldoffice) "hpe" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -55277,6 +55061,14 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/plasteel/dark, /area/service/chapel/office) +"hpv" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Blueshield's Quarters"; + req_access_txt = "72" + }, +/turf/open/floor/wood, +/area/command/blueshielquarters) "hpw" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -55306,6 +55098,30 @@ }, /turf/open/floor/plasteel, /area/service/hydroponics/garden) +"hqe" = ( +/obj/structure/table, +/obj/item/book/manual/splurt_space_law{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/item/book/manual/splurt_space_law{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/item/book/manual/splurt_space_law{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24 + }, +/turf/open/floor/plasteel/dark, +/area/security/courtroom) "hqi" = ( /obj/machinery/firealarm{ dir = 4; @@ -55319,14 +55135,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/treatment_center) -"hqm" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command{ - name = "Blueshield's Quarters"; - req_access_txt = "72" - }, -/turf/open/floor/wood, -/area/command/blueshielquarters) "hqy" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -55642,13 +55450,6 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/plasteel/dark, /area/engineering/main) -"hzs" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, -/obj/effect/landmark/start/bridgeofficer, -/turf/open/floor/carpet, -/area/command/bridge) "hzH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 @@ -55709,12 +55510,14 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/aisat/exterior) -"hAH" = ( -/obj/machinery/photocopier, -/turf/open/floor/wood, -/area/command/blueshieldoffice) "hAI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "hAL" = ( @@ -55753,6 +55556,20 @@ }, /turf/open/floor/plasteel/dark, /area/command/bridge) +"hBr" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/structure/closet/secure_closet/brigdoc, +/turf/open/floor/plasteel/white, +/area/security/brig) "hBG" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 @@ -55772,12 +55589,6 @@ }, /turf/open/floor/plasteel, /area/engineering/gravity_generator) -"hBP" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/wood, -/area/command/blueshieldoffice) "hCt" = ( /obj/machinery/gibber, /turf/open/floor/plasteel/showroomfloor, @@ -55989,6 +55800,18 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/cargo/miningoffice) +"hIh" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/aisat/exterior) "hIt" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters{ @@ -56059,17 +55882,6 @@ }, /turf/open/floor/plating, /area/security/prison/upper) -"hKm" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command{ - name = "Blueshield's Quarters"; - req_access_txt = "72" - }, -/turf/open/floor/wood, -/area/command/blueshielquarters) "hKA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -56220,6 +56032,13 @@ /obj/structure/table/wood, /turf/open/floor/wood, /area/command/heads_quarters/hop) +"hNI" = ( +/obj/structure/curtain, +/obj/machinery/shower{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/command/blueshielquarters) "hNP" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -56357,6 +56176,33 @@ }, /turf/open/floor/engine/n2, /area/engineering/atmos) +"hQP" = ( +/obj/item/pen, +/obj/structure/table/reinforced, +/obj/structure/reagent_dispensers/peppertank{ + pixel_x = 30 + }, +/obj/item/folder/red, +/obj/item/book/manual/splurt_space_law{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/machinery/newscaster/security_unit{ + pixel_y = 32 + }, +/obj/item/screwdriver{ + pixel_y = 10 + }, +/obj/item/radio/off, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/checkpoint/medical) "hSe" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 @@ -56452,6 +56298,12 @@ /obj/structure/janitorialcart, /turf/open/floor/plasteel, /area/service/janitor) +"hUI" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/flask, +/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/turf/open/floor/carpet, +/area/command/blueshieldoffice) "hUO" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -56604,12 +56456,6 @@ }, /turf/open/floor/plating, /area/engineering/main) -"hYl" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "hYq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 @@ -56863,16 +56709,6 @@ /obj/item/storage/crayons, /turf/open/floor/wood, /area/service/library) -"igf" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/item/radio/intercom{ - pixel_x = -29 - }, -/obj/structure/closet/secure_closet/blueshield, -/turf/open/floor/carpet, -/area/command/blueshielquarters) "igL" = ( /obj/structure/disposalpipe/segment, /obj/structure/chair/office/dark{ @@ -56905,6 +56741,13 @@ /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, /area/engineering/main) +"iix" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/light/small, +/turf/open/floor/plasteel, +/area/engineering/atmos) "iiE" = ( /obj/machinery/firealarm{ dir = 8; @@ -56970,13 +56813,6 @@ }, /turf/open/floor/wood, /area/service/library) -"ijT" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/suit_storage_unit/atmos, -/turf/open/floor/plasteel/dark/corner, -/area/engineering/atmos) "ijW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -57032,6 +56868,23 @@ /obj/item/clothing/under/suit/navy, /turf/open/floor/carpet, /area/commons/dorms) +"ikO" = ( +/obj/structure/table, +/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/mask/surgical, +/obj/item/reagent_containers/spray/cleaner, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/item/storage/backpack/duffelbag/sec/surgery, +/turf/open/floor/plasteel/white, +/area/security/brig) "ilE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output{ dir = 1 @@ -57153,22 +57006,6 @@ }, /turf/open/floor/engine, /area/engineering/main) -"ipF" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/button/door{ - id = "atmos"; - name = "Atmospherics Lockdown"; - pixel_x = 26; - req_access_txt = "24" - }, -/turf/open/floor/plasteel/dark/corner, -/area/engineering/atmos) "ipG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output{ dir = 8 @@ -57236,10 +57073,6 @@ }, /turf/open/floor/plasteel, /area/engineering/main) -"irH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/wood, -/area/command/blueshieldoffice) "irY" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -57270,6 +57103,12 @@ }, /turf/open/floor/plasteel, /area/security/prison/upper) +"itw" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/turf/open/floor/wood, +/area/command/blueshieldoffice) "itH" = ( /obj/machinery/portable_atmospherics/pump, /obj/effect/turf_decal/tile/blue{ @@ -57324,6 +57163,10 @@ }, /turf/open/floor/plasteel/white, /area/medical/treatment_center) +"iup" = ( +/obj/structure/dresser, +/turf/open/floor/carpet, +/area/command/blueshielquarters) "iuy" = ( /obj/machinery/light{ dir = 4 @@ -57444,6 +57287,14 @@ }, /turf/open/floor/plating, /area/service/chapel/main) +"ixJ" = ( +/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/engineering/atmos) "ixL" = ( /turf/closed/wall, /area/cargo/miningoffice) @@ -57551,6 +57402,25 @@ }, /turf/open/floor/wood, /area/command/heads_quarters/captain/private) +"izM" = ( +/obj/machinery/computer/secure_data{ + dir = 8 + }, +/obj/item/book/manual/splurt_space_law, +/obj/machinery/computer/security/telescreen{ + desc = "Used for watching the RD's goons from the safety of his office."; + dir = 8; + name = "Research Monitor"; + network = list("rd"); + pixel_x = 28; + pixel_y = 2 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/checkpoint/science/research) "izT" = ( /turf/closed/wall/r_wall, /area/security/prison/upper) @@ -58232,6 +58102,17 @@ }, /turf/open/floor/plasteel/freezer, /area/security/prison/upper) +"iUU" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Blueshield's Quarters"; + req_access_txt = "72" + }, +/turf/open/floor/wood, +/area/command/blueshielquarters) "iUY" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/effect/turf_decal/tile/bar, @@ -58257,13 +58138,6 @@ }, /turf/open/floor/plasteel, /area/cargo/office) -"iVM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "iWB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -58283,6 +58157,22 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/cargo/storage) +"iWS" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 27 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=14-Starboard-Central"; + location = "13.2-Tcommstore" + }, +/turf/open/floor/plasteel/dark/corner, +/area/hallway/primary/starboard) "iXR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -58485,6 +58375,13 @@ }, /turf/open/space, /area/solars/port/fore) +"jdn" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/hallway/primary/starboard) "jdJ" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/n2o{ dir = 1 @@ -58839,6 +58736,24 @@ }, /turf/open/floor/plasteel, /area/engineering/atmos) +"jox" = ( +/obj/machinery/light_switch{ + pixel_x = -28 + }, +/obj/machinery/power/apc{ + areastring = "/area/security/brig"; + dir = 1; + name = "Blueshield's Office APC"; + pixel_y = 23 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/wood, +/area/command/blueshieldoffice) "joE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 @@ -58911,6 +58826,22 @@ }, /turf/open/floor/plasteel, /area/service/bar) +"jps" = ( +/obj/machinery/camera{ + c_tag = "Head of Personnel's Office"; + dir = 1 + }, +/obj/structure/table/wood, +/obj/item/storage/box/PDAs{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/storage/box/silver_ids, +/obj/item/storage/box/ids, +/obj/machinery/light, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/wood, +/area/command/heads_quarters/hop) "jqj" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -59428,23 +59359,15 @@ }, /turf/open/floor/plasteel, /area/cargo/miningoffice) -"jBG" = ( -/obj/structure/table/wood, -/obj/item/book/manual/splurt_space_law{ - pixel_y = 3 - }, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 28 - }, -/turf/open/floor/plasteel/dark, -/area/command/bridge) "jCt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel, /area/commons/storage/primary) +"jDi" = ( +/turf/open/floor/carpet, +/area/command/blueshielquarters) "jDx" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -60067,24 +59990,6 @@ }, /turf/open/floor/plasteel/dark, /area/command/bridge) -"jUo" = ( -/obj/machinery/light_switch{ - pixel_x = -28 - }, -/obj/machinery/power/apc{ - areastring = "/area/security/brig"; - dir = 1; - name = "Blueshield's Office APC"; - pixel_y = 23 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 - }, -/turf/open/floor/wood, -/area/command/blueshieldoffice) "jUp" = ( /obj/machinery/door/window/northleft{ dir = 8; @@ -60160,6 +60065,14 @@ }, /turf/open/floor/engine, /area/engineering/main) +"jVY" = ( +/obj/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/aisat/exterior) "jXa" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/holopad, @@ -60229,6 +60142,19 @@ }, /turf/open/floor/plasteel/dark, /area/command/bridge) +"jZM" = ( +/obj/structure/table/wood, +/obj/item/book/manual/splurt_space_law, +/obj/item/book/manual/splurt_space_law, +/obj/item/pen/red, +/obj/machinery/computer/security/telescreen{ + desc = "Used for watching Prison Wing holding areas."; + name = "Prison Monitor"; + network = list("prison"); + pixel_y = 30 + }, +/turf/open/floor/wood, +/area/service/lawoffice) "kaM" = ( /obj/structure/table, /obj/item/storage/fancy/egg_box, @@ -60269,6 +60195,9 @@ }, /turf/open/floor/plating, /area/command/bridge) +"kbY" = ( +/turf/open/floor/carpet, +/area/command/blueshieldoffice) "kcH" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/brown{ @@ -60695,18 +60624,6 @@ }, /turf/open/floor/plasteel, /area/service/bar) -"krs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics Monitoring"; - req_access_txt = "24" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/plasteel, -/area/engineering/atmos) "krD" = ( /turf/closed/wall, /area/science/circuit) @@ -60794,6 +60711,17 @@ }, /turf/open/floor/engine/co2, /area/engineering/atmos) +"ktV" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/obj/machinery/door/airlock/atmos/glass{ + name = "Atmospherics Monitoring"; + req_access_txt = "24" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel, +/area/engineering/atmos) "kuk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/yellow{ @@ -60920,20 +60848,6 @@ /obj/structure/closet/secure_closet/engineering_welding, /turf/open/floor/plasteel, /area/engineering/main) -"kwT" = ( -/obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics Monitoring"; - req_access_txt = "24" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/plasteel, -/area/engineering/atmos) "kxk" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, @@ -61049,12 +60963,6 @@ }, /turf/open/floor/plasteel, /area/ai_monitored/command/storage/eva) -"kzB" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/carpet, -/area/command/blueshielquarters) "kAc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/table, @@ -61447,6 +61355,16 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/commons/locker) +"kJm" = ( +/obj/structure/table, +/obj/item/folder/red, +/obj/item/book/manual/splurt_space_law{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/item/clothing/mask/gas/sechailer, +/turf/open/floor/plasteel, +/area/security/office) "kJB" = ( /obj/structure/table, /obj/item/stock_parts/subspace/treatment, @@ -61548,9 +61466,6 @@ }, /turf/open/floor/plasteel, /area/engineering/atmos) -"kLv" = ( -/turf/open/floor/carpet, -/area/command/blueshieldoffice) "kLD" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -61598,6 +61513,29 @@ }, /turf/open/floor/plasteel, /area/commons/storage/art) +"kNj" = ( +/obj/machinery/button/door{ + id = "armory"; + name = "Armory Shutters"; + pixel_x = 28; + req_access_txt = "3" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/rack, +/obj/item/storage/fancy/donut_box, +/obj/item/clothing/suit/brigdoc/armor, +/obj/item/clothing/head/helmet/brigdoc, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) "kNr" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 @@ -61619,15 +61557,6 @@ }, /turf/closed/wall, /area/commons/fitness/recreation) -"kNM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/engineering/break_room) "kOt" = ( /obj/item/multitool, /obj/item/screwdriver, @@ -61824,16 +61753,6 @@ }, /turf/open/floor/plasteel, /area/service/hydroponics/garden) -"kSt" = ( -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/computer/secure_data{ - dir = 8 - }, -/turf/open/floor/carpet, -/area/command/blueshieldoffice) "kSy" = ( /obj/machinery/power/apc{ areastring = "/area/maintenance/solars/starboard/aft"; @@ -61997,6 +61916,16 @@ /obj/machinery/vending/snack/random, /turf/open/floor/plasteel/dark, /area/command/bridge) +"kWW" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/closet/crate, +/turf/open/floor/plasteel, +/area/engineering/atmos) "kXd" = ( /obj/machinery/power/terminal, /obj/structure/cable, @@ -62321,16 +62250,6 @@ /obj/structure/grille, /turf/closed/wall/r_wall, /area/engineering/atmos) -"leV" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 1 - }, -/obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics Monitoring"; - req_access_txt = "24" - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "lgF" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -62354,6 +62273,12 @@ dir = 1 }, /area/service/chapel/main) +"lgX" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/command/blueshielquarters) "lgY" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -63059,13 +62984,6 @@ }, /turf/open/floor/carpet, /area/command/bridge) -"lBY" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/aisat/exterior) "lCe" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -63142,6 +63060,15 @@ }, /turf/open/floor/plasteel, /area/commons/locker) +"lFH" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel/dark/corner, +/area/engineering/atmos) "lFQ" = ( /obj/structure/chair/office/dark{ dir = 4 @@ -63341,29 +63268,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/cargo/storage) -"lMS" = ( -/obj/item/book/manual/splurt_space_law{ - name = "space law"; - pixel_y = 2 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/item/toy/gun, -/obj/item/restraints/handcuffs, -/obj/structure/table/wood, -/obj/item/clothing/head/collectable/HoS{ - name = "novelty HoS hat" - }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/command/corporate_showroom) "lMY" = ( /obj/structure/table, /obj/item/storage/box/bodybags{ @@ -63636,6 +63540,14 @@ }, /turf/open/floor/plasteel, /area/engineering/atmos) +"lUs" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/pipedispenser/disposal/transit_tube, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/engineering/atmos) "lUv" = ( /obj/structure/noticeboard{ dir = 1; @@ -63698,25 +63610,25 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/eva) -"lVL" = ( -/obj/structure/table/wood, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -2; - pixel_y = -1 - }, -/obj/item/multitool, -/obj/machinery/camera{ - c_tag = "Blueshield"; - dir = 4 - }, -/turf/open/floor/carpet, -/area/command/blueshieldoffice) "lWq" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/wood, /area/service/bar) +"lWG" = ( +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + areastring = "/area/command/heads_quarters/hop"; + dir = 1; + name = "Head of Personnel APC"; + pixel_y = 23 + }, +/obj/structure/bed/dogbed/ian, +/turf/open/floor/carpet, +/area/command/heads_quarters/hop) "lWL" = ( /obj/machinery/computer/med_data{ dir = 8 @@ -63777,6 +63689,12 @@ }, /turf/open/floor/plasteel, /area/commons/fitness/recreation) +"lXt" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "lYc" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -63836,24 +63754,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/commons/cryopod) -"lZv" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, -/turf/open/floor/wood, -/area/command/blueshieldoffice) -"lZE" = ( -/obj/structure/chair/office/dark{ - dir = 8 - }, -/turf/open/floor/carpet, -/area/command/blueshieldoffice) "lZK" = ( /obj/item/paper_bin{ pixel_x = -3; @@ -63910,19 +63810,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/commons/dorms) -"mbl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/vending/wardrobe/blueshield_wardrobe, -/turf/open/floor/carpet, -/area/command/blueshielquarters) "mbw" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -64344,6 +64231,13 @@ }, /turf/open/floor/plasteel, /area/security/prison/upper) +"mml" = ( +/obj/structure/chair/comfy/black{ + dir = 8 + }, +/obj/effect/landmark/start/bridgeofficer, +/turf/open/floor/carpet, +/area/command/bridge) "mmy" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -64719,6 +64613,13 @@ /obj/effect/landmark/start/botanist, /turf/open/floor/plasteel, /area/service/hydroponics) +"mwS" = ( +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 28 + }, +/turf/open/floor/carpet, +/area/command/blueshielquarters) "mxh" = ( /obj/structure/table/wood, /obj/machinery/button/door{ @@ -64738,14 +64639,6 @@ }, /turf/open/floor/carpet, /area/command/corporate_showroom) -"mxo" = ( -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/aisat/exterior) "mxL" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -65063,6 +64956,23 @@ /obj/structure/reagent_dispensers/cooking_oil, /turf/open/floor/plasteel/showroomfloor, /area/service/kitchen) +"mFT" = ( +/obj/structure/table, +/obj/item/book/manual/splurt_space_law, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/requests_console{ + department = "Security"; + departmentType = 5; + pixel_x = 30 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/checkpoint/engineering) "mGL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line{ @@ -65109,6 +65019,10 @@ }, /turf/closed/wall/r_wall, /area/commons/storage/tools) +"mHO" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/command/blueshieldoffice) "mHR" = ( /obj/machinery/photocopier{ pixel_y = 3 @@ -65434,21 +65348,6 @@ }, /turf/open/floor/plasteel, /area/cargo/qm) -"mSc" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "mSd" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -65466,6 +65365,17 @@ luminosity = 2 }, /area/ai_monitored/command/nuke_storage) +"mSB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "mSL" = ( /obj/structure/cable, /obj/machinery/power/solar{ @@ -65769,18 +65679,6 @@ /obj/machinery/atmospherics/components/binary/pump, /turf/closed/wall/r_wall, /area/engineering/atmos) -"nfb" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/dark/corner, -/area/engineering/atmos) "nfs" = ( /obj/structure/mirror{ pixel_x = 28 @@ -65807,6 +65705,15 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/ai_monitored/command/storage/eva) +"ngc" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/pen, +/turf/open/floor/carpet, +/area/command/blueshieldoffice) "ngt" = ( /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -66439,14 +66346,6 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) -"nBS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/engineering/atmos) "nBX" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -66633,16 +66532,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plasteel, /area/engineering/atmos) -"nJT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "nKi" = ( /obj/machinery/conveyor{ dir = 1; @@ -66922,18 +66811,6 @@ }, /turf/open/floor/plasteel, /area/service/hydroponics/garden) -"nSl" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/plasteel/dark/corner, -/area/hallway/primary/starboard) "nSn" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -66947,6 +66824,17 @@ "nSv" = ( /turf/closed/wall, /area/command/heads_quarters/rd) +"nSx" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command/glass{ + name = "Blueshield"; + req_access_txt = "72" + }, +/turf/open/floor/wood, +/area/command/blueshieldoffice) "nSP" = ( /obj/structure/rack, /obj/machinery/power/apc{ @@ -67060,6 +66948,13 @@ }, /turf/open/floor/plasteel, /area/security/office) +"nVk" = ( +/obj/structure/closet/secure_closet/hop, +/obj/item/clothing/suit/toggle/armor/hop/hop_formal, +/obj/item/clothing/under/rank/civilian/head_of_personnel/parade, +/obj/item/clothing/under/rank/civilian/head_of_personnel/parade/female, +/turf/open/floor/wood, +/area/command/heads_quarters/hop) "nVE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -67323,6 +67218,24 @@ dir = 1 }, /area/command/gateway) +"oay" = ( +/obj/machinery/power/apc/highcap/ten_k{ + areastring = "/area/engineering/atmos"; + dir = 1; + name = "Atmospherics APC"; + pixel_y = 23 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/light_switch{ + pixel_x = -26 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "oaA" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -67771,6 +67684,20 @@ /obj/machinery/recharge_station, /turf/open/floor/plasteel/freezer, /area/commons/toilet/restrooms) +"olw" = ( +/obj/machinery/door/airlock/atmos/glass{ + name = "Atmospherics Monitoring"; + req_access_txt = "24" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel, +/area/engineering/atmos) "olW" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -68280,6 +68207,10 @@ }, /turf/open/floor/plasteel, /area/service/bar) +"oBF" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/engineering/atmos) "oBW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -68436,24 +68367,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, /area/security/prison/cells) -"oGQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 +"oHg" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Blueshield's Quarters"; + req_access_txt = "72" }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/suit_storage_unit/atmos, -/turf/open/floor/plasteel/dark/corner, -/area/engineering/atmos) -"oHI" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/pipedispenser/disposal/transit_tube, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/turf/open/floor/carpet, +/area/command/blueshielquarters) "oHW" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/turf_decal/bot, @@ -68774,6 +68695,14 @@ }, /turf/open/floor/plasteel, /area/commons/fitness/recreation) +"oQJ" = ( +/obj/structure/sign/poster/official/random{ + pixel_y = -32 + }, +/obj/item/bedsheet/blue/double, +/obj/structure/bed/double, +/turf/open/floor/carpet, +/area/command/blueshielquarters) "oRp" = ( /turf/open/space/basic, /area/space/station_ruins) @@ -68910,6 +68839,15 @@ /obj/item/pen, /turf/open/floor/plasteel/white, /area/science/circuit) +"oUE" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/engineering/break_room) "oUJ" = ( /obj/structure/rack, /obj/item/stack/packageWrap{ @@ -68996,24 +68934,22 @@ }, /turf/open/floor/plasteel, /area/commons/dorms) +"oWF" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/door/airlock/atmos/glass{ + name = "Atmospherics Monitoring"; + req_access_txt = "24" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel, +/area/engineering/atmos) "oWR" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port) -"oXc" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/structure/dresser, -/turf/open/floor/plasteel, -/area/security/prison/upper) "oXj" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -69048,17 +68984,6 @@ }, /turf/open/floor/plating, /area/construction/storage_wing) -"oXz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "oYR" = ( /obj/structure/table, /obj/item/assembly/igniter{ @@ -69075,10 +69000,27 @@ }, /turf/open/floor/plasteel, /area/commons/storage/primary) -"oYW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/wood, -/area/command/blueshieldoffice) +"oYS" = ( +/obj/item/folder/red{ + pixel_y = 3 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/table/glass, +/obj/item/folder/red{ + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/plasteel/dark, +/area/command/bridge) "oZg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -69753,19 +69695,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/prison/upper) -"poT" = ( -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - areastring = "/area/command/heads_quarters/hop"; - dir = 1; - name = "Head of Personnel APC"; - pixel_y = 23 - }, -/obj/structure/bed/dogbed/ian, -/turf/open/floor/carpet, -/area/command/heads_quarters/hop) "poW" = ( /obj/effect/decal/cleanable/cobweb, /obj/structure/bodycontainer/morgue{ @@ -69940,10 +69869,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/commons/fitness/recreation) -"ptO" = ( -/obj/structure/dresser, -/turf/open/floor/carpet, -/area/command/blueshielquarters) "ptX" = ( /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, @@ -70351,15 +70276,6 @@ }, /turf/open/floor/plasteel, /area/engineering/break_room) -"pDg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "pDn" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -70367,6 +70283,16 @@ }, /turf/open/space/basic, /area/space/nearstation) +"pDv" = ( +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24 + }, +/obj/machinery/computer/secure_data{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/command/blueshieldoffice) "pDz" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -70374,15 +70300,6 @@ }, /turf/open/space, /area/solars/starboard/aft) -"pDM" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/item/pen, -/turf/open/floor/carpet, -/area/command/blueshieldoffice) "pEN" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -70640,6 +70557,26 @@ }, /turf/open/floor/plasteel, /area/commons/fitness/recreation) +"pKR" = ( +/obj/structure/table/wood, +/obj/item/book/manual/splurt_space_law, +/obj/machinery/power/apc{ + areastring = "/area/command/heads_quarters/captain/private"; + dir = 8; + name = "Captain's Quarters APC"; + pixel_x = -25 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/item/paper/fluff/gateway, +/obj/item/coin/plasma, +/obj/item/melee/chainofcommand, +/turf/open/floor/wood, +/area/command/heads_quarters/captain/private) "pLf" = ( /turf/open/floor/engine/n2, /area/engineering/atmos) @@ -70690,9 +70627,6 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"pMZ" = ( -/turf/open/floor/wood, -/area/command/blueshieldoffice) "pNU" = ( /obj/machinery/holopad, /turf/open/floor/plasteel, @@ -70989,13 +70923,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/aisat/exterior) -"pVV" = ( -/obj/structure/closet/secure_closet/hop, -/obj/item/clothing/suit/toggle/armor/hop/hop_formal, -/obj/item/clothing/under/rank/civilian/head_of_personnel/parade, -/obj/item/clothing/under/rank/civilian/head_of_personnel/parade/female, -/turf/open/floor/wood, -/area/command/heads_quarters/hop) "pXj" = ( /obj/structure/plasticflaps/opaque, /obj/machinery/conveyor{ @@ -71157,12 +71084,6 @@ }, /turf/open/floor/wood, /area/service/library) -"qbZ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "qcF" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/techstorage/service, @@ -71195,14 +71116,6 @@ dir = 5 }, /area/command/heads_quarters/rd) -"qde" = ( -/obj/effect/landmark/start/blueshield, -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -22 - }, -/turf/open/floor/carpet, -/area/command/blueshielquarters) "qed" = ( /obj/structure/table, /obj/item/radio/intercom{ @@ -71583,19 +71496,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/treatment_center) -"qmB" = ( -/obj/structure/table/wood, -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/obj/item/folder/blue, -/obj/item/phone{ - desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; - pixel_x = -3; - pixel_y = 3 - }, -/turf/open/floor/carpet, -/area/command/blueshieldoffice) "qmK" = ( /obj/machinery/newscaster{ pixel_y = 32 @@ -71887,6 +71787,15 @@ "qur" = ( /turf/open/floor/wood, /area/command/corporate_showroom) +"quv" = ( +/obj/structure/table/wood, +/obj/machinery/recharger, +/obj/item/radio/off{ + pixel_x = 6; + pixel_y = 4 + }, +/turf/open/floor/wood, +/area/command/blueshieldoffice) "qvR" = ( /obj/structure/chair/office/dark{ dir = 1 @@ -71963,12 +71872,6 @@ }, /turf/open/floor/wood, /area/service/library) -"qxN" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/flask, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, -/turf/open/floor/carpet, -/area/command/blueshieldoffice) "qyd" = ( /obj/structure/bed/roller, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -71987,6 +71890,9 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/commons/fitness/recreation) +"qzx" = ( +/turf/closed/wall, +/area/command/blueshieldoffice) "qzI" = ( /obj/machinery/computer/security/qm{ dir = 4 @@ -72410,6 +72316,10 @@ }, /turf/closed/wall/r_wall, /area/ai_monitored/command/nuke_storage) +"qIE" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/command/blueshielquarters) "qIM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/computer/rdconsole/production{ @@ -72440,18 +72350,6 @@ dir = 1 }, /area/engineering/main) -"qJh" = ( -/obj/structure/table/wood, -/obj/item/storage/secure/briefcase{ - pixel_x = -2 - }, -/obj/item/book/manual/splurt_space_law, -/obj/item/cartridge/detective, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/dark, -/area/command/heads_quarters/hos) "qJk" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -72613,6 +72511,12 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plasteel, /area/cargo/warehouse) +"qQH" = ( +/obj/structure/table/wood, +/obj/item/stamp/hos, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/carpet, +/area/command/heads_quarters/hos) "qQR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, @@ -72732,6 +72636,12 @@ }, /turf/open/floor/plasteel, /area/security/prison/upper) +"qTp" = ( +/obj/structure/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/command/blueshieldoffice) "qTq" = ( /obj/structure/chair{ dir = 4 @@ -72925,6 +72835,18 @@ }, /turf/open/floor/wood, /area/service/theater) +"qWR" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/dark/corner, +/area/engineering/atmos) "qXd" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -73015,6 +72937,19 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) +"qZp" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/vending/wardrobe/blueshield_wardrobe, +/turf/open/floor/carpet, +/area/command/blueshielquarters) "qZB" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -73195,6 +73130,14 @@ }, /turf/open/floor/plasteel/cafeteria, /area/command/heads_quarters/cmo) +"rdg" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/engineering/atmos) "rdv" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/vending/wardrobe/cargo_wardrobe, @@ -73245,13 +73188,6 @@ dir = 5 }, /area/service/kitchen) -"reE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/engineering/atmos) "reM" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -73621,13 +73557,6 @@ /obj/machinery/atmospherics/pipe/simple/green/visible, /turf/open/floor/engine, /area/engineering/main) -"rrD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/wood, -/area/command/blueshielquarters) "rrX" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, @@ -73942,6 +73871,29 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/service/bar) +"rzU" = ( +/obj/item/book/manual/splurt_space_law{ + name = "space law"; + pixel_y = 2 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/item/toy/gun, +/obj/item/restraints/handcuffs, +/obj/structure/table/wood, +/obj/item/clothing/head/collectable/HoS{ + name = "novelty HoS hat" + }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 24 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/command/corporate_showroom) "rzX" = ( /obj/structure/chair/office/light{ dir = 1; @@ -74071,6 +74023,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/commons/fitness/recreation) +"rEy" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/obj/effect/landmark/start/brigdoc, +/turf/open/floor/plasteel/white, +/area/security/brig) "rEX" = ( /obj/structure/filingcabinet/employment, /obj/machinery/airalarm{ @@ -74426,6 +74385,18 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/hallway/primary/port) +"rOg" = ( +/obj/structure/sink{ + pixel_y = 25 + }, +/obj/structure/mirror{ + pixel_y = 32 + }, +/obj/structure/toilet/secret/low_loot{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/command/blueshielquarters) "rOP" = ( /obj/item/radio/intercom{ name = "Station Intercom (General)"; @@ -74610,6 +74581,10 @@ }, /turf/open/floor/plasteel, /area/service/hydroponics) +"rTc" = ( +/obj/machinery/vending/wardrobe/bridgeofficer_wardrobe, +/turf/open/floor/carpet, +/area/command/bridge) "rTj" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -75096,6 +75071,12 @@ }, /turf/open/floor/plating, /area/engineering/atmos) +"sgw" = ( +/obj/machinery/firealarm{ + pixel_y = -24 + }, +/turf/open/floor/wood, +/area/command/blueshieldoffice) "sgy" = ( /obj/machinery/light/small{ dir = 8 @@ -75423,6 +75404,19 @@ /obj/structure/mirror, /turf/closed/wall, /area/medical/surgery) +"spj" = ( +/obj/structure/table/wood, +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/obj/item/folder/blue, +/obj/item/phone{ + desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + pixel_x = -3; + pixel_y = 3 + }, +/turf/open/floor/carpet, +/area/command/blueshieldoffice) "spx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 @@ -75498,6 +75492,10 @@ luminosity = 2 }, /area/ai_monitored/command/nuke_storage) +"sst" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/wood, +/area/command/blueshieldoffice) "ssE" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -75508,24 +75506,6 @@ }, /turf/open/space, /area/solars/port/fore) -"ssY" = ( -/obj/machinery/power/apc/highcap/ten_k{ - areastring = "/area/engineering/atmos"; - dir = 1; - name = "Atmospherics APC"; - pixel_y = 23 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/light_switch{ - pixel_x = -26 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "stk" = ( /obj/machinery/camera{ c_tag = "Captain's Office"; @@ -75547,6 +75527,36 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/aisat/exterior) +"sux" = ( +/obj/structure/table, +/obj/machinery/newscaster/security_unit{ + pixel_x = 29; + pixel_y = 1 + }, +/obj/machinery/camera{ + c_tag = "Departure Lounge - Security Post"; + dir = 1 + }, +/obj/item/book/manual/splurt_space_law{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/taperecorder{ + pixel_x = 4 + }, +/obj/item/radio/intercom{ + name = "Station Intercom (General)"; + pixel_y = -32 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) "suE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall/r_wall, @@ -75681,12 +75691,15 @@ }, /turf/open/floor/plasteel/dark, /area/command/bridge) -"swU" = ( -/obj/item/hilbertshotel/ghostdojo{ - pixel_y = 16 +"sxn" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance{ + name = "Blueshield's Office Maintenance"; + req_access_txt = "72" }, -/turf/open/floor/carpet, -/area/hallway/primary/port) +/turf/open/floor/plating, +/area/command/blueshielquarters) "syi" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod Three" @@ -76103,12 +76116,6 @@ "sKl" = ( /turf/closed/wall/r_wall, /area/command/heads_quarters/captain/private) -"sKp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/closed/wall, -/area/command/blueshielquarters) "sKv" = ( /turf/closed/wall, /area/engineering/atmos) @@ -76208,17 +76215,6 @@ }, /turf/open/floor/plasteel/dark, /area/command/heads_quarters/ce) -"sOM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/vending/wardrobe/hos_wardrobe, -/turf/open/floor/carpet, -/area/command/heads_quarters/hos) "sOT" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -76286,15 +76282,6 @@ }, /turf/open/floor/plasteel/cafeteria, /area/command/heads_quarters/cmo) -"sQT" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "sQY" = ( /obj/structure/rack, /obj/machinery/status_display/ai{ @@ -76396,10 +76383,6 @@ }, /turf/open/floor/plasteel, /area/security/prison/upper) -"sUi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/command/blueshielquarters) "sUI" = ( /obj/structure/table, /obj/machinery/chem_dispenser/drinks/beer, @@ -76602,11 +76585,17 @@ /obj/structure/table/wood, /turf/open/floor/carpet, /area/service/chapel/main) -"taZ" = ( -/obj/structure/table/wood, -/obj/item/book/manual/splurt_space_law, -/turf/open/floor/carpet, -/area/command/blueshieldoffice) +"tbL" = ( +/obj/structure/table/reinforced, +/obj/item/book/manual/splurt_space_law{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/item/taperecorder{ + pixel_x = -4 + }, +/turf/open/floor/plasteel, +/area/security/office) "tbN" = ( /obj/machinery/status_display/ai{ pixel_y = 32 @@ -76988,13 +76977,6 @@ }, /turf/open/floor/plasteel, /area/ai_monitored/command/storage/eva) -"tlh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/light/small, -/turf/open/floor/plasteel, -/area/engineering/atmos) "tlp" = ( /obj/item/candle, /obj/machinery/light_switch{ @@ -77195,6 +77177,20 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/engineering/break_room) +"tro" = ( +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/structure/dresser, +/turf/open/floor/plasteel, +/area/security/prison/upper) "tsn" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 @@ -77388,6 +77384,13 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/solars/starboard/fore) +"tzt" = ( +/obj/machinery/power/floodlight, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/engineering/atmos) "tAp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 @@ -77409,12 +77412,6 @@ }, /turf/open/floor/plasteel, /area/cargo/sorting) -"tCt" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/turf/open/floor/wood, -/area/command/blueshieldoffice) "tCA" = ( /obj/machinery/disposal/bin{ pixel_x = -2; @@ -77511,6 +77508,16 @@ dir = 1 }, /area/engineering/atmos) +"tFH" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "tFJ" = ( /obj/structure/bodycontainer/morgue{ dir = 8 @@ -77535,6 +77542,16 @@ }, /turf/open/floor/plasteel/dark, /area/security/office) +"tGd" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "tGD" = ( /obj/structure/closet/crate, /obj/structure/extinguisher_cabinet{ @@ -77656,6 +77673,19 @@ }, /turf/open/floor/plating, /area/engineering/main) +"tJl" = ( +/obj/machinery/requests_console{ + department = "Detective's office"; + pixel_x = -30 + }, +/obj/structure/table/wood, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/item/book/manual/splurt_space_law, +/obj/item/camera/detective, +/turf/open/floor/plasteel/grimy, +/area/security/detectives_office) "tJG" = ( /obj/structure/cable/yellow, /obj/machinery/power/apc{ @@ -77748,11 +77778,6 @@ }, /turf/open/floor/plasteel, /area/commons/locker) -"tLu" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green, -/turf/open/floor/carpet, -/area/command/blueshieldoffice) "tLZ" = ( /obj/machinery/light{ dir = 8 @@ -78144,11 +78169,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/service/kitchen) -"tWQ" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/machinery/light, -/turf/open/floor/wood, -/area/command/blueshieldoffice) "tXp" = ( /obj/machinery/status_display/evac{ pixel_y = 32 @@ -78654,16 +78674,6 @@ }, /turf/open/floor/plasteel, /area/commons/dorms) -"ukO" = ( -/obj/machinery/power/smes{ - capacity = 9e+006; - charge = 10000 - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/maintenance/disposal/incinerator) "ulp" = ( /obj/machinery/vending/sustenance, /turf/open/floor/plasteel/cafeteria, @@ -78951,6 +78961,15 @@ /obj/machinery/mineral/ore_redemption, /turf/open/floor/plasteel/dark, /area/cargo/office) +"usM" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "utH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -79075,6 +79094,12 @@ }, /turf/closed/wall/r_wall, /area/engineering/atmos) +"uwV" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/wood, +/area/command/blueshieldoffice) "uxs" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -79249,26 +79274,16 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/plasteel, /area/commons/fitness/recreation) -"uEC" = ( -/obj/structure/table/wood, -/obj/item/storage/firstaid/brute{ - pixel_x = 5 - }, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/toxin{ - pixel_x = -5 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +"uED" = ( +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 1 }, -/obj/machinery/light{ - dir = 8 +/obj/machinery/door/airlock/atmos/glass{ + name = "Atmospherics Monitoring"; + req_access_txt = "24" }, -/obj/item/radio/intercom{ - pixel_x = -29 - }, -/turf/open/floor/wood, -/area/command/blueshieldoffice) +/turf/open/floor/plasteel, +/area/engineering/atmos) "uFM" = ( /obj/machinery/power/emitter, /obj/machinery/light/small, @@ -79572,6 +79587,18 @@ }, /turf/open/floor/plasteel/white, /area/science/research) +"uRX" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/turf/open/floor/wood, +/area/command/blueshieldoffice) "uSn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -79671,16 +79698,6 @@ }, /turf/open/floor/plasteel, /area/commons/locker) -"uVk" = ( -/obj/structure/table, -/obj/item/folder/red, -/obj/item/book/manual/splurt_space_law{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/item/clothing/mask/gas/sechailer, -/turf/open/floor/plasteel, -/area/security/office) "uVl" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -79691,6 +79708,16 @@ }, /turf/open/floor/plasteel, /area/service/hydroponics/garden) +"uVF" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/item/radio/intercom{ + pixel_x = -29 + }, +/obj/structure/closet/secure_closet/blueshield, +/turf/open/floor/carpet, +/area/command/blueshielquarters) "uVQ" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -79850,13 +79877,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/engine, /area/engineering/main) -"vax" = ( -/obj/machinery/power/floodlight, -/obj/structure/cable/yellow{ - icon_state = "0-8" +"van" = ( +/obj/structure/table/wood, +/obj/item/book/manual/splurt_space_law, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/turf/open/floor/plating, -/area/engineering/atmos) +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/courtroom) "vaA" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 @@ -80158,9 +80189,6 @@ }, /turf/open/floor/plasteel, /area/cargo/miningoffice) -"vhb" = ( -/turf/open/floor/carpet, -/area/command/blueshielquarters) "vhg" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/structure/disposalpipe/segment, @@ -80448,12 +80476,6 @@ }, /turf/open/floor/carpet, /area/service/theater) -"vqk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/turf/open/floor/wood, -/area/command/blueshieldoffice) "vqv" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ @@ -80713,6 +80735,19 @@ }, /turf/open/floor/wood, /area/service/library) +"vzb" = ( +/obj/structure/chair/office/dark{ + dir = 4 + }, +/obj/effect/landmark/start/atmospheric_technician, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "vzs" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -80893,24 +80928,6 @@ dir = 1 }, /area/service/bar) -"vEr" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, -/obj/machinery/pipedispenser, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/camera{ - c_tag = "Atmospherics - Entrance"; - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "vFz" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -81008,6 +81025,26 @@ /obj/item/reagent_containers/food/drinks/shaker, /turf/open/floor/carpet, /area/command/heads_quarters/captain/private) +"vHS" = ( +/obj/structure/table/wood, +/obj/item/storage/firstaid/brute{ + pixel_x = 5 + }, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/toxin{ + pixel_x = -5 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/item/radio/intercom{ + pixel_x = -29 + }, +/turf/open/floor/wood, +/area/command/blueshieldoffice) "vIz" = ( /obj/structure/table/wood, /obj/item/folder, @@ -81031,12 +81068,6 @@ }, /turf/open/floor/wood, /area/commons/dorms) -"vJr" = ( -/obj/machinery/firealarm{ - pixel_y = -24 - }, -/turf/open/floor/wood, -/area/command/blueshieldoffice) "vJE" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/chem_master/condimaster{ @@ -81109,24 +81140,6 @@ }, /turf/open/floor/plasteel, /area/cargo/sorting) -"vMo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/plasteel/dark/corner, -/area/engineering/atmos) -"vMu" = ( -/obj/structure/table/wood, -/obj/machinery/recharger, -/obj/item/radio/off{ - pixel_x = 6; - pixel_y = 4 - }, -/turf/open/floor/wood, -/area/command/blueshieldoffice) "vMG" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -81233,6 +81246,29 @@ /obj/structure/girder/reinforced, /turf/open/floor/plating/airless, /area/engineering/atmos) +"vPl" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/item/book/manual/splurt_space_law{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/machinery/light_switch{ + pixel_y = 26 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/security/checkpoint/customs) "vPE" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible, /turf/open/floor/plasteel/dark, @@ -81246,10 +81282,18 @@ }, /turf/open/floor/plasteel, /area/cargo/storage) -"vQX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/command/blueshieldoffice) +"vRs" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/engineering/break_room) "vRu" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ @@ -81276,6 +81320,22 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"vRG" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -22 + }, +/obj/item/radio/intercom{ + name = "Station Intercom (General)"; + pixel_x = -29; + pixel_y = 23 + }, +/obj/structure/closet/secure_closet/hosnew, +/turf/open/floor/plasteel/dark, +/area/command/heads_quarters/hos) "vSm" = ( /obj/machinery/power/emitter, /turf/open/floor/plating, @@ -81399,6 +81459,11 @@ }, /turf/open/floor/plasteel/freezer, /area/commons/fitness/recreation) +"vUJ" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/machinery/light, +/turf/open/floor/wood, +/area/command/blueshieldoffice) "vWf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -81727,10 +81792,6 @@ dir = 1 }, /area/engineering/main) -"wcZ" = ( -/obj/structure/closet/secure_closet/bridgesec, -/turf/open/floor/carpet, -/area/command/bridge) "wda" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -81911,17 +81972,6 @@ }, /turf/open/floor/wood, /area/command/heads_quarters/captain/private) -"wie" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics Monitoring"; - req_access_txt = "24" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/plasteel, -/area/engineering/atmos) "wim" = ( /obj/structure/table, /obj/item/stock_parts/micro_laser, @@ -81997,6 +82047,18 @@ }, /turf/open/floor/plasteel, /area/cargo/sorting) +"wkF" = ( +/obj/structure/table/wood, +/obj/item/storage/secure/briefcase{ + pixel_x = -2 + }, +/obj/item/book/manual/splurt_space_law, +/obj/item/cartridge/detective, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/command/heads_quarters/hos) "wlz" = ( /obj/machinery/light/small, /obj/machinery/air_sensor/atmos/nitrogen_tank, @@ -82398,14 +82460,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/command/gateway) -"wul" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, -/obj/item/bedsheet/blue/double, -/obj/structure/bed/double, -/turf/open/floor/carpet, -/area/command/blueshielquarters) "wuo" = ( /obj/effect/spawner/structure/window, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -82538,15 +82592,6 @@ }, /turf/open/floor/plasteel, /area/service/hydroponics) -"wxF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ - name = "Blueshield's Office Maintenance"; - req_access_txt = "72" - }, -/turf/open/floor/plating, -/area/command/blueshielquarters) "wxP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 @@ -82816,6 +82861,9 @@ }, /turf/open/floor/carpet, /area/command/bridge) +"wEu" = ( +/turf/closed/wall, +/area/command/blueshielquarters) "wEG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -82860,6 +82908,14 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/engine, /area/engineering/main) +"wFr" = ( +/obj/effect/landmark/start/blueshield, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -22 + }, +/turf/open/floor/carpet, +/area/command/blueshielquarters) "wFu" = ( /obj/machinery/atmospherics/pipe/simple/green/visible, /turf/open/floor/plasteel/dark, @@ -82898,14 +82954,6 @@ /obj/machinery/meter, /turf/closed/wall/r_wall, /area/engineering/atmos) -"wGj" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/engineering/atmos) "wGp" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -83042,6 +83090,13 @@ /obj/effect/landmark/start/shaft_miner, /turf/open/floor/plasteel, /area/cargo/miningoffice) +"wKg" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/engineering/atmos) "wKo" = ( /obj/effect/turf_decal/stripes/line, /turf/closed/wall, @@ -83092,19 +83147,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/command/nuke_storage) -"wLS" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/disposal/incinerator) "wMe" = ( /obj/item/taperecorder, /obj/item/camera, @@ -83383,18 +83425,6 @@ }, /turf/open/floor/plasteel, /area/ai_monitored/command/storage/eva) -"wTk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/aisat/exterior) "wTI" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -83921,9 +83951,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/cargo/office) -"xht" = ( -/turf/closed/wall, -/area/command/blueshielquarters) "xhF" = ( /obj/structure/sign/directions/command{ dir = 1; @@ -83950,6 +83977,9 @@ }, /turf/open/floor/plating, /area/security/prison) +"xiC" = ( +/turf/open/floor/wood, +/area/command/blueshieldoffice) "xiO" = ( /obj/structure/cable{ icon_state = "4-8" @@ -84205,16 +84235,6 @@ }, /turf/open/floor/carpet, /area/commons/dorms) -"xpB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/pipedispenser/disposal, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "xpD" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -84308,6 +84328,19 @@ }, /turf/open/floor/wood, /area/command/heads_quarters/captain/private) +"xrV" = ( +/obj/machinery/newscaster/security_unit{ + pixel_y = -30 + }, +/obj/item/folder/red, +/obj/item/folder/red, +/obj/structure/table, +/obj/item/book/manual/splurt_space_law{ + pixel_x = -3; + pixel_y = 5 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/security/warden) "xsc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/red{ @@ -84489,19 +84522,6 @@ /obj/machinery/meter, /turf/open/floor/plasteel, /area/engineering/atmos) -"xxq" = ( -/obj/structure/table/wood, -/obj/item/book/manual/splurt_space_law, -/obj/item/book/manual/splurt_space_law, -/obj/item/pen/red, -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching Prison Wing holding areas."; - name = "Prison Monitor"; - network = list("prison"); - pixel_y = 30 - }, -/turf/open/floor/wood, -/area/service/lawoffice) "xyp" = ( /obj/docking_port/stationary{ dheight = 1; @@ -84751,6 +84771,13 @@ }, /turf/open/floor/wood, /area/service/library) +"xEc" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/wood, +/area/command/blueshielquarters) "xEf" = ( /obj/structure/table, /obj/item/flashlight/lamp{ @@ -84856,9 +84883,6 @@ /obj/effect/spawner/lootdrop/bedsheet, /turf/open/floor/wood, /area/commons/dorms) -"xGF" = ( -/turf/closed/wall, -/area/command/blueshieldoffice) "xGK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/blue, @@ -84910,6 +84934,12 @@ }, /turf/open/floor/plasteel, /area/science/mixing) +"xHm" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "xHA" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 8; @@ -85153,18 +85183,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/wood, /area/service/library) -"xNe" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/engineering/break_room) "xNj" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -85426,6 +85444,13 @@ }, /turf/open/floor/plasteel/dark, /area/engineering/break_room) +"xUc" = ( +/obj/machinery/status_display/evac{ + pixel_y = 32 + }, +/obj/machinery/photocopier, +/turf/open/floor/wood, +/area/command/heads_quarters/hop) "xUs" = ( /obj/machinery/conveyor_switch/oneway{ dir = 8; @@ -85718,16 +85743,6 @@ dir = 1 }, /area/engineering/main) -"ycp" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/closet/crate, -/turf/open/floor/plasteel, -/area/engineering/atmos) "ycy" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -85935,14 +85950,6 @@ dir = 5 }, /area/service/kitchen) -"yfu" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command{ - name = "Blueshield's Quarters"; - req_access_txt = "72" - }, -/turf/open/floor/carpet, -/area/command/blueshielquarters) "yfL" = ( /obj/machinery/door/airlock/silver{ name = "Bathroom" @@ -86009,13 +86016,6 @@ }, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) -"yho" = ( -/obj/structure/chair/comfy/black{ - dir = 4 - }, -/obj/effect/landmark/start/bridgeofficer, -/turf/open/floor/carpet, -/area/command/bridge) "yhD" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ @@ -100373,7 +100373,7 @@ aaa dne arZ bbK -bcX +vPl beL bgw bix @@ -100642,17 +100642,17 @@ bHM ajs jBe pHS -xGF -xGF -xGF -xGF -xGF -xht -xht -xht -xht -xht -xht +qzx +qzx +qzx +qzx +qzx +wEu +wEu +wEu +wEu +wEu +wEu alC mEe alK @@ -100899,17 +100899,17 @@ ahT bKX jPu rbE -vQX -jUo -uEC -lVL -vMu -xht -igf -qde -kzB -ptO -xht +mHO +jox +vHS +fkJ +quv +wEu +uVF +wFr +lgX +iup +wEu amZ bSq bTr @@ -101152,21 +101152,21 @@ bka blY aeD ahT -swU +gom aeD kQP rNX -xGF -lZv -oYW -oYW -oYW -sUi -mbl -vhb -efp -wul -xht +qzx +uRX +fvS +fvS +fvS +qIE +qZp +jDi +mwS +oQJ +wEu auF bSo alK @@ -101413,17 +101413,17 @@ ahT bKX aju syk -eBu -hBP -pMZ -pMZ -vJr -xht -sKp -yfu -xht -xht -xht +nSx +dRA +xiC +xiC +sgw +wEu +bDK +oHg +wEu +wEu +wEu aoa bSo alK @@ -101670,17 +101670,17 @@ aiW dig amv wlH -xGF -tLu -taZ -pDM -vqk -irH -hKm -fcp -rrD -fcp -wxF +qzx +fFx +hov +ngc +itw +sst +iUU +fTP +xEc +fTP +sxn bRd ghM alK @@ -101927,17 +101927,17 @@ baE baE bqd xfI -xGF -qmB -lZE -kLv -tCt -tWQ -xht -xht -hqm -xht -xht +qzx +spj +qTp +kbY +uwV +vUJ +wEu +wEu +hpv +wEu +wEu bRe xDn aSO @@ -102184,17 +102184,17 @@ bJp eiS jBe xmb -xGF -qxN -ePx -kSt -pMZ -hAH -xht -edM -gCM -gdH -xht +qzx +hUI +eco +pDv +xiC +dDi +wEu +rOg +bKa +hNI +wEu aqO bSt dux @@ -102441,17 +102441,17 @@ bsu btY maP xLL -xGF -xGF -xGF -xGF -xGF -xGF -xht -xht -xht -xht -xht +qzx +qzx +qzx +qzx +qzx +qzx +wEu +wEu +wEu +wEu +wEu alK bSo dux @@ -106537,7 +106537,7 @@ lYW aSX aUl aVP -aXp +cMN aSX qOf xOk @@ -106996,7 +106996,7 @@ xAO hXi viX dCu -oXc +tro jVo wDM sMe @@ -109848,7 +109848,7 @@ wHw ajm air ajm -akt +ikO alM and aon @@ -109892,7 +109892,7 @@ vDn rcc dSO gBI -pVV +nVk pBK bzM bBB @@ -110147,9 +110147,9 @@ pBK pBK pBK pBK -poT +lWG nSn -aal +jps pBK bzN bBB @@ -110363,7 +110363,7 @@ aws aws ahx akv -alO +rEy anf aop orJ @@ -110425,7 +110425,7 @@ bTJ aYX bWj bXL -bYZ +hQP cag cbR cdx @@ -110619,7 +110619,7 @@ pvy pvy ait ahx -akw +hBr alP ang aoq @@ -110917,7 +110917,7 @@ biX bkB bmt pBK -eTH +xUc mmH uGn fSx @@ -112681,7 +112681,7 @@ adY adY apL dCh -ass +xrV adY auW awd @@ -112719,9 +112719,9 @@ qWe jAG tmg sjK -jBG +dgX eil -fpx +rTc vsz bDj bEN @@ -112978,7 +112978,7 @@ pHb sjK qVT eil -yho +ajD woJ bDk bEP @@ -114006,7 +114006,7 @@ kWa tmg kUx qaa -hzs +mml ezp bDk bEP @@ -114263,7 +114263,7 @@ tmg tmg wrY uiF -wcZ +fNJ vsz bDn bES @@ -114728,7 +114728,7 @@ aeq aeq aad ahC -ahI +kNj aeq ajA akJ @@ -114768,7 +114768,7 @@ bci aaf myk xeF -aah +oYS pJi sKT uGy @@ -114788,7 +114788,7 @@ wQw gFw qka mxh -lMS +rzU vCw bTS aYX @@ -115090,7 +115090,7 @@ cgM cPb cNd cNS -cOz +sux cPb aaa aaa @@ -115522,7 +115522,7 @@ aEY aGs aHE aIQ -aKb +van dCq aIR aOi @@ -115753,8 +115753,8 @@ aaf aaa tsH tsH -eyO -qJh +vRG +wkF okn xHQ tsH @@ -116057,7 +116057,7 @@ mLk nGl mLk uzX -fsX +pKR huJ cVF pok @@ -116270,7 +116270,7 @@ ruy sXr nee jcF -sOM +aoD dlG jMq wNF @@ -116301,7 +116301,7 @@ aPB aQJ aIT aIT -aUJ +hqe aHD aXS aYX @@ -116525,7 +116525,7 @@ aaf fmY pHm uHd -aae +qQH wcl eQY gWb @@ -116545,7 +116545,7 @@ ayF azQ aBk pjG -aDI +tJl ayJ ayJ aHD @@ -116789,7 +116789,7 @@ rGC rxy ejY imk -gLI +tbL vvt keY owz @@ -116829,7 +116829,7 @@ xrJ vCg eAW fcg -aak +fnk hVY oxr ffN @@ -117063,7 +117063,7 @@ aDK aFa aGv lNc -xxq +jZM mJg xSp qXX @@ -117304,7 +117304,7 @@ icE okp wts ooe -uVk +kJm nmx owz nUI @@ -117366,7 +117366,7 @@ bWD bYa bZo caE -ccn +izM cdS ceX cgl @@ -125318,7 +125318,7 @@ bAy bAy bDN bFD -bHn +jdn bIG nUa rzt @@ -125569,13 +125569,13 @@ bpf brz bty bvb -bxb -dAr +iWS +byQ bAz bCf bty bFE -nSl +bHo bIH qtO uYc @@ -125845,8 +125845,8 @@ alq alq bXb bYu -gPr -wLS +bZD +caY ccI ced cfq @@ -126103,7 +126103,7 @@ aut bXc bZz bZE -fNX +caZ ccJ cee cfr @@ -126360,8 +126360,8 @@ bPs bXd apf bZE -ukO -dak +cba +ccK cef cfs czH @@ -126599,8 +126599,8 @@ iLe bCK qxd jJw -sQT -qbZ +usM +lXt lzQ tyC kLr @@ -126856,9 +126856,9 @@ iLe bvg odq ipm -fky -hAI hAI +oBF +oBF jxI kLr qDJ @@ -127113,12 +127113,12 @@ btz bvh qxd oNX -fjC +vzb mMn -eJY -hYl +cWn +xHm kLr -tlh +iix sKv qxd qxd @@ -127370,12 +127370,12 @@ iLe kqF qxd wtG -nfb -aDt -ipF -ijT -vMo -oGQ +qWR +cVp +gGc +dtk +lFH +hdJ shK itH itH @@ -127627,12 +127627,12 @@ iLe iLe qxd oBX -kwT +olw sKv sKv uKL -wie -reE +ktV +wKg uTg tFA hHh @@ -127883,11 +127883,11 @@ ltg txb trn sKv -ssY -mSc -ycp +oay +fNf +kWW uKL -pDg +grX hop ldI elC @@ -127896,7 +127896,7 @@ ooB ibJ ibJ ibJ -cWa +tGd ibJ ibJ omb @@ -128135,16 +128135,16 @@ paS nmt hNW hNW -xNe +vRs eDc lTr xca hZe mZD -oXz -iVM -krs -nJT +mSB +dRb +oWF +tFH tfk sfM kBk @@ -128153,7 +128153,7 @@ eCZ mMn mMn mMn -aGD +fYL mMn mMn eWY @@ -128384,7 +128384,7 @@ mzH apc aYu aZN -bbD +mFT bcN beo bfX @@ -128392,16 +128392,16 @@ pDf tMN tnh ryM -kNM +oUE vpQ kuk oOQ naf -vEr -xpB -oHI -gul -eeL +gaV +fpg +lUs +fFR +fNh tNF dHR nwU @@ -128410,7 +128410,7 @@ pcs mMn mMn mMn -aGD +fYL mMn mMn mMn @@ -128658,7 +128658,7 @@ jiZ mHn mHn mHn -nBS +rdg fGc lHN tac @@ -128667,7 +128667,7 @@ mMn mMn mMn mMn -aGD +fYL mMn mMn mMn @@ -128924,7 +128924,7 @@ mMn mMn mMn mMn -vax +tzt mMn mMn mMn @@ -129173,7 +129173,7 @@ npE pPS esR mMn -leV +uED hfg tac wqG @@ -129687,7 +129687,7 @@ qVE qoD oyV mtM -wGj +ixJ htZ oLm eWY @@ -137901,8 +137901,8 @@ fMm beq blx iDz -wTk -dIo +hIh +fnW blx anT anT @@ -138158,8 +138158,8 @@ kDk aOX bly jYV -lBY -mxo +eOz +jVY aOX aNw aNw diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm index 4bc9ccaacd..25b5334a2b 100644 --- a/code/__HELPERS/_logging.dm +++ b/code/__HELPERS/_logging.dm @@ -109,6 +109,10 @@ if (CONFIG_GET(flag/log_attack)) WRITE_LOG(GLOB.world_attack_log, "ATTACK: [text]") +/proc/log_victim(text) + if (CONFIG_GET(flag/log_victim)) + WRITE_LOG(GLOB.world_victim_log, "VICTIM: [text]") + /proc/log_manifest(ckey, datum/mind/mind,mob/body, latejoin = FALSE) if (CONFIG_GET(flag/log_manifest)) WRITE_LOG(GLOB.world_manifest_log, "[ckey] \\ [body.real_name] \\ [mind.assigned_role] \\ [mind.special_role ? mind.special_role : "NONE"] \\ [latejoin ? "LATEJOIN":"ROUNDSTART"]") diff --git a/code/_globalvars/logging.dm b/code/_globalvars/logging.dm index 843eab6fb0..f445843364 100644 --- a/code/_globalvars/logging.dm +++ b/code/_globalvars/logging.dm @@ -11,6 +11,8 @@ GLOBAL_VAR(world_qdel_log) GLOBAL_PROTECT(world_qdel_log) GLOBAL_VAR(world_attack_log) GLOBAL_PROTECT(world_attack_log) +GLOBAL_VAR(world_victim_log) +GLOBAL_PROTECT(world_victim_log) // GLOBAL_VAR(world_econ_log) // GLOBAL_PROTECT(world_econ_log) GLOBAL_VAR(world_href_log) diff --git a/code/_rendering/parallax/types/space.dm b/code/_rendering/parallax/types/space.dm index f7bae7344d..1a6cf191cb 100644 --- a/code/_rendering/parallax/types/space.dm +++ b/code/_rendering/parallax/types/space.dm @@ -17,7 +17,7 @@ P.pixel_x = planet_offset_x P.pixel_y = planet_offset_y . += P - if(random_layer && random_layer != "null") + if(ispath(random_layer, /atom/movable/screen/parallax_layer)) . += new random_layer if(ispath(random_layer, /atom/movable/screen/parallax_layer/space/random/space_gas)) var/atom/movable/screen/parallax_layer/space/random/space_gas/SG = locate(random_layer) in objects diff --git a/code/controllers/configuration/entries/logging.dm b/code/controllers/configuration/entries/logging.dm index 54bd5cb713..e9fe04f2d4 100644 --- a/code/controllers/configuration/entries/logging.dm +++ b/code/controllers/configuration/entries/logging.dm @@ -1,88 +1,119 @@ -/datum/config_entry/flag/log_ooc // log OOC channel +/// log OOC channel +/datum/config_entry/flag/log_ooc config_entry_value = TRUE -/datum/config_entry/flag/log_access // log login/logout +/// log login/logout +/datum/config_entry/flag/log_access config_entry_value = TRUE /// Config entry which special logging of failed logins under suspicious circumstances. /datum/config_entry/flag/log_suspicious_login config_entry_value = TRUE -/datum/config_entry/flag/log_say // log client say +/// log client say +/datum/config_entry/flag/log_say config_entry_value = TRUE -/datum/config_entry/flag/log_admin // log admin actions +/// log admin actions +/datum/config_entry/flag/log_admin protection = CONFIG_ENTRY_LOCKED config_entry_value = TRUE -/datum/config_entry/flag/log_prayer // log prayers +/// log prayers +/datum/config_entry/flag/log_prayer config_entry_value = TRUE -/datum/config_entry/flag/log_law // log lawchanges +/// log lawchanges +/datum/config_entry/flag/log_law config_entry_value = TRUE -/datum/config_entry/flag/log_game // log game events +/// log game events +/datum/config_entry/flag/log_game config_entry_value = TRUE -/datum/config_entry/flag/log_virus // log virology data +/// log virology data +/datum/config_entry/flag/log_virus config_entry_value = TRUE -/datum/config_entry/flag/log_vote // log voting +/// log voting +/datum/config_entry/flag/log_vote config_entry_value = TRUE -/datum/config_entry/flag/log_craft // log crafting +/// log crafting +/datum/config_entry/flag/log_craft config_entry_value = TRUE -/datum/config_entry/flag/log_whisper // log client whisper +/// log client whisper +/datum/config_entry/flag/log_whisper config_entry_value = TRUE -/datum/config_entry/flag/log_attack // log attack messages +/// log attack messages +/datum/config_entry/flag/log_attack config_entry_value = TRUE -/datum/config_entry/flag/log_emote // log emotes +/// log attack messages +/datum/config_entry/flag/log_victim config_entry_value = TRUE -/datum/config_entry/flag/log_adminchat // log admin chat messages +/// log emotes +/datum/config_entry/flag/log_emote + config_entry_value = TRUE + +/// log admin chat messages +/datum/config_entry/flag/log_adminchat protection = CONFIG_ENTRY_LOCKED -/datum/config_entry/flag/log_shuttle // log shuttle related actions, ie shuttle computers, shuttle manipulator, emergency console +/// log shuttle related actions, ie shuttle computers, shuttle manipulator, emergency console +/datum/config_entry/flag/log_shuttle config_entry_value = TRUE -/datum/config_entry/flag/log_pda // log pda messages +/// log pda messages +/datum/config_entry/flag/log_pda config_entry_value = TRUE -/datum/config_entry/flag/log_telecomms // log telecomms messages +/// log telecomms messages +/datum/config_entry/flag/log_telecomms config_entry_value = TRUE -/datum/config_entry/flag/log_twitter // log certain expliotable parrots and other such fun things in a JSON file of twitter valid phrases. +/// log certain expliotable parrots and other such fun things in a JSON file of twitter valid phrases. +/datum/config_entry/flag/log_twitter config_entry_value = TRUE -/datum/config_entry/flag/log_world_topic // log all world.Topic() calls +/// log all world.Topic() calls +/datum/config_entry/flag/log_world_topic config_entry_value = TRUE -/datum/config_entry/flag/log_manifest // log crew manifest to seperate file +/// log crew manifest to seperate file +/datum/config_entry/flag/log_manifest config_entry_value = TRUE -/datum/config_entry/flag/log_job_debug // log roundstart divide occupations debug information to a file +/// log roundstart divide occupations debug information to a file +/datum/config_entry/flag/log_job_debug config_entry_value = TRUE +/// log photos taken by players with a camera /datum/config_entry/flag/log_pictures +/// This is... shitcode, literally same as above, if one of them is inactive, won't log at all, PLEASE FUCKING REMOVE THIS. /datum/config_entry/flag/picture_logging_camera /// forces log_href for tgui /datum/config_entry/flag/emergency_tgui_logging config_entry_value = FALSE -/datum/config_entry/number/error_cooldown // The "cooldown" time for each occurrence of a unique error +/// The "cooldown" time for each occurrence of a unique error +/datum/config_entry/number/error_cooldown config_entry_value = 600 min_val = 0 -/datum/config_entry/number/error_limit // How many occurrences before the next will silence them +/// How many occurrences before the next will silence them +/datum/config_entry/number/error_limit config_entry_value = 50 -/datum/config_entry/number/error_silence_time // How long a unique error will be silenced for +/// How long a unique error will be silenced for +/datum/config_entry/number/error_silence_time config_entry_value = 6000 -/datum/config_entry/number/error_msg_delay // How long to wait between messaging admins about occurrences of a unique error +/// How long to wait between messaging admins about occurrences of a unique error +/datum/config_entry/number/error_msg_delay config_entry_value = 50 diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 1c5ca4500f..dd8c6732c0 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -1007,9 +1007,11 @@ /datum/status_effect/trance/proc/hypnotize(datum/source, list/hearing_args) if(!owner.can_hear()) return - if(hearing_args[HEARING_SPEAKER] == owner) + var/mob/hearing_speaker = hearing_args[HEARING_SPEAKER] + if(hearing_speaker == owner) return var/mob/living/carbon/C = owner + var/hypnomsg = uncostumize_say(hearing_args[HEARING_RAW_MESSAGE], hearing_args[HEARING_MESSAGE_MODE]) if (is_stupor) // Record when a hypnosis is applied var/mob/living/carbon/human/H = owner var/list/traumas = H.get_traumas() @@ -1019,7 +1021,10 @@ var/datum/brain_trauma/severe/hypnotic_stupor/T = BT T.on_hypnosis() C.cure_trauma_type(/datum/brain_trauma/hypnosis, TRAUMA_RESILIENCE_SURGERY) //clear previous hypnosis - addtimer(CALLBACK(C, /mob/living/carbon.proc/gain_trauma, /datum/brain_trauma/hypnosis, TRAUMA_RESILIENCE_SURGERY, hearing_args[HEARING_RAW_MESSAGE]), 10) + // The brain trauma itself does its own set of logging, but this is the only place the source of the hypnosis phrase can be found. + hearing_speaker.log_message("has hypnotised [key_name(C)] with the phrase '[hypnomsg]'", LOG_ATTACK) + C.log_message("has been hypnotised by the phrase '[hypnomsg]' spoken by [key_name(hearing_speaker)]", LOG_VICTIM, log_globally = FALSE) + addtimer(CALLBACK(C, /mob/living/carbon.proc/gain_trauma, /datum/brain_trauma/hypnosis, TRAUMA_RESILIENCE_SURGERY, hypnomsg), 10) addtimer(CALLBACK(C, /mob/living.proc/Stun, 60, TRUE, TRUE), 15) //Take some time to think about it qdel(src) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 1896f123c5..68c1d6b9ac 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -1238,7 +1238,7 @@ if(user != target) var/reverse_message = "has been [what_done] by [ssource][postfix]" - target.log_message(reverse_message, LOG_ATTACK, color="orange", log_globally=FALSE) + target.log_message(reverse_message, LOG_VICTIM, color="orange", log_globally=FALSE) /** * log_wound() is for when someone is *attacked* and suffers a wound. Note that this only captures wounds from damage, so smites/forced wounds aren't logged, as well as demotions like cuts scabbing over diff --git a/code/game/objects/items/implants/implantchair.dm b/code/game/objects/items/implants/implantchair.dm index 7b05cf302e..e32acd105e 100644 --- a/code/game/objects/items/implants/implantchair.dm +++ b/code/game/objects/items/implants/implantchair.dm @@ -189,5 +189,7 @@ return FALSE brainwash(C, objective) message_admins("[ADMIN_LOOKUPFLW(user)] brainwashed [key_name_admin(C)] with objective '[objective]'.") + user.log_message("has brainwashed [key_name(C)] with the objective '[objective]' using \the [src]", LOG_ATTACK) + C.log_message("has been brainwashed with the objective '[objective]' by [key_name(user)] using \the [src]", LOG_VICTIM, log_globally = FALSE) log_game("[key_name(user)] brainwashed [key_name(C)] with objective '[objective]'.") return TRUE diff --git a/code/game/world.dm b/code/game/world.dm index dd52129229..d1d5747b38 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -115,6 +115,7 @@ GLOBAL_LIST(topic_status_cache) GLOB.world_virus_log = "[GLOB.log_directory]/virus.log" GLOB.world_asset_log = "[GLOB.log_directory]/asset.log" GLOB.world_attack_log = "[GLOB.log_directory]/attack.log" + GLOB.world_victim_log = "[GLOB.log_directory]/victim.log" GLOB.world_pda_log = "[GLOB.log_directory]/pda.log" GLOB.world_telecomms_log = "[GLOB.log_directory]/telecomms.log" GLOB.world_manifest_log = "[GLOB.log_directory]/manifest.log" diff --git a/code/modules/antagonists/brainwashing/brainwashing.dm b/code/modules/antagonists/brainwashing/brainwashing.dm index bd7a9a43cb..65c58611cb 100644 --- a/code/modules/antagonists/brainwashing/brainwashing.dm +++ b/code/modules/antagonists/brainwashing/brainwashing.dm @@ -73,7 +73,7 @@ brainwash(C, objectives) var/obj_list = english_list(objectives) message_admins("[key_name_admin(admin)] has brainwashed [key_name_admin(C)] with the following objectives: [obj_list].") - C.log_message("has been force-brainwashed with the objective '[obj_list]' by admin [key_name(admin)]", LOG_ATTACK, log_globally = FALSE) + C.log_message("has been force-brainwashed with the objective '[obj_list]' by admin [key_name(admin)]", LOG_VICTIM) log_admin("[key_name(admin)] has brainwashed [key_name(C)] with the following objectives: [obj_list].") /datum/objective/brainwashing diff --git a/code/modules/research/anomaly/explosive_compressor.dm b/code/modules/research/anomaly/explosive_compressor.dm index 23983e31dc..54236e3763 100644 --- a/code/modules/research/anomaly/explosive_compressor.dm +++ b/code/modules/research/anomaly/explosive_compressor.dm @@ -1,4 +1,4 @@ -#define MAX_RADIUS_REQUIRED 8000 //tritbomb +#define MAX_RADIUS_REQUIRED 175 //tritbomb #define MIN_RADIUS_REQUIRED 20 //maxcap /** * # Explosive compressor machines diff --git a/code/modules/surgery/advanced/brainwashing.dm b/code/modules/surgery/advanced/brainwashing.dm index 28103f7f97..2a09fd2b93 100644 --- a/code/modules/surgery/advanced/brainwashing.dm +++ b/code/modules/surgery/advanced/brainwashing.dm @@ -49,6 +49,8 @@ to_chat(target, "A new compulsion fills your mind... you feel forced to obey it!") brainwash(target, objective) message_admins("[ADMIN_LOOKUPFLW(user)] surgically brainwashed [ADMIN_LOOKUPFLW(target)] with the objective '[objective]'.") + user.log_message("has brainwashed [key_name(target)] with the objective '[objective]' using brainwashing surgery.", LOG_ATTACK) + target.log_message("has been brainwashed with the objective '[objective]' by [key_name(user)] using brainwashing surgery.", LOG_VICTIM, log_globally=FALSE) log_game("[key_name(user)] surgically brainwashed [key_name(target)] with the objective '[objective]'.") return TRUE diff --git a/config/entries/logging.txt b/config/entries/logging.txt index 31692afccb..6483a371f0 100644 --- a/config/entries/logging.txt +++ b/config/entries/logging.txt @@ -34,6 +34,9 @@ LOG_EMOTE ## log attack messages LOG_ATTACK +## log victim messages +LOG_VICTIM + ## log pda messages LOG_PDA