From 9a2ea0eb69bb2cfb916be194fb4aa401ed2ef095 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 6 Mar 2018 07:08:16 -0600 Subject: [PATCH] [MIRROR] Pubbystation: tweaks and fixes round two (#5803) * Pubbystation: tweaks and fixes round two * pubby fixes --- .../PubbyStation/PubbyStation.dmm | 606 ++++++++++-------- _maps/map_files/PubbyStation/PubbyStation.dmm | 606 ++++++++++-------- 2 files changed, 686 insertions(+), 526 deletions(-) diff --git a/_maps/cit_map_files/PubbyStation/PubbyStation.dmm b/_maps/cit_map_files/PubbyStation/PubbyStation.dmm index 0f56742f49..3eebcbf5e1 100644 --- a/_maps/cit_map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/cit_map_files/PubbyStation/PubbyStation.dmm @@ -8933,16 +8933,6 @@ dir = 4 }, /area/bridge) -"axf" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id = "bridgespace"; - name = "bridge external shutters" - }, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/bridge) "axg" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/dark, @@ -12234,11 +12224,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/central) -"aEY" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "aEZ" = ( /obj/structure/sink{ dir = 8; @@ -12942,6 +12927,11 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/hallway/primary/central) +"aGW" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "aGX" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -15026,6 +15016,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/open/floor/plasteel/floorgrime, /area/quartermaster/warehouse) "aMq" = ( @@ -15033,6 +15026,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/floorgrime, /area/quartermaster/warehouse) "aMr" = ( @@ -15040,6 +15036,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/floorgrime, /area/quartermaster/warehouse) "aMs" = ( @@ -15049,6 +15048,9 @@ /obj/structure/sign/poster/official/random{ pixel_y = 32 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/floorgrime, /area/quartermaster/warehouse) "aMt" = ( @@ -15063,6 +15065,9 @@ c_tag = "Cargo Warehouse"; dir = 2 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/floorgrime, /area/quartermaster/warehouse) "aMu" = ( @@ -15070,6 +15075,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/floorgrime, /area/quartermaster/warehouse) "aMv" = ( @@ -15083,6 +15091,9 @@ pixel_x = 26 }, /obj/structure/cable, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/plasteel/floorgrime, /area/quartermaster/warehouse) "aMw" = ( @@ -15649,6 +15660,9 @@ /obj/structure/sign/poster/official/random{ pixel_x = -32 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/floorgrime, /area/quartermaster/warehouse) "aNO" = ( @@ -16155,6 +16169,9 @@ "aOY" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/floorgrime, /area/quartermaster/warehouse) "aOZ" = ( @@ -16542,6 +16559,9 @@ req_access_txt = "31" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/floorgrime, /area/quartermaster/warehouse) "aQd" = ( @@ -17040,6 +17060,14 @@ /area/quartermaster/sorting) "aRl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/power/apc/highcap/fifteen_k{ + dir = 4; + name = "Delivery Office APC"; + pixel_x = 28 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, /turf/open/floor/plasteel, /area/quartermaster/sorting) "aRm" = ( @@ -17057,6 +17085,9 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/delivery, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, /area/quartermaster/warehouse) "aRo" = ( @@ -17434,6 +17465,9 @@ "aSh" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plating, /area/quartermaster/sorting) "aSi" = ( @@ -17447,6 +17481,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, /area/quartermaster/storage) "aSj" = ( @@ -17825,6 +17862,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/plasteel, /area/quartermaster/office) "aTi" = ( @@ -17839,6 +17879,9 @@ departmentType = 2; pixel_y = 32 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/quartermaster/storage) "aTj" = ( @@ -17851,6 +17894,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/plasteel, /area/quartermaster/storage) "aTl" = ( @@ -22032,8 +22078,7 @@ }, /area/maintenance/department/cargo) "bdA" = ( -/obj/item/cigbutt, -/obj/effect/spawner/lootdrop/maintenance, +/obj/machinery/droneDispenser, /turf/open/floor/plating, /area/maintenance/department/cargo) "bdB" = ( @@ -28377,7 +28422,7 @@ /turf/open/floor/plasteel/white, /area/science/explab) "btj" = ( -/obj/machinery/droneDispenser, +/obj/structure/table, /turf/open/floor/plasteel/white, /area/science/explab) "btk" = ( @@ -32314,6 +32359,9 @@ /area/crew_quarters/heads/hor) "bBw" = ( /obj/machinery/computer/security, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/plasteel/red/side{ dir = 8 }, @@ -36419,6 +36467,14 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/hallway/primary/aft) +"bKN" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/preopen{ + id = "prison release"; + name = "prisoner processing blast door" + }, +/turf/open/floor/plasteel/dark, +/area/security/brig) "bKO" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/poddoor/preopen{ @@ -38108,6 +38164,7 @@ }, /obj/item/stack/sheet/glass, /obj/item/stack/rods/fifty, +/obj/item/pipe_dispenser, /turf/open/floor/plasteel/yellow/side, /area/engine/atmos) "bOY" = ( @@ -40916,9 +40973,6 @@ /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/lighter, -/obj/item/clothing/glasses/meson{ - pixel_y = 4 - }, /obj/item/stamp/ce, /obj/item/stock_parts/cell/high/plus, /obj/machinery/keycard_auth{ @@ -40933,6 +40987,7 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/item/clothing/glasses/meson/engine, /turf/open/floor/plasteel/yellow/side{ dir = 4 }, @@ -42850,10 +42905,7 @@ }, /obj/effect/turf_decal/stripes/line, /obj/item/airlock_painter, -/obj/item/clothing/glasses/meson{ - pixel_x = 3; - pixel_y = -4 - }, +/obj/item/clothing/glasses/meson/engine, /turf/open/floor/plasteel, /area/engine/engineering) "cap" = ( @@ -43188,11 +43240,11 @@ "cbe" = ( /obj/item/pen, /obj/item/storage/belt/utility, -/obj/item/clothing/glasses/meson, /obj/item/paper_bin{ layer = 2.9 }, /obj/structure/table/glass, +/obj/item/clothing/glasses/meson/engine, /turf/open/floor/plasteel, /area/engine/engineering) "cbf" = ( @@ -43279,7 +43331,7 @@ /obj/structure/table, /obj/item/clothing/gloves/color/yellow, /obj/item/storage/belt/utility, -/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson/engine, /turf/open/floor/plasteel, /area/engine/engineering) "cbo" = ( @@ -43728,6 +43780,9 @@ /obj/item/stack/sheet/mineral/plasma{ amount = 30 }, +/obj/item/device/gps{ + gpstag = "ENG0" + }, /turf/open/floor/plating, /area/engine/engineering) "ccS" = ( @@ -49333,6 +49388,18 @@ dir = 1 }, /area/library/lounge) +"cyr" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = 29 + }, +/turf/open/floor/plasteel/red/side{ + dir = 1 + }, +/area/security/brig) "cyy" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 @@ -50057,18 +50124,25 @@ "cDa" = ( /turf/closed/wall, /area/quartermaster/warehouse) -"dse" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 +"dTw" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable{ + icon_state = "1-4" }, -/turf/open/floor/plasteel, -/area/quartermaster/sorting) -"dMB" = ( +/turf/open/floor/carpet, +/area/library) +"ecV" = ( /turf/open/floor/plasteel, /area/quartermaster/sorting) "eHp" = ( /turf/closed/wall, /area/crew_quarters/cryopod) +"eIE" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/library/lounge) "eJt" = ( /obj/machinery/computer/cryopod{ pixel_y = 24 @@ -50082,29 +50156,43 @@ }, /turf/open/floor/plasteel/darkpurple, /area/crew_quarters/cryopod) -"fwl" = ( +"fki" = ( /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 6 }, /turf/open/floor/plasteel, /area/quartermaster/sorting) -"fWv" = ( -/obj/structure/bookcase/random/religion, -/turf/open/floor/plasteel/dark, -/area/library/lounge) -"ick" = ( +"frt" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/dark, -/area/library) -"ijF" = ( +/turf/open/floor/plasteel, +/area/quartermaster/office) +"fyh" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ icon_state = "1-2" }, /turf/open/floor/carpet, /area/library) +"fID" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/quartermaster/sorting) +"izp" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "Engineering"; + name = "engineering security door" + }, +/turf/open/floor/plating, +/area/security/checkpoint/engineering) "izB" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod" @@ -50114,7 +50202,7 @@ }, /turf/open/floor/plating, /area/crew_quarters/dorms) -"iKb" = ( +"iCc" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/quartermaster/sorting) @@ -50141,31 +50229,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel/dark, /area/library) -"jvi" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -26 - }, -/turf/open/floor/plasteel/darkred/side{ - dir = 1 - }, -/area/crew_quarters/heads/hos) -"jFO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/carpet, -/area/library/lounge) -"jXh" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/library/lounge) "jZg" = ( /obj/machinery/cryopod, /turf/open/floor/plasteel/darkpurple, @@ -50197,6 +50260,24 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/AIsatextAP) +"kqj" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/quartermaster/storage) +"krG" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/dark, +/area/library) +"let" = ( +/turf/closed/wall/r_wall, +/area/space) "lqy" = ( /obj/machinery/door/airlock/centcom{ name = "Library" @@ -50206,37 +50287,64 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel/dark, /area/library/lounge) -"lAs" = ( -/turf/closed/wall, -/area/quartermaster/sorting) -"lQQ" = ( -/obj/machinery/door/poddoor/preopen{ - id = "bridgespace"; - name = "bridge external shutters" - }, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/bridge) -"mdL" = ( -/obj/structure/table, -/obj/item/stock_parts/matter_bin, -/obj/item/stock_parts/matter_bin, -/obj/item/stock_parts/micro_laser, -/obj/item/stock_parts/micro_laser, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil, -/turf/open/floor/plasteel/whitepurple/side, -/area/science/lab) -"mCe" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "Engineering"; - name = "engineering security door" - }, +"lvl" = ( +/obj/effect/spawner/lootdrop/maintenance, +/obj/item/cigbutt, /turf/open/floor/plating, -/area/security/checkpoint/engineering) -"mKc" = ( +/area/maintenance/department/cargo) +"mHo" = ( +/obj/structure/table, +/obj/machinery/microwave{ + pixel_x = -3; + pixel_y = 6 + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = 27 + }, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/kitchen) +"mLe" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -26 + }, +/turf/open/floor/plasteel/darkred/side{ + dir = 1 + }, +/area/crew_quarters/heads/hos) +"nuB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/carpet, +/area/library/lounge) +"nJY" = ( +/obj/structure/rack, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/stack/sheet/metal/fifty, +/turf/open/floor/plating, +/area/maintenance/department/cargo) +"opC" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/power/apc{ + dir = 4; + name = "Library APC"; + pixel_x = 24 + }, +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/library) +"oJF" = ( /obj/structure/bookcase/random/nonfiction, /turf/open/floor/plasteel/dark, /area/library/lounge) @@ -50263,16 +50371,6 @@ "pps" = ( /turf/closed/wall, /area/engine/break_room) -"pXc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/carpet, -/area/library) -"qOE" = ( -/turf/open/floor/plasteel/dark, -/area/library/lounge) "qWK" = ( /obj/structure/cable{ icon_state = "4-8" @@ -50285,30 +50383,10 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"rxV" = ( -/obj/structure/table, -/obj/machinery/microwave{ - pixel_x = -3; - pixel_y = 6 - }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 27 - }, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/kitchen) -"sBA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 29 - }, -/turf/open/floor/plasteel/red/side{ - dir = 1 - }, -/area/security/brig) +"sHK" = ( +/obj/structure/bookcase/random/religion, +/turf/open/floor/plasteel/dark, +/area/library/lounge) "sQt" = ( /obj/machinery/door/airlock/external{ name = "Supply Dock Airlock"; @@ -50331,6 +50409,10 @@ }, /turf/open/floor/plasteel/darkpurple, /area/crew_quarters/cryopod) +"tez" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/carpet, +/area/library/lounge) "tjW" = ( /obj/machinery/light{ dir = 8 @@ -50342,6 +50424,15 @@ }, /turf/open/floor/plasteel/dark, /area/security/prison) +"ufi" = ( +/turf/open/floor/plasteel/dark, +/area/library/lounge) +"urZ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/library) "uyt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -50351,16 +50442,9 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"uTf" = ( -/turf/closed/wall/r_wall, -/area/space) "vpU" = ( /turf/open/floor/plasteel/darkpurple, /area/crew_quarters/cryopod) -"vyc" = ( -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) "vzz" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -50385,36 +50469,32 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel/dark, /area/library) -"wxJ" = ( -/obj/effect/turf_decal/delivery, +"vTA" = ( /obj/machinery/door/poddoor/preopen{ - id = "prison release"; - name = "prisoner processing blast door" + id = "bridgespace"; + name = "bridge external shutters" }, -/turf/open/floor/plasteel/dark, -/area/security/brig) -"xhj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/carpet, -/area/library/lounge) -"xja" = ( -/obj/machinery/light/small{ - dir = 4 +/turf/open/floor/plasteel/vault{ + dir = 8 }, -/obj/machinery/power/apc{ - dir = 4; - name = "Library APC"; - pixel_x = 24 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/dark, -/area/library) -"xjc" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel/dark, -/area/library) +/area/bridge) +"xzr" = ( +/turf/closed/wall, +/area/quartermaster/sorting) +"yhZ" = ( +/obj/structure/table, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/micro_laser, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/turf/open/floor/plasteel/whitepurple/side, +/area/science/lab) +"yia" = ( +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) (1,1,1) = {" aaa @@ -68080,13 +68160,13 @@ cgG cfn ckE ckT -xhj -xhj +tez +tez cwK -xhj -xhj +tez +tez cxn -xhj +tez lqy cxC cxK @@ -68338,12 +68418,12 @@ cvw cvK cwg cjR -jFO +nuB ckF -jFO +nuB cxe -jFO -jFO +nuB +nuB cxz cxD cxL @@ -68351,8 +68431,8 @@ cxY cym cyA vOw -ijF -pXc +fyh +dTw ckm ckm ckm @@ -68598,7 +68678,7 @@ cwr clm ckG cwU -jXh +eIE ckU cwe cwe @@ -68609,7 +68689,7 @@ cxM cyB cjp cyR -ick +urZ ckH ckH ckH @@ -68852,10 +68932,10 @@ cvy cvL cwe cwe -fWv -qOE +sHK +ufi ckV -qOE +ufi cln cwe cfN @@ -68866,7 +68946,7 @@ aaa aaa cjp cyS -ick +urZ cyZ ckH czo @@ -69109,10 +69189,10 @@ cvc cvM cfm cwe -fWv -qOE -mKc -qOE +sHK +ufi +oJF +ufi cln cwe caS @@ -69123,7 +69203,7 @@ aht aht cjp cko -ick +urZ ckH ckH clp @@ -69380,7 +69460,7 @@ aaa aaa cjp cyT -ick +urZ cyZ ckH czp @@ -69637,8 +69717,8 @@ aht aht cjp cjp -xjc -xja +krG +opC ckH czq czw @@ -70544,7 +70624,7 @@ aok aoO apF apE -wxJ +bKN apE bBW ajM @@ -73884,7 +73964,7 @@ anJ amX aoY apN -sBA +cyr arp asB atB @@ -74671,7 +74751,7 @@ aDv aBh aBh aGd -aEY +aGW aHG aIM aJG @@ -77221,7 +77301,7 @@ akW alK amw ani -jvi +mLe aiR aph ajM @@ -79131,7 +79211,7 @@ bXk bXk bXk bXk -uTf +let aaa aaa aaa @@ -79388,7 +79468,7 @@ cjT ckq ckq bXk -uTf +let aaa aaa aaa @@ -79645,7 +79725,7 @@ cgS cfV cfV bXk -uTf +let aaa aaa aaa @@ -79828,7 +79908,7 @@ aRN aWa aRN aRN -rxV +mHo aYS cpn bch @@ -79902,7 +79982,7 @@ cgT cfV ckr bXk -uTf +let aaa aaa aaa @@ -80159,7 +80239,7 @@ cfV cfV cfV bXk -uTf +let aaa aaa aaa @@ -80416,7 +80496,7 @@ cfV cfV cfV bXk -uTf +let aaa aaa aaa @@ -80673,7 +80753,7 @@ cgV cfV cfV bXk -uTf +let aaa aaa aaa @@ -80921,7 +81001,7 @@ cgv bBW bBW bBW -vyc +yia abI aaa bBW @@ -80930,7 +81010,7 @@ bBW cfV cfV bXk -uTf +let aaa aaa aaa @@ -81187,7 +81267,7 @@ bBW cfV cfV bXk -uTf +let aaa aaa aaa @@ -81439,12 +81519,12 @@ cii cis ciG aaa -vyc +yia cgV cfV cfV bXk -uTf +let aaa aaa aaa @@ -81701,7 +81781,7 @@ aht cfV cfV bXk -uTf +let aaa aaa aaa @@ -81947,7 +82027,7 @@ cfx cfa cgv cgV -vyc +yia aaa cik ciu @@ -81958,7 +82038,7 @@ aaa cfV cfV bXk -uTf +let aaa aaa aaa @@ -82215,7 +82295,7 @@ bBW cfV cfV bXk -uTf +let aaa aaa aaa @@ -82465,14 +82545,14 @@ bBW aaa aaa abI -vyc +yia aaa bBW bBW cfV cfV bXk -uTf +let aaa aaa aaa @@ -82703,7 +82783,7 @@ bUi bUV bVO bWA -mCe +izp bYj bYQ bZA @@ -82729,7 +82809,7 @@ cgV cfV cfV bXk -uTf +let aaa aaa aaa @@ -82960,7 +83040,7 @@ bUj bUW bVP bWB -mCe +izp bYk bYQ bZA @@ -82986,7 +83066,7 @@ cfV cfV cfV bXk -uTf +let abI abI aaa @@ -83142,9 +83222,9 @@ ahi atY auU atY -lQQ +vTA ayf -axf +vTA aAF aBz aCP @@ -83217,7 +83297,7 @@ bUk bUX bVQ bWC -mCe +izp bYl bYO bZC @@ -83243,7 +83323,7 @@ cfV cfV cfV bXk -uTf +let abI aaa aaa @@ -83500,7 +83580,7 @@ cgY cfV cks bXk -uTf +let aaa aaa aaa @@ -83757,7 +83837,7 @@ cgZ cfV cfV bXk -uTf +let abI aaa aaa @@ -84014,7 +84094,7 @@ cjU ckq ckq bXk -uTf +let aaa aaa aaa @@ -84271,7 +84351,7 @@ bXk bXk bXk ckJ -uTf +let aaa aaa aaa @@ -84991,7 +85071,7 @@ bsT bus bvz bxg -mdL +yhZ bAs bBu bCI @@ -85722,7 +85802,7 @@ aBI aES aBI aBI -aEY +aGW aHG aBI aJX @@ -85745,7 +85825,7 @@ aMb aSX aMb aBI -aEY +aGW bgA bhe aDZ @@ -87028,7 +87108,7 @@ aVu bat aLf bcy -aKq +lvl aEj aEj bgC @@ -87525,13 +87605,13 @@ eHp aHN aIU aJI -lAs -lAs +xzr +xzr aNG aOR -iKb -lAs -lAs +iCc +xzr +xzr aTb aOT aVp @@ -87542,7 +87622,7 @@ aPY bav aLf aFi -aFi +nJY beI bfv bgE @@ -87782,7 +87862,7 @@ aET aHN aIU aJI -lAs +xzr aMg aNH aOS @@ -88039,11 +88119,11 @@ aET aHN aJh bhe -lAs +xzr aMh aNI -fwl -dMB +fID +ecV aRi aSf aTd @@ -88296,13 +88376,13 @@ aHn aIi aJi aKe -lAs +xzr aMi aNJ -fwl +fID aPZ aRj -lAs +xzr aTe aUo aVs @@ -88553,13 +88633,13 @@ aET aHN aIU aJI -lAs +xzr aMj aNK -fwl -dMB -dMB -iKb +fID +ecV +ecV +iCc aTf aUp aVt @@ -88810,7 +88890,7 @@ aET aHN aIU aJI -lAs +xzr aMk aNL aOU @@ -89067,10 +89147,10 @@ cos coy aJj aJI -lAs +xzr aMl aNM -dse +fki aQb aRl aSh @@ -89324,14 +89404,14 @@ aDZ aDZ aJk aJH -lAs +xzr aMm -lAs +xzr aOW -lAs -lAs -lAs -aSY +xzr +xzr +xzr +frt aUs aLf aLf @@ -89574,18 +89654,18 @@ aAP avk aDg aEc -aEY +aGW cot aBI aBI aBI aJl aKf -lAs +xzr aMn -lAs +xzr aOX -lAs +xzr aRm aLg aTi @@ -89845,7 +89925,7 @@ cDa cDa cDa aLg -aTj +kqj aUu aVx aVx diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 0f56742f49..3eebcbf5e1 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -8933,16 +8933,6 @@ dir = 4 }, /area/bridge) -"axf" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id = "bridgespace"; - name = "bridge external shutters" - }, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/bridge) "axg" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/dark, @@ -12234,11 +12224,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/central) -"aEY" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "aEZ" = ( /obj/structure/sink{ dir = 8; @@ -12942,6 +12927,11 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/hallway/primary/central) +"aGW" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "aGX" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -15026,6 +15016,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/open/floor/plasteel/floorgrime, /area/quartermaster/warehouse) "aMq" = ( @@ -15033,6 +15026,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/floorgrime, /area/quartermaster/warehouse) "aMr" = ( @@ -15040,6 +15036,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/floorgrime, /area/quartermaster/warehouse) "aMs" = ( @@ -15049,6 +15048,9 @@ /obj/structure/sign/poster/official/random{ pixel_y = 32 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/floorgrime, /area/quartermaster/warehouse) "aMt" = ( @@ -15063,6 +15065,9 @@ c_tag = "Cargo Warehouse"; dir = 2 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/floorgrime, /area/quartermaster/warehouse) "aMu" = ( @@ -15070,6 +15075,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/floorgrime, /area/quartermaster/warehouse) "aMv" = ( @@ -15083,6 +15091,9 @@ pixel_x = 26 }, /obj/structure/cable, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/plasteel/floorgrime, /area/quartermaster/warehouse) "aMw" = ( @@ -15649,6 +15660,9 @@ /obj/structure/sign/poster/official/random{ pixel_x = -32 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/floorgrime, /area/quartermaster/warehouse) "aNO" = ( @@ -16155,6 +16169,9 @@ "aOY" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/floorgrime, /area/quartermaster/warehouse) "aOZ" = ( @@ -16542,6 +16559,9 @@ req_access_txt = "31" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/floorgrime, /area/quartermaster/warehouse) "aQd" = ( @@ -17040,6 +17060,14 @@ /area/quartermaster/sorting) "aRl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/power/apc/highcap/fifteen_k{ + dir = 4; + name = "Delivery Office APC"; + pixel_x = 28 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, /turf/open/floor/plasteel, /area/quartermaster/sorting) "aRm" = ( @@ -17057,6 +17085,9 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/delivery, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, /area/quartermaster/warehouse) "aRo" = ( @@ -17434,6 +17465,9 @@ "aSh" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plating, /area/quartermaster/sorting) "aSi" = ( @@ -17447,6 +17481,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, /area/quartermaster/storage) "aSj" = ( @@ -17825,6 +17862,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/plasteel, /area/quartermaster/office) "aTi" = ( @@ -17839,6 +17879,9 @@ departmentType = 2; pixel_y = 32 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/quartermaster/storage) "aTj" = ( @@ -17851,6 +17894,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/plasteel, /area/quartermaster/storage) "aTl" = ( @@ -22032,8 +22078,7 @@ }, /area/maintenance/department/cargo) "bdA" = ( -/obj/item/cigbutt, -/obj/effect/spawner/lootdrop/maintenance, +/obj/machinery/droneDispenser, /turf/open/floor/plating, /area/maintenance/department/cargo) "bdB" = ( @@ -28377,7 +28422,7 @@ /turf/open/floor/plasteel/white, /area/science/explab) "btj" = ( -/obj/machinery/droneDispenser, +/obj/structure/table, /turf/open/floor/plasteel/white, /area/science/explab) "btk" = ( @@ -32314,6 +32359,9 @@ /area/crew_quarters/heads/hor) "bBw" = ( /obj/machinery/computer/security, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/plasteel/red/side{ dir = 8 }, @@ -36419,6 +36467,14 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/hallway/primary/aft) +"bKN" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/preopen{ + id = "prison release"; + name = "prisoner processing blast door" + }, +/turf/open/floor/plasteel/dark, +/area/security/brig) "bKO" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/poddoor/preopen{ @@ -38108,6 +38164,7 @@ }, /obj/item/stack/sheet/glass, /obj/item/stack/rods/fifty, +/obj/item/pipe_dispenser, /turf/open/floor/plasteel/yellow/side, /area/engine/atmos) "bOY" = ( @@ -40916,9 +40973,6 @@ /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/lighter, -/obj/item/clothing/glasses/meson{ - pixel_y = 4 - }, /obj/item/stamp/ce, /obj/item/stock_parts/cell/high/plus, /obj/machinery/keycard_auth{ @@ -40933,6 +40987,7 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/item/clothing/glasses/meson/engine, /turf/open/floor/plasteel/yellow/side{ dir = 4 }, @@ -42850,10 +42905,7 @@ }, /obj/effect/turf_decal/stripes/line, /obj/item/airlock_painter, -/obj/item/clothing/glasses/meson{ - pixel_x = 3; - pixel_y = -4 - }, +/obj/item/clothing/glasses/meson/engine, /turf/open/floor/plasteel, /area/engine/engineering) "cap" = ( @@ -43188,11 +43240,11 @@ "cbe" = ( /obj/item/pen, /obj/item/storage/belt/utility, -/obj/item/clothing/glasses/meson, /obj/item/paper_bin{ layer = 2.9 }, /obj/structure/table/glass, +/obj/item/clothing/glasses/meson/engine, /turf/open/floor/plasteel, /area/engine/engineering) "cbf" = ( @@ -43279,7 +43331,7 @@ /obj/structure/table, /obj/item/clothing/gloves/color/yellow, /obj/item/storage/belt/utility, -/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson/engine, /turf/open/floor/plasteel, /area/engine/engineering) "cbo" = ( @@ -43728,6 +43780,9 @@ /obj/item/stack/sheet/mineral/plasma{ amount = 30 }, +/obj/item/device/gps{ + gpstag = "ENG0" + }, /turf/open/floor/plating, /area/engine/engineering) "ccS" = ( @@ -49333,6 +49388,18 @@ dir = 1 }, /area/library/lounge) +"cyr" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = 29 + }, +/turf/open/floor/plasteel/red/side{ + dir = 1 + }, +/area/security/brig) "cyy" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 @@ -50057,18 +50124,25 @@ "cDa" = ( /turf/closed/wall, /area/quartermaster/warehouse) -"dse" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 +"dTw" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable{ + icon_state = "1-4" }, -/turf/open/floor/plasteel, -/area/quartermaster/sorting) -"dMB" = ( +/turf/open/floor/carpet, +/area/library) +"ecV" = ( /turf/open/floor/plasteel, /area/quartermaster/sorting) "eHp" = ( /turf/closed/wall, /area/crew_quarters/cryopod) +"eIE" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/library/lounge) "eJt" = ( /obj/machinery/computer/cryopod{ pixel_y = 24 @@ -50082,29 +50156,43 @@ }, /turf/open/floor/plasteel/darkpurple, /area/crew_quarters/cryopod) -"fwl" = ( +"fki" = ( /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 6 }, /turf/open/floor/plasteel, /area/quartermaster/sorting) -"fWv" = ( -/obj/structure/bookcase/random/religion, -/turf/open/floor/plasteel/dark, -/area/library/lounge) -"ick" = ( +"frt" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/dark, -/area/library) -"ijF" = ( +/turf/open/floor/plasteel, +/area/quartermaster/office) +"fyh" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ icon_state = "1-2" }, /turf/open/floor/carpet, /area/library) +"fID" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/quartermaster/sorting) +"izp" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "Engineering"; + name = "engineering security door" + }, +/turf/open/floor/plating, +/area/security/checkpoint/engineering) "izB" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod" @@ -50114,7 +50202,7 @@ }, /turf/open/floor/plating, /area/crew_quarters/dorms) -"iKb" = ( +"iCc" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/quartermaster/sorting) @@ -50141,31 +50229,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel/dark, /area/library) -"jvi" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -26 - }, -/turf/open/floor/plasteel/darkred/side{ - dir = 1 - }, -/area/crew_quarters/heads/hos) -"jFO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/carpet, -/area/library/lounge) -"jXh" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/library/lounge) "jZg" = ( /obj/machinery/cryopod, /turf/open/floor/plasteel/darkpurple, @@ -50197,6 +50260,24 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/AIsatextAP) +"kqj" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/quartermaster/storage) +"krG" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/dark, +/area/library) +"let" = ( +/turf/closed/wall/r_wall, +/area/space) "lqy" = ( /obj/machinery/door/airlock/centcom{ name = "Library" @@ -50206,37 +50287,64 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel/dark, /area/library/lounge) -"lAs" = ( -/turf/closed/wall, -/area/quartermaster/sorting) -"lQQ" = ( -/obj/machinery/door/poddoor/preopen{ - id = "bridgespace"; - name = "bridge external shutters" - }, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/bridge) -"mdL" = ( -/obj/structure/table, -/obj/item/stock_parts/matter_bin, -/obj/item/stock_parts/matter_bin, -/obj/item/stock_parts/micro_laser, -/obj/item/stock_parts/micro_laser, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil, -/turf/open/floor/plasteel/whitepurple/side, -/area/science/lab) -"mCe" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "Engineering"; - name = "engineering security door" - }, +"lvl" = ( +/obj/effect/spawner/lootdrop/maintenance, +/obj/item/cigbutt, /turf/open/floor/plating, -/area/security/checkpoint/engineering) -"mKc" = ( +/area/maintenance/department/cargo) +"mHo" = ( +/obj/structure/table, +/obj/machinery/microwave{ + pixel_x = -3; + pixel_y = 6 + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = 27 + }, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/kitchen) +"mLe" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -26 + }, +/turf/open/floor/plasteel/darkred/side{ + dir = 1 + }, +/area/crew_quarters/heads/hos) +"nuB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/carpet, +/area/library/lounge) +"nJY" = ( +/obj/structure/rack, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/stack/sheet/metal/fifty, +/turf/open/floor/plating, +/area/maintenance/department/cargo) +"opC" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/power/apc{ + dir = 4; + name = "Library APC"; + pixel_x = 24 + }, +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/library) +"oJF" = ( /obj/structure/bookcase/random/nonfiction, /turf/open/floor/plasteel/dark, /area/library/lounge) @@ -50263,16 +50371,6 @@ "pps" = ( /turf/closed/wall, /area/engine/break_room) -"pXc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/carpet, -/area/library) -"qOE" = ( -/turf/open/floor/plasteel/dark, -/area/library/lounge) "qWK" = ( /obj/structure/cable{ icon_state = "4-8" @@ -50285,30 +50383,10 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"rxV" = ( -/obj/structure/table, -/obj/machinery/microwave{ - pixel_x = -3; - pixel_y = 6 - }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 27 - }, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/kitchen) -"sBA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 29 - }, -/turf/open/floor/plasteel/red/side{ - dir = 1 - }, -/area/security/brig) +"sHK" = ( +/obj/structure/bookcase/random/religion, +/turf/open/floor/plasteel/dark, +/area/library/lounge) "sQt" = ( /obj/machinery/door/airlock/external{ name = "Supply Dock Airlock"; @@ -50331,6 +50409,10 @@ }, /turf/open/floor/plasteel/darkpurple, /area/crew_quarters/cryopod) +"tez" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/carpet, +/area/library/lounge) "tjW" = ( /obj/machinery/light{ dir = 8 @@ -50342,6 +50424,15 @@ }, /turf/open/floor/plasteel/dark, /area/security/prison) +"ufi" = ( +/turf/open/floor/plasteel/dark, +/area/library/lounge) +"urZ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/library) "uyt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -50351,16 +50442,9 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"uTf" = ( -/turf/closed/wall/r_wall, -/area/space) "vpU" = ( /turf/open/floor/plasteel/darkpurple, /area/crew_quarters/cryopod) -"vyc" = ( -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) "vzz" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -50385,36 +50469,32 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel/dark, /area/library) -"wxJ" = ( -/obj/effect/turf_decal/delivery, +"vTA" = ( /obj/machinery/door/poddoor/preopen{ - id = "prison release"; - name = "prisoner processing blast door" + id = "bridgespace"; + name = "bridge external shutters" }, -/turf/open/floor/plasteel/dark, -/area/security/brig) -"xhj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/carpet, -/area/library/lounge) -"xja" = ( -/obj/machinery/light/small{ - dir = 4 +/turf/open/floor/plasteel/vault{ + dir = 8 }, -/obj/machinery/power/apc{ - dir = 4; - name = "Library APC"; - pixel_x = 24 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/dark, -/area/library) -"xjc" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel/dark, -/area/library) +/area/bridge) +"xzr" = ( +/turf/closed/wall, +/area/quartermaster/sorting) +"yhZ" = ( +/obj/structure/table, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/micro_laser, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/turf/open/floor/plasteel/whitepurple/side, +/area/science/lab) +"yia" = ( +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) (1,1,1) = {" aaa @@ -68080,13 +68160,13 @@ cgG cfn ckE ckT -xhj -xhj +tez +tez cwK -xhj -xhj +tez +tez cxn -xhj +tez lqy cxC cxK @@ -68338,12 +68418,12 @@ cvw cvK cwg cjR -jFO +nuB ckF -jFO +nuB cxe -jFO -jFO +nuB +nuB cxz cxD cxL @@ -68351,8 +68431,8 @@ cxY cym cyA vOw -ijF -pXc +fyh +dTw ckm ckm ckm @@ -68598,7 +68678,7 @@ cwr clm ckG cwU -jXh +eIE ckU cwe cwe @@ -68609,7 +68689,7 @@ cxM cyB cjp cyR -ick +urZ ckH ckH ckH @@ -68852,10 +68932,10 @@ cvy cvL cwe cwe -fWv -qOE +sHK +ufi ckV -qOE +ufi cln cwe cfN @@ -68866,7 +68946,7 @@ aaa aaa cjp cyS -ick +urZ cyZ ckH czo @@ -69109,10 +69189,10 @@ cvc cvM cfm cwe -fWv -qOE -mKc -qOE +sHK +ufi +oJF +ufi cln cwe caS @@ -69123,7 +69203,7 @@ aht aht cjp cko -ick +urZ ckH ckH clp @@ -69380,7 +69460,7 @@ aaa aaa cjp cyT -ick +urZ cyZ ckH czp @@ -69637,8 +69717,8 @@ aht aht cjp cjp -xjc -xja +krG +opC ckH czq czw @@ -70544,7 +70624,7 @@ aok aoO apF apE -wxJ +bKN apE bBW ajM @@ -73884,7 +73964,7 @@ anJ amX aoY apN -sBA +cyr arp asB atB @@ -74671,7 +74751,7 @@ aDv aBh aBh aGd -aEY +aGW aHG aIM aJG @@ -77221,7 +77301,7 @@ akW alK amw ani -jvi +mLe aiR aph ajM @@ -79131,7 +79211,7 @@ bXk bXk bXk bXk -uTf +let aaa aaa aaa @@ -79388,7 +79468,7 @@ cjT ckq ckq bXk -uTf +let aaa aaa aaa @@ -79645,7 +79725,7 @@ cgS cfV cfV bXk -uTf +let aaa aaa aaa @@ -79828,7 +79908,7 @@ aRN aWa aRN aRN -rxV +mHo aYS cpn bch @@ -79902,7 +79982,7 @@ cgT cfV ckr bXk -uTf +let aaa aaa aaa @@ -80159,7 +80239,7 @@ cfV cfV cfV bXk -uTf +let aaa aaa aaa @@ -80416,7 +80496,7 @@ cfV cfV cfV bXk -uTf +let aaa aaa aaa @@ -80673,7 +80753,7 @@ cgV cfV cfV bXk -uTf +let aaa aaa aaa @@ -80921,7 +81001,7 @@ cgv bBW bBW bBW -vyc +yia abI aaa bBW @@ -80930,7 +81010,7 @@ bBW cfV cfV bXk -uTf +let aaa aaa aaa @@ -81187,7 +81267,7 @@ bBW cfV cfV bXk -uTf +let aaa aaa aaa @@ -81439,12 +81519,12 @@ cii cis ciG aaa -vyc +yia cgV cfV cfV bXk -uTf +let aaa aaa aaa @@ -81701,7 +81781,7 @@ aht cfV cfV bXk -uTf +let aaa aaa aaa @@ -81947,7 +82027,7 @@ cfx cfa cgv cgV -vyc +yia aaa cik ciu @@ -81958,7 +82038,7 @@ aaa cfV cfV bXk -uTf +let aaa aaa aaa @@ -82215,7 +82295,7 @@ bBW cfV cfV bXk -uTf +let aaa aaa aaa @@ -82465,14 +82545,14 @@ bBW aaa aaa abI -vyc +yia aaa bBW bBW cfV cfV bXk -uTf +let aaa aaa aaa @@ -82703,7 +82783,7 @@ bUi bUV bVO bWA -mCe +izp bYj bYQ bZA @@ -82729,7 +82809,7 @@ cgV cfV cfV bXk -uTf +let aaa aaa aaa @@ -82960,7 +83040,7 @@ bUj bUW bVP bWB -mCe +izp bYk bYQ bZA @@ -82986,7 +83066,7 @@ cfV cfV cfV bXk -uTf +let abI abI aaa @@ -83142,9 +83222,9 @@ ahi atY auU atY -lQQ +vTA ayf -axf +vTA aAF aBz aCP @@ -83217,7 +83297,7 @@ bUk bUX bVQ bWC -mCe +izp bYl bYO bZC @@ -83243,7 +83323,7 @@ cfV cfV cfV bXk -uTf +let abI aaa aaa @@ -83500,7 +83580,7 @@ cgY cfV cks bXk -uTf +let aaa aaa aaa @@ -83757,7 +83837,7 @@ cgZ cfV cfV bXk -uTf +let abI aaa aaa @@ -84014,7 +84094,7 @@ cjU ckq ckq bXk -uTf +let aaa aaa aaa @@ -84271,7 +84351,7 @@ bXk bXk bXk ckJ -uTf +let aaa aaa aaa @@ -84991,7 +85071,7 @@ bsT bus bvz bxg -mdL +yhZ bAs bBu bCI @@ -85722,7 +85802,7 @@ aBI aES aBI aBI -aEY +aGW aHG aBI aJX @@ -85745,7 +85825,7 @@ aMb aSX aMb aBI -aEY +aGW bgA bhe aDZ @@ -87028,7 +87108,7 @@ aVu bat aLf bcy -aKq +lvl aEj aEj bgC @@ -87525,13 +87605,13 @@ eHp aHN aIU aJI -lAs -lAs +xzr +xzr aNG aOR -iKb -lAs -lAs +iCc +xzr +xzr aTb aOT aVp @@ -87542,7 +87622,7 @@ aPY bav aLf aFi -aFi +nJY beI bfv bgE @@ -87782,7 +87862,7 @@ aET aHN aIU aJI -lAs +xzr aMg aNH aOS @@ -88039,11 +88119,11 @@ aET aHN aJh bhe -lAs +xzr aMh aNI -fwl -dMB +fID +ecV aRi aSf aTd @@ -88296,13 +88376,13 @@ aHn aIi aJi aKe -lAs +xzr aMi aNJ -fwl +fID aPZ aRj -lAs +xzr aTe aUo aVs @@ -88553,13 +88633,13 @@ aET aHN aIU aJI -lAs +xzr aMj aNK -fwl -dMB -dMB -iKb +fID +ecV +ecV +iCc aTf aUp aVt @@ -88810,7 +88890,7 @@ aET aHN aIU aJI -lAs +xzr aMk aNL aOU @@ -89067,10 +89147,10 @@ cos coy aJj aJI -lAs +xzr aMl aNM -dse +fki aQb aRl aSh @@ -89324,14 +89404,14 @@ aDZ aDZ aJk aJH -lAs +xzr aMm -lAs +xzr aOW -lAs -lAs -lAs -aSY +xzr +xzr +xzr +frt aUs aLf aLf @@ -89574,18 +89654,18 @@ aAP avk aDg aEc -aEY +aGW cot aBI aBI aBI aJl aKf -lAs +xzr aMn -lAs +xzr aOX -lAs +xzr aRm aLg aTi @@ -89845,7 +89925,7 @@ cDa cDa cDa aLg -aTj +kqj aUu aVx aVx