diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 1313f0f6de8..df2f76e917d 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -1658,7 +1658,9 @@ pixel_x = 28; pixel_y = -2 }, -/obj/machinery/computer/security, +/obj/machinery/computer/security{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, @@ -4942,7 +4944,9 @@ }, /area/maintenance/tourist) "aKM" = ( -/obj/structure/computerframe, +/obj/structure/computerframe{ + dir = 1 + }, /turf/simulated/floor/shuttle, /area/shuttle/arrival/station) "aKO" = ( @@ -14758,7 +14762,9 @@ }, /area/storage/primary) "bKE" = ( -/obj/machinery/computer/account_database, +/obj/machinery/computer/account_database{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -20226,7 +20232,9 @@ /turf/simulated/floor/plating, /area/maintenance/fore) "cjk" = ( -/obj/machinery/computer/brigcells, +/obj/machinery/computer/brigcells{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkred" @@ -26413,7 +26421,7 @@ /area/space) "cIW" = ( /obj/machinery/computer/secure_data{ - dir = 1 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 10; @@ -31956,7 +31964,9 @@ /turf/simulated/floor/plasteel, /area/toxins/xenobiology) "dfZ" = ( -/obj/machinery/computer/camera_advanced/xenobio, +/obj/machinery/computer/camera_advanced/xenobio{ + dir = 8 + }, /obj/machinery/status_display{ pixel_x = 32 }, @@ -32699,7 +32709,9 @@ }, /area/construction/hallway) "diX" = ( -/obj/machinery/computer/borgupload, +/obj/machinery/computer/borgupload{ + dir = 1 + }, /obj/item/radio/intercom/private{ pixel_y = -28 }, @@ -37590,7 +37602,9 @@ /turf/simulated/wall/r_wall, /area/maintenance/turbine) "dDm" = ( -/obj/machinery/computer/communications, +/obj/machinery/computer/communications{ + dir = 4 + }, /obj/machinery/ai_status_display{ pixel_x = -32 }, @@ -39121,7 +39135,8 @@ /area/magistrateoffice) "dJc" = ( /obj/machinery/computer/prisoner{ - req_access = list(2) + req_access = list(2); + dir = 1 }, /turf/simulated/floor/wood/fancy/cherry, /area/magistrateoffice) @@ -51438,7 +51453,9 @@ }, /area/toxins/misc_lab) "fPs" = ( -/obj/structure/computerframe, +/obj/structure/computerframe{ + dir = 8 + }, /obj/machinery/door_control{ id = "SupermatterVenting"; name = "Supermatter Venting Control"; @@ -52456,7 +52473,9 @@ pixel_x = 26; pixel_y = 6 }, -/obj/structure/computerframe, +/obj/structure/computerframe{ + dir = 8 + }, /obj/machinery/door_control{ id = "smbolts1"; name = "Supermatter Bolt Control"; @@ -56400,9 +56419,7 @@ /turf/simulated/floor/plasteel, /area/medical/virology/lab) "gTK" = ( -/obj/machinery/computer/operating{ - dir = 4 - }, +/obj/machinery/computer/operating, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitered" @@ -57869,7 +57886,9 @@ name = "Captain Requests Console"; pixel_x = -30 }, -/obj/machinery/computer/card, +/obj/machinery/computer/card{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/crew_quarters/captain) "hog" = ( @@ -58025,9 +58044,7 @@ /obj/structure/sign/poster/official/random{ pixel_y = 32 }, -/obj/machinery/computer/med_data{ - dir = 4 - }, +/obj/machinery/computer/med_data, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitered" @@ -66525,7 +66542,9 @@ }, /area/turret_protected/ai) "jru" = ( -/obj/machinery/computer/cloning, +/obj/machinery/computer/cloning{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whiteblue" @@ -67901,7 +67920,8 @@ /area/maintenance/asmaint3) "jHJ" = ( /obj/machinery/computer/prisoner{ - req_access = list(2) + req_access = list(2); + dir = 4 }, /obj/machinery/light{ dir = 8 @@ -70551,7 +70571,9 @@ }, /area/bridge/checkpoint/north) "kqm" = ( -/obj/machinery/computer/security, +/obj/machinery/computer/security{ + dir = 8 + }, /obj/structure/cable{ icon_state = "4-8" }, @@ -74904,7 +74926,9 @@ }, /area/medical/medbay) "lyD" = ( -/obj/machinery/computer/secure_data, +/obj/machinery/computer/secure_data{ + dir = 8 + }, /obj/structure/cable{ icon_state = "4-8" }, @@ -80021,7 +80045,9 @@ }, /area/security/checkpoint/south) "mHJ" = ( -/obj/machinery/computer/aiupload, +/obj/machinery/computer/aiupload{ + dir = 1 + }, /obj/machinery/flasher{ id = "AI"; pixel_y = -21 @@ -80436,7 +80462,9 @@ }, /area/crew_quarters/locker) "mMi" = ( -/obj/machinery/computer/security, +/obj/machinery/computer/security{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkred" @@ -89831,7 +89859,9 @@ }, /area/quartermaster/delivery) "oUP" = ( -/obj/machinery/computer/security, +/obj/machinery/computer/security{ + dir = 4 + }, /obj/structure/extinguisher_cabinet{ pixel_y = 62 }, @@ -99417,8 +99447,8 @@ /obj/item/radio/intercom{ pixel_y = 22 }, -/obj/item/clothing/glasses/hud/health, /obj/item/stamp/cmo, +/obj/item/clothing/glasses/hud/health/sunglasses, /turf/simulated/floor/plasteel{ icon_state = "cmo" }, @@ -102518,7 +102548,9 @@ name = "south bump Important Area"; pixel_y = -24 }, -/obj/machinery/computer/message_monitor, +/obj/machinery/computer/message_monitor{ + dir = 1 + }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai_upload) "rKL" = ( @@ -104548,7 +104580,7 @@ /area/maintenance/asmaint3) "sjR" = ( /obj/structure/sign/securearea, -/turf/simulated/wall/r_wall/coated, +/turf/simulated/wall/r_wall, /area/toxins/sm_test_chamber) "sjW" = ( /obj/structure/sign/science, @@ -106744,8 +106776,8 @@ /area/maintenance/kitchen) "sKw" = ( /obj/item/radio/intercom{ - dir = 8; - pixel_x = -28 + dir = 4; + pixel_x = -22 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -107450,7 +107482,9 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/computer/shuttle/labor, +/obj/machinery/computer/shuttle/labor{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -110678,7 +110712,10 @@ dir = 4 }, /obj/structure/table/glass, -/obj/machinery/computer/med_data/laptop, +/obj/machinery/computer/med_data/laptop{ + dir = 8; + pixel_y = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "cmo" }, @@ -111584,7 +111621,7 @@ "tOT" = ( /obj/machinery/computer/security{ network = list("SS13","Research Outpost","Mining Outpost"); - dir = 1 + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -113948,7 +113985,7 @@ /area/construction/hallway) "urC" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction, -/turf/simulated/wall/r_wall/coated, +/turf/simulated/wall/r_wall, /area/toxins/mixing) "urM" = ( /obj/machinery/door/poddoor/shutters/preopen{ @@ -117633,10 +117670,6 @@ icon_state = "whitepurple" }, /area/medical/genetics) -"vlf" = ( -/obj/structure/lattice, -/turf/simulated/wall/r_wall/coated, -/area/toxins/sm_test_chamber) "vlh" = ( /obj/machinery/firealarm{ dir = 8; @@ -120887,7 +120920,9 @@ }, /area/medical/surgery/north) "vWq" = ( -/obj/machinery/computer/prisoner, +/obj/machinery/computer/prisoner{ + dir = 4 + }, /obj/structure/cable{ icon_state = "4-8" }, @@ -123932,9 +123967,6 @@ dir = 1 }, /area/security/securehallway) -"wHM" = ( -/turf/simulated/wall/r_wall/coated, -/area/toxins/storage) "wHR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -125337,9 +125369,6 @@ }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai_upload) -"xbn" = ( -/turf/simulated/wall/r_wall/coated, -/area/toxins/mixing) "xbr" = ( /obj/item/aiModule/freeform, /obj/structure/table/glass, @@ -125670,7 +125699,8 @@ /area/maintenance/electrical) "xen" = ( /obj/machinery/computer/prisoner{ - req_access = list(2) + req_access = list(2); + dir = 8 }, /obj/structure/cable{ icon_state = "2-8" @@ -130591,7 +130621,9 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/structure/computerframe, +/obj/structure/computerframe{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "purple" @@ -147362,11 +147394,11 @@ cUS rRM rRM cUS -vlf -uFo +cUS +cUS dGb -uFo -uFo +cUS +cUS iqN hsp hsp @@ -147623,7 +147655,7 @@ uFo wcN wcN wcN -uFo +cUS jBv wUr cHe @@ -147880,7 +147912,7 @@ ccY xzc aee wcN -uFo +cUS exl nRb vwo @@ -148133,11 +148165,11 @@ cUS pFI nvQ nfm -uFo +cUS wcN wcN ejP -uFo +cUS uNV mMR deL @@ -148394,7 +148426,7 @@ sjR xMC xMC geX -uFo +cUS qan fSK deL @@ -162287,13 +162319,13 @@ mLx hxp dkF biW -xbn +dkI vHs xpD vHs -xbn +dkI xpD -xbn +dkI oXh xeK yhS @@ -162544,7 +162576,7 @@ cRW djw tdt upr -xbn +dkI dlO tUX vHG @@ -163315,13 +163347,13 @@ vsH vsH vsH vsH +vsH +vsH whO -whO -whO -whO -whO -wHM -wHM +vsH +vsH +puB +puB dWn eRD mMo diff --git a/_maps/map_files/RandomZLevels/academy.dmm b/_maps/map_files/RandomZLevels/academy.dmm index 052784bc990..51fab37febe 100644 --- a/_maps/map_files/RandomZLevels/academy.dmm +++ b/_maps/map_files/RandomZLevels/academy.dmm @@ -6,10 +6,7 @@ /turf/simulated/wall/r_wall, /area/awaymission/academy/headmaster) "ac" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 5 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/academy/headmaster) "ad" = ( @@ -614,7 +611,6 @@ }, /area/awaymission/academy/headmaster) "bU" = ( -/obj/structure/grille, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -623,9 +619,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/structure/window/reinforced{ - dir = 5 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/academy/headmaster) "bV" = ( @@ -743,15 +737,12 @@ }, /area/awaymission/academy/headmaster) "ci" = ( -/obj/structure/grille, /obj/structure/cable{ d2 = 2; icon_state = "0-2" }, /obj/structure/cable, -/obj/structure/window/reinforced{ - dir = 5 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/academy/headmaster) "cj" = ( @@ -1018,11 +1009,8 @@ }, /area/awaymission/academy/headmaster) "cW" = ( -/obj/structure/grille, /obj/structure/cable, -/obj/structure/window/reinforced{ - dir = 5 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/academy/headmaster) "cX" = ( @@ -1328,7 +1316,9 @@ /turf/simulated/floor/plating, /area/awaymission/academy/classrooms) "dH" = ( -/obj/machinery/computer/mech_bay_power_console, +/obj/machinery/computer/mech_bay_power_console{ + dir = 1 + }, /obj/structure/cable, /turf/simulated/floor/greengrid, /area/awaymission/academy/classrooms) @@ -1595,12 +1585,12 @@ }, /area/awaymission/academy/classrooms) "er" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 5 +/obj/structure/computerframe{ + anchored = 1; + dir = 8 }, -/turf/simulated/floor/plating, -/area/awaymission/academy/classrooms) +/turf/simulated/floor/carpet, +/area/awaymission/academy/headmaster) "es" = ( /obj/structure/window/reinforced{ dir = 4 @@ -2165,7 +2155,6 @@ }, /area/awaymission/academy/classrooms) "fO" = ( -/obj/structure/grille, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -2174,9 +2163,7 @@ d2 = 4; icon_state = "0-4" }, -/obj/structure/window/reinforced{ - dir = 5 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/academy/classrooms) "fP" = ( @@ -2283,15 +2270,12 @@ /turf/simulated/floor/plasteel, /area/awaymission/academy/classrooms) "ge" = ( -/obj/structure/grille, /obj/structure/cable, /obj/structure/cable{ d2 = 2; icon_state = "0-2" }, -/obj/structure/window/reinforced{ - dir = 5 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/academy/classrooms) "gf" = ( @@ -2309,7 +2293,6 @@ }, /area/awaymission/academy/classrooms) "gh" = ( -/obj/structure/grille, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -2318,9 +2301,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/structure/window/reinforced{ - dir = 5 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/academy/classrooms) "gi" = ( @@ -2465,27 +2446,21 @@ /turf/simulated/floor/plasteel, /area/awaymission/academy/classrooms) "gB" = ( -/obj/structure/grille, /obj/structure/cable{ d2 = 4; icon_state = "0-4" }, /obj/structure/cable, -/obj/structure/window/reinforced{ - dir = 5 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/academy/classrooms) "gC" = ( -/obj/structure/grille, /obj/structure/cable{ d2 = 2; icon_state = "0-2" }, /obj/structure/cable, -/obj/structure/window/reinforced{ - dir = 5 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/academy/classrooms) "gD" = ( @@ -2619,15 +2594,12 @@ /turf/simulated/floor/plasteel, /area/awaymission/academy/classrooms) "gV" = ( -/obj/structure/grille, /obj/structure/cable, /obj/structure/cable{ d2 = 4; icon_state = "0-4" }, -/obj/structure/window/reinforced{ - dir = 5 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/academy/classrooms) "gW" = ( @@ -3383,14 +3355,11 @@ /turf/space, /area/awaymission/academy/academyaft) "iY" = ( -/obj/structure/grille, /obj/structure/cable{ d2 = 4; icon_state = "0-4" }, -/obj/structure/window/reinforced{ - dir = 5 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/academy/academyaft) "iZ" = ( @@ -3448,14 +3417,11 @@ }, /area/awaymission/academy/academyaft) "je" = ( -/obj/structure/grille, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, -/obj/structure/window/reinforced{ - dir = 5 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/academy/academyaft) "jf" = ( @@ -3548,12 +3514,11 @@ /turf/simulated/floor/plasteel, /area/awaymission/academy/academyaft) "jq" = ( -/obj/structure/grille, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, -/obj/item/shard, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating/airless, /area/awaymission/academy/academyaft) "jr" = ( @@ -3610,11 +3575,12 @@ }, /area/awaymission/academy/academyaft) "jy" = ( -/obj/item/shard{ - icon_state = "medium" +/obj/structure/computerframe{ + anchored = 1; + dir = 4 }, -/turf/space, -/area/space/nearstation) +/turf/simulated/floor/carpet, +/area/awaymission/academy/headmaster) "jz" = ( /obj/machinery/igniter/on, /turf/simulated/floor/plating, @@ -3624,11 +3590,8 @@ /turf/simulated/floor/carpet, /area/awaymission/academy/academyaft) "jB" = ( -/obj/structure/grille, /obj/structure/cable, -/obj/structure/window/reinforced{ - dir = 5 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/academy/academyaft) "jC" = ( @@ -3724,7 +3687,6 @@ /turf/simulated/floor/grass, /area/awaymission/academy/academygate) "jR" = ( -/obj/structure/grille, /obj/structure/cable{ icon_state = "4-8" }, @@ -3732,9 +3694,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/structure/window/reinforced{ - dir = 5 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/academy/academyaft) "jS" = ( @@ -3744,10 +3704,7 @@ /turf/simulated/floor/carpet, /area/awaymission/academy/academygate) "jU" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 5 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/academy/academygate) "jV" = ( @@ -3839,13 +3796,11 @@ /turf/simulated/floor/plating, /area/awaymission/academy/academygate) "kg" = ( -/obj/structure/grille, /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/cable, -/obj/structure/window/reinforced{ - dir = 5 +/obj/structure/cable{ + icon_state = "2-8" }, /turf/simulated/floor/plating, /area/awaymission/academy/academyaft) @@ -3856,15 +3811,12 @@ /turf/simulated/floor/plasteel, /area/awaymission/academy/academyaft) "ki" = ( -/obj/structure/grille, /obj/structure/cable{ d2 = 2; icon_state = "0-2" }, /obj/structure/cable, -/obj/structure/window/reinforced{ - dir = 5 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/academy/academyaft) "kj" = ( @@ -3954,15 +3906,12 @@ /turf/simulated/floor/carpet, /area/awaymission/academy/academygate) "ku" = ( -/obj/structure/grille, /obj/structure/cable, /obj/structure/cable{ d2 = 2; icon_state = "0-2" }, -/obj/structure/window/reinforced{ - dir = 5 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/academy/academyaft) "kv" = ( @@ -12705,12 +12654,12 @@ bs bs bs dZ -er +LR bB bB bB bB -er +LR dZ bs bs @@ -12835,12 +12784,12 @@ dG de bs dZ -er +LR hH bB bB bB -er +LR dZ bs bB @@ -12967,8 +12916,8 @@ bs bs bs hG -er -er +LR +LR eA bs bs @@ -14402,7 +14351,7 @@ BT ek ei fE -er +LR Uo gb zu @@ -14532,7 +14481,7 @@ Rh wG ei Sz -er +LR wP dc dc @@ -14662,7 +14611,7 @@ Ec ek ei RH -er +LR mu dc dc @@ -14792,7 +14741,7 @@ fb ev ex fF -er +LR JW dc dc @@ -15013,9 +14962,9 @@ ab ab ak ar -ae +jy aC -ae +jy aM aN ab @@ -16443,9 +16392,9 @@ ab ab aq aw -ae +er aI -ae +er ak af ab @@ -17029,7 +16978,7 @@ aa aa aa aa -jy +aa aa aa aa diff --git a/_maps/map_files/RandomZLevels/beach.dmm b/_maps/map_files/RandomZLevels/beach.dmm index 0340f7e7957..5c009e04fc6 100644 --- a/_maps/map_files/RandomZLevels/beach.dmm +++ b/_maps/map_files/RandomZLevels/beach.dmm @@ -719,21 +719,6 @@ /obj/structure/flora/ausbushes/leafybush, /turf/simulated/floor/indestructible/beach/sand/dense, /area/awaymission/beach) -"cD" = ( -/turf/simulated/wall/indestructible{ - icon_state = "sandstone12" - }, -/area/awaymission/beach) -"cE" = ( -/turf/simulated/wall/indestructible{ - icon_state = "sandstone6" - }, -/area/awaymission/beach) -"cF" = ( -/turf/simulated/wall/indestructible{ - icon_state = "sandstone10" - }, -/area/awaymission/beach) "cG" = ( /obj/structure/flora/ausbushes/ppflowers, /obj/effect/decal/snow/sand/edge{ @@ -743,15 +728,8 @@ }, /turf/simulated/floor/indestructible/beach/sand, /area/awaymission/beach) -"cH" = ( -/turf/simulated/wall/indestructible{ - icon_state = "sandstone3" - }, -/area/awaymission/beach) "cI" = ( -/turf/simulated/wall/indestructible{ - icon_state = "sandstone1" - }, +/turf/simulated/wall/indestructible/sandstone, /area/awaymission/beach) "cJ" = ( /obj/effect/decal/snow/sand/edge{ @@ -978,16 +956,14 @@ /area/awaymission/beach) "dC" = ( /obj/structure/table/wood, -/obj/machinery/chem_dispenser/soda, +/obj/machinery/chem_dispenser/soda{ + dir = 1; + pixel_y = 6 + }, /turf/simulated/floor/indestructible{ icon_state = "wood" }, /area/awaymission/beach) -"dD" = ( -/turf/simulated/wall/indestructible{ - icon_state = "sandstone0" - }, -/area/awaymission/beach) "dE" = ( /obj/effect/decal/snow/sand/edge{ name = "rough sand" @@ -997,7 +973,10 @@ /area/awaymission/beach) "dF" = ( /obj/structure/table/wood, -/obj/machinery/chem_dispenser/beer, +/obj/machinery/chem_dispenser/beer{ + dir = 1; + pixel_y = 6 + }, /turf/simulated/floor/indestructible{ icon_state = "wood" }, @@ -6479,11 +6458,11 @@ bW bj bj bi -cE -cH +cI +cI cI dA -dD +cI by bj bj @@ -6736,7 +6715,7 @@ bT bj bj bi -cD +cI cS dq dq @@ -6993,7 +6972,7 @@ bV bj bj cq -cD +cI cU dq dq @@ -7250,7 +7229,7 @@ bX bj bj cr -cD +cI cW dq dq @@ -7507,7 +7486,7 @@ bW bj bj cq -cD +cI cX dq dq @@ -7764,7 +7743,7 @@ bV bj bj bi -cD +cI cV dq dq @@ -8021,7 +8000,7 @@ bX bj bj bi -cD +cI da dq dq @@ -8278,7 +8257,7 @@ bT bj bj bi -cD +cI cZ dq dq @@ -8535,7 +8514,7 @@ bZ ce bj bi -cD +cI dl dq dq @@ -8792,7 +8771,7 @@ ca bj bj bi -cD +cI db dq dq @@ -9049,7 +9028,7 @@ bX cf bj bi -cD +cI dm dq dq @@ -9306,10 +9285,10 @@ bT cd bj bi -cF -cH -cH -cH +cI +cI +cI +cI cI by bj @@ -10076,8 +10055,8 @@ bj cc bj bi -cE -cH +cI +cI cI by bj @@ -10333,7 +10312,7 @@ bN bX bj bi -cD +cI cO dn by @@ -10590,8 +10569,8 @@ bj bW bj bi -cF -cH +cI +cI cI by bj @@ -11361,8 +11340,8 @@ bf bX bj bi -cE -cH +cI +cI cI by bj @@ -11618,7 +11597,7 @@ bj bT bj bi -cD +cI cO dn by @@ -11875,8 +11854,8 @@ bN bV bj bi -cF -cH +cI +cI cI by bF @@ -12646,8 +12625,8 @@ bL bX bj bi -cE -cH +cI +cI cI by bj @@ -12903,7 +12882,7 @@ bR cb bf bi -cD +cI cO dn by @@ -13160,8 +13139,8 @@ bf bX bz bi -cF -cH +cI +cI cI by bj @@ -14705,8 +14684,8 @@ bl bl bl bz -bz -bz +bj +bj bj bD bj @@ -17270,11 +17249,11 @@ bf bL bj cc -cE -cH -cH -cH -cH +cI +cI +cI +cI +cI cI bj bj @@ -17527,7 +17506,7 @@ bj bz bf bX -cD +cI dr dr dr @@ -17784,7 +17763,7 @@ bz bj bj bT -cD +cI dr dr dr @@ -18041,7 +18020,7 @@ bL bj bN bV -cD +cI dr dr dW @@ -18298,7 +18277,7 @@ bj bz bj bW -cD +cI dr dr dr @@ -18555,7 +18534,7 @@ bj bD bj cc -cD +cI dr dr dr @@ -18812,11 +18791,11 @@ bz bz bL bX -cF -cH -cH -cH -cH +cI +cI +cI +cI +cI cI bj bj @@ -19326,18 +19305,18 @@ bj bz bf bX -cE -cH -cH -cH -cH -cH -cH -cH +cI +cI +cI +cI +cI +cI +cI +cI cI cL cL -dD +cI bf bX cg @@ -19583,10 +19562,10 @@ by bj bN bT -cD +cI dI dO -cD +cI bj dL bj @@ -19594,7 +19573,7 @@ cL bj bj bj -cD +cI bN bT cg @@ -19840,18 +19819,18 @@ bB bL bj ca -cD +cI dK bj -cD +cI bj bj bj -dD +cI bj bj bj -cD +cI bj ca cg @@ -20097,18 +20076,18 @@ ci bE bj bj -cD +cI dJ bj -cD +cI ed bj bj -dD +cI bj en bj -cD +cI bj bj bx @@ -20354,10 +20333,10 @@ bz bj bL bL -cD +cI bj bj -cD +cI ee bj bj @@ -20365,7 +20344,7 @@ cL bj bj bj -cD +cI bL bL by @@ -20611,18 +20590,18 @@ bj bz bj bz -cD +cI cI cL -cF -cH -cH -cH -cH +cI +cI +cI +cI +cI cI bj bj -cD +cI bj bz bJ @@ -20868,7 +20847,7 @@ bj bD bj bz -cD +cI dL bj bj @@ -20879,7 +20858,7 @@ bj bj bj bj -cD +cI bj bz bj @@ -21125,7 +21104,7 @@ bD bj bK bj -cD +cI bj bj bj @@ -21136,7 +21115,7 @@ bj bj bj bj -cD +cI bK bj bJ @@ -21382,7 +21361,7 @@ bj bD bj bz -cD +cI dL bj bj @@ -21393,7 +21372,7 @@ bj bj bj bj -cD +cI bj bz bj @@ -21639,18 +21618,18 @@ bD bj bK bD -cD -cH +cI +cI cI cL -cE -cH -cH -cH +cI +cI +cI +cI cI bj bj -cD +cI bK bD bj @@ -21896,11 +21875,11 @@ bz bD bj bS -cD +cI dN bj bj -cD +cI ej bj bj @@ -22153,11 +22132,11 @@ bE bj bz bf -cD +cI dM dQ cT -cD +cI bj dL bj @@ -22410,17 +22389,17 @@ bz bN bf bT -cF -cH -cH -cH -cD -cH -cH -cH -cH -cH -cH +cI +cI +cI +cI +cI +cI +cI +cI +cI +cI +cI cI bj ca diff --git a/_maps/map_files/RandomZLevels/centcomAway.dmm b/_maps/map_files/RandomZLevels/centcomAway.dmm index f50457a53c4..4703e786d9d 100644 --- a/_maps/map_files/RandomZLevels/centcomAway.dmm +++ b/_maps/map_files/RandomZLevels/centcomAway.dmm @@ -8,36 +8,6 @@ "ac" = ( /turf/simulated/wall/r_wall, /area/awaymission/centcomAway/cafe) -"ad" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/cafe) -"ae" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/cafe) -"af" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/cafe) "ag" = ( /turf/simulated/floor/plating, /area/awaymission/centcomAway/maint) @@ -145,19 +115,6 @@ dir = 1 }, /area/awaymission/centcomAway/cafe) -"at" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/cafe) "au" = ( /obj/machinery/hydroponics/constructable, /turf/simulated/floor/plasteel{ @@ -205,16 +162,6 @@ icon_state = "cafeteria" }, /area/awaymission/centcomAway/cafe) -"aB" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/cafe) "aC" = ( /obj/structure/closet/secure_closet/freezer/kitchen, /turf/simulated/floor/plasteel{ @@ -261,19 +208,13 @@ }, /area/awaymission/centcomAway/cafe) "aK" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ +/obj/structure/computerframe{ dir = 8 }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/cafe) +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/awaymission/centcomAway/general) "aL" = ( /obj/structure/table, /turf/simulated/floor/plasteel{ @@ -329,35 +270,9 @@ dir = 8 }, /area/awaymission/centcomAway/cafe) -"aT" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/wall/r_wall, -/area/awaymission/centcomAway/maint) -"aU" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/wall/r_wall, -/area/awaymission/centcomAway/maint) "aV" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/wall/r_wall, +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, /area/awaymission/centcomAway/maint) "aW" = ( /turf/simulated/wall/r_wall, @@ -396,17 +311,6 @@ }, /turf/simulated/floor/plating, /area/awaymission/centcomAway/maint) -"bb" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/cafe) "bc" = ( /obj/structure/chair{ dir = 1 @@ -813,18 +717,8 @@ /turf/simulated/floor/shuttle, /area/awaymission/centcomAway/hangar) "ch" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/structure/disposalpipe/segment, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/centcomAway/cafe) "ci" = ( @@ -852,19 +746,6 @@ layer = 2 }, /area/awaymission/centcomAway/hangar) -"cl" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/maint) "cm" = ( /obj/machinery/door/airlock/external, /turf/simulated/floor/plating, @@ -938,16 +819,6 @@ icon_state = "hydrofloor" }, /area/awaymission/centcomAway/cafe) -"cx" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/maint) "cy" = ( /obj/structure/sign/vacuum, /turf/simulated/wall/r_wall, @@ -1132,7 +1003,9 @@ }, /area/awaymission/centcomAway/cafe) "cY" = ( -/obj/machinery/computer/secure_data, +/obj/machinery/computer/secure_data{ + dir = 4 + }, /turf/simulated/floor/shuttle{ icon_state = "floor2" }, @@ -1172,15 +1045,7 @@ /turf/simulated/floor/plating, /area/awaymission/centcomAway/maint) "dd" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, +/turf/space, /area/awaymission/centcomAway/maint) "de" = ( /obj/structure/table, @@ -1234,7 +1099,8 @@ /obj/machinery/power/solar_control{ id = "centcomawaysolar"; name = "Solar Control"; - track = 1 + track = 1; + dir = 8 }, /obj/structure/cable, /obj/structure/cable{ @@ -1541,33 +1407,7 @@ /turf/simulated/floor/plating, /area/awaymission/centcomAway/hangar) "dZ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/cafe) -"ea" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/cafe) -"eb" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/centcomAway/cafe) "ec" = ( @@ -1688,20 +1528,6 @@ icon_state = "redfull" }, /area/awaymission/centcomAway/cafe) -"es" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/cafe) "et" = ( /obj/structure/sink/kitchen{ pixel_y = 28 @@ -1957,20 +1783,6 @@ icon_state = "asteroid2" }, /area/awaymission/centcomAway/cafe) -"fg" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/general) "fh" = ( /obj/structure/chair{ dir = 1 @@ -2003,7 +1815,9 @@ /turf/simulated/floor/shuttle, /area/awaymission/centcomAway/hangar) "fm" = ( -/obj/structure/computerframe, +/obj/structure/computerframe{ + dir = 1 + }, /turf/simulated/floor/shuttle, /area/awaymission/centcomAway/hangar) "fn" = ( @@ -2100,34 +1914,8 @@ }, /area/awaymission/centcomAway/courtroom) "fz" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/shuttle/plating, -/area/awaymission/centcomAway/hangar) -"fA" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/shuttle/plating, -/area/awaymission/centcomAway/hangar) -"fB" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/shuttle/plating, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/awaymission/centcomAway/hangar) "fC" = ( /obj/structure/closet/secure_closet/freezer/fridge, @@ -2153,70 +1941,29 @@ /obj/structure/sign/electricshock, /turf/simulated/wall/r_wall, /area/awaymission/centcomAway/general) -"fG" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 +"fL" = ( +/obj/structure/table, +/obj/item/storage/box/donkpockets{ + pixel_x = 3; + pixel_y = 3 }, -/obj/structure/window/reinforced{ - dir = 8 +/obj/item/kitchen/rollingpin, +/turf/simulated/floor/plasteel{ + tag = "icon-redfull"; + icon_state = "redfull" }, +/area/awaymission/centcomAway/cafe) +"fM" = ( /turf/simulated/floor/plating, -/area/awaymission/centcomAway/general) -"fH" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/general) -"fI" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/general) -"fJ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/general) -"fL" = ( -/obj/structure/table, -/obj/item/storage/box/donkpockets{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/kitchen/rollingpin, -/turf/simulated/floor/plasteel{ - tag = "icon-redfull"; - icon_state = "redfull" - }, -/area/awaymission/centcomAway/cafe) -"fM" = ( -/turf/simulated/floor/plating, -/turf/simulated/wall/shuttle{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/awaymission/centcomAway/hangar) -"fN" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, +/turf/simulated/wall/shuttle{ + icon_state = "swall_f5"; + dir = 2 + }, +/area/awaymission/centcomAway/hangar) +"fN" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, /obj/structure/window/reinforced{ dir = 1 }, @@ -2447,56 +2194,6 @@ dir = 5 }, /area/awaymission/centcomAway/general) -"gv" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/general) -"gw" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/general) -"gx" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/general) -"gy" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/general) -"gz" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/general) "gA" = ( /obj/machinery/sleeper{ icon_state = "sleeper-open"; @@ -2566,14 +2263,7 @@ }, /area/awaymission/centcomAway/general) "gK" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/centcomAway/general) "gL" = ( @@ -2746,21 +2436,10 @@ dir = 5 }, /area/awaymission/centcomAway/general) -"hk" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ +"hl" = ( +/obj/machinery/computer/robotics{ dir = 4 }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/general) -"hl" = ( -/obj/machinery/computer/robotics, /turf/simulated/floor/plasteel{ icon_state = "floor" }, @@ -2782,7 +2461,9 @@ }, /area/awaymission/centcomAway/general) "ho" = ( -/obj/machinery/computer/med_data, +/obj/machinery/computer/med_data{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "floor" }, @@ -2845,18 +2526,10 @@ /obj/item/storage/lockbox, /turf/simulated/floor/shuttle, /area/awaymission/centcomAway/hangar) -"hy" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ +"hz" = ( +/obj/machinery/computer/card{ dir = 4 }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/general) -"hz" = ( -/obj/machinery/computer/card, /turf/simulated/floor/plasteel{ icon_state = "floor" }, @@ -2868,7 +2541,9 @@ }, /area/awaymission/centcomAway/general) "hB" = ( -/obj/machinery/computer/crew, +/obj/machinery/computer/crew{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "floor" }, @@ -2896,17 +2571,7 @@ /turf/simulated/floor/shuttle, /area/awaymission/centcomAway/hangar) "hF" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/shuttle/plating, /area/awaymission/centcomAway/hangar) "hG" = ( @@ -2950,7 +2615,9 @@ }, /area/awaymission/centcomAway/general) "hN" = ( -/obj/machinery/computer/secure_data, +/obj/machinery/computer/secure_data{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "floor" }, @@ -2966,7 +2633,9 @@ }, /area/awaymission/centcomAway/general) "hP" = ( -/obj/machinery/computer/security, +/obj/machinery/computer/security{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "floor" }, @@ -2992,28 +2661,6 @@ icon_state = "floor" }, /area/awaymission/centcomAway/general) -"hS" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/wall/r_wall, -/area/awaymission/centcomAway/courtroom) -"hT" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/courtroom) "hU" = ( /obj/structure/dispenser, /turf/simulated/floor/plasteel{ @@ -3027,31 +2674,8 @@ icon_state = "dark" }, /area/awaymission/centcomAway/courtroom) -"hW" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/courtroom) "hX" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/centcomAway/hangar) "hY" = ( @@ -3118,16 +2742,6 @@ icon_state = "dark" }, /area/awaymission/centcomAway/courtroom) -"ii" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/courtroom) "ij" = ( /obj/machinery/power/apc/noalarm{ cell_type = 15000; @@ -3328,14 +2942,7 @@ }, /area/awaymission/centcomAway/courtroom) "iH" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/centcomAway/courtroom) "iI" = ( @@ -3482,25 +3089,6 @@ dir = 4 }, /area/awaymission/centcomAway/general) -"ja" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/wall/r_wall, -/area/awaymission/centcomAway/courtroom) -"jb" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/awaymission/centcomAway/courtroom) "jc" = ( /obj/structure/cable{ icon_state = "1-4"; @@ -3558,17 +3146,6 @@ icon_state = "dark" }, /area/awaymission/centcomAway/courtroom) -"jh" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/general) "ji" = ( /obj/structure/chair{ dir = 8 @@ -4059,53 +3636,6 @@ icon_state = "white" }, /area/awaymission/centcomAway/general) -"kp" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - name = "plating" - }, -/area/awaymission/centcomAway/general) -"kq" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - name = "plating" - }, -/area/awaymission/centcomAway/general) -"kr" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - name = "plating" - }, -/area/awaymission/centcomAway/general) -"ks" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/general) "kt" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical, @@ -4169,17 +3699,6 @@ }, /turf/simulated/floor/plating, /area/awaymission/centcomAway/hangar) -"kC" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/general) "kD" = ( /obj/effect/landmark/awaystart, /turf/simulated/floor/plasteel{ @@ -4230,17 +3749,6 @@ }, /turf/simulated/floor/plating, /area/awaymission/centcomAway/hangar) -"kL" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/general) "kM" = ( /obj/machinery/gateway{ dir = 8 @@ -4290,45 +3798,6 @@ icon_state = "greencorner" }, /area/awaymission/centcomAway/general) -"kU" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/general) -"kV" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/general) -"kW" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/general) "kX" = ( /obj/structure/table, /obj/item/flash, @@ -4407,17 +3876,6 @@ /obj/item/paper_bin, /turf/simulated/floor/wood, /area/awaymission/centcomAway/courtroom) -"lg" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/general) "lh" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -4560,19 +4018,6 @@ /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, /area/awaymission/centcomAway/hangar) -"lx" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/general) "ly" = ( /obj/structure/table/wood, /obj/item/clothing/accessory/medal, @@ -4620,14 +4065,6 @@ dir = 5 }, /area/awaymission/centcomAway/hangar) -"lG" = ( -/obj/structure/window/reinforced, -/turf/simulated/floor/plasteel{ - tag = "icon-vault (NORTHEAST)"; - icon_state = "vault"; - dir = 5 - }, -/area/awaymission/centcomAway/general) "lH" = ( /obj/machinery/light{ dir = 1; @@ -4637,24 +4074,6 @@ icon_state = "dark" }, /area/awaymission/centcomAway/general) -"lI" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2"; - pixel_y = 0 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/general) "lJ" = ( /obj/machinery/door/airlock/external, /turf/simulated/floor/plating, @@ -4676,6 +4095,7 @@ }, /area/awaymission/centcomAway/hangar) "lM" = ( +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plasteel{ tag = "icon-ironsand3 (WEST)"; icon_state = "ironsand3"; @@ -4683,26 +4103,6 @@ heat_capacity = 1 }, /area/awaymission/centcomAway/general) -"lN" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - tag = "icon-vault (NORTHEAST)"; - icon_state = "vault"; - dir = 5 - }, -/area/awaymission/centcomAway/general) -"lO" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - tag = "icon-vault (NORTHEAST)"; - icon_state = "vault"; - dir = 5 - }, -/area/awaymission/centcomAway/general) "lP" = ( /obj/machinery/door/airlock/centcom{ name = "Thunderdome Administration"; @@ -4801,6 +4201,7 @@ }, /area/awaymission/centcomAway/general) "lZ" = ( +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plasteel{ tag = "icon-ironsand11 (WEST)"; icon_state = "ironsand11"; @@ -4829,6 +4230,7 @@ }, /area/awaymission/centcomAway/general) "md" = ( +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plasteel{ tag = "icon-ironsand9 (WEST)"; icon_state = "ironsand9"; @@ -4871,37 +4273,11 @@ name = "XCC Shutter 3 Control" }, /turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/awaymission/centcomAway/general) -"mi" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/thunderdome) -"mj" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/thunderdome) -"mk" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 + icon_state = "dark" }, +/area/awaymission/centcomAway/general) +"mj" = ( +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/centcomAway/thunderdome) "ml" = ( @@ -4931,6 +4307,7 @@ }, /area/awaymission/centcomAway/hangar) "mo" = ( +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plasteel{ tag = "icon-ironsand4 (WEST)"; icon_state = "ironsand4"; @@ -4970,16 +4347,6 @@ dir = 1 }, /area/awaymission/centcomAway/hangar) -"mu" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - tag = "icon-vault (NORTHEAST)"; - icon_state = "vault"; - dir = 5 - }, -/area/awaymission/centcomAway/general) "mv" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -5105,18 +4472,11 @@ }, /area/awaymission/centcomAway/hangar) "mN" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/structure/cable{ icon_state = "1-2"; pixel_y = 0 }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/centcomAway/general) "mO" = ( @@ -5297,15 +4657,6 @@ icon_state = "dark" }, /area/awaymission/centcomAway/hangar) -"nj" = ( -/obj/structure/flora/ausbushes, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "asteroid8"; - name = "sand"; - tag = "icon-asteroid8 (SOUTHEAST)" - }, -/area/awaymission/centcomAway/general) "nk" = ( /obj/structure/flora/ausbushes, /obj/machinery/light{ @@ -5313,9 +4664,9 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "asteroid6"; - name = "sand"; - tag = "icon-asteroid6" + tag = "icon-asteroid"; + name = "plating"; + icon_state = "asteroid" }, /area/awaymission/centcomAway/general) "nl" = ( @@ -5330,14 +4681,6 @@ icon_state = "asteroid" }, /area/awaymission/centcomAway/general) -"nm" = ( -/obj/structure/flora/ausbushes, -/turf/simulated/floor/plasteel{ - tag = "icon-asteroid5"; - name = "plating"; - icon_state = "asteroid5" - }, -/area/awaymission/centcomAway/general) "nn" = ( /obj/machinery/light{ icon_state = "tube1"; @@ -5429,7 +4772,9 @@ }, /area/awaymission/centcomAway/general) "nw" = ( -/obj/machinery/computer/secure_data, +/obj/machinery/computer/secure_data{ + dir = 8 + }, /turf/simulated/floor/plasteel{ tag = "icon-vault (NORTH)"; icon_state = "vault"; @@ -5470,7 +4815,9 @@ }, /area/awaymission/centcomAway/general) "nB" = ( -/obj/machinery/computer/card, +/obj/machinery/computer/card{ + dir = 8 + }, /turf/simulated/floor/plasteel{ tag = "icon-vault (NORTH)"; icon_state = "vault"; @@ -5641,7 +4988,9 @@ /turf/simulated/floor/shuttle/plating, /area/awaymission/centcomAway/thunderdome) "nY" = ( -/obj/structure/computerframe, +/obj/structure/computerframe{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "floor" }, @@ -11914,7 +11263,7 @@ fP cS cq fl -fA +fz bn bn jp @@ -12044,7 +11393,7 @@ fR bY fc fm -fA +fz bn bn bn @@ -12174,7 +11523,7 @@ bO dg cq hH -fA +fz bn bn bn @@ -12304,7 +11653,7 @@ bP eM fr hL -fB +fz bn bo bn @@ -12578,12 +11927,12 @@ bk lw aW aa -fG +gK hg fY fY hg -fG +gK aa aW gX @@ -12708,12 +12057,12 @@ cU kB aW aa -fH +gK hg fY fY hg -fH +gK aa aW gX @@ -12838,12 +12187,12 @@ cU is aW aa -fH +gK hg fY fY hg -fH +gK aa aW nb @@ -12968,12 +12317,12 @@ cU od aW aa -fH +gK hg lY fY hg -fH +gK aa aW cU @@ -13098,12 +12447,12 @@ cU iu aW aa -fH +gK hg fY fY hg -fH +gK aa aW gX @@ -13228,12 +12577,12 @@ kt kt aW aa -jh +gK hg fY fY hg -jh +gK aa aW aW @@ -13369,9 +12718,9 @@ eF eF kw eO -fG +gK nk -fG +gK eO go eF @@ -13499,12 +12848,12 @@ lh eF kw eO -fH -nj -fH +gK +mW +gK eO go -fG +gK aa bm bm @@ -13619,22 +12968,22 @@ eF fY hg fY -lN -lN -lN -lN +fY +fY +fY +fY fY hg fY eF kw eO -fH -mO -fH +gK +mW +gK eO go -fH +gK aa aa bm @@ -13748,23 +13097,23 @@ hf eF fY hg -lG +fY lM lZ md mo -mu +fY hg fY eF kw eO -fH +gK mW -fH +gK eO go -fH +gK aa aa aa @@ -13879,22 +13228,22 @@ eF fY hg fY -lO -lO -lO -lO +fY +fY +fY +fY fY hg fY eF kw eO -fH -nm -fH +gK +mW +gK eO go -jh +gK aa aa aa @@ -14019,9 +13368,9 @@ lh eF kw eO -jh +gK nl -jh +gK eO go eF @@ -14378,7 +13727,7 @@ aG ak aH aG -ea +dZ fi eF ge @@ -14536,7 +13885,7 @@ jj fD eF mO -kp +gK ku nf nf @@ -14666,7 +14015,7 @@ jK or eF mQ -kq +gK ku nf nf @@ -14695,7 +14044,7 @@ oD oC oC oP -mi +mj oX oQ oQ @@ -14703,7 +14052,7 @@ oQ oQ oQ pH -mi +mj pN pN pN @@ -14748,7 +14097,7 @@ aa aa aa aa -ad +dZ ai ai ai @@ -14796,7 +14145,7 @@ jL oq eF mP -kr +gK eO eO eO @@ -14878,7 +14227,7 @@ aa aa aa aa -ae +dZ ai ai aM @@ -14904,7 +14253,7 @@ eF gt eO hb -fG +gK iQ gn ju @@ -14922,7 +14271,7 @@ jj fD jj mg -jM +aK jj eF eF @@ -14930,7 +14279,7 @@ eF eF iD eF -fg +gK eF iD eF @@ -15008,7 +14357,7 @@ aa aa aa aa -ae +dZ ai ai aL @@ -15028,20 +14377,20 @@ ai aL aL ai -eb +dZ fi eF gp eO hb -fH +gK iV go -gv +gK gK jH -hk -hy +gK +gK gK eF kw @@ -15068,13 +14417,13 @@ pG eF le eO -fg +gK nI nJ eF -lx -hy -ks +gK +gK +gK eF aa lD @@ -15138,7 +14487,7 @@ aa aa aa aa -ae +dZ ai ai aL @@ -15158,22 +14507,22 @@ ai ep aL ai -ea +dZ fo eF ge eO hU -fI +gK iQ go -gw +gK gL eO hl hz ki -fG +gK kw eO eF @@ -15185,16 +14534,16 @@ eF eF eF eF -hk -ks +gK +gK eF iD eF -fg +gK eF iD eF -kU +gK eF nx lk @@ -15268,7 +14617,7 @@ aa aa aa aa -ae +dZ ai ai ai @@ -15303,7 +14652,7 @@ eO hm eO kh -fH +gK kw kG eF @@ -15314,7 +14663,7 @@ ma jv mp mp -fH +gK mS mS nd @@ -15325,18 +14674,18 @@ np eO mS mp -gv -lg +gK +gK le -fg +gK eO nK eF -hk -hy -hy -hy -ks +gK +gK +gK +gK +gK lD lD ou @@ -15398,7 +14747,7 @@ aa aa aa aa -ae +dZ ai ai ai @@ -15427,24 +14776,24 @@ hY eO ik go -gx +gK gN eO eO hA hN -fH +gK kw kP eF lE -fg +gK jG eO eO eO mv -fJ +gK eO eO eO @@ -15455,7 +14804,7 @@ eO eO eO go -fJ +gK nz nz nz @@ -15528,7 +14877,7 @@ aa aa aa aa -af +dZ ai ai ai @@ -15549,21 +14898,21 @@ ai ai ai ai -es +dZ fY fY -fg +gK eO eO ik go -gy +gK jE kF eO eO nY -fH +gK kw eO iD @@ -15589,14 +14938,14 @@ fY fY fY fY -hk -ks +gK +gK ic fY fY nS -lx -ks +gK +gK lD om ot @@ -15687,18 +15036,18 @@ hZ ir jc go -gw +gK jF eO eO hA hP -fH +gK kw kZ li nc -lI +mN lT hM hM @@ -15791,23 +15140,23 @@ aa ac ak ak -aK +dZ aZ -aK +dZ bp bp bp ak -aK +dZ cF -aK +dZ ak bp bp bp -aK +dZ dM -aK +dZ ak ak eF @@ -15823,7 +15172,7 @@ eO hn eO kj -fH +gK kw kT eF @@ -15834,7 +15183,7 @@ mb ju mq mq -fH +gK mT mT ne @@ -15845,18 +15194,18 @@ nq eO mT mq -gz +gK gK le -fg +gK eO go eF -hk -hy -hy -hy -ks +gK +gK +gK +gK +gK lD lD ou @@ -15944,16 +15293,16 @@ eF gA eU gA -fG +gK jf go -gx +gK gR eO ho hB hR -fJ +gK kw ik eF @@ -15965,16 +15314,16 @@ ml ms mz eF -hk -ks +gK +gK eF iD eF -fg +gK eF iD eF -kV +gK eF nx ll @@ -16074,20 +15423,20 @@ eF eU eU eU -fH +gK je go -gz +gK gK jH -hk -hy +gK +gK gK eF kw la eF -fg +gK eF lU hg @@ -16108,13 +15457,13 @@ qk eF le eO -fg +gK ju mq eF -lx -hy -ks +gK +gK +gK eF aa lD @@ -16187,11 +15536,11 @@ dL ax ax bV -aK +dZ cs cG cs -aK +dZ dK ax ax @@ -16204,7 +15553,7 @@ eF gF eU eU -fJ +gK jf jm jv @@ -16230,7 +15579,7 @@ eF eF iD eF -fg +gK eF iD eF @@ -16347,7 +15696,7 @@ eO oa lb eF -fg +gK eF lV mc @@ -16356,7 +15705,7 @@ mm mD eF mW -fG +gK eO eO eO @@ -16486,7 +15835,7 @@ eF eF eF mZ -fH +gK ku eO eO @@ -16515,7 +15864,7 @@ oJ oC oC oP -mk +mj pf oT oT @@ -16523,7 +15872,7 @@ oT oT oT pL -mk +mj pN pN pN @@ -16616,7 +15965,7 @@ bm bm eF mX -fH +gK ku eO eO @@ -16746,7 +16095,7 @@ aa aa eF na -jh +gK eO eO eO @@ -16878,15 +16227,15 @@ eF eF eF kx -kC +gK kE eF kE -kL +gK kx -gx +gK kx -fG +gK eF eF eF @@ -16959,11 +16308,11 @@ aa aa aa ac -at -aB -aB -aB -bb +dZ +dZ +dZ +dZ +dZ ak ak ak @@ -16975,11 +16324,11 @@ ak ak ak ak -at -aB -aB -aB -bb +dZ +dZ +dZ +dZ +dZ eF gM eU @@ -17006,17 +16355,17 @@ aa aa aa aa -fG +gK fD -fH +gK aa aa aa -fH +gK fD -gy +gK fD -fH +gK aa aa aa @@ -17122,7 +16471,7 @@ gT fU fy fy -hS +iH aa aa aa @@ -17136,17 +16485,17 @@ aa aa aa aa -jh +gK kx -jh +gK aa aa aa -jh +gK kx -kW +gK kx -jh +gK aa aa aa @@ -17252,7 +16601,7 @@ gT fU fy fy -hT +iH aa aa aa @@ -17487,11 +16836,11 @@ au bs bB bB -aK +dZ cw cI cw -aK +dZ bB ee em @@ -17872,7 +17221,7 @@ aa aa aa aa -aT +aV ag ag ag @@ -18002,16 +17351,16 @@ aa aa aa aa -aU +aV bc ag ag ac -at -aB -aB -aB -bb +dZ +dZ +dZ +dZ +dZ ac ag ag @@ -18132,7 +17481,7 @@ aa aa aa aa -aU +aV bc ag ag @@ -18167,7 +17516,7 @@ fQ iz lf gV -hS +iH aa aa aa @@ -18267,10 +17616,10 @@ ag ag ag ab -cl -cx -cx -cx +dd +dd +dd +dd dd ab ag @@ -18297,7 +17646,7 @@ fQ fU gE gW -ja +iH aa aa aa @@ -18427,7 +17776,7 @@ fQ fQ gE gC -ja +iH aa aa aa @@ -18557,7 +17906,7 @@ fQ fQ gC gC -jb +iH aa aa aa @@ -19319,7 +18668,7 @@ aa aa aa aa -aT +aV ag ag fj @@ -19449,7 +18798,7 @@ aa aa aa aa -aU +aV ag nC fj @@ -19465,7 +18814,7 @@ fj fj fj gT -hW +iH iH gT aa @@ -19579,7 +18928,7 @@ aa aa aa aa -aU +aV ag ag fj @@ -20372,10 +19721,10 @@ aa aa gT gT -hW -ii -ii -ii +iH +iH +iH +iH iH gT aa diff --git a/_maps/map_files/RandomZLevels/evil_santa.dmm b/_maps/map_files/RandomZLevels/evil_santa.dmm index c57829e57fe..c2b2cc8b642 100644 --- a/_maps/map_files/RandomZLevels/evil_santa.dmm +++ b/_maps/map_files/RandomZLevels/evil_santa.dmm @@ -119,8 +119,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/challenge/main) "au" = ( -/obj/structure/grille, -/obj/structure/window/full/basic, +/obj/effect/spawner/window, /turf/simulated/floor/plating, /area/awaymission/challenge/main) "av" = ( diff --git a/_maps/map_files/RandomZLevels/example.dmm b/_maps/map_files/RandomZLevels/example.dmm index 62c87f9002d..17db47fb6c0 100644 --- a/_maps/map_files/RandomZLevels/example.dmm +++ b/_maps/map_files/RandomZLevels/example.dmm @@ -336,39 +336,15 @@ }, /area/awaymission/example) "aY" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, /obj/machinery/door/poddoor/shutters{ density = 0; icon_state = "open"; id_tag = "example"; name = "Privacy Shutters"; - opacity = 0 - }, -/turf/simulated/floor/plating, -/area/awaymission/example) -"aZ" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ + opacity = 0; dir = 1 }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, -/obj/machinery/door/poddoor/shutters{ - density = 0; - icon_state = "open"; - id_tag = "example"; - name = "Privacy Shutters"; - opacity = 0 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/example) "ba" = ( @@ -461,20 +437,6 @@ icon_state = "yellowcorner" }, /area/awaymission/example) -"bn" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/awaymission/example) "bo" = ( /turf/simulated/floor/plasteel{ tag = "icon-stage_stairs (WEST)"; @@ -482,34 +444,8 @@ dir = 8 }, /area/awaymission/example) -"bp" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/awaymission/example) "bq" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/awaymission/example) -"br" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/example) "bs" = ( @@ -1980,7 +1916,7 @@ ab ac aQ bk -bn +bq bt by by @@ -1990,7 +1926,7 @@ ab bV ac ac -bp +bq aP aQ ac @@ -2112,7 +2048,7 @@ ab ac aQ bm -bn +bq bt bz bt @@ -2188,7 +2124,7 @@ ab bX ac ac -br +bq aN aQ bm @@ -2244,9 +2180,9 @@ ab ac aQ ac -bp +bq aa -bp +bq bJ bt by @@ -2376,9 +2312,9 @@ ab ac aQ ac -br +bq aa -br +bq bK bt bJ @@ -2508,7 +2444,7 @@ ab ac aQ bk -bn +bq bt bA bt @@ -2640,7 +2576,7 @@ ab ac aQ bm -bn +bq bt bB bM @@ -3813,7 +3749,7 @@ aR aT aT aT -aZ +aY bb be bi diff --git a/_maps/map_files/RandomZLevels/moonoutpost19.dmm b/_maps/map_files/RandomZLevels/moonoutpost19.dmm index 93bf612ae9b..c29598a870a 100644 --- a/_maps/map_files/RandomZLevels/moonoutpost19.dmm +++ b/_maps/map_files/RandomZLevels/moonoutpost19.dmm @@ -1,9 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/turf/simulated/wall/indestructible{ - icon_state = "rock"; - name = "rock" - }, +/turf/simulated/wall/indestructible/rock, /area/moonoutpost19/khonsu19) "ab" = ( /turf/simulated/mineral/random/labormineral, @@ -755,8 +752,7 @@ /turf/simulated/floor/plasteel, /area/moonoutpost19/syndicateoutpost) "bP" = ( -/obj/structure/grille, -/obj/structure/window/full/basic, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/moonoutpost19/syndicateoutpost) "bQ" = ( @@ -1013,11 +1009,6 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, /area/moonoutpost19/syndicateoutpost) -"cn" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, -/turf/simulated/floor/plating, -/area/moonoutpost19/syndicateoutpost) "co" = ( /obj/structure/alien/weeds{ icon_state = "weeds2" @@ -2173,8 +2164,7 @@ name = "Acid-Proof containment chamber blast door" }, /obj/structure/cable, -/obj/structure/grille, -/obj/structure/window/full/reinforced, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/moonoutpost19/mo19research) "eA" = ( @@ -2261,13 +2251,12 @@ }, /area/moonoutpost19/mo19research) "eM" = ( -/obj/structure/grille, /obj/machinery/door/poddoor{ desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating."; id_tag = "Awaybiohazard"; name = "Acid-Proof biohazard containment door" }, -/obj/structure/window/full/reinforced, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/moonoutpost19/mo19research) "eN" = ( @@ -2570,8 +2559,7 @@ id_tag = "Awaylab"; name = "Acid-Proof containment chamber blast door" }, -/obj/structure/grille, -/obj/structure/window/full/reinforced, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/moonoutpost19/mo19research) "fp" = ( @@ -2997,8 +2985,7 @@ }, /area/moonoutpost19/mo19research) "fX" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/moonoutpost19/mo19research) "fY" = ( @@ -3289,8 +3276,7 @@ name = "Acid-Proof containment chamber blast door" }, /obj/structure/cable, -/obj/structure/grille, -/obj/structure/window/full/reinforced, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/moonoutpost19/mo19research) "gw" = ( @@ -3512,8 +3498,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/structure/grille, -/obj/structure/window/full/reinforced, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/moonoutpost19/mo19research) "gP" = ( @@ -3896,12 +3881,11 @@ }, /area/moonoutpost19/mo19research) "hx" = ( -/obj/structure/grille, /obj/machinery/door/poddoor{ id_tag = "AwayRD"; name = "privacy shutter" }, -/obj/structure/window/full/reinforced, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/moonoutpost19/mo19research) "hy" = ( @@ -4401,8 +4385,7 @@ }, /area/moonoutpost19/mo19research) "is" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/moonoutpost19/mo19arrivals) "it" = ( @@ -5023,11 +5006,6 @@ icon_state = "bar" }, /area/moonoutpost19/mo19arrivals) -"jO" = ( -/obj/structure/grille, -/obj/structure/window/full/basic, -/turf/simulated/floor/plating, -/area/moonoutpost19/mo19arrivals) "jP" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ @@ -5153,8 +5131,7 @@ /turf/simulated/floor/plating, /area/moonoutpost19/mo19utilityroom) "kd" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating/airless{ name = "plating" }, @@ -5677,8 +5654,7 @@ }, /area/moonoutpost19/mo19arrivals) "ld" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating/asteroid/airless, /area/moonoutpost19/mo19arrivals) "lg" = ( @@ -6191,12 +6167,11 @@ }, /area/moonoutpost19/mo19arrivals) "mx" = ( -/obj/structure/grille, /obj/structure/sign/vacuum{ desc = "A warning sign which reads 'HOSTILE ATMOSPHERE AHEAD'"; name = "\improper HOSTILE ATMOSPHERE AHEAD" }, -/obj/structure/window/full/reinforced, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/moonoutpost19/mo19arrivals) "my" = ( @@ -6776,9 +6751,8 @@ }, /area/moonoutpost19/mo19arrivals) "nW" = ( -/obj/structure/grille, /obj/structure/disposalpipe/segment, -/obj/structure/window/full/reinforced, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/moonoutpost19/mo19arrivals) "nX" = ( @@ -14230,10 +14204,10 @@ bv aT aT bX -cn +bP cD -cn -cn +bP +bP df dn aT @@ -15527,10 +15501,10 @@ io iB hJ hJ -jO +is oq ko -jO +is hK kX hK diff --git a/_maps/map_files/RandomZLevels/terrorspiders.dmm b/_maps/map_files/RandomZLevels/terrorspiders.dmm index 1fe41dba8ea..ba1044420ef 100644 --- a/_maps/map_files/RandomZLevels/terrorspiders.dmm +++ b/_maps/map_files/RandomZLevels/terrorspiders.dmm @@ -1,9 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/turf/simulated/wall/indestructible{ - icon_state = "rock"; - name = "rock" - }, +/turf/simulated/wall/indestructible/rock, /area/awaymission/UO71/outside) "ab" = ( /turf/simulated/mineral/random/labormineral, @@ -115,11 +112,6 @@ icon_state = "dark" }, /area/awaymission/UO71/plaza) -"at" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, -/turf/simulated/floor/plating, -/area/awaymission/UO71/plaza) "au" = ( /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -1415,8 +1407,7 @@ }, /area/awaymission/UO71/plaza) "dR" = ( -/obj/structure/grille, -/obj/structure/window/full/basic, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) "dS" = ( @@ -2438,8 +2429,7 @@ }, /area/awaymission/UO71/gateway) "gs" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO71/gateway) "gt" = ( @@ -2896,12 +2886,11 @@ }, /area/awaymission/UO71/centralhall) "hr" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4; level = 2 }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO71/centralhall) "hs" = ( @@ -3369,11 +3358,10 @@ /turf/simulated/wall, /area/awaymission/UO71/gateway) "iy" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO71/gateway) "iz" = ( @@ -3792,8 +3780,7 @@ }, /area/awaymission/UO71/gateway) "jM" = ( -/obj/structure/grille, -/obj/structure/window/full/basic, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO71/science) "jN" = ( @@ -5109,11 +5096,6 @@ icon_state = "cafeteria" }, /area/awaymission/UO71/science) -"mu" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, -/turf/simulated/floor/plating, -/area/awaymission/UO71/science) "mv" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -7028,8 +7010,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/eng) "qe" = ( -/obj/structure/grille, -/obj/structure/window/full/basic, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO71/medical) "qf" = ( @@ -7241,8 +7222,7 @@ /turf/simulated/floor/plating, /area/awaymission/UO71/science) "qy" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO71/eng) "qz" = ( @@ -8337,8 +8317,6 @@ /turf/simulated/floor/plating, /area/awaymission/UO71/science) "sF" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/door/poddoor/preopen{ id_tag = "UO71_Engineering"; name = "engineering security door" @@ -8346,6 +8324,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/universal{ dir = 4 }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO71/eng) "sG" = ( @@ -8810,7 +8789,8 @@ input_tag = "UO71_waste_in"; name = "Gas Mix Tank Control"; output_tag = "UO71_waste_out"; - sensors = list("UO71_waste_sensor"="Tank") + sensors = list("UO71_waste_sensor"="Tank"); + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 6 @@ -8948,7 +8928,8 @@ /area/awaymission/UO71/eng) "tW" = ( /obj/machinery/computer/security{ - network = list("UO71") + network = list("UO71"); + dir = 1 }, /obj/machinery/door_control{ desc = "A remote control-switch for the security privacy shutters."; @@ -8990,8 +8971,6 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/eng) "ua" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -8999,6 +8978,7 @@ id_tag = "UO71_Engineering"; name = "engineering security door" }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO71/eng) "ub" = ( @@ -9400,7 +9380,8 @@ input_tag = "UO71_n2_in"; name = "Nitrogen Supply Control"; output_tag = "UO71_n2_out"; - sensors = list("UO71_n2_sensor"="Tank") + sensors = list("UO71_n2_sensor"="Tank"); + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/plasteel{ @@ -9417,7 +9398,8 @@ input_tag = "UO71_o2_in"; name = "Oxygen Supply Control"; output_tag = "UO71_o2_out"; - sensors = list("UO71_o2_sensor"="Tank") + sensors = list("UO71_o2_sensor"="Tank"); + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -9513,7 +9495,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/computer/general_air_control{ name = "Tank Monitor"; - sensors = list("UO71_n2_sensor"="Nitrogen","UO71_o2_sensor"="Oxygen","UO71_waste_sensor"="Gas Mix Tank") + sensors = list("UO71_n2_sensor"="Nitrogen","UO71_o2_sensor"="Oxygen","UO71_waste_sensor"="Gas Mix Tank"); + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -9644,8 +9627,7 @@ }, /area/awaymission/UO71/medical) "vu" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO71/centralhall) "vv" = ( @@ -9696,7 +9678,8 @@ frequency = 1443; level = 3; name = "Distribution and Waste Monitor"; - sensors = list("UO71_mair_in_meter"="Mixed Air In","UO71_air_sensor"="Mixed Air Supply Tank","UO71_mair_out_meter"="Mixed Air Out","UO71_dloop_atm_meter"="Distribution Loop","UO71_wloop_atm_meter"="Waste Loop") + sensors = list("UO71_mair_in_meter"="Mixed Air In","UO71_air_sensor"="Mixed Air Supply Tank","UO71_mair_out_meter"="Mixed Air Out","UO71_dloop_atm_meter"="Distribution Loop","UO71_wloop_atm_meter"="Waste Loop"); + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -9923,11 +9906,10 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/bridge) "vZ" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO71/centralhall) "wa" = ( @@ -9970,7 +9952,9 @@ /area/awaymission/UO71/centralhall) "wf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/computer/atmos_alert, +/obj/machinery/computer/atmos_alert{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" @@ -10185,7 +10169,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/computer/station_alert, +/obj/machinery/computer/station_alert{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "caution" @@ -10412,8 +10398,6 @@ /turf/simulated/floor/plating, /area/awaymission/UO71/mining) "xf" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -10422,16 +10406,16 @@ d2 = 8; icon_state = "0-8" }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO71/eng) "xg" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ d2 = 4; icon_state = "0-4" }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO71/eng) "xh" = ( @@ -11015,11 +10999,6 @@ }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/mining) -"yl" = ( -/obj/structure/grille, -/obj/structure/window/full/basic, -/turf/simulated/floor/plating, -/area/awaymission/UO71/mining) "ym" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ @@ -11039,8 +11018,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/mining) "yp" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO71/mining) "yq" = ( @@ -11087,11 +11065,10 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/queen) "yv" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO71/mining) "yw" = ( @@ -11264,9 +11241,8 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/queen) "yR" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO71/mining) "yS" = ( @@ -11328,17 +11304,11 @@ }, /area/awaymission/UO71/outside) "zd" = ( -/turf/simulated/wall/indestructible{ - icon_state = "rock"; - name = "rock" - }, +/turf/simulated/wall/indestructible/rock, /area/awaymission/UO71/queen) "ze" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall/indestructible{ - icon_state = "rock"; - name = "rock" - }, +/turf/simulated/wall/indestructible/rock, /area/awaymission/UO71/queen) "zf" = ( /turf/simulated/floor/plasteel, @@ -11609,11 +11579,10 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/plaza) "CP" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) "Eb" = ( @@ -11701,10 +11670,7 @@ /turf/simulated/floor/vault, /area/awaymission/UO71/prince) "Lf" = ( -/turf/simulated/wall/indestructible{ - icon_state = "rock"; - name = "rock" - }, +/turf/simulated/wall/indestructible/rock, /area/awaymission/UO71/loot) "Lw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -11814,9 +11780,8 @@ /turf/simulated/mineral/random/labormineral, /area/awaymission/UO71/outside) "ZV" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO71/science) @@ -13912,9 +13877,9 @@ aa aa aa aa -ab -ab -ab +aa +aa +aa aa aa aa @@ -14062,9 +14027,9 @@ aa aa aa aa -ab -ab -ab +aa +aa +aa aa aa aa @@ -14212,9 +14177,9 @@ ab aa aa aa -ab -ab -ab +aa +aa +aa aa aa aa @@ -14362,9 +14327,9 @@ ab aa aa aa -ab -ab -ab +aa +aa +aa aa aa aa @@ -14512,9 +14477,9 @@ ab aa aa aa -ab -ab -ab +aa +aa +aa aa aa aa @@ -14662,9 +14627,9 @@ ab aa aa aa -ab -ab -ab +aa +aa +aa aa aa aa @@ -14812,12 +14777,12 @@ ab aa aa aa -ab -ab -ab -ab -ab -ab +aa +aa +aa +aa +aa +aa aa "} (21,1,1) = {" @@ -17740,9 +17705,9 @@ oj oj pF fO -mu +jM rj -mu +jM fO CE ol @@ -18783,7 +18748,7 @@ ab fO kZ lX -mu +jM nd nE oq @@ -18933,7 +18898,7 @@ ab fO la lX -mu +jM nf nG os @@ -19083,10 +19048,10 @@ jG kn lb lY -mu -mu -mu -mu +jM +jM +jM +jM pc fO pX @@ -19961,7 +19926,7 @@ ad Iq ad dx -at +dR ea ek CP @@ -20544,7 +20509,7 @@ ab ad al al -at +dR ax ax aK @@ -20694,7 +20659,7 @@ ab ad al al -at +dR aA aA aK @@ -20844,7 +20809,7 @@ ab ad al ar -at +dR az aA aK @@ -20994,7 +20959,7 @@ ab ac al ar -at +dR aC aG aK @@ -21612,7 +21577,7 @@ ac CP dG dU -at +dR dt eA ac @@ -21762,7 +21727,7 @@ ac CP dF al -at +dR ep ep ac @@ -22857,9 +22822,9 @@ xm vP wv wi -yl +yp yn -yl +yp yC xe wu diff --git a/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm b/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm index e017a9b2c40..ffa29907013 100644 --- a/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm @@ -1,9 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/turf/simulated/wall/indestructible{ - icon_state = "rock"; - name = "rock" - }, +/turf/simulated/wall/indestructible/rock, /area/awaymission/UO45/caves) "ac" = ( /turf/simulated/mineral/random/labormineral, @@ -227,11 +224,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel, /area/awaymission/UO45/central_hall) -"aP" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, -/turf/simulated/floor/plating, -/area/awaymission/UO45/central_hall) "aQ" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -1667,8 +1659,7 @@ }, /area/awaymission/UO45/central_hall) "el" = ( -/obj/structure/grille, -/obj/structure/window/full/basic, +/obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/central_hall) "em" = ( @@ -1868,7 +1859,7 @@ /area/awaymission/UO45/central_hall) "eK" = ( /obj/structure/alien/weeds, -/obj/structure/alien/resin/wall, +/obj/structure/alien/resin, /turf/simulated/floor/plating/asteroid/airless, /area/awaymission/UO45/caves) "eL" = ( @@ -2598,7 +2589,6 @@ /turf/simulated/floor/plating, /area/awaymission/UO45/central_hall) "gs" = ( -/obj/structure/grille, /obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/crew_quarters) @@ -2643,11 +2633,6 @@ tag = "icon-floorgrime (WEST)" }, /area/awaymission/UO45/crew_quarters) -"gC" = ( -/obj/structure/alien/resin/wall, -/obj/structure/alien/weeds, -/turf/simulated/floor/plating/asteroid/airless, -/area/awaymission/UO45/caves) "gD" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -2807,7 +2792,6 @@ }, /area/awaymission/UO45/gateaway) "gV" = ( -/obj/structure/grille, /obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/gateaway) @@ -3147,7 +3131,6 @@ }, /area/awaymission/UO45/research) "hH" = ( -/obj/structure/grille, /obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/research) @@ -3279,12 +3262,11 @@ }, /area/awaymission/UO45/crew_quarters) "hV" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4; level = 2 }, +/obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/crew_quarters) "hW" = ( @@ -3301,9 +3283,8 @@ }, /area/awaymission/UO45/crew_quarters) "hX" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/central_hall) "hY" = ( @@ -3388,7 +3369,8 @@ "ih" = ( /obj/machinery/computer/rdconsole/core{ id = 3; - req_access = null + req_access = null; + dir = 4 }, /turf/simulated/floor/plasteel, /area/awaymission/UO45/research) @@ -3730,11 +3712,10 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO45/gateaway) "iS" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/gateaway) "iT" = ( @@ -3919,11 +3900,10 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO45/gateaway) "jl" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/gateaway) "jm" = ( @@ -4171,14 +4151,8 @@ /turf/simulated/floor/plating/asteroid/airless, /area/awaymission/UO45/crew_quarters) "jN" = ( -/obj/structure/grille, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/window/full/basic, -/turf/simulated/floor/plating, -/area/awaymission/UO45/research) -"jO" = ( -/obj/structure/grille, -/obj/structure/window/full/basic, +/obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/research) "jP" = ( @@ -4370,7 +4344,6 @@ tag = "" }, /obj/machinery/door/airlock/command{ - icon_state = "door_closed"; name = "Gateway Chamber"; req_access = list(201) }, @@ -5090,7 +5063,6 @@ dir = 4 }, /obj/machinery/door/airlock/command{ - icon_state = "door_closed"; name = "Gateway Ready Room"; req_access = list(201) }, @@ -5551,22 +5523,22 @@ }, /area/awaymission/UO45/research) "mj" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id_tag = "UO45_rdprivacy"; - name = "privacy shutters" + name = "privacy shutters"; + dir = 1 }, +/obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/research) "mk" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/poddoor/shutters/preopen{ id_tag = "UO45_rdprivacy"; - name = "privacy shutters" + name = "privacy shutters"; + dir = 1 }, +/obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/research) "ml" = ( @@ -6104,7 +6076,8 @@ /area/awaymission/UO45/research) "no" = ( /obj/machinery/computer/security{ - network = list("UO45") + network = list("UO45"); + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -6891,7 +6864,9 @@ }, /area/awaymission/UO45/research) "oA" = ( -/obj/machinery/computer/aifixer, +/obj/machinery/computer/aifixer{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria"; @@ -7642,7 +7617,6 @@ /turf/simulated/floor/plating/asteroid/airless, /area/awaymission/UO45/gateaway) "qc" = ( -/obj/structure/grille, /obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/engineering) @@ -7653,25 +7627,23 @@ }, /area/awaymission/UO45/research) "qe" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/meter{ id = "UO45_mair_out_meter"; layer = 3.3; name = "Mixed Air Tank Out" }, /obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/engineering) "qf" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/atmospherics/pipe/simple/visible/cyan, /obj/machinery/meter{ id = "UO45_mair_in_meter"; layer = 3.3; name = "Mixed Air Tank In" }, +/obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/engineering) "qg" = ( @@ -7727,13 +7699,12 @@ }, /area/awaymission/UO45/research) "ql" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'SERVER ROOM'."; name = "SERVER ROOM"; pixel_y = 32 }, +/obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/research) "qm" = ( @@ -7874,12 +7845,6 @@ }, /turf/simulated/floor/plating/asteroid/airless, /area/awaymission/UO45/caves) -"qC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/purple{ - dir = 4 - }, -/turf/simulated/floor/plating/asteroid/airless, -/area/awaymission/UO45/engineering) "qD" = ( /obj/structure/cable{ d2 = 4; @@ -8235,9 +8200,8 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO45/crew_quarters) "rh" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/purple, +/obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/crew_quarters) "ri" = ( @@ -8422,7 +8386,9 @@ }, /area/awaymission/UO45/research) "rz" = ( -/obj/machinery/computer/rdservercontrol, +/obj/machinery/computer/rdservercontrol{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -8457,13 +8423,12 @@ /turf/simulated/floor/plating, /area/awaymission/UO45/research) "rC" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'SERVER ROOM'."; name = "SERVER ROOM"; pixel_y = -32 }, +/obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/research) "rD" = ( @@ -8893,8 +8858,6 @@ }, /area/awaymission/UO45/research) "si" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/door/poddoor/preopen{ id_tag = "UO45_Engineering"; name = "engineering security door" @@ -8902,6 +8865,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/universal{ dir = 4 }, +/obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/engineering) "sj" = ( @@ -8954,14 +8918,13 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO45/engineering) "sq" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, /obj/machinery/meter{ layer = 3.3 }, +/obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/engineering) "sr" = ( @@ -9253,7 +9216,8 @@ input_tag = "UO45_waste_in"; name = "Gas Mix Tank Control"; output_tag = "UO45_waste_out"; - sensors = list("UO45_waste_sensor"="Tank") + sensors = list("UO45_waste_sensor"="Tank"); + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 6 @@ -9331,14 +9295,13 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO45/engineering) "td" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/meter{ layer = 3.3 }, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, +/obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/engineering) "te" = ( @@ -9546,7 +9509,8 @@ /area/awaymission/UO45/engineering) "ty" = ( /obj/machinery/computer/security{ - network = list("UO45") + network = list("UO45"); + dir = 1 }, /obj/machinery/door_control{ desc = "A remote control-switch for the security privacy shutters."; @@ -9605,8 +9569,6 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO45/engineering) "tE" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -9614,6 +9576,7 @@ id_tag = "UO45_Engineering"; name = "engineering security door" }, +/obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/engineering) "tF" = ( @@ -9954,7 +9917,8 @@ input_tag = "UO45_n2_in"; name = "Nitrogen Supply Control"; output_tag = "UO45_n2_out"; - sensors = list("UO45_n2_sensor"="Tank") + sensors = list("UO45_n2_sensor"="Tank"); + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/plasteel{ @@ -9971,7 +9935,8 @@ input_tag = "UO45_o2_in"; name = "Oxygen Supply Control"; output_tag = "UO45_o2_out"; - sensors = list("UO45_o2_sensor"="Tank") + sensors = list("UO45_o2_sensor"="Tank"); + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -10041,7 +10006,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/computer/general_air_control{ name = "Tank Monitor"; - sensors = list("UO45_n2_sensor"="Nitrogen","UO45_o2_sensor"="Oxygen","UO45_waste_sensor"="Gas Mix Tank") + sensors = list("UO45_n2_sensor"="Nitrogen","UO45_o2_sensor"="Oxygen","UO45_waste_sensor"="Gas Mix Tank"); + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -10143,21 +10109,19 @@ /turf/simulated/wall/r_wall, /area/awaymission/UO45/engineering) "uJ" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/meter{ layer = 3.3 }, /obj/machinery/atmospherics/pipe/simple/visible/green, +/obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/engineering) "uK" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/meter{ layer = 3.3 }, /obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/engineering) "uL" = ( @@ -10224,7 +10188,8 @@ frequency = 1443; level = 3; name = "Distribution and Waste Monitor"; - sensors = list("UO45_mair_in_meter"="Mixed Air In","UO45_air_sensor"="Mixed Air Supply Tank","UO45_mair_out_meter"="Mixed Air Out","UO45_dloop_atm_meter"="Distribution Loop","UO45_wloop_atm_meter"="Waste Loop") + sensors = list("UO45_mair_in_meter"="Mixed Air In","UO45_air_sensor"="Mixed Air Supply Tank","UO45_mair_out_meter"="Mixed Air Out","UO45_dloop_atm_meter"="Distribution Loop","UO45_wloop_atm_meter"="Waste Loop"); + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -10417,11 +10382,10 @@ /turf/simulated/floor/plating/asteroid/airless, /area/awaymission/UO45/caves) "vn" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/crew_quarters) "vo" = ( @@ -10447,7 +10411,9 @@ /area/awaymission/UO45/crew_quarters) "vr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/computer/atmos_alert, +/obj/machinery/computer/atmos_alert{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" @@ -10578,7 +10544,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/computer/station_alert, +/obj/machinery/computer/station_alert{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "caution"; @@ -10864,8 +10832,6 @@ /turf/simulated/floor/plating/asteroid/airless, /area/awaymission/UO45/caves) "wl" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -10874,16 +10840,16 @@ d2 = 8; icon_state = "0-8" }, +/obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/engineering) "wm" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ d2 = 4; icon_state = "0-4" }, +/obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/engineering) "wn" = ( @@ -10972,7 +10938,6 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO45/mining) "wx" = ( -/obj/structure/grille, /obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/mining) @@ -11341,14 +11306,17 @@ }, /area/awaymission/UO45/engineering) "xf" = ( -/obj/machinery/computer/station_alert, +/obj/machinery/computer/station_alert{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, /area/awaymission/UO45/engineering) "xg" = ( /obj/machinery/computer/monitor{ - name = "primary power monitoring console" + name = "primary power monitoring console"; + dir = 1 }, /obj/structure/cable, /turf/simulated/floor/plasteel{ @@ -11380,7 +11348,9 @@ /area/awaymission/UO45/mining) "xj" = ( /obj/machinery/light/small, -/obj/machinery/computer/atmos_alert, +/obj/machinery/computer/atmos_alert{ + dir = 1 + }, /obj/machinery/door_control{ desc = "A remote control-switch for the engineering security doors."; id = "UO45_Engineering"; @@ -11479,11 +11449,6 @@ }, /turf/simulated/floor/plasteel, /area/awaymission/UO45/mining) -"xt" = ( -/obj/structure/grille, -/obj/structure/window/full/basic, -/turf/simulated/floor/plating, -/area/awaymission/UO45/mining) "xu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ @@ -11550,11 +11515,10 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO45/mining) "xC" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/mining) "xD" = ( @@ -11661,7 +11625,9 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO45/mining) "xR" = ( -/obj/machinery/computer/mech_bay_power_console, +/obj/machinery/computer/mech_bay_power_console{ + dir = 1 + }, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -11691,9 +11657,8 @@ /turf/simulated/floor/plating, /area/awaymission/UO45/mining) "xY" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/window/full/reinforced, /turf/simulated/floor/plating, /area/awaymission/UO45/mining) "ye" = ( @@ -11857,7 +11822,7 @@ /turf/simulated/floor/plating/asteroid/airless, /area/awaymission/UO45/caves) "yz" = ( -/obj/structure/alien/resin/membrane, +/obj/structure/alien/resin, /turf/simulated/floor/plating/asteroid/airless, /area/awaymission/UO45/caves) "yA" = ( @@ -14471,7 +14436,7 @@ ac yf yr eK -gC +eK ac ac ac @@ -15383,7 +15348,7 @@ fo fo fo eK -gC +eK ac ac ac @@ -17713,7 +17678,7 @@ ii iz hb gY -jO +hH kk kP lH @@ -19523,7 +19488,7 @@ ns mV mV kX -jO +hH qq qV rG @@ -20095,10 +20060,10 @@ aC bt am dR -aP +el ex eM -aP +el ad fD aB @@ -20229,8 +20194,8 @@ aC aE aL aB -aP -aP +el +el aB aC bw @@ -20678,7 +20643,7 @@ aA am aF aH -aP +el aU aU bf @@ -20828,7 +20793,7 @@ an an aH aH -aP +el aX bc bh @@ -20978,7 +20943,7 @@ ar an aH aM -aP +el aW bb bh @@ -21128,7 +21093,7 @@ aA ad aH aM -aP +el aZ bd bh @@ -21152,7 +21117,7 @@ el fq fF aM -aP +el fo fo fo @@ -21302,7 +21267,7 @@ aY fs fH fX -aP +el fo fo fo @@ -21452,7 +21417,7 @@ eo eo fJ fZ -aP +el fo fo fo @@ -21579,10 +21544,10 @@ aB aJ aN aB -aP -aP -aP -aP +el +el +el +el aB aC aB @@ -21743,10 +21708,10 @@ aB aC aC aB -aP +el ea ep -aP +el dN fe ad @@ -21893,10 +21858,10 @@ cn cu dd aB -aP +el dZ aH -aP +el eR fd ad @@ -22199,7 +22164,7 @@ eq aH aH ff -aP +el fo fo fo @@ -22349,7 +22314,7 @@ ec ec ec ff -aP +el fo fo he @@ -22499,7 +22464,7 @@ aH aH eT ff -aP +el fo fo fo @@ -22649,7 +22614,7 @@ ec ec ec fg -aP +el fo fo fo @@ -22991,9 +22956,9 @@ wt vR vL vW -xt +wx xy -xt +wx xN xm vJ @@ -23239,7 +23204,7 @@ ac fo fo fo -aP +el cR dg aC @@ -23389,7 +23354,7 @@ ac ac he fo -aP +el cQ dh cp @@ -24445,9 +24410,9 @@ ac ac ac ad -aP +el eJ -aP +el am fo fo @@ -25522,7 +25487,7 @@ fo fo fo fo -qC +qA nj lo ri diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index f1158709fac..22f349dab98 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -401,7 +401,8 @@ /obj/machinery/light_switch{ name = "custom light switch"; pixel_x = -25; - pixel_y = -8 + pixel_y = -8; + dir = 4 }, /turf/simulated/floor/plasteel, /area/security/main) @@ -1966,7 +1967,7 @@ "ahW" = ( /obj/item/radio/intercom/department/security{ name = "north station intercom (Security)"; - pixel_y = 25 + pixel_y = 22 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -2353,7 +2354,7 @@ }, /obj/structure/chair/stool/bar, /turf/simulated/floor/wood, -/area/maintenance/bar) +/area/maintenance/kitchen) "ajf" = ( /obj/structure/weightmachine/stacklifter, /obj/machinery/atmospherics/unary/outlet_injector/on{ @@ -2912,7 +2913,8 @@ /obj/effect/decal/warning_stripes/east, /obj/item/radio/intercom/department/security{ name = "west station intercom (Security)"; - pixel_x = -28 + pixel_x = -22; + dir = 4 }, /turf/simulated/floor/plasteel, /area/security/podbay) @@ -4412,7 +4414,9 @@ }, /area/security/lobby) "aom" = ( -/obj/machinery/computer/brigcells, +/obj/machinery/computer/brigcells{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkred" @@ -5590,7 +5594,8 @@ /area/security/lobby) "arl" = ( /obj/machinery/computer/security{ - network = list("SS13","Research Outpost","Mining Outpost") + network = list("SS13","Research Outpost","Mining Outpost"); + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -6138,7 +6143,8 @@ /obj/machinery/computer/area_atmos/area, /obj/item/radio/intercom/department/security{ name = "west station intercom (Security)"; - pixel_x = -28 + pixel_x = -22; + dir = 4 }, /turf/simulated/floor/plasteel, /area/security/permabrig) @@ -6393,7 +6399,9 @@ }, /area/security/brig) "asX" = ( -/obj/machinery/computer/secure_data, +/obj/machinery/computer/secure_data{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkred" @@ -6761,10 +6769,11 @@ "atT" = ( /obj/structure/rack, /obj/item/storage/firstaid/regular{ - pixel_x = 2; + pixel_y = 4 + }, +/obj/item/storage/firstaid/regular{ pixel_y = 2 }, -/obj/item/storage/firstaid/regular, /obj/machinery/light{ dir = 1 }, @@ -7227,7 +7236,8 @@ }, /obj/item/radio/intercom/department/security{ name = "west station intercom (Security)"; - pixel_x = -28 + pixel_x = -22; + dir = 4 }, /obj/machinery/button/windowtint{ id = "processing"; @@ -8097,7 +8107,8 @@ /obj/machinery/light_switch{ name = "custom light switch"; pixel_x = -5; - pixel_y = -24 + pixel_y = -24; + dir = 1 }, /turf/simulated/floor/plasteel, /area/security/permabrig) @@ -9263,7 +9274,7 @@ /obj/structure/chair/stool/bar, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/wood, -/area/maintenance/bar) +/area/maintenance/kitchen) "azT" = ( /obj/machinery/door/airlock/external{ frequency = 1450; @@ -9347,7 +9358,7 @@ broken = 1; icon_state = "wood-broken" }, -/area/maintenance/bar) +/area/maintenance/kitchen) "aAc" = ( /obj/structure/grille/broken, /turf/simulated/floor/plating, @@ -9358,11 +9369,11 @@ /area/maintenance/auxsolarport) "aAf" = ( /turf/simulated/wall, -/area/maintenance/bar) +/area/maintenance/kitchen) "aAg" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, -/area/maintenance/bar) +/area/maintenance/kitchen) "aAk" = ( /obj/structure/morgue{ dir = 8 @@ -9549,7 +9560,7 @@ /obj/structure/chair/stool/bar, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/wood, -/area/maintenance/bar) +/area/maintenance/kitchen) "aAO" = ( /obj/structure/chair/comfy/brown, /obj/effect/landmark/start/magistrate, @@ -9658,7 +9669,7 @@ /obj/effect/decal/cleanable/dust, /obj/item/deck/tarot, /turf/simulated/floor/wood, -/area/maintenance/bar) +/area/maintenance/kitchen) "aBd" = ( /obj/structure/chair/wood/wings{ dir = 4 @@ -9666,7 +9677,7 @@ /obj/effect/decal/cleanable/dust, /obj/structure/spider/stickyweb, /turf/simulated/floor/plating, -/area/maintenance/bar) +/area/maintenance/kitchen) "aBe" = ( /obj/structure/chair/wood/wings{ dir = 8 @@ -9678,21 +9689,21 @@ broken = 1; icon_state = "wood-broken" }, -/area/maintenance/bar) +/area/maintenance/kitchen) "aBf" = ( /obj/structure/chair/wood/wings{ dir = 4 }, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/wood, -/area/maintenance/bar) +/area/maintenance/kitchen) "aBg" = ( /turf/simulated/floor/wood, -/area/maintenance/bar) +/area/maintenance/kitchen) "aBh" = ( /obj/item/stack/tile/wood, /turf/simulated/floor/plating, -/area/maintenance/bar) +/area/maintenance/kitchen) "aBi" = ( /obj/structure/table/reinforced, /obj/item/taperecorder{ @@ -9709,7 +9720,7 @@ /obj/effect/decal/cleanable/dust, /obj/structure/spider/stickyweb, /turf/simulated/floor/plating, -/area/maintenance/bar) +/area/maintenance/kitchen) "aBm" = ( /obj/structure/closet/boxinggloves, /turf/simulated/floor/plasteel, @@ -9953,7 +9964,7 @@ pixel_y = 32 }, /turf/simulated/wall, -/area/maintenance/bar) +/area/maintenance/kitchen) "aBV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -9968,7 +9979,7 @@ broken = 1; icon_state = "wood-broken" }, -/area/maintenance/bar) +/area/maintenance/kitchen) "aBW" = ( /obj/structure/sink/kitchen{ pixel_y = 25 @@ -9982,7 +9993,7 @@ broken = 1; icon_state = "wood-broken" }, -/area/maintenance/bar) +/area/maintenance/kitchen) "aBX" = ( /obj/item/trash/liquidfood, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -9996,7 +10007,7 @@ }, /mob/living/simple_animal/mouse/white, /turf/simulated/floor/wood, -/area/maintenance/bar) +/area/maintenance/kitchen) "aBY" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -10304,11 +10315,11 @@ dir = 9; icon_regular_floor = "escape" }, -/area/maintenance/bar) +/area/maintenance/kitchen) "aCN" = ( /obj/effect/decal/cleanable/fungus, /turf/simulated/wall, -/area/maintenance/bar) +/area/maintenance/kitchen) "aCO" = ( /obj/structure/toilet{ dir = 4 @@ -10325,7 +10336,7 @@ /area/maintenance/fsmaint2) "aCP" = ( /turf/simulated/wall/rust, -/area/maintenance/bar) +/area/maintenance/kitchen) "aCQ" = ( /obj/structure/window/reinforced{ dir = 4 @@ -10343,7 +10354,7 @@ dir = 5; icon_regular_floor = "escape" }, -/area/maintenance/bar) +/area/maintenance/kitchen) "aCR" = ( /obj/structure/window/reinforced{ dir = 1 @@ -10358,7 +10369,7 @@ dir = 1; icon_state = "escape" }, -/area/maintenance/bar) +/area/maintenance/kitchen) "aCS" = ( /obj/item/lighter/random, /obj/effect/decal/cleanable/dust, @@ -10366,14 +10377,14 @@ broken = 1; icon_state = "wood-broken" }, -/area/maintenance/bar) +/area/maintenance/kitchen) "aCU" = ( /obj/structure/chair/wood/wings{ dir = 8 }, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/wood, -/area/maintenance/bar) +/area/maintenance/kitchen) "aCV" = ( /obj/structure/table/wood, /obj/item/trash/plate, @@ -10381,14 +10392,14 @@ /obj/item/melee/baseball_bat, /obj/item/clothing/mask/bandana/skull, /turf/simulated/floor/wood, -/area/maintenance/bar) +/area/maintenance/kitchen) "aCW" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/bottle/patron, /obj/item/storage/fancy/cigarettes/cigpack_shadyjims, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/plating, -/area/maintenance/bar) +/area/maintenance/kitchen) "aCX" = ( /turf/simulated/floor/wood{ icon_state = "wood-broken3" @@ -10554,7 +10565,7 @@ /area/maintenance/library) "aDs" = ( /turf/simulated/floor/plating, -/area/maintenance/bar) +/area/maintenance/kitchen) "aDt" = ( /obj/structure/cable{ icon_state = "4-8" @@ -10778,7 +10789,7 @@ dir = 8; icon_state = "escape" }, -/area/maintenance/bar) +/area/maintenance/kitchen) "aDW" = ( /obj/structure/door_assembly{ anchored = 1 @@ -10789,7 +10800,7 @@ }, /obj/structure/spider/stickyweb, /turf/simulated/floor/plating, -/area/maintenance/bar) +/area/maintenance/kitchen) "aDX" = ( /obj/item/shard{ icon_state = "small" @@ -10800,12 +10811,12 @@ dir = 4; icon_regular_floor = "escape" }, -/area/maintenance/bar) +/area/maintenance/kitchen) "aDY" = ( /obj/item/stack/tile/plasteel, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/plating, -/area/maintenance/bar) +/area/maintenance/kitchen) "aDZ" = ( /obj/structure/chair/wood/wings{ dir = 8 @@ -10826,7 +10837,7 @@ broken = 1; icon_state = "wood-broken" }, -/area/maintenance/bar) +/area/maintenance/kitchen) "aEb" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; @@ -10840,7 +10851,7 @@ /obj/machinery/vending/boozeomat, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/plating, -/area/maintenance/bar) +/area/maintenance/kitchen) "aEg" = ( /obj/structure/filingcabinet, /turf/simulated/floor/plasteel{ @@ -11005,7 +11016,7 @@ "aEx" = ( /obj/effect/decal/cleanable/dust, /turf/simulated/floor/plating, -/area/maintenance/bar) +/area/maintenance/kitchen) "aEy" = ( /obj/structure/sign/poster/contraband/rebels_unite{ pixel_y = -32 @@ -11021,7 +11032,7 @@ }, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, -/area/maintenance/bar) +/area/maintenance/kitchen) "aEA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -11207,7 +11218,7 @@ dir = 10; icon_regular_floor = "escape" }, -/area/maintenance/bar) +/area/maintenance/kitchen) "aEV" = ( /obj/structure/window/reinforced{ dir = 4 @@ -11218,7 +11229,7 @@ dir = 6; icon_state = "escape" }, -/area/maintenance/bar) +/area/maintenance/kitchen) "aEW" = ( /obj/item/stack/rods, /obj/effect/decal/cleanable/dust, @@ -11226,7 +11237,7 @@ /turf/simulated/floor/plasteel{ icon_state = "escape" }, -/area/maintenance/bar) +/area/maintenance/kitchen) "aEX" = ( /obj/item/trash/pistachios, /obj/machinery/light_construct, @@ -11235,7 +11246,7 @@ broken = 1; icon_state = "wood-broken" }, -/area/maintenance/bar) +/area/maintenance/kitchen) "aFa" = ( /obj/structure/sign/poster/contraband/random{ pixel_x = 32 @@ -11246,14 +11257,14 @@ broken = 1; icon_state = "wood-broken" }, -/area/maintenance/bar) +/area/maintenance/kitchen) "aFb" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/condiment/saltshaker, /obj/item/reagent_containers/food/condiment/peppermill, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/plating, -/area/maintenance/bar) +/area/maintenance/kitchen) "aFc" = ( /obj/structure/chair/stool, /obj/structure/sign/poster/contraband/random{ @@ -11520,7 +11531,7 @@ dir = 4; icon_state = "whitecorner" }, -/area/maintenance/bar) +/area/maintenance/kitchen) "aFO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -11637,11 +11648,11 @@ broken = 1; icon_state = "wood-broken" }, -/area/maintenance/bar) +/area/maintenance/kitchen) "aGd" = ( /obj/effect/decal/cleanable/fungus, /turf/simulated/wall/rust, -/area/maintenance/bar) +/area/maintenance/kitchen) "aGe" = ( /obj/structure/table, /obj/item/restraints/handcuffs/cable, @@ -12843,7 +12854,8 @@ /obj/structure/table/wood, /obj/item/radio/intercom/department/security{ name = "south station intercom (Security)"; - pixel_y = -28 + pixel_y = -22; + dir = 1 }, /obj/structure/cable{ icon_state = "1-8" @@ -12965,7 +12977,8 @@ /obj/structure/table/reinforced, /obj/item/clothing/gloves/color/yellow/power, /obj/item/radio/intercom{ - pixel_y = -28 + pixel_y = -22; + dir = 1 }, /obj/item/clothing/glasses/welding{ pixel_y = 8; @@ -14375,19 +14388,9 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/central/nw) "aNH" = ( -/obj/structure/grille, -/obj/structure/window/basic, -/obj/structure/window/basic{ - dir = 1 - }, -/obj/structure/window/basic{ - dir = 8 - }, -/obj/structure/window/basic{ - dir = 4 - }, +/obj/effect/spawner/window, /turf/simulated/floor/plating, -/area/maintenance/fpmaint) +/area/hallway/secondary/entry) "aNI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -14964,7 +14967,7 @@ }, /area/civilian/barber) "aPf" = ( -/obj/effect/spawner/window/reinforced, +/obj/structure/window/full/basic, /turf/simulated/floor/plating, /area/crew_quarters/arcade) "aPg" = ( @@ -16118,7 +16121,7 @@ }, /area/crew_quarters/dorms) "aSl" = ( -/obj/effect/spawner/window/reinforced, +/obj/structure/window/full/basic, /turf/simulated/floor/plating, /area/crew_quarters/sleep) "aSm" = ( @@ -16480,7 +16483,7 @@ /obj/machinery/fishtank/tank, /obj/item/tank_brush, /turf/simulated/floor/plating, -/area/maintenance/bar) +/area/maintenance/kitchen) "aTm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack{ @@ -18106,7 +18109,8 @@ "aXE" = ( /obj/item/radio/intercom/department/security{ name = "east station intercom (Security)"; - pixel_x = 28 + pixel_x = 22; + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -18551,7 +18555,8 @@ /obj/item/radio, /obj/item/radio/intercom/department/security{ name = "south station intercom (Security)"; - pixel_y = -28 + pixel_y = -22; + dir = 1 }, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ @@ -20764,7 +20769,7 @@ }, /area/hallway/primary/port) "beP" = ( -/obj/effect/spawner/window/reinforced, +/obj/effect/spawner/window, /turf/simulated/floor/plating, /area/hallway/secondary/garden) "beQ" = ( @@ -20775,7 +20780,7 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/garden) "beR" = ( -/obj/effect/spawner/window/reinforced, +/obj/effect/spawner/window, /turf/simulated/floor/plating, /area/storage/primary) "beS" = ( @@ -20799,8 +20804,8 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/dorms) "beU" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/disposalpipe/segment, +/obj/effect/spawner/window, /turf/simulated/floor/plating, /area/storage/primary) "beV" = ( @@ -20869,8 +20874,9 @@ dir = 4 }, /obj/machinery/poolcontroller{ - pixel_y = -25; - srange = 7 + pixel_y = -24; + srange = 7; + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -21610,7 +21616,7 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/central/nw) "bgT" = ( -/obj/effect/spawner/window/reinforced, +/obj/structure/window/full/basic, /turf/simulated/floor/plating, /area/crew_quarters/mrchangs) "bgU" = ( @@ -36836,7 +36842,7 @@ "cdl" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/bar) +/area/maintenance/kitchen) "cdx" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -37366,7 +37372,7 @@ "cfY" = ( /obj/item/radio/intercom/department/security{ name = "north station intercom (Security)"; - pixel_y = 25 + pixel_y = 22 }, /turf/simulated/floor/plasteel, /area/security/main) @@ -37610,7 +37616,9 @@ /turf/simulated/wall/r_wall, /area/toxins/launch) "cgH" = ( -/obj/machinery/computer/shuttle/mining, +/obj/machinery/computer/shuttle/mining{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "brown" @@ -41724,7 +41732,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/turf/simulated/wall/r_wall/coated, +/turf/simulated/wall/r_wall, /area/maintenance/incinerator) "cBa" = ( /obj/machinery/atmospherics/pipe/simple/visible, @@ -42858,9 +42866,6 @@ /obj/machinery/light/small, /turf/simulated/floor/plating/airless, /area/toxins/test_area) -"cEU" = ( -/turf/simulated/wall/r_wall/coated, -/area/maintenance/incinerator) "cEW" = ( /turf/simulated/wall/r_wall, /area/engine/mechanic_workshop) @@ -48086,17 +48091,7 @@ /turf/simulated/floor/plasteel, /area/atmos/distribution) "cTo" = ( -/obj/structure/grille, -/obj/structure/window/plasmareinforced{ - dir = 4 - }, -/obj/structure/window/plasmareinforced{ - dir = 8 - }, -/obj/structure/window/plasmareinforced, -/obj/structure/window/plasmareinforced{ - dir = 1 - }, +/obj/effect/spawner/window/reinforced/plasma, /turf/simulated/floor/plating, /area/atmos) "cTp" = ( @@ -50429,7 +50424,8 @@ /obj/machinery/light_switch{ name = "custom light switch"; pixel_x = -24; - pixel_y = 8 + pixel_y = 8; + dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -55809,7 +55805,9 @@ /area/maintenance/asmaint) "dnK" = ( /obj/structure/table, -/obj/machinery/smartfridge/disks, +/obj/machinery/smartfridge/disks{ + pixel_y = 2 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -57324,11 +57322,6 @@ icon_state = "whiteblue" }, /area/security/medbay) -"dBZ" = ( -/obj/structure/bed, -/obj/item/bedsheet/patriot, -/turf/simulated/floor/carpet, -/area/security/permabrig) "dCK" = ( /obj/structure/reagent_dispensers/fueltank, /obj/machinery/power/apc{ @@ -58764,7 +58757,7 @@ "eje" = ( /obj/structure/chair/sofa/corner{ color = "#85130b"; - dir = 1 + dir = 4 }, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/wood, @@ -60656,7 +60649,7 @@ /obj/machinery/door/airlock, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/bar) +/area/maintenance/kitchen) "fej" = ( /obj/structure/cable{ icon_state = "2-4" @@ -63073,7 +63066,7 @@ "gjk" = ( /obj/effect/decal/ants, /turf/simulated/floor/wood, -/area/maintenance/bar) +/area/maintenance/kitchen) "gjs" = ( /obj/machinery/atmospherics/unary/portables_connector, /turf/simulated/floor/plating, @@ -65984,7 +65977,6 @@ }, /obj/machinery/door/poddoor{ density = 0; - icon_state = "pdoor0"; id_tag = "xenosecure"; name = "Secure Creature Cell"; opacity = 0 @@ -66172,7 +66164,7 @@ /obj/effect/decal/cleanable/dust, /obj/item/storage/pill_bottle/random_drug_bottle, /turf/simulated/floor/plating, -/area/maintenance/bar) +/area/maintenance/kitchen) "hTt" = ( /obj/effect/decal/cleanable/dust, /obj/effect/decal/cleanable/cobweb2, @@ -66331,7 +66323,7 @@ dir = 1 }, /turf/simulated/floor/wood, -/area/maintenance/bar) +/area/maintenance/kitchen) "hYH" = ( /obj/structure/table/reinforced, /obj/machinery/door_control{ @@ -66812,7 +66804,7 @@ broken = 1; icon_state = "wood-broken" }, -/area/maintenance/bar) +/area/maintenance/kitchen) "ilo" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -69584,7 +69576,7 @@ icon_state = "1-2" }, /turf/simulated/floor/wood, -/area/maintenance/bar) +/area/maintenance/kitchen) "jwG" = ( /obj/machinery/light, /obj/machinery/light_switch{ @@ -69707,7 +69699,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/maintenance/bar) +/area/maintenance/kitchen) "jzr" = ( /obj/machinery/computer/prisoner{ req_access = list(2); @@ -69843,7 +69835,7 @@ }, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/plating, -/area/maintenance/bar) +/area/maintenance/kitchen) "jCM" = ( /obj/structure/table, /obj/item/storage/box/masks{ @@ -70152,7 +70144,7 @@ broken = 1; icon_state = "wood-broken" }, -/area/maintenance/bar) +/area/maintenance/kitchen) "jNU" = ( /obj/structure/table, /obj/item/toolbox_tiles, @@ -71079,10 +71071,11 @@ "klq" = ( /obj/structure/rack, /obj/item/storage/firstaid/toxin{ - pixel_x = 2; + pixel_y = 4 + }, +/obj/item/storage/firstaid/toxin{ pixel_y = 2 }, -/obj/item/storage/firstaid/toxin, /obj/machinery/light{ dir = 1 }, @@ -72081,7 +72074,7 @@ pixel_x = 32 }, /turf/simulated/floor/plating, -/area/maintenance/bar) +/area/maintenance/kitchen) "kGe" = ( /obj/effect/decal/cleanable/dust, /obj/machinery/light_construct{ @@ -73381,7 +73374,7 @@ icon_state = "4-8" }, /turf/simulated/floor/wood, -/area/maintenance/bar) +/area/maintenance/kitchen) "lhQ" = ( /obj/machinery/light_switch{ name = "west light switch"; @@ -73434,7 +73427,7 @@ "lix" = ( /obj/item/radio/intercom/department/security{ name = "north station intercom (Security)"; - pixel_y = 25 + pixel_y = 22 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -74575,7 +74568,7 @@ /obj/effect/decal/cleanable/dust, /obj/item/stack/spacecash/c10, /turf/simulated/floor/wood, -/area/maintenance/bar) +/area/maintenance/kitchen) "lIm" = ( /obj/item/stack/rods, /obj/effect/spawner/random_spawners/oil_maybe, @@ -74625,8 +74618,12 @@ /turf/simulated/floor/plating, /area/maintenance/gambling_den) "lIJ" = ( -/obj/structure/bed, -/obj/item/bedsheet/brown, +/obj/structure/bed{ + dir = 4 + }, +/obj/item/bedsheet/brown{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/security/permabrig) "lIQ" = ( @@ -74636,7 +74633,8 @@ /obj/item/pen, /obj/item/radio/intercom/department/security{ name = "south station intercom (Security)"; - pixel_y = -28 + pixel_y = -22; + dir = 1 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -75088,7 +75086,7 @@ /obj/effect/spawner/lootdrop/maintenance, /obj/structure/spider/stickyweb, /turf/simulated/floor/plating, -/area/maintenance/bar) +/area/maintenance/kitchen) "lVv" = ( /obj/machinery/light{ dir = 4 @@ -76148,10 +76146,11 @@ "mtO" = ( /obj/structure/rack, /obj/item/storage/firstaid/fire{ - pixel_x = 2; + pixel_y = 4 + }, +/obj/item/storage/firstaid/fire{ pixel_y = 2 }, -/obj/item/storage/firstaid/fire, /obj/machinery/camera{ c_tag = "Medbay Storage" }, @@ -77098,7 +77097,7 @@ }, /obj/structure/spider/stickyweb, /turf/simulated/floor/wood, -/area/maintenance/bar) +/area/maintenance/kitchen) "mQz" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -77242,7 +77241,7 @@ "mST" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/wood, -/area/maintenance/bar) +/area/maintenance/kitchen) "mTD" = ( /obj/structure/cable{ icon_state = "4-8" @@ -77351,10 +77350,11 @@ "mXo" = ( /obj/structure/rack, /obj/item/storage/firstaid/o2{ - pixel_x = 2; + pixel_y = 4 + }, +/obj/item/storage/firstaid/o2{ pixel_y = 2 }, -/obj/item/storage/firstaid/o2, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -78059,7 +78059,8 @@ }, /obj/item/radio/intercom/department/security{ name = "south station intercom (Security)"; - pixel_y = -28 + pixel_y = -22; + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -79143,7 +79144,7 @@ /obj/structure/spider/stickyweb, /obj/structure/coatrack, /turf/simulated/floor/wood, -/area/maintenance/bar) +/area/maintenance/kitchen) "nNj" = ( /obj/effect/decal/warning_stripes/yellow, /obj/item/radio/intercom{ @@ -80119,7 +80120,7 @@ /obj/effect/decal/cleanable/dust, /obj/structure/spider/stickyweb, /turf/simulated/floor/wood, -/area/maintenance/bar) +/area/maintenance/kitchen) "onN" = ( /obj/machinery/kitchen_machine/microwave{ pixel_x = -3; @@ -80467,7 +80468,9 @@ /area/toxins/mixing) "owE" = ( /obj/structure/table, -/obj/machinery/computer/library, +/obj/machinery/computer/library{ + pixel_y = 8 + }, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/wood, /area/security/permabrig) @@ -81852,7 +81855,7 @@ /turf/simulated/floor/wood{ icon_state = "wood-broken5" }, -/area/maintenance/bar) +/area/maintenance/kitchen) "pex" = ( /obj/effect/decal/cleanable/crayon{ color = "#cc3300"; @@ -83606,7 +83609,7 @@ /turf/simulated/floor/wood{ icon_state = "wood-broken3" }, -/area/maintenance/bar) +/area/maintenance/kitchen) "pWA" = ( /obj/structure/girder, /obj/structure/sign/poster/contraband/missing_gloves{ @@ -83903,7 +83906,7 @@ dir = 8; icon_state = "whitecorner" }, -/area/maintenance/bar) +/area/maintenance/kitchen) "qfk" = ( /obj/structure/window/reinforced{ dir = 4 @@ -84436,7 +84439,7 @@ /turf/simulated/floor/wood{ icon_state = "wood-broken7" }, -/area/maintenance/bar) +/area/maintenance/kitchen) "qqf" = ( /obj/structure/table, /obj/item/stack/sheet/metal{ @@ -85237,8 +85240,12 @@ }, /area/medical/morgue) "qHH" = ( -/obj/structure/bed, -/obj/item/bedsheet/orange, +/obj/structure/bed{ + dir = 4 + }, +/obj/item/bedsheet/orange{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/security/permabrig) "qIc" = ( @@ -86528,7 +86535,9 @@ /area/security/interrogation) "rns" = ( /obj/effect/decal/cleanable/dust, -/obj/structure/computerframe, +/obj/structure/computerframe{ + dir = 1 + }, /turf/simulated/floor/engine, /area/maintenance/server) "rnI" = ( @@ -87076,6 +87085,12 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/bed{ + dir = 4 + }, +/obj/item/bedsheet/patriot{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/security/permabrig) "rBq" = ( @@ -88721,7 +88736,7 @@ "sue" = ( /obj/effect/decal/cleanable/dust, /turf/simulated/floor/wood, -/area/maintenance/bar) +/area/maintenance/kitchen) "suf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random_spawners/oil_maybe, @@ -91409,7 +91424,9 @@ pixel_y = -22; dir = 1 }, -/obj/machinery/computer/drone_control, +/obj/machinery/computer/drone_control{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/engine/controlroom) "tIs" = ( @@ -91530,7 +91547,8 @@ }, /obj/structure/rack, /obj/item/radio/intercom{ - pixel_y = -28 + pixel_y = -22; + dir = 1 }, /obj/item/gun/energy/kinetic_accelerator{ pixel_y = -2; @@ -92471,7 +92489,7 @@ icon_state = "1-2" }, /turf/simulated/floor/wood, -/area/maintenance/bar) +/area/maintenance/kitchen) "ulV" = ( /obj/effect/spawner/random_spawners/grille_maybe, /obj/machinery/atmospherics/pipe/simple/hidden, @@ -93257,7 +93275,7 @@ /obj/item/toy/figure/bartender, /obj/structure/spider/stickyweb, /turf/simulated/floor/wood, -/area/maintenance/bar) +/area/maintenance/kitchen) "uIC" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -94363,7 +94381,8 @@ /obj/structure/table/wood, /obj/item/radio/intercom/department/security{ name = "east station intercom (Security)"; - pixel_x = 28 + pixel_x = 22; + dir = 8 }, /obj/item/reagent_containers/food/drinks/flask/detflask{ pixel_y = 4; @@ -94503,7 +94522,7 @@ icon_state = "2-8" }, /turf/simulated/floor/wood, -/area/maintenance/bar) +/area/maintenance/kitchen) "viu" = ( /obj/structure/cable{ icon_state = "1-2" @@ -94670,7 +94689,7 @@ icon_state = "1-2" }, /turf/simulated/floor/wood, -/area/maintenance/bar) +/area/maintenance/kitchen) "vlO" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -95144,7 +95163,6 @@ }, /obj/machinery/door/poddoor{ density = 0; - icon_state = "pdoor0"; id_tag = "xenosecure"; name = "Secure Creature Cell"; opacity = 0 @@ -97176,7 +97194,8 @@ /obj/machinery/light_switch{ name = "custom light switch"; pixel_x = -25; - pixel_y = -8 + pixel_y = -8; + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -97898,7 +97917,7 @@ /obj/effect/decal/cleanable/dust, /obj/structure/spider/stickyweb, /turf/simulated/floor/wood, -/area/maintenance/bar) +/area/maintenance/kitchen) "wQm" = ( /obj/machinery/alarm{ dir = 4; @@ -98592,7 +98611,7 @@ "xgQ" = ( /obj/effect/decal/cleanable/vomit, /turf/simulated/floor/wood, -/area/maintenance/bar) +/area/maintenance/kitchen) "xgY" = ( /obj/structure/table, /obj/item/reagent_containers/food/snacks/donut, @@ -100682,10 +100701,11 @@ "yfV" = ( /obj/structure/rack, /obj/item/storage/firstaid/brute{ - pixel_x = 2; + pixel_y = 4 + }, +/obj/item/storage/firstaid/brute{ pixel_y = 2 }, -/obj/item/storage/firstaid/brute, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -113938,10 +113958,10 @@ aVc aVc bgk bhE -aSd -aSd -aSd -aSd +aNH +aNH +aNH +aNH bre bgG bqr @@ -116970,7 +116990,7 @@ uTI uTI amW abN -dBZ +aqs aqs qHH abN @@ -117323,11 +117343,11 @@ jUI jil bCf bTz -cEU +cwx cBi cBi cBi -cEU +cwx uTI uTI uTI @@ -117580,11 +117600,11 @@ bCf bCf bCf bTz -cEU +cwx cBg cCw cDP -cEU +cwx uTI uTI uTI @@ -117837,11 +117857,11 @@ coL cvl cgQ bTz -cEU +cwx cAX cCx cAX -cEU +cwx uTI uTI uTI @@ -118094,11 +118114,11 @@ vXN nfm cgQ bTz -cEU +cwx cBj cCq cDU -cEU +cwx uTI uTI uTI @@ -118293,7 +118313,7 @@ aQl aLx aMA aMA -aNH +aMZ aMA aMA aMA @@ -118351,11 +118371,11 @@ sIq cgQ cwx cyo -cEU +cwx cAX cCy cAX -cEU +cwx uTI uTI uTI diff --git a/_maps/map_files/generic/CentComm.dmm b/_maps/map_files/generic/CentComm.dmm index 30396cc5436..7d26b0937ec 100644 --- a/_maps/map_files/generic/CentComm.dmm +++ b/_maps/map_files/generic/CentComm.dmm @@ -137,9 +137,7 @@ }, /area/centcom/specops) "abm" = ( -/turf/simulated/wall/indestructible{ - icon_state = "rwall0" - }, +/turf/simulated/wall/indestructible/reinforced/rusted, /area/vox_station) "abs" = ( /turf/simulated/floor/shuttle{ @@ -1056,7 +1054,9 @@ }, /area/syndicate_mothership/cargo) "axT" = ( -/obj/machinery/computer/crew, +/obj/machinery/computer/crew{ + dir = 1 + }, /obj/structure/window/reinforced{ dir = 8 }, @@ -1208,7 +1208,9 @@ }, /area/vox_station) "aAP" = ( -/obj/machinery/computer/card/centcom, +/obj/machinery/computer/card/centcom{ + dir = 1 + }, /turf/simulated/floor/wood, /area/centcom/bridge) "aAR" = ( @@ -1385,9 +1387,7 @@ /area/syndicate_mothership/control) "aFz" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/wall/indestructible{ - icon_state = "iron3" - }, +/turf/simulated/wall/indestructible/iron, /area/syndicate_mothership) "aFM" = ( /obj/structure/extinguisher_cabinet{ @@ -1419,7 +1419,9 @@ }, /area/syndicate_mothership/elite_squad) "aGD" = ( -/obj/machinery/computer/camera_advanced, +/obj/machinery/computer/camera_advanced{ + dir = 1 + }, /obj/structure/window/reinforced{ dir = 8 }, @@ -1693,7 +1695,9 @@ /turf/simulated/floor/carpet/black, /area/trader_station/sol) "aOd" = ( -/obj/machinery/computer/station_alert, +/obj/machinery/computer/station_alert{ + dir = 1 + }, /obj/structure/window/reinforced{ dir = 8 }, @@ -2067,7 +2071,8 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/simulated/wall/indestructible/reinforced, +/obj/structure/chair/comfy/red, +/turf/simulated/floor/carpet/black, /area/centcom/zone2) "aYm" = ( /obj/structure/window/plasmareinforced{ @@ -2098,10 +2103,7 @@ /area/ninja/outside) "aZa" = ( /obj/structure/flora/grass/jungle/b, -/turf/simulated/wall/indestructible{ - icon_state = "rock"; - name = "rock" - }, +/turf/simulated/wall/indestructible/rock, /area/syndicate_mothership/outside) "aZv" = ( /turf/simulated/floor/plasteel{ @@ -2345,7 +2347,9 @@ }, /area/centcom/evac) "bfH" = ( -/obj/machinery/computer/communications, +/obj/machinery/computer/communications{ + dir = 1 + }, /obj/machinery/light/small, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -2353,7 +2357,9 @@ /area/centcom/specops) "bfQ" = ( /obj/structure/table/wood/fancy/black, -/obj/machinery/chem_dispenser/soda/upgraded, +/obj/machinery/chem_dispenser/soda/upgraded{ + pixel_y = 4 + }, /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_y = 32 }, @@ -2953,17 +2959,9 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/ninja/outside) -"buH" = ( -/turf/simulated/wall/indestructible{ - icon_state = "rock"; - name = "rock" - }, -/area/ninja/holding) "buJ" = ( -/turf/simulated/wall/indestructible{ - color = "#91857C"; - icon_state = "rock"; - name = "rock" +/turf/simulated/wall/indestructible/rock{ + color = "#91857C" }, /area/ninja/holding) "buW" = ( @@ -3126,11 +3124,6 @@ icon_state = "floor" }, /area/ninja/holding) -"bAv" = ( -/turf/simulated/wall/indestructible{ - icon_state = "arust4" - }, -/area/ninja/holding) "bAw" = ( /obj/machinery/door/airlock/centcom{ name = "Bridge 1-1"; @@ -3140,9 +3133,7 @@ /turf/simulated/floor/wood, /area/centcom/zone2) "bAO" = ( -/turf/simulated/wall/indestructible{ - icon_state = "arust8" - }, +/turf/simulated/wall/indestructible/rusted, /area/ninja/holding) "bAP" = ( /obj/item/radio/intercom/syndicate{ @@ -3608,7 +3599,9 @@ }, /area/syndicate_mothership/control) "bQi" = ( -/obj/machinery/computer, +/obj/machinery/computer{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "darkbluefull" }, @@ -3935,9 +3928,7 @@ /turf/simulated/floor/carpet/black, /area/centcom/zone2) "bVW" = ( -/turf/simulated/wall/indestructible{ - icon_state = "arust" - }, +/turf/simulated/wall/indestructible/rock, /area/ninja/holding) "bWH" = ( /turf/simulated/floor/shuttle/transparent_floor, @@ -4144,9 +4135,7 @@ icon_state = "wallkatana"; name = "Katanas" }, -/turf/simulated/wall/indestructible{ - icon_state = "arust" - }, +/turf/simulated/wall/indestructible/rock, /area/ninja/holding) "ceD" = ( /obj/machinery/door/airlock/syndicate/command{ @@ -4786,11 +4775,6 @@ icon_state = "darkyellowalt" }, /area/syndicate_mothership/cargo) -"csL" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron14" - }, -/area/syndicate_mothership/jail) "csN" = ( /obj/structure/filingcabinet/filingcabinet, /turf/simulated/floor/carpet/black, @@ -5176,11 +5160,6 @@ icon_state = "darkfull" }, /area/syndicate_mothership) -"cCl" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron4" - }, -/area/syndicate_mothership/control) "cCA" = ( /obj/structure/flora/ausbushes/leafybush, /turf/simulated/floor/indestructible/beach/sand, @@ -5247,9 +5226,7 @@ baseturf = /turf/simulated/floor/indestructible/snow; name = "snow baseturf editor" }, -/turf/simulated/wall/indestructible{ - icon_state = "arust8" - }, +/turf/simulated/wall/indestructible/rusted, /area/ninja/holding) "cEE" = ( /obj/structure/table/wood, @@ -5361,7 +5338,9 @@ /turf/simulated/floor/carpet, /area/centcom/evac) "cHW" = ( -/obj/machinery/computer/shuttle/ninja, +/obj/machinery/computer/shuttle/ninja{ + dir = 1 + }, /turf/simulated/floor/shuttle{ icon_state = "floor13" }, @@ -5879,7 +5858,9 @@ /area/centcom/zone2) "cVM" = ( /obj/structure/table, -/obj/machinery/chem_dispenser/soda/upgraded, +/obj/machinery/chem_dispenser/soda/upgraded{ + pixel_y = 4 + }, /obj/machinery/light{ dir = 1 }, @@ -6074,12 +6055,6 @@ icon_state = "darkyellowcornersalt" }, /area/syndicate_mothership/cargo) -"dbC" = ( -/turf/simulated/wall/indestructible{ - icon_state = "rock"; - name = "rock" - }, -/area/space) "dbO" = ( /obj/machinery/cryopod{ dir = 4 @@ -6359,9 +6334,7 @@ icon_state = "wallkatana"; name = "Katanas" }, -/turf/simulated/wall/indestructible{ - icon_state = "arust" - }, +/turf/simulated/wall/indestructible/rock, /area/ninja/holding) "dnh" = ( /obj/docking_port/stationary{ @@ -6728,11 +6701,7 @@ /turf/simulated/floor/grass, /area/centcom/evac) "dwR" = ( -/turf/simulated/wall/indestructible{ - color = "#91857C"; - icon_state = "rock"; - name = "rock" - }, +/turf/simulated/wall/indestructible/rock, /area/space) "dwU" = ( /obj/structure/lattice, @@ -7174,7 +7143,9 @@ /turf/simulated/floor/plasteel/grimy, /area/trader_station/sol) "dHE" = ( -/obj/machinery/computer/shuttle/ruins_civil_shuttle, +/obj/machinery/computer/shuttle/ruins_civil_shuttle{ + dir = 4 + }, /turf/simulated/floor/shuttle, /area/shuttle/spacebar) "dHP" = ( @@ -7232,9 +7203,7 @@ }, /area/syndicate_mothership/control) "dII" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron1" - }, +/turf/simulated/wall/indestructible/iron, /area/syndicate_mothership/jail) "dIY" = ( /obj/structure/window/reinforced{ @@ -7785,7 +7754,8 @@ /area/ninja/outside) "dZe" = ( /obj/machinery/computer/account_database{ - name = "Admin Accounts Database" + name = "Admin Accounts Database"; + dir = 4 }, /obj/machinery/newscaster/security_unit{ pixel_x = -32 @@ -7934,7 +7904,9 @@ /turf/simulated/floor/wood, /area/centcom/zone1) "ebR" = ( -/obj/machinery/computer/shuttle/ert, +/obj/machinery/computer/shuttle/ert{ + dir = 4 + }, /obj/structure/window/reinforced{ dir = 8 }, @@ -8616,14 +8588,14 @@ dir = 1 }, /obj/effect/turf_decal/tile/neutral, -/obj/structure/chair/comfy/lime, +/obj/structure/chair/comfy/brown, /turf/simulated/floor/shuttle{ icon = 'icons/turf/floors.dmi'; icon_state = "dark" }, /area/shuttle/administration) "evd" = ( -/obj/structure/chair/comfy/lime, +/obj/structure/chair/comfy/brown, /turf/simulated/floor/shuttle{ icon = 'icons/turf/floors.dmi'; icon_state = "dark" @@ -8967,11 +8939,6 @@ /obj/machinery/light/small, /turf/simulated/floor/wood/fancy/light, /area/ussp_centcom/secretariat) -"eGA" = ( -/turf/simulated/wall/indestructible{ - icon_state = "rrust" - }, -/area/vox_station) "eHj" = ( /obj/item/storage/firstaid/ancient{ pixel_x = 3; @@ -8990,11 +8957,6 @@ icon_state = "barber" }, /area/centcom/jail) -"eIp" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron2" - }, -/area/syndicate_mothership/jail) "eIq" = ( /obj/structure/table/wood, /obj/item/tank/jetpack/oxygen/harness{ @@ -9878,7 +9840,9 @@ /turf/simulated/floor/shuttle/objective_check/vox, /area/shuttle/vox) "ffV" = ( -/obj/machinery/computer/atmos_alert, +/obj/machinery/computer/atmos_alert{ + dir = 1 + }, /obj/structure/window/reinforced{ dir = 4 }, @@ -9888,13 +9852,6 @@ /area/centcom/bridge) "fgq" = ( /obj/effect/decal/warning_stripes/northwest, -/obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, /turf/simulated/wall/indestructible/fakeglass, /area/centcom/specops) "fgu" = ( @@ -10197,7 +10154,9 @@ }, /area/syndicate_mothership) "fnW" = ( -/obj/machinery/computer/communications, +/obj/machinery/computer/communications{ + dir = 8 + }, /obj/machinery/newscaster/security_unit{ pixel_x = 32 }, @@ -11106,7 +11065,7 @@ }, /area/centcom/zone2) "fHH" = ( -/obj/structure/chair/comfy/lime{ +/obj/structure/chair/comfy/brown{ dir = 1 }, /turf/simulated/floor/shuttle{ @@ -11605,7 +11564,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/neutral, -/obj/structure/chair/comfy/lime{ +/obj/structure/chair/comfy/brown{ dir = 8 }, /turf/simulated/floor/shuttle{ @@ -12203,7 +12162,8 @@ "gjn" = ( /obj/machinery/computer/shuttle/ert{ armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); - req_access = list(109) + req_access = list(109); + dir = 8 }, /obj/effect/decal/warning_stripes/north, /obj/effect/decal/warning_stripes/east, @@ -12380,11 +12340,6 @@ icon_state = "darkfull" }, /area/syndicate_mothership/cargo) -"god" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron7" - }, -/area/syndicate_mothership/jail) "goz" = ( /obj/effect/baseturf_helper/asteroid/snow{ baseturf = /turf/simulated/floor/indestructible/snow; @@ -12402,11 +12357,6 @@ icon_state = "dark" }, /area/centcom/specops) -"gpg" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron8" - }, -/area/syndicate_mothership/jail) "gpm" = ( /obj/structure/window/reinforced{ dir = 1 @@ -12453,7 +12403,9 @@ /turf/simulated/floor/wood/fancy/light, /area/ninja/outpost) "gqg" = ( -/obj/machinery/computer/station_alert, +/obj/machinery/computer/station_alert{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -13554,7 +13506,9 @@ }, /area/syndicate_mothership) "haZ" = ( -/obj/machinery/computer/security/mining, +/obj/machinery/computer/security/mining{ + dir = 1 + }, /obj/structure/window/reinforced{ dir = 4 }, @@ -13856,11 +13810,6 @@ icon_state = "neutral" }, /area/centcom/evac) -"hln" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron6" - }, -/area/syndicate_mothership/control) "hls" = ( /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/jail) @@ -14768,11 +14717,6 @@ /obj/machinery/light/small, /turf/simulated/floor/wood, /area/centcom/zone2) -"hLV" = ( -/turf/simulated/wall/indestructible/abductor{ - icon_state = "alien20" - }, -/area/abductor_ship) "hMi" = ( /obj/machinery/computer/operating{ layer = 3.5 @@ -14784,16 +14728,6 @@ icon_state = "white" }, /area/centcom/zone1) -"hMy" = ( -/turf/simulated/wall/indestructible/abductor{ - icon_state = "alien21" - }, -/area/abductor_ship) -"hMD" = ( -/turf/simulated/wall/indestructible/abductor{ - icon_state = "alien22" - }, -/area/abductor_ship) "hME" = ( /obj/structure/chair/sofa, /turf/simulated/floor/plasteel{ @@ -14874,11 +14808,6 @@ icon_state = "white_walls_corners" }, /area/shuttle/mining) -"hOM" = ( -/turf/simulated/wall/indestructible/abductor{ - icon_state = "alien23" - }, -/area/abductor_ship) "hPQ" = ( /obj/effect/turf_decal{ dir = 5; @@ -14887,31 +14816,16 @@ /obj/structure/dresser, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/control) -"hPX" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron5" - }, -/area/syndicate_mothership/jail) "hQg" = ( /obj/structure/weightmachine/weightlifter, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"hQj" = ( -/turf/simulated/wall/indestructible/abductor{ - icon_state = "alien24" - }, -/area/abductor_ship) "hQx" = ( /turf/simulated/floor/plasteel{ dir = 8; icon_state = "arrivalcorner" }, /area/centcom/evac) -"hQG" = ( -/turf/simulated/wall/indestructible{ - icon_state = "sandstone6" - }, -/area/wizard_station) "hQS" = ( /turf/simulated/floor/shuttle{ icon = 'icons/turf/floors.dmi'; @@ -14939,7 +14853,9 @@ }, /area/syndicate_mothership/control) "hRy" = ( -/obj/machinery/computer/atmoscontrol, +/obj/machinery/computer/atmoscontrol{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "darkyellowfull" }, @@ -14972,9 +14888,7 @@ }, /area/shuttle/administration) "hSb" = ( -/turf/simulated/wall/indestructible{ - icon_state = "sandstone12" - }, +/turf/simulated/wall/indestructible/sandstone, /area/wizard_station) "hSv" = ( /obj/machinery/door_control{ @@ -14999,11 +14913,6 @@ name = "Tatami" }, /area/ninja/outpost) -"hTb" = ( -/turf/simulated/wall/indestructible{ - icon_state = "sandstone14" - }, -/area/wizard_station) "hTg" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/condiment/peppermill, @@ -15085,11 +14994,6 @@ dir = 6 }, /area/centcom/specops) -"hUI" = ( -/turf/simulated/wall/indestructible{ - icon_state = "sandstone10" - }, -/area/wizard_station) "hVd" = ( /obj/structure/chair{ dir = 4 @@ -15225,11 +15129,6 @@ icon_state = "navybluecorners" }, /area/centcom/specops) -"icm" = ( -/turf/simulated/wall/indestructible/abductor{ - icon_state = "alien16" - }, -/area/abductor_ship) "ico" = ( /obj/effect/turf_decal/siding{ color = "#444444"; @@ -15358,11 +15257,6 @@ icon_state = "darkyellowaltstrip" }, /area/centcom/supply) -"igh" = ( -/turf/simulated/wall/indestructible/abductor{ - icon_state = "alien17" - }, -/area/abductor_ship) "igq" = ( /obj/structure/flora/junglebush, /obj/structure/flora/rock/pile/largejungle{ @@ -15548,11 +15442,6 @@ icon_state = "dark" }, /area/centcom/specops) -"ilI" = ( -/turf/simulated/wall/indestructible/abductor{ - icon_state = "alien18" - }, -/area/abductor_ship) "ilL" = ( /obj/item/radio/intercom/specops{ pixel_x = 32 @@ -15571,11 +15460,6 @@ icon_state = "darkredalt" }, /area/centcom/jail) -"imX" = ( -/turf/simulated/wall/indestructible/abductor{ - icon_state = "alien19" - }, -/area/abductor_ship) "ina" = ( /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ @@ -15700,11 +15584,6 @@ /obj/item/storage/firstaid/toxin, /turf/simulated/floor/shuttle/objective_check/vox, /area/shuttle/vox) -"iqM" = ( -/turf/simulated/wall/indestructible{ - icon_state = "sandstone3" - }, -/area/wizard_station) "iqP" = ( /obj/machinery/atmospherics/unary/cryo_cell, /turf/simulated/floor/plasteel{ @@ -15720,11 +15599,6 @@ }, /turf/simulated/floor/carpet, /area/centcom/zone2) -"irg" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron8" - }, -/area/syndicate_mothership/control) "irL" = ( /turf/simulated/wall/shuttle/onlyselfsmooth, /area/shuttle/gamma/space) @@ -15957,11 +15831,6 @@ /obj/item/book/manual, /turf/simulated/floor/carpet/black, /area/wizard_station) -"iwJ" = ( -/turf/simulated/wall/indestructible{ - icon_state = "sandstone1" - }, -/area/wizard_station) "iwS" = ( /turf/simulated/wall/indestructible/reinforced, /area/centcom/zone2) @@ -16092,11 +15961,6 @@ /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/carpet/black, /area/centcom/zone2) -"izV" = ( -/turf/simulated/wall/indestructible{ - icon_state = "sandstone0" - }, -/area/wizard_station) "izX" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 @@ -16147,7 +16011,7 @@ /area/syndicate_mothership/outside) "iBn" = ( /obj/machinery/computer/shuttle/admin{ - dir = 1; + dir = 4; name = "NTV Argos shuttle console" }, /obj/effect/turf_decal/stripes/gold{ @@ -16248,10 +16112,7 @@ /area/syndicate_mothership/outside) "iDg" = ( /obj/structure/flora/ausbushes/lavendergrass, -/turf/simulated/wall/indestructible{ - icon_state = "rock"; - name = "rock" - }, +/turf/simulated/wall/indestructible/rock, /area/syndicate_mothership/outside) "iDq" = ( /obj/machinery/light/small{ @@ -16591,7 +16452,9 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/computer/mech_bay_power_console, +/obj/machinery/computer/mech_bay_power_console{ + dir = 1 + }, /obj/machinery/light/spot{ dir = 4; tag = "icon-tube1 (EAST)" @@ -16664,9 +16527,7 @@ /turf/simulated/floor/carpet/green, /area/ninja/outpost) "iND" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron5" - }, +/turf/simulated/wall/indestructible/iron, /area/syndicate_mothership/control) "iNW" = ( /obj/effect/turf_decal{ @@ -16697,11 +16558,6 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"iOx" = ( -/turf/simulated/wall/indestructible/abductor{ - icon_state = "alien14" - }, -/area/abductor_ship) "iOH" = ( /obj/structure/chair/sofa/left{ dir = 4 @@ -16898,11 +16754,6 @@ }, /turf/simulated/floor/plating, /area/centcom/specops) -"iVo" = ( -/turf/simulated/wall/indestructible/abductor{ - icon_state = "alien15" - }, -/area/abductor_ship) "iVu" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/condiment/peppermill, @@ -17282,7 +17133,9 @@ /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) "jfv" = ( -/obj/machinery/computer/shuttle/ruins_transport_shuttle, +/obj/machinery/computer/shuttle/ruins_transport_shuttle{ + dir = 4 + }, /turf/simulated/floor/shuttle{ icon_state = "floor4" }, @@ -17667,11 +17520,6 @@ icon_state = "white" }, /area/centcom/zone1) -"jnr" = ( -/turf/simulated/wall/indestructible/abductor{ - icon_state = "alien12" - }, -/area/abductor_ship) "jnx" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -17849,7 +17697,7 @@ /area/abductor_ship) "jta" = ( /obj/machinery/computer/cloning{ - dir = 8 + dir = 1 }, /turf/simulated/floor/shuttle{ icon_state = "floor3" @@ -18107,11 +17955,6 @@ /obj/structure/flora/ausbushes/sunnybush, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"jAl" = ( -/turf/simulated/wall/indestructible/abductor{ - icon_state = "alien13" - }, -/area/abductor_ship) "jAC" = ( /obj/structure/spacepoddoor/invincible, /obj/machinery/door/poddoor/multi_tile/two_tile_ver{ @@ -18152,7 +17995,7 @@ /area/centcom/zone1) "jBo" = ( /obj/machinery/computer/communications{ - dir = 1 + dir = 4 }, /obj/effect/turf_decal/stripes/gold{ dir = 6; @@ -18305,11 +18148,6 @@ }, /turf/simulated/floor/wood, /area/centcom/bridge) -"jFC" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron4" - }, -/area/syndicate_mothership/infteam) "jFD" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/effect/turf_decal/siding/wideplating{ @@ -18394,11 +18232,6 @@ icon_state = "dark" }, /area/centcom/supply) -"jHG" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron8" - }, -/area/syndicate_mothership/infteam) "jHP" = ( /obj/effect/turf_decal{ icon_state = "grass_edge_medium_corner" @@ -18465,11 +18298,6 @@ icon_state = "navyblue" }, /area/centcom/specops) -"jJM" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron10" - }, -/area/syndicate_mothership/infteam) "jJS" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -18763,11 +18591,6 @@ /obj/structure/flora/ausbushes/reedbush, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"jTt" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron0" - }, -/area/syndicate_mothership/elite_squad) "jUr" = ( /obj/machinery/hydroponics/constructable, /obj/item/seeds/apple, @@ -18800,11 +18623,6 @@ icon_state = "darkyellowfull" }, /area/syndicate_mothership/cargo) -"jVO" = ( -/turf/simulated/wall/indestructible/abductor{ - icon_state = "alien10" - }, -/area/abductor_ship) "jWb" = ( /obj/structure/curtain/black, /turf/simulated/wall/indestructible/fakeglass{ @@ -18817,11 +18635,6 @@ }, /turf/simulated/floor/plating, /area/centcom/specops) -"jWK" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron4" - }, -/area/syndicate_mothership/elite_squad) "jWM" = ( /obj/item/flag/nt, /turf/simulated/floor/plasteel{ @@ -18874,11 +18687,6 @@ icon_state = "darkgrey" }, /area/shuttle/administration) -"jYc" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron10" - }, -/area/syndicate_mothership/elite_squad) "jYK" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 @@ -18892,22 +18700,12 @@ icon_state = "bot" }, /area/shuttle/escape) -"jYQ" = ( -/turf/simulated/wall/indestructible/abductor{ - icon_state = "alien11" - }, -/area/abductor_ship) "jYV" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 }, /turf/simulated/floor/carpet/black, /area/centcom/specops) -"jYY" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron8" - }, -/area/syndicate_mothership/elite_squad) "kag" = ( /obj/structure/table/wood/fancy/green, /obj/item/reagent_containers/food/drinks/tea{ @@ -19458,11 +19256,6 @@ }, /turf/simulated/floor/carpet/green, /area/shuttle/trade/sol) -"knv" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron3" - }, -/area/syndicate_mothership/infteam) "knF" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -19485,11 +19278,6 @@ }, /turf/simulated/floor/wood/fancy/light, /area/ninja/outpost) -"kob" = ( -/turf/simulated/wall/indestructible/abductor{ - icon_state = "alien6" - }, -/area/abductor_ship) "kom" = ( /obj/machinery/porta_turret/centcom/pulse{ armor = list("melee"=90,"bullet"=90,"laser"=95,"energy"=95,"bomb"=80,"bio"=100,"rad"=100,"fire"=100,"acid"=100); @@ -19570,11 +19358,6 @@ icon_state = "darkredaltstrip" }, /area/syndicate_mothership/jail) -"kps" = ( -/turf/simulated/wall/indestructible/abductor{ - icon_state = "alien7" - }, -/area/abductor_ship) "kpB" = ( /obj/structure/lattice/catwalk, /turf/simulated/floor/shuttle/transparent_floor{ @@ -19801,11 +19584,6 @@ icon_state = "white" }, /area/centcom/jail) -"kvR" = ( -/turf/simulated/wall/indestructible/abductor{ - icon_state = "alien8" - }, -/area/abductor_ship) "kvU" = ( /obj/effect/turf_decal/stripes/black{ dir = 5; @@ -19819,11 +19597,6 @@ icon_state = "dark" }, /area/centcom/zone3) -"kwr" = ( -/turf/simulated/wall/indestructible/abductor{ - icon_state = "alien9" - }, -/area/abductor_ship) "kws" = ( /obj/effect/spawner/lootdrop/trade_sol/vehicle, /turf/simulated/floor/wood{ @@ -20335,11 +20108,6 @@ /obj/item/book/manual, /turf/simulated/floor/carpet/black, /area/wizard_station) -"kJP" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron1" - }, -/area/syndicate_mothership/elite_squad) "kKf" = ( /obj/structure/chair/sofa{ dir = 8 @@ -20375,11 +20143,6 @@ icon_state = "grimy" }, /area/syndicate_mothership/elite_squad) -"kLh" = ( -/turf/simulated/wall/indestructible/abductor{ - icon_state = "alien2" - }, -/area/abductor_ship) "kLj" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor{ @@ -20538,11 +20301,6 @@ }, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership) -"kMQ" = ( -/turf/simulated/wall/indestructible/abductor{ - icon_state = "alien3" - }, -/area/abductor_ship) "kMS" = ( /obj/machinery/light/small{ dir = 1 @@ -20587,16 +20345,6 @@ icon_state = "dark" }, /area/centcom/zone2) -"kNN" = ( -/turf/simulated/wall/indestructible/abductor{ - icon_state = "alien4" - }, -/area/abductor_ship) -"kOn" = ( -/turf/simulated/wall/indestructible/abductor{ - icon_state = "alien5" - }, -/area/abductor_ship) "kPa" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/portable_atmospherics/canister/oxygen{ @@ -20832,10 +20580,7 @@ /area/centcom/evac) "kTh" = ( /obj/structure/flora/grass/jungle, -/turf/simulated/wall/indestructible{ - icon_state = "rock"; - name = "rock" - }, +/turf/simulated/wall/indestructible/rock, /area/syndicate_mothership/outside) "kTy" = ( /obj/structure/curtain/open/shower, @@ -20923,11 +20668,6 @@ icon_state = "warnwhite" }, /area/centcom/zone1) -"kVB" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron3" - }, -/area/syndicate_mothership/control) "kVS" = ( /obj/structure/curtain/black{ pixel_x = 32; @@ -21253,11 +20993,6 @@ icon_state = "darkredalt" }, /area/centcom/jail) -"lcd" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron1" - }, -/area/syndicate_mothership/infteam) "lcq" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/plasteel{ @@ -21377,11 +21112,6 @@ icon_state = "white" }, /area/centcom/zone1) -"lfU" = ( -/turf/simulated/wall/indestructible{ - icon_state = "sandstone2" - }, -/area/wizard_station) "lga" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -21483,11 +21213,6 @@ /obj/item/beach_ball, /turf/simulated/floor/beach/sand, /area/centcom/evac) -"ljm" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron6" - }, -/area/syndicate_mothership) "ljo" = ( /obj/structure/table/glass, /obj/item/vending_refill/nta, @@ -21533,11 +21258,6 @@ }, /turf/simulated/floor/indestructible/abductor, /area/abductor_ship) -"ljL" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron8" - }, -/area/syndicate_mothership) "lke" = ( /obj/machinery/light/spot{ dir = 1 @@ -21841,9 +21561,7 @@ /turf/simulated/floor/carpet/red, /area/syndicate_mothership/control) "lsK" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron4" - }, +/turf/simulated/wall/indestructible/iron, /area/syndicate_mothership) "lsO" = ( /obj/structure/table/glass, @@ -22019,11 +21737,6 @@ icon_state = "podfloor_dark" }, /area/shuttle/administration) -"lvt" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron10" - }, -/area/syndicate_mothership) "lvG" = ( /obj/structure/flora/grass/jungle/b, /obj/effect/mapping_helpers/light, @@ -22507,11 +22220,6 @@ /obj/machinery/computer/shuttle/sst, /turf/simulated/floor/carpet, /area/syndicate_mothership/control) -"lHv" = ( -/turf/simulated/wall/indestructible{ - icon_state = "sandstone5" - }, -/area/wizard_station) "lHw" = ( /obj/structure/window/reinforced{ dir = 8 @@ -22557,11 +22265,6 @@ icon_state = "grimy" }, /area/centcom/zone2) -"lIj" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron6" - }, -/area/syndicate_mothership/infteam) "lIw" = ( /obj/effect/mapping_helpers/light{ light_power = 3 @@ -22569,11 +22272,6 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/indestructible/snow, /area/ninja/outside) -"lJc" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron12" - }, -/area/syndicate_mothership/infteam) "lJl" = ( /obj/effect/decal/warning_stripes/white/hollow, /turf/simulated/floor/plasteel{ @@ -22587,14 +22285,7 @@ /area/centcom/evac) "lJn" = ( /obj/structure/sign/poster/official/ue_no, -/turf/simulated/wall/indestructible{ - icon_state = "sandstone12" - }, -/area/wizard_station) -"lJp" = ( -/turf/simulated/wall/indestructible{ - icon_state = "sandstone13" - }, +/turf/simulated/wall/indestructible/sandstone, /area/wizard_station) "lJL" = ( /obj/effect/turf_decal{ @@ -22625,11 +22316,6 @@ }, /turf/simulated/wall/indestructible/reinforced, /area/centcom/specops) -"lKq" = ( -/turf/simulated/wall/indestructible{ - icon_state = "sandstone11" - }, -/area/wizard_station) "lKw" = ( /obj/effect/turf_decal{ icon_state = "grass_edge_medium" @@ -22795,11 +22481,6 @@ icon_state = "dark" }, /area/shuttle/administration) -"lNe" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron2" - }, -/area/syndicate_mothership/infteam) "lNn" = ( /obj/structure/chair/sofa/left{ dir = 4 @@ -23019,11 +22700,6 @@ }, /turf/simulated/floor/indestructible/abductor, /area/abductor_ship) -"lTz" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron9" - }, -/area/syndicate_mothership) "lUK" = ( /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/carpet/black, @@ -23164,11 +22840,6 @@ icon_state = "warndarkgreycornerred" }, /area/syndicate_mothership) -"lYO" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron5" - }, -/area/syndicate_mothership) "lYV" = ( /obj/effect/landmark/abductor/agent{ team = 3 @@ -23452,11 +23123,6 @@ /obj/structure/flora/junglebush, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"mer" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron2" - }, -/area/syndicate_mothership/elite_squad) "mes" = ( /obj/structure/window/reinforced{ dir = 4 @@ -23926,7 +23592,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/neutral, -/obj/structure/chair/comfy/lime{ +/obj/structure/chair/comfy/brown{ dir = 4 }, /turf/simulated/floor/shuttle{ @@ -24294,9 +23960,7 @@ /turf/simulated/floor/wood, /area/centcom/specops) "mwP" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron14" - }, +/turf/space, /area/syndicate_mothership/infteam) "mwS" = ( /obj/structure/window/reinforced{ @@ -24482,11 +24146,6 @@ icon_state = "navybluealtstrip" }, /area/centcom/specops) -"mzF" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron14" - }, -/area/syndicate_mothership/elite_squad) "mzH" = ( /obj/structure/table/wood/fancy/black, /obj/machinery/door_control{ @@ -24573,11 +24232,6 @@ }, /turf/simulated/floor/plating/airless, /area/space) -"mAR" = ( -/turf/simulated/wall/indestructible{ - icon_state = "sandstone9" - }, -/area/wizard_station) "mBe" = ( /obj/machinery/door/poddoor/multi_tile/three_tile_hor{ closingLayer = 3.2; @@ -24797,11 +24451,6 @@ icon_state = "sepia" }, /area/ninja/outpost) -"mEu" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron3" - }, -/area/syndicate_mothership/elite_squad) "mEE" = ( /obj/machinery/light/small{ dir = 8 @@ -25067,9 +24716,7 @@ }, /area/centcom/specops) "mJe" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron5" - }, +/turf/simulated/wall/indestructible/iron, /area/syndicate_mothership/infteam) "mJn" = ( /obj/structure/table/reinforced, @@ -25083,11 +24730,6 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"mJH" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron9" - }, -/area/syndicate_mothership/infteam) "mKe" = ( /obj/effect/turf_decal{ dir = 9; @@ -25187,11 +24829,6 @@ icon_state = "white_walls_corners" }, /area/shuttle/supply) -"mMH" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron10" - }, -/area/syndicate_mothership/control) "mNh" = ( /obj/structure/table/reinforced, /obj/item/clothing/gloves/color/latex/nitrile, @@ -25970,11 +25607,6 @@ }, /turf/simulated/floor/carpet, /area/centcom/court) -"mZE" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron12" - }, -/area/syndicate_mothership) "nae" = ( /obj/machinery/light/small, /turf/simulated/floor/wood, @@ -26914,10 +26546,6 @@ /area/ninja/outpost) "nsM" = ( /obj/effect/decal/warning_stripes/west, -/obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 - }, /turf/simulated/wall/indestructible/fakeglass, /area/centcom/specops) "nsV" = ( @@ -27578,11 +27206,6 @@ icon_state = "darkredalt" }, /area/centcom/zone3) -"nGy" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron4" - }, -/area/syndicate_mothership/jail) "nHd" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -27617,11 +27240,6 @@ icon_state = "darkredalt" }, /area/centcom/zone3) -"nHX" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron9" - }, -/area/syndicate_mothership/control) "nIj" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -28042,11 +27660,6 @@ }, /turf/simulated/floor/wood, /area/centcom/zone2) -"nRU" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron13" - }, -/area/syndicate_mothership/infteam) "nRW" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -28297,9 +27910,7 @@ }, /area/syndicate_mothership) "nYR" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron2" - }, +/turf/simulated/wall/indestructible/iron, /area/syndicate_mothership/outside) "nZe" = ( /obj/structure/railing/corner{ @@ -28760,7 +28371,8 @@ /area/shuttle/administration) "ojv" = ( /obj/machinery/computer/security{ - network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome") + network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome"); + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -29402,11 +29014,6 @@ icon_state = "floor13" }, /area/shuttle/ninja) -"oyp" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron11" - }, -/area/syndicate_mothership/jail) "oyw" = ( /obj/effect/turf_decal{ dir = 9; @@ -29439,14 +29046,10 @@ icon_state = "darkyellowcornersalt" }, /area/centcom/zone3) -"oAu" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron7" - }, -/area/syndicate_mothership/elite_squad) "oAE" = ( /obj/machinery/computer/shuttle/ferry/request{ - req_access = list(101) + req_access = list(101); + dir = 4 }, /turf/simulated/floor/shuttle, /area/shuttle/transport) @@ -29588,11 +29191,6 @@ icon_state = "darkredaltstrip" }, /area/syndicate_mothership/jail) -"oEe" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron12" - }, -/area/syndicate_mothership/elite_squad) "oEs" = ( /obj/effect/turf_decal/stripes/line{ icon = 'icons/turf/floors.dmi'; @@ -29807,11 +29405,6 @@ icon_state = "white" }, /area/shuttle/administration) -"oJh" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron13" - }, -/area/syndicate_mothership/elite_squad) "oJi" = ( /obj/machinery/hydroponics/constructable, /turf/simulated/floor/plasteel{ @@ -29841,11 +29434,6 @@ "oJI" = ( /turf/simulated/wall/shuttle, /area/shuttle/siberia) -"oJZ" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron11" - }, -/area/syndicate_mothership/elite_squad) "oKa" = ( /obj/effect/turf_decal/stripes/gold{ dir = 4 @@ -30228,11 +29816,6 @@ /obj/item/flag/ninja, /turf/simulated/floor/wood/fancy/light, /area/ninja/outpost) -"oQr" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron15" - }, -/area/syndicate_mothership) "oQJ" = ( /turf/simulated/floor/shuttle/objective_check{ dir = 8; @@ -30438,11 +30021,6 @@ icon_state = "dark" }, /area/centcom/supply) -"oTY" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron3" - }, -/area/syndicate_mothership/jail) "oUj" = ( /obj/effect/turf_decal/stripes/line{ color = null; @@ -30947,7 +30525,9 @@ }, /area/syndicate_mothership/control) "plq" = ( -/obj/machinery/computer/mech_bay_power_console, +/obj/machinery/computer/mech_bay_power_console{ + dir = 8 + }, /obj/machinery/light/small{ dir = 4 }, @@ -31122,11 +30702,6 @@ icon_state = "darkfull" }, /area/syndicate_mothership/infteam) -"ppH" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron7" - }, -/area/syndicate_mothership/infteam) "ppL" = ( /obj/machinery/reagentgrinder{ layer = 4; @@ -31138,11 +30713,6 @@ icon_state = "white" }, /area/centcom/zone1) -"ppV" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron11" - }, -/area/syndicate_mothership/infteam) "ppZ" = ( /obj/structure/chair/comfy/beige, /turf/simulated/floor/carpet/black, @@ -31215,7 +30785,9 @@ /turf/simulated/floor/shuttle/plating, /area/shuttle/vox) "psd" = ( -/obj/machinery/computer/camera_advanced/shuttle_docker/ninja, +/obj/machinery/computer/camera_advanced/shuttle_docker/ninja{ + dir = 1 + }, /turf/simulated/floor/shuttle{ icon_state = "floor13" }, @@ -31538,7 +31110,9 @@ /area/syndicate_mothership/outside) "pzx" = ( /obj/structure/table, -/obj/machinery/chem_dispenser/beer/upgraded, +/obj/machinery/chem_dispenser/beer/upgraded{ + pixel_y = 4 + }, /obj/structure/sign/barsign{ pixel_y = 32 }, @@ -31571,7 +31145,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/neutral, -/obj/structure/chair/comfy/lime{ +/obj/structure/chair/comfy/brown{ dir = 1 }, /turf/simulated/floor/shuttle{ @@ -32011,7 +31585,9 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/computer/crew, +/obj/machinery/computer/crew{ + dir = 4 + }, /turf/simulated/floor/wood, /area/centcom/specops) "pMv" = ( @@ -32700,7 +32276,10 @@ /area/syndicate_mothership/outside) "qbr" = ( /obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/beer/upgraded, +/obj/machinery/chem_dispenser/beer/upgraded{ + pixel_y = 4; + dir = 1 + }, /turf/simulated/floor/carpet/black, /area/shuttle/administration) "qbO" = ( @@ -32815,11 +32394,6 @@ icon_state = "dark" }, /area/centcom/zone1) -"qex" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron12" - }, -/area/syndicate_mothership/control) "qfj" = ( /obj/machinery/door_control{ id = "CC_BSA"; @@ -32874,7 +32448,10 @@ /area/syndicate_mothership/elite_squad) "qfX" = ( /obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/soda/upgraded, +/obj/machinery/chem_dispenser/soda/upgraded{ + pixel_y = 4; + dir = 1 + }, /obj/item/storage/box/drinkingglasses{ pixel_x = 1; pixel_y = 5 @@ -33154,7 +32731,9 @@ dir = 1 }, /obj/structure/table/wood/fancy/black, -/obj/machinery/chem_dispenser/beer/upgraded, +/obj/machinery/chem_dispenser/beer/upgraded{ + pixel_y = 4 + }, /turf/simulated/floor/carpet/red, /area/centcom/specops) "qnP" = ( @@ -33471,7 +33050,8 @@ pixel_x = -32 }, /obj/machinery/computer/security{ - network = list("SS13","Research Outpost","Mining Outpost","Telecomms") + network = list("SS13","Research Outpost","Mining Outpost","Telecomms"); + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -33495,7 +33075,9 @@ /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_x = 32 }, -/obj/machinery/computer/station_alert, +/obj/machinery/computer/station_alert{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkyellow" @@ -33619,7 +33201,9 @@ /turf/simulated/floor/carpet/black, /area/syndicate_mothership/control) "qzL" = ( -/obj/machinery/computer/secure_data, +/obj/machinery/computer/secure_data{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkred" @@ -33634,18 +33218,10 @@ /area/centcom/zone1) "qzU" = ( /obj/effect/decal/warning_stripes/southwest, -/obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 - }, -/obj/structure/window/reinforced, /turf/simulated/wall/indestructible/fakeglass, /area/centcom/specops) "qAj" = ( -/turf/simulated/wall/indestructible{ - icon_state = "rock"; - name = "rock" - }, +/turf/simulated/wall/indestructible/rock, /area/syndicate_mothership/outside) "qAN" = ( /obj/machinery/vending/wallmed/syndicate{ @@ -34194,7 +33770,9 @@ dir = 1; layer = 2 }, -/obj/machinery/computer/operating, +/obj/machinery/computer/operating{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -34286,7 +33864,7 @@ /area/centcom/specops) "qOT" = ( /obj/machinery/computer/card{ - dir = 1 + dir = 4 }, /obj/effect/turf_decal/stripes/gold{ dir = 5; @@ -34452,7 +34030,9 @@ /turf/simulated/floor/carpet/black, /area/centcom/specops) "qTw" = ( -/obj/machinery/computer/operating, +/obj/machinery/computer/operating{ + dir = 1 + }, /turf/simulated/floor/shuttle{ icon_state = "floor3" }, @@ -35483,11 +35063,6 @@ icon_state = "darkbluealtstrip" }, /area/syndicate_mothership/elite_squad) -"rqI" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron15" - }, -/area/syndicate_mothership/elite_squad) "rqJ" = ( /obj/machinery/light, /turf/simulated/floor/plasteel{ @@ -35541,11 +35116,6 @@ icon_state = "fancy-wood-cherry" }, /area/syndicate_mothership/infteam) -"rsG" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron7" - }, -/area/syndicate_mothership) "rsS" = ( /obj/item/flag/med, /obj/machinery/light/spot{ @@ -35555,11 +35125,6 @@ icon_state = "cmo" }, /area/shuttle/escape) -"rsZ" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron13" - }, -/area/syndicate_mothership) "rtg" = ( /obj/machinery/light/small{ dir = 8 @@ -35677,9 +35242,7 @@ }, /area/syndicate_mothership/outside) "rvs" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron9" - }, +/turf/simulated/wall/indestructible/iron, /area/syndicate_mothership/elite_squad) "rvw" = ( /obj/structure/table/reinforced, @@ -35833,7 +35396,9 @@ dir = 8; tag = "icon-tube1 (WEST)" }, -/obj/machinery/computer/camera_advanced/shuttle_docker/ert, +/obj/machinery/computer/camera_advanced/shuttle_docker/ert{ + dir = 4 + }, /turf/simulated/floor/shuttle{ icon_state = "floor4" }, @@ -36563,11 +36128,6 @@ }, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"rNL" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron3" - }, -/area/syndicate_mothership) "rOi" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -36616,11 +36176,6 @@ icon_state = "darkred" }, /area/shuttle/escape) -"rPF" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron11" - }, -/area/syndicate_mothership/control) "rPH" = ( /obj/machinery/chem_master, /obj/machinery/light, @@ -36675,7 +36230,9 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/elite_squad) "rRF" = ( -/obj/machinery/computer/med_data, +/obj/machinery/computer/med_data{ + dir = 1 + }, /obj/structure/window/reinforced{ dir = 4 }, @@ -37009,7 +36566,9 @@ }, /area/syndicate_mothership/outside) "rYO" = ( -/obj/machinery/computer/communications, +/obj/machinery/computer/communications{ + dir = 4 + }, /obj/machinery/computer/security/telescreen{ desc = "Used for watching the Special Ops team."; name = "Security Station Monitor"; @@ -37213,11 +36772,6 @@ icon_state = "darkredcorners" }, /area/shuttle/escape) -"sfg" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron7" - }, -/area/syndicate_mothership/control) "sfl" = ( /obj/structure/chair{ dir = 1 @@ -37454,7 +37008,9 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/elite_squad) "smL" = ( -/obj/machinery/computer/supplycomp, +/obj/machinery/computer/supplycomp{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "darkyellowfull" }, @@ -37596,11 +37152,6 @@ }, /turf/simulated/floor/carpet, /area/centcom/evac) -"spD" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron14" - }, -/area/syndicate_mothership) "sqw" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo9" @@ -37914,11 +37465,6 @@ icon_state = "dark" }, /area/shuttle/siberia) -"swu" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron0" - }, -/area/syndicate_mothership/jail) "sxa" = ( /obj/machinery/computer/shuttle/sit, /turf/simulated/floor/carpet, @@ -37968,7 +37514,7 @@ /area/shuttle/escape) "szi" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/admin{ - dir = 1; + dir = 4; name = "NTV Argos shuttle navigation computer" }, /obj/effect/turf_decal/stripes/gold{ @@ -38247,11 +37793,6 @@ icon_state = "floor12" }, /area/shuttle/syndicate) -"sEl" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron1" - }, -/area/syndicate_mothership) "sEU" = ( /obj/machinery/vending/tool, /turf/simulated/floor/plasteel{ @@ -38274,11 +37815,6 @@ /obj/item/paper, /turf/simulated/floor/carpet/black, /area/centcom/zone2) -"sFq" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron12" - }, -/area/syndicate_mothership/jail) "sFz" = ( /obj/machinery/computer/shuttle/ferry, /turf/simulated/floor/plasteel{ @@ -38412,7 +37948,8 @@ /area/shuttle/escape) "sJY" = ( /obj/machinery/computer/account_database{ - name = "Admin Accounts Database" + name = "Admin Accounts Database"; + dir = 8 }, /obj/item/radio/intercom/specops{ pixel_x = 32 @@ -38464,11 +38001,6 @@ }, /turf/simulated/floor/wood, /area/centcom/zone2) -"sKO" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron6" - }, -/area/syndicate_mothership/jail) "sKR" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/lavendergrass, @@ -38619,11 +38151,6 @@ /obj/effect/turf_decal/bot_white, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/elite_squad) -"sQb" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron9" - }, -/area/syndicate_mothership/jail) "sQh" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 1; @@ -38914,12 +38441,6 @@ /obj/item/flashlight/lamp, /turf/simulated/floor/carpet, /area/centcom/zone1) -"sVH" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/wall/indestructible/reinforced, -/area/centcom/zone2) "sVL" = ( /obj/machinery/door/airlock/centcom{ name = "Prison"; @@ -39928,11 +39449,6 @@ icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi' }, /area/shuttle/syndicate_elite) -"trP" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron10" - }, -/area/syndicate_mothership/jail) "trQ" = ( /obj/structure/kitchenspike, /turf/simulated/floor/plasteel{ @@ -40193,7 +39709,9 @@ }, /area/syndicate_mothership/infteam) "tyO" = ( -/obj/machinery/computer/teleporter, +/obj/machinery/computer/teleporter{ + dir = 1 + }, /obj/machinery/light, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -41242,11 +40760,6 @@ }, /turf/simulated/floor/plating, /area/syndicate_mothership) -"tVz" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron5" - }, -/area/syndicate_mothership/elite_squad) "tVF" = ( /turf/simulated/floor/shuttle{ icon_state = "floor4" @@ -41354,11 +40867,6 @@ }, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership) -"tYp" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron6" - }, -/area/syndicate_mothership/elite_squad) "tYq" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -41521,11 +41029,6 @@ icon_state = "floor3" }, /area/shuttle/syndicate) -"ucc" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron2" - }, -/area/syndicate_mothership) "ucn" = ( /obj/effect/turf_decal/delivery/white, /turf/simulated/floor/plasteel{ @@ -41784,11 +41287,6 @@ }, /turf/simulated/floor/carpet/black, /area/centcom/court) -"uhs" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron0" - }, -/area/syndicate_mothership) "uhy" = ( /obj/effect/turf_decal/stripes/line{ icon = 'icons/turf/floors.dmi'; @@ -41937,7 +41435,9 @@ }, /area/syndicate_mothership/control) "umm" = ( -/obj/machinery/computer/atmos_alert, +/obj/machinery/computer/atmos_alert{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkyellow" @@ -42065,7 +41565,9 @@ }, /area/shuttle/syndicate_sit) "uqg" = ( -/obj/machinery/computer, +/obj/machinery/computer{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkredfull" @@ -42367,16 +41869,13 @@ }, /area/syndicate_mothership/outside) "uuY" = ( -/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/sst, +/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/sst{ + dir = 1 + }, /turf/simulated/floor/shuttle{ icon_state = "floor4" }, /area/shuttle/syndicate_elite) -"uvb" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron0" - }, -/area/syndicate_mothership/control) "uvg" = ( /obj/machinery/light/spot{ dir = 1 @@ -42414,11 +41913,6 @@ /obj/machinery/light, /turf/simulated/floor/grass, /area/centcom/evac) -"uvZ" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron13" - }, -/area/syndicate_mothership/control) "uwo" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -42429,7 +41923,9 @@ }, /area/syndicate_mothership) "uws" = ( -/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/sit, +/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/sit{ + dir = 1 + }, /turf/simulated/floor/shuttle{ icon_state = "floor4" }, @@ -43261,7 +42757,9 @@ /area/centcom/specops) "uOj" = ( /obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/beer/upgraded, +/obj/machinery/chem_dispenser/beer/upgraded{ + pixel_y = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -43742,7 +43240,9 @@ }, /area/centcom/jail) "vcj" = ( -/obj/machinery/computer/crew, +/obj/machinery/computer/crew{ + dir = 4 + }, /turf/simulated/floor/wood, /area/centcom/specops) "vcC" = ( @@ -44067,7 +43567,9 @@ /turf/simulated/floor/mineral/abductor, /area/centcom/zone1) "vjq" = ( -/obj/machinery/computer/sm_monitor, +/obj/machinery/computer/sm_monitor{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "darkyellowfull" }, @@ -44076,7 +43578,9 @@ /obj/machinery/ai_status_display{ pixel_x = -32 }, -/obj/machinery/computer/communications, +/obj/machinery/computer/communications{ + dir = 4 + }, /turf/simulated/floor/wood, /area/centcom/bridge) "vjT" = ( @@ -44141,11 +43645,6 @@ /obj/item/toy/plushie/red_fox, /turf/simulated/floor/carpet/black, /area/centcom/zone2) -"vmA" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron2" - }, -/area/syndicate_mothership/control) "vmC" = ( /obj/structure/railing{ dir = 4 @@ -44187,7 +43686,9 @@ network = list("ERT"); pixel_y = 30 }, -/obj/machinery/computer/shuttle/ert, +/obj/machinery/computer/shuttle/ert{ + dir = 4 + }, /turf/simulated/floor/shuttle{ icon_state = "floor4" }, @@ -44209,7 +43710,9 @@ }, /area/syndicate_mothership) "vnF" = ( -/obj/machinery/computer/shuttle/sst, +/obj/machinery/computer/shuttle/sst{ + dir = 1 + }, /turf/simulated/floor/shuttle{ icon_state = "floor4" }, @@ -44472,7 +43975,9 @@ /turf/simulated/floor/carpet, /area/centcom/zone2) "vtg" = ( -/obj/machinery/computer/shuttle/sit, +/obj/machinery/computer/shuttle/sit{ + dir = 1 + }, /turf/simulated/floor/shuttle{ icon_state = "floor4" }, @@ -44798,10 +44303,6 @@ icon_state = "floor4" }, /area/shuttle/specops) -"vCn" = ( -/obj/effect/gibspawner/xeno, -/turf/simulated/floor/plating, -/area/syndicate_mothership/control) "vCI" = ( /obj/structure/window/reinforced{ dir = 1; @@ -45044,15 +44545,6 @@ icon_state = "neutralfull" }, /area/shuttle/escape) -"vJu" = ( -/obj/effect/decal/warning_stripes/west, -/obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 - }, -/obj/structure/window/reinforced, -/turf/simulated/wall/indestructible/fakeglass, -/area/centcom/specops) "vJx" = ( /obj/structure/chair/sofa{ dir = 1 @@ -45386,7 +44878,9 @@ /turf/simulated/floor/wood, /area/shuttle/trade/sol) "vRi" = ( -/obj/machinery/computer/mech_bay_power_console, +/obj/machinery/computer/mech_bay_power_console{ + dir = 1 + }, /obj/effect/decal/cleanable/dirt, /obj/structure/extinguisher_cabinet{ name = "south extinguisher cabinet"; @@ -46575,11 +46069,6 @@ /obj/item/flag/nt, /turf/simulated/floor/wood, /area/centcom/jail) -"wvo" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron11" - }, -/area/syndicate_mothership) "wvH" = ( /obj/effect/turf_decal{ dir = 8; @@ -46652,7 +46141,9 @@ /turf/simulated/floor/carpet/black, /area/centcom/zone1) "wwE" = ( -/obj/machinery/computer/camera_advanced, +/obj/machinery/computer/camera_advanced{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -46848,7 +46339,9 @@ /turf/simulated/floor/wood, /area/centcom/specops) "wAE" = ( -/obj/machinery/computer/secure_data, +/obj/machinery/computer/secure_data{ + dir = 1 + }, /obj/structure/window/reinforced{ dir = 8 }, @@ -47495,11 +46988,6 @@ icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi' }, /area/shuttle/assault_pod) -"wWg" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron1" - }, -/area/syndicate_mothership/control) "wWh" = ( /obj/item/gun/projectile/automatic/ar, /obj/item/gun/projectile/automatic/ar, @@ -48446,7 +47934,9 @@ }, /area/shuttle/syndicate) "xqZ" = ( -/obj/machinery/computer/drone_control, +/obj/machinery/computer/drone_control{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "darkyellowfull" }, @@ -48484,11 +47974,6 @@ }, /turf/simulated/floor/shuttle, /area/shuttle/pod_2) -"xsf" = ( -/turf/simulated/wall/indestructible{ - icon_state = "iron14" - }, -/area/syndicate_mothership/control) "xss" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/wood{ @@ -49085,7 +48570,9 @@ }, /area/centcom/evac) "xGP" = ( -/obj/structure/computerframe, +/obj/structure/computerframe{ + dir = 4 + }, /obj/item/paper/synditele, /turf/simulated/floor/shuttle{ icon = 'icons/turf/floors.dmi'; @@ -49291,7 +48778,9 @@ }, /area/syndicate_mothership/control) "xLE" = ( -/obj/machinery/computer/cloning, +/obj/machinery/computer/cloning{ + dir = 1 + }, /obj/structure/window/reinforced, /turf/simulated/floor/plasteel{ dir = 6; @@ -49750,7 +49239,9 @@ /area/centcom/zone1) "xSg" = ( /obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/soda/upgraded, +/obj/machinery/chem_dispenser/soda/upgraded{ + pixel_y = 4 + }, /obj/machinery/light{ dir = 1 }, @@ -51955,7 +51446,7 @@ vPe vPe vPe vPe -jFC +mJe jET jET jET @@ -51963,7 +51454,7 @@ jET jET jET jET -jFC +mJe vPe vPe vPe @@ -52211,8 +51702,8 @@ vPe jET jET jET -lNe -mJH +mJe +mJe oKN pff pBH @@ -52220,8 +51711,8 @@ pWj qlw qCd oKN -jJM -lcd +mJe +mJe jET jET jET @@ -52977,8 +52468,8 @@ vPe jET jET jET -lIj -knv +mJe +mJe mJe ngk lOM @@ -52995,8 +52486,8 @@ ovy oNI lOM sbs -lIj -knv +mJe +mJe mJe jET jET @@ -53234,9 +52725,9 @@ vPe jET kbc kWc -lJc +mJe xOo -lJc +mJe ngv lOM nPY @@ -53252,9 +52743,9 @@ ovy oNI lOM scA -lJc +mJe mBV -lJc +mJe kWc tLY jET @@ -53491,9 +52982,9 @@ vPe jET kei kWk -jJM -knv -mJH +mJe +mJe +mJe nhC lOM nPY @@ -53509,9 +53000,9 @@ ovy oNI lOM scZ -jJM -knv -mJH +mJe +mJe +mJe kWk tOk jET @@ -53745,7 +53236,7 @@ izZ ivl iwf vPe -jFC +mJe kfD kXj lMh @@ -53771,7 +53262,7 @@ lOM sZn txk kfD -jFC +mJe vPe vPe vPe @@ -54002,7 +53493,7 @@ vPe wpJ iVA vPe -jHG +mJe kfS kXn lMh @@ -54028,7 +53519,7 @@ fRH sZn txr tPj -jHG +mJe vPe izZ wpJ @@ -54262,27 +53753,27 @@ jhz jIN khv kXT -lNe -knv +mJe +mJe mJe nhY nhY -lIj -knv -knv -mJe +mwP +mwP +mwP +mwP pFT lOM qAN -lIj -knv -knv +mJe +mJe +mJe mJe seA seA -lIj -knv -lcd +mJe +mJe +mJe tyd khv ubY @@ -54521,23 +54012,23 @@ khv kXn lNn szE -lJc +mJe brr lOM -lJc +mwP tmU moV -lJc +mwP lOM lOM lOM -lJc +mJe niV moV -lJc +mJe lOM eeV -lJc +mJe whd sZX txr @@ -54773,33 +54264,33 @@ ngo iNW iOg vPe -jFC +mJe kfS kXn lNu mpQ -jHG +mJe njJ njJ mwP -knv -knv -mJH +mwP +mwP +mwP njJ njJ njJ -jJM -knv -knv -nRU +mJe +mJe +mJe +mJe njJ njJ -jHG +mJe szX taf txr tPj -jFC +mJe vPe vPe vPe @@ -55030,7 +54521,7 @@ iNW iOg vPe vPe -jHG +mJe khv laa kfD @@ -55038,7 +54529,7 @@ kfD mMj kfD kfD -jHG +mwP owc oRB pph @@ -55048,7 +54539,7 @@ wbU qMv oRB qrL -jHG +mJe rHH kfD sob @@ -55056,7 +54547,7 @@ kfD kfD tyD khv -jHG +mJe vPe ivl vPe @@ -56058,7 +55549,7 @@ vPe vPe vPe vPe -jFC +mJe khv laU khv @@ -56066,7 +55557,7 @@ khv khv laU khv -jFC +mJe owt moV moV @@ -56076,7 +55567,7 @@ moV moV moV reR -jFC +mJe rIL khv laU @@ -56084,7 +55575,7 @@ sAg sAg sAg tPj -jFC +mJe vPe vPe jEk @@ -56315,15 +55806,15 @@ wpJ vPe jiV vPe -jJM -knv -lcd +mJe +mJe +mJe njJ njJ njJ -lNe -knv -nRU +mJe +mJe +mJe owq moV moV @@ -56333,15 +55824,15 @@ moV moV moV reF -mwP -lcd +mJe +mJe sfb -jFC +mJe sAC tdC tBi tQQ -jHG +mJe vPe vPe izZ @@ -56580,7 +56071,7 @@ lOM lOM skU nFC -lJc +mJe gHn oSZ haG @@ -56590,10 +56081,10 @@ oKt haG oSZ dvZ -lJc +mJe rJa sfs -lJc +mJe sBs tdF sBs @@ -56837,20 +56328,20 @@ lOM lOM pQd nFC -mwP -knv -knv -ppH -lcd +mJe +mJe +mJe +mJe +mJe qcl -lNe -ppH -knv -knv -nRU +mJe +mJe +mJe +mJe +mJe rKo sfs -lJc +mJe sBO sBs tdF @@ -57094,20 +56585,20 @@ lOM lOM pQd nFC -lJc +mJe vPe oTb -jHG +mJe pMv pJf pMv -jHG +mJe qOg vPe -lJc +mJe rKZ sgk -lJc +mJe sBs tdF sBs @@ -57343,7 +56834,7 @@ vPe vPe vPe vPe -jFC +mJe kpW leD lOM @@ -57351,7 +56842,7 @@ mrX lOM leD kpW -lJc +mJe izZ oTy jET @@ -57361,15 +56852,15 @@ pJf jET qOg jEk -lJc +mJe rMn sfs -lJc +mJe sCg teO tDf -lIj -lcd +mJe +mJe wpJ wpJ ngo @@ -57600,15 +57091,15 @@ vPe vPe wpJ vPe -jHG +mJe jET jET -lNe -knv -lcd +mJe +mJe +mJe jET jET -jHG +mJe izZ fwf jET @@ -57618,14 +57109,14 @@ pMv jET qOg jiV -jJM -knv -knv -mJH +mJe +mJe +mJe +mJe jET jET jET -jHG +mJe jEk vPe ngo @@ -58382,11 +57873,11 @@ vPe nSG izZ oTy -jFC +mJe pMw pJf pMv -jFC +mJe qPu vPe nSG @@ -58410,7 +57901,7 @@ wGu wGu wGu wGu -uhs +lsK tDM tDM lsK @@ -58426,15 +57917,15 @@ vPe vPe vPe oDx -vmA -kVB -kVB +iND +iND +iND iND alt alt -hln -kVB -kVB +iND +iND +iND iND vPe vPe @@ -58632,36 +58123,36 @@ vPe vPe vPe vPe -lIj -knv -knv -knv -knv -knv -knv -ppV -lcd +mJe +mJe +mJe +mJe +mJe +mJe +mJe +mJe +mJe qcl -lNe -ppV -knv -knv -rsG -rNL -rNL -rNL -rNL -sEl +mJe +mJe +mJe +mJe +lsK +lsK +lsK +lsK +lsK +lsK tcM uyZ -ucc -rNL -rNL -rNL -rNL -rsG -rNL -lTz +lsK +lsK +lsK +lsK +lsK +lsK +lsK +lsK xoT fKY cuf @@ -58670,7 +58161,7 @@ qNy tly xGb xNs -ljL +lsK vPe vPe izZ @@ -58686,13 +58177,13 @@ oDx unf kVT gPJ -qex +iND bce vhY -qex +iND fZg pun -mMH +iND iND vPe vPe @@ -58889,7 +58380,7 @@ vPe vPe vPe vPe -jHG +mJe mNB nkV llv @@ -58903,7 +58394,7 @@ nkV llv nkV rfE -mZE +lsK nYK nYK nYK @@ -58916,7 +58407,7 @@ nYK nYK nYK nYK -mZE +lsK iRG jjR xGb @@ -58943,14 +58434,14 @@ eSi luv dmj lxn -irg +iND nMc wDe -qex +iND aSy fZg fZg -xsf +iND iND vPe vPe @@ -59160,7 +58651,7 @@ nmw nmw nmw rgB -mZE +lsK gDm gVk mRB @@ -59173,7 +58664,7 @@ aAR nKH qsK wfM -mZE +lsK wBD jjR xGb @@ -59203,12 +58694,12 @@ dfC oDx nMc wDe -qex +iND aSy aSy aSy -xsf -rPF +iND +iND iND vPe xMR @@ -59417,7 +58908,7 @@ nmw nmw nmw rgB -mZE +lsK nYK uxM iBM @@ -59430,8 +58921,8 @@ iBM pVc pOi nYK -lvt -sEl +lsK +lsK blr xvr oFF @@ -59460,13 +58951,13 @@ dfC oDx nMc hEO -qex +iND fZg pBM fZg -qex +iND akW -mMH +iND iND vPe xMR @@ -59674,7 +59165,7 @@ nmw nmw nmw rgB -mZE +lsK nYK bVx wlI @@ -59696,9 +59187,9 @@ lKQ aWO klz jee -ljm -rNL -lTz +lsK +lsK +lsK vPe vPe vPe @@ -59706,7 +59197,7 @@ vPe vPe izZ vPe -cCl +iND xGV luv dmj @@ -59717,42 +59208,42 @@ dfC oDx nMc wDe -qex +iND fZg aSy aSy -qex +iND akW akW -qex +iND vPe ivl hII vPe -ljm -rNL -rNL -rNL -rNL -rNL -rNL -rNL -rNL -rNL -rNL -rNL -rNL -rNL -rNL -rNL -rNL -rNL -rNL -rNL -rNL -rNL -rNL -lYO +lsK +lsK +lsK +lsK +lsK +lsK +lsK +lsK +lsK +lsK +lsK +lsK +lsK +lsK +lsK +lsK +lsK +lsK +lsK +lsK +lsK +lsK +lsK +lsK iBm iGn iGf @@ -59931,7 +59422,7 @@ nmw nmw nmw rgB -mZE +lsK nYK uxM vgP @@ -59953,7 +59444,7 @@ bHM bMx kcI xGb -mZE +lsK vPe vPe vPe @@ -59963,7 +59454,7 @@ jiV vPe izZ vPe -irg +iND pSe dmj dmj @@ -59971,22 +59462,22 @@ dmj bZu mJn lxn -cCl +iND nMc wDe -qex +iND aSy fZg aSy -qex +iND eUc akW -irg +iND vPe wpJ vPe xMR -mZE +lsK nYK amX myt @@ -60009,7 +59500,7 @@ sKd myt sYR nYK -mZE +lsK vPe iBm iGn @@ -60188,7 +59679,7 @@ nmw nmw nmw rgB -mZE +lsK gDm uZO mOA @@ -60201,8 +59692,8 @@ mOA lga fBG wfM -ljm -sEl +lsK +lsK mFf iKS tYo @@ -60210,12 +59701,12 @@ veF tCX poo xGb -lvt -rNL -rNL -rNL -rNL -lYO +lsK +lsK +lsK +lsK +lsK +lsK vPe vPe vPe @@ -60228,22 +59719,22 @@ fbr jIq isc fHZ -qex +iND nMc wDe -qex +iND aSy aSy fZg -xsf -kVB -wWg +iND +iND +iND gSC gSC vPe xMR wpJ -mZE +lsK nYK lXz qiR @@ -60266,7 +59757,7 @@ qiR qiR uff nYK -mZE +lsK vPe jiV iAZ @@ -60431,7 +59922,7 @@ izZ izZ vPe vPe -jFC +mJe mOt nnb nnb @@ -60445,7 +59936,7 @@ nnb nnb nnb rit -mZE +lsK nYK nYK nYK @@ -60458,7 +59949,7 @@ eFc nYK nYK nYK -mZE +lsK qIk jjR xNs @@ -60472,7 +59963,7 @@ vua okO wXZ wXZ -mZE +lsK vPe vPe oDx @@ -60482,17 +59973,17 @@ luv dmj dmj nRW -hln -kVB -kVB -nHX +iND +iND +iND +iND njf aXw -mMH -kVB -kVB -kVB -uvZ +iND +iND +iND +iND +iND uHP htS jFV @@ -60500,7 +59991,7 @@ gSC gSC vPe kFV -mZE +lsK gDm lXz qiR @@ -60523,7 +60014,7 @@ qiR qiR uff wfM -mZE +lsK vPe vPe iAZ @@ -60688,8 +60179,8 @@ vPe vPe vPe vPe -mwP -lcd +mJe +mJe jET jET jET @@ -60701,8 +60192,8 @@ jET jET jET jET -lNe -rsZ +mJe +lsK cvl cvl sos @@ -60715,7 +60206,7 @@ lsK cvl cvl sos -mZE +lsK vtI jjR wGg @@ -60729,7 +60220,7 @@ vua okO wXZ jSZ -mZE +lsK vPe vPe oDx @@ -60739,7 +60230,7 @@ dmj dmj dmj tfq -qex +iND oyw dhX dhX @@ -60749,7 +60240,7 @@ dhX dhX dhX dhX -qex +iND jSH hCl mPc @@ -60757,7 +60248,7 @@ lJL gSC wpJ vPe -mZE +lsK nYK lXz qiR @@ -60780,7 +60271,7 @@ qiR qiR uff nYK -mZE +lsK vPe ivl iAZ @@ -60944,8 +60435,8 @@ vPe wpJ ivl vPe -ljm -lTz +lsK +lsK mOA mOA nHd @@ -60959,44 +60450,44 @@ mOA nHd mOA mOA -ljL +lsK mOA mOA mOA -ljL +lsK mOA mOA mOA mOA -ljL +lsK mOA mOA mOA -spD -rNL -rNL -rNL -rNL -rNL -lYO +lsK +lsK +lsK +lsK +lsK +lsK +lsK nra bGz -ucc +lsK aFz -lYO +lsK wXZ wXZ -ljL +lsK wGu wGu -cCl +iND eNB dmj dmj dmj dmj jJf -qex +iND nMc vhY woR @@ -61006,15 +60497,15 @@ woR rca dmj dmj -qex +iND mcz hCl hCl rms -cCl +iND wGu wGu -ljL +lsK nYK lXz qiR @@ -61037,7 +60528,7 @@ qiR qiR uff nYK -mZE +lsK vPe vPe iAZ @@ -61200,8 +60691,8 @@ vPe vPe wpJ vPe -ljm -lTz +lsK +lsK mxA mxA mxA @@ -61229,46 +60720,46 @@ uta mxA nYK nYK -mZE +lsK wDT xAs uCi lEC tph -mZE +lsK xGb xGb xGb pXQ -mZE +lsK wXZ wXZ ygg dXY opb -qex +iND vSy dmj dmj fbr xmo gAc -qex +iND nMc wDe -vmA -kVB -kVB -kVB -wWg +iND +iND +iND +iND +iND bus bus -qex +iND fGc hCl cNc eSy -qex +iND aao vua ygg @@ -61294,7 +60785,7 @@ qiR qiR uff nYK -mZE +lsK vPe vPe iAZ @@ -61457,7 +60948,7 @@ vPe vPe vPe vPe -ljL +lsK lVM myt myt @@ -61486,31 +60977,31 @@ uvE van vCV wfM -mZE +lsK wEL xBl xBl wFC wFC -ljL +lsK cUz xNs xNs qst -mZE +lsK wXZ wXZ ygg dXY xBC -qex +iND ebA dmj dmj ouC -hln -kVB -nHX +iND +iND +iND nMc wDe gSC @@ -61520,12 +61011,12 @@ xzh ebc hCl hCl -qex +iND mcz hCl hCl oRn -qex +iND eMn vua ygg @@ -61551,7 +61042,7 @@ qiR qiR uff nYK -mZE +lsK vPe jiV iAZ @@ -61743,7 +61234,7 @@ uwo vdW vDI nYK -mZE +lsK wFC wFC xBl @@ -61754,18 +61245,18 @@ xNs xNs tIn bDZ -mZE +lsK wXZ wXZ ygg dXY lwI -qex +iND czs dmj dmj ouC -qex +iND lAU dhX qOC @@ -61777,12 +61268,12 @@ nar gel hCl hCl -qex +iND jkA hCl hCl blf -qex +iND mLJ vua ygg @@ -61808,7 +61299,7 @@ qiR qiR uff nYK -mZE +lsK vPe vPe iAZ @@ -62000,29 +61491,29 @@ uwE wlI vDS nYK -mZE +lsK wIz lsK aVm -uhs +lsK wZU lsK xNs xNs xNs gDV -mZE +lsK nVw tFp -hln -kVB -kVB -rPF -sfg -wWg +iND +iND +iND +iND +iND +iND rVN -vmA -uvZ +iND +iND bLi dmj vhY @@ -62034,15 +61525,15 @@ dWc ebc hCl uXo -mMH -wWg +iND +iND mHZ nrP -vmA -nHX +iND +iND wGu wGu -uhs +lsK gDm lXz qiR @@ -62065,7 +61556,7 @@ qiR qiR uff wfM -mZE +lsK ivl wpJ iAZ @@ -62257,37 +61748,37 @@ uxM vgP vDI nYK -mZE +lsK wLP -mZE +lsK hHh nEp hsL -mZE +lsK xfK tcM tcM xfK -mZE +lsK wGu wGu -qex +iND url nBf pkS -irg +iND iRW uoE pko -irg +iND lDc dmj gkO -vmA -wWg +iND +iND ljv tJe -uvb +iND ebc hCl hCl @@ -62322,7 +61813,7 @@ qiR qiR uff nYK -mZE +lsK vPe vPe iAZ @@ -62514,21 +62005,21 @@ uyg vhZ vGa nYK -spD -rNL -wvo -rNL -rNL -rNL -oQr -sEl +lsK +lsK +lsK +lsK +lsK +lsK +lsK +lsK okO okO -ucc -rsZ +lsK +lsK vPe vPe -qex +iND gCz oDi iBt @@ -62579,7 +62070,7 @@ qiR qiR uff nYK -mZE +lsK vPe vPe iAZ @@ -62771,21 +62262,21 @@ uxM viK vHB nYK -mZE +lsK wPq xBV bsK lWc wXg -mZE +lsK ebq hDb xWp gZE -mZE +lsK vPe vPe -irg +iND dIE dmj iBt @@ -62836,7 +62327,7 @@ qiR qiR uff nYK -mZE +lsK vPe jiV iAZ @@ -63028,18 +62519,18 @@ uDd viM vKv wfM -mZE +lsK wUZ xBV wWV xBV aHS -mZE +lsK aae tkm tDk qsy -mZE +lsK vPe jiV oDx @@ -63062,12 +62553,12 @@ dIY vfh hCl qnX -hln -wWg +iND +iND nnw nnw -vmA -wWg +iND +iND rBc nYK nYK @@ -63093,7 +62584,7 @@ qiR qiR uff nYK -mZE +lsK vPe vPe iAZ @@ -63285,33 +62776,33 @@ uHa vny vKQ uHa -mZE +lsK wVn xBV qHC xBV nIK -mZE +lsK aaf tkm ssv tWF -mZE +lsK jEk vPe oDx krC gay pGk -cCl +iND aFh ttr usi -cCl +iND nMc wDe -vmA -wWg +iND +iND gzB hwi anf @@ -63319,7 +62810,7 @@ nja tKD hCl hCl -qex +iND nYu bfg bfg @@ -63350,7 +62841,7 @@ qiR qiR uff nYK -mZE +lsK vPe akg iAZ @@ -63537,34 +63028,34 @@ qiR qiR qiR qiR -uhs +lsK wGu wGu wGu wGu -ljL +lsK wXg xCM ieK xCM xNx -ljL +lsK jKU tkm ssv uON -ljL +lsK vPe vPe -vmA -wWg +iND +iND tJk cpA -irg +iND qpI vPq gfs -irg +iND noN wDe gSC @@ -63576,7 +63067,7 @@ kQX aNy vYT jyy -qex +iND sqV gOB fqN @@ -63607,7 +63098,7 @@ qiR qiR uff wfM -mZE +lsK vPe ivl iAZ @@ -63833,7 +63324,7 @@ rIf cGG cnV dWJ -qex +iND ask uzi hMW @@ -63864,7 +63355,7 @@ qiR qiR uff nYK -mZE +lsK vPe wpJ iAZ @@ -64090,7 +63581,7 @@ hEW cjD msh dWJ -qex +iND oOb uzi hMW @@ -64121,7 +63612,7 @@ qiR qiR uff nYK -mZE +lsK vPe jiV iAZ @@ -64308,7 +63799,7 @@ qiR qiR qiR qiR -uhs +lsK wGu wGu wGu @@ -64327,15 +63818,15 @@ psE lsK vPe vPe -vmA -wWg +iND +iND tJk aUf -cCl +iND pvC uoE eCX -cCl +iND llS wDe gSC @@ -64347,7 +63838,7 @@ npt oPI sRh ejy -qex +iND grJ ttS dBt @@ -64378,7 +63869,7 @@ qiR qiR uff wfM -mZE +lsK vPe vPe iAZ @@ -64570,33 +64061,33 @@ uLg vrH vMj wje -mZE +lsK xbw xGb eOV tkm kSF -mZE +lsK aOE jEO fRP gVQ -ljL +lsK vPe jEk oDx krC nBf pkS -irg +iND aFh ttr usi -irg +iND nMc wDe -vmA -wWg +iND +iND dcA qzC fPz @@ -64604,7 +64095,7 @@ nkJ itt hCl hCl -qex +iND nYu bfg bfg @@ -64635,7 +64126,7 @@ qiR qiR uff nYK -mZE +lsK vPe ivl iAZ @@ -64827,13 +64318,13 @@ uLi van vWs wkk -mZE +lsK xdH xIM gMG tkm taB -ljL +lsK izc lGT jDS @@ -64861,12 +64352,12 @@ dIY vfh hCl uXo -mMH -wWg +iND +iND vpY vpY -vmA -wWg +iND +iND rBc nYK nYK @@ -64892,7 +64383,7 @@ qiR qiR uff nYK -mZE +lsK vPe vPe iAZ @@ -65084,7 +64575,7 @@ uMl vvX vWN mxA -mZE +lsK xdW xJo xPb @@ -65098,7 +64589,7 @@ aOB wGu vPe vPe -cCl +iND dIE dmj iBt @@ -65149,7 +64640,7 @@ qiR qiR uff nYK -mZE +lsK akg vPe iAZ @@ -65341,7 +64832,7 @@ uMQ yas vYs mxA -ljL +lsK fUX xGb esE @@ -65355,7 +64846,7 @@ ufa lsK vPe vPe -qex +iND tLH oDi iBt @@ -65406,7 +64897,7 @@ qiR qiR uff nYK -mZE +lsK vPe jiV iAZ @@ -65604,31 +65095,31 @@ rKb rKb wXi mlH -spD -rNL -rNL -rNL -rNL -rsZ +lsK +lsK +lsK +lsK +lsK +lsK wGu wGu -qex +iND url gay pGk -cCl +iND qpI vPq gwk -cCl +iND bLi dmj gkO -vmA -wWg +iND +iND wNm tJe -uvb +iND ebc hCl hCl @@ -65663,7 +65154,7 @@ qiR qiR uff nYK -mZE +lsK vPe ivl iAZ @@ -65861,23 +65352,23 @@ xGb xGb tkm fnJ -mZE +lsK spk wlI yas spk -mZE +lsK rjt pLC -mMH -kVB -kVB -sfg -rPF -wWg +iND +iND +iND +iND +iND +iND lWx -vmA -uvZ +iND +iND lDc dmj icT @@ -65889,15 +65380,15 @@ dWc ebc hCl uXo -hln -wWg +iND +iND mHZ nrP -vmA +iND iND wGu wGu -uhs +lsK gDm lXz qiR @@ -65920,7 +65411,7 @@ qiR qiR uff wfM -mZE +lsK vPe wpJ iAZ @@ -66112,29 +65603,29 @@ uxM vgP vDI nYK -mZE +lsK xfL xNx xGb tkm csh -mZE +lsK spk wlI yas spk -mZE +lsK wXZ wXZ ygg dXY oEs -qex +iND nyH dmj dmj sLW -qex +iND hxy woR bce @@ -66146,12 +65637,12 @@ nar aSA hCl hCl -qex +iND jkA hCl hCl blf -qex +iND wVK vua ygg @@ -66177,7 +65668,7 @@ qiR qiR uff nYK -mZE +lsK vPe vPe iAZ @@ -66369,30 +65860,30 @@ uSD vyy waI wfM -mZE +lsK xhc xPb wXg tkm ssv -mZE +lsK liY yas wlI iyi -mZE +lsK wXZ wXZ ygg dXY ehm -qex +iND nyH dmj dmj sLW -mMH -kVB +iND +iND iND nMc wDe @@ -66403,12 +65894,12 @@ nar ebc hCl hCl -qex +iND mcz hCl hCl rms -qex +iND fAD vua ygg @@ -66434,7 +65925,7 @@ qiR qiR uff nYK -mZE +lsK vPe tdQ iAZ @@ -66597,8 +66088,8 @@ duS vPe vPe vPe -lvt -lYO +lsK +lsK mzk mxA mxA @@ -66626,46 +66117,46 @@ uZp mxA nYK nYK -mZE +lsK xhl xTf jee yah taB -mZE +lsK spk wlI yas spk -mZE +lsK wXZ wXZ ygg dXY sAl -qex +iND jfV dmj dmj esC xLn jnx -qex +iND nMc wDe -vmA -kVB -kVB -kVB -wWg +iND +iND +iND +iND +iND bus bus -qex +iND fGc hCl cNc eSy -qex +iND pOE vua ygg @@ -66691,7 +66182,7 @@ qiR qiR uff nYK -mZE +lsK vPe wpJ iAZ @@ -66855,8 +66346,8 @@ vPe vPe ivl vPe -lvt -lYO +lsK +lsK mRB mRB nHg @@ -66883,31 +66374,31 @@ lsK mRB mRB mRB -spD -rNL -rNL -sEl +lsK +lsK +lsK +lsK okO okO -lvt -sEl +lsK +lsK gSx gSx -ucc -lTz +lsK +lsK wXZ wXZ lsK wGu wGu -irg +iND bIU dmj dmj ruB dmj qjR -qex +iND nMc icT dhX @@ -66917,12 +66408,12 @@ dhX tKP dmj dmj -qex +iND mcz hCl hCl oRn -irg +iND wGu wGu lsK @@ -66948,7 +66439,7 @@ qiR qiR uff nYK -mZE +lsK vPe vPe iAZ @@ -67113,8 +66604,8 @@ vPe izZ vPe vPe -mzF -kJP +rvs +rvs qQE qQE qQE @@ -67126,21 +66617,21 @@ qQE qQE qQE qQE -mer -oJh +rvs +rvs pQe pQe -spD -rNL -rNL -rNL -lTz +lsK +lsK +lsK +lsK +lsK ocZ -lvt -rNL -rNL -rNL -rsZ +lsK +lsK +lsK +lsK +lsK xjo xYF hCL @@ -67154,7 +66645,7 @@ vua okO wXZ jSZ -mZE +lsK izZ vPe oDx @@ -67164,7 +66655,7 @@ ruB ruB izp kgG -qex +iND iny woR woR @@ -67174,7 +66665,7 @@ woR woR woR woR -qex +iND inX hCl wqk @@ -67182,7 +66673,7 @@ vTr gSC vPe vPe -mZE +lsK nYK lXz qiR @@ -67205,7 +66696,7 @@ qiR qiR uff nYK -mZE +lsK vPe wpJ iAZ @@ -67370,7 +66861,7 @@ vPe vPe vPe vPe -jYY +rvs mSB nqX nqX @@ -67384,10 +66875,10 @@ nqX nqX nqX riD -oEe +rvs pQe pQe -mZE +lsK qiR qiR vTC @@ -67397,7 +66888,7 @@ xlm vTC qiR qiR -mZE +lsK xlE yas wlI @@ -67411,7 +66902,7 @@ vua okO wXZ wXZ -mZE +lsK vPe ivl oDx @@ -67421,17 +66912,17 @@ ekY ruB dmj rim -mMH -kVB -kVB +iND +iND +iND iND njf aXw -hln -kVB -kVB -kVB -uvZ +iND +iND +iND +iND +iND hPQ cfx rGH @@ -67439,7 +66930,7 @@ gSC gSC vPe vPe -mZE +lsK gDm lXz qiR @@ -67462,7 +66953,7 @@ qiR qiR uff wfM -mZE +lsK vPe wpJ iAZ @@ -67641,10 +67132,10 @@ nqY nqY nqY rkx -oEe +rvs hag pQe -mZE +lsK qiR vTC jim @@ -67654,7 +67145,7 @@ wre jim vTC qiR -mZE +lsK xoy yas yas @@ -67663,12 +67154,12 @@ yas xlE wlI yas -ljm -rNL -rNL -rNL -rNL -lTz +lsK +lsK +lsK +lsK +lsK +lsK vPe vPe vPe @@ -67681,22 +67172,22 @@ esC fhX hRw hcx -qex +iND nMc wDe -qex +iND aSy aSy aSy -xsf -kVB -wWg +iND +iND +iND gSC gSC vPe vPe vPe -mZE +lsK nYK rwB myH @@ -67719,7 +67210,7 @@ myH myH uhU nYK -mZE +lsK vPe jiV iAZ @@ -67898,11 +67389,11 @@ nqY nqY nqY rkx -oEe +rvs pQe pQe -lvt -sEl +lsK +lsK xlm uaD xwm @@ -67910,9 +67401,9 @@ uVg xwm rxj xlm -ucc -wvo -sEl +lsK +lsK +lsK ycX yas wlI @@ -67920,7 +67411,7 @@ wlI xlE yas sCt -mZE +lsK vPe izZ izZ @@ -67930,7 +67421,7 @@ wpJ jiV izZ vPe -cCl +iND aui dmj dmj @@ -67938,22 +67429,22 @@ dmj dmj nyA nMV -irg +iND nMc wDe -qex +iND +aSy aSy -vCn aSy -qex +iND akW akW -cCl +iND vPe vPe jiV vPe -mZE +lsK nYK nYK jeE @@ -67976,7 +67467,7 @@ nYK jeE nYK nYK -mZE +lsK vPe vPe iAZ @@ -68155,7 +67646,7 @@ nqY nqY nqY rkx -oEe +rvs pQe pQe oRQ @@ -68177,9 +67668,9 @@ xlE yas wlI wlI -lvt -rNL -lYO +lsK +lsK +lsK vPe wpJ ivl @@ -68187,7 +67678,7 @@ vPe wpJ vPe vPe -irg +iND rjv ekY dmj @@ -68198,21 +67689,21 @@ qpY oDx nMc wDe -qex +iND aSy aSy aOi -qex +iND akW akW -qex +iND vPe vPe wpJ vPe -lvt -rNL -sEl +lsK +lsK +lsK cvl cvl cvl @@ -68231,9 +67722,9 @@ cvl cvl cvl sOp -ucc -rNL -lTz +lsK +lsK +lsK wpJ ngo iDT @@ -68412,11 +67903,11 @@ nqY nqY nqY rkx -oEe +rvs pQe pQe -ljm -sEl +lsK +lsK xlm uaD xwm @@ -68424,9 +67915,9 @@ uWJ xwm rxj xlm -ucc -rsG -sEl +lsK +lsK +lsK wGu wGu wGu @@ -68436,7 +67927,7 @@ wlI wlI yas vwk -ljL +lsK vPe vPe vPe @@ -68455,14 +67946,14 @@ bUX oDx nMc hEO -qex +iND aSy aSy aSy -qex +iND akW -hln -nHX +iND +iND vPe vPe ivl @@ -68669,10 +68160,10 @@ nqY nqY nqY rkx -oEe +rvs hag pQe -mZE +lsK qiR vTC jim @@ -68682,7 +68173,7 @@ kmD jim vTC qiR -mZE +lsK xoH yjA wlI @@ -68712,13 +68203,13 @@ jEe oDx nMc wDe -qex +iND +aSy aSy -vCn aSy -xsf -sfg -nHX +iND +iND +iND vPe vPe akg @@ -68912,7 +68403,7 @@ izZ vPe vPe vPe -jWK +rvs mTp nrg rlT @@ -68926,10 +68417,10 @@ nrg rlT nrg rkV -oEe +rvs pQe pQe -mZE +lsK qiR qiR vTC @@ -68939,7 +68430,7 @@ xlm vTC qiR qiR -mZE +lsK aHf yjF yas @@ -68950,7 +68441,7 @@ wlI yas xlE dxs -wGu +lsK vPe vPe apu @@ -68966,15 +68457,15 @@ oOy ekY dmj bgu -cCl +iND nMc wDe -qex +iND aSy -vCn aSy -xsf -nHX +aSy +iND +iND vPe vPe vPe @@ -69169,34 +68660,34 @@ vPe wpJ wpJ vPe -jYc -mEu -mEu -mEu -mEu -mEu -mEu -oAu -kJP +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs qfD -mer -oAu -mEu -mEu -oJh +rvs +rvs +rvs +rvs +rvs pQe pQe -spD -rNL -rNL -rNL -lYO +lsK +lsK +lsK +lsK +lsK jEv -ljm -rNL -rNL -rNL -lTz +lsK +lsK +lsK +lsK +lsK wGu ykF vnN @@ -69223,14 +68714,14 @@ oDx iQH xRi jNM -qex +iND qOC icT -qex +iND aSy aSy -hln -nHX +iND +iND vPe vPe wpJ @@ -69433,23 +68924,23 @@ vPe nSG vPe oTy -jYY +rvs pNO pQe dFh -jYY +rvs qOg oUj -jYY +rvs pQe pQe -jYY +rvs qOg izZ oTy -jYY +rvs pQe -jYY +rvs qPu vPe izZ @@ -69461,10 +68952,10 @@ wGu wGu wGu wGu -uhs +lsK vAv vAv -ljL +lsK vPe vPe wpJ @@ -69477,16 +68968,16 @@ vPe vPe vPe oDx -vmA -kVB -kVB -nHX +iND +iND +iND +iND alt alt -mMH -kVB -kVB -nHX +iND +iND +iND +iND vPe vPe vPe @@ -70718,23 +70209,23 @@ vPe nSG vPe oTy -jWK +rvs dFh pQe dFh -jWK +rvs qPu oTy -jWK +rvs pQe pQe -jWK +rvs qOg vPe oTb -jWK +rvs pQe -jWK +rvs qPu vPe izZ @@ -70973,26 +70464,26 @@ vPe izZ vPe nYR -mEu -mEu -oJZ -kJP +rvs +rvs +rvs +rvs qfD -mer -oJZ -mEu -mEu +rvs +rvs +rvs +rvs rvs rQr rQr -jYc -mEu -mEu -mEu +rvs +rvs +rvs +rvs rvs qLW -jYc -kJP +rvs +rvs svh svh rNF @@ -71001,16 +70492,16 @@ iAZ iEU duS akg -sKO +dII dII kfv bVI -eIp -god -oTY -oTY -oTY -hPX +dII +dII +dII +dII +dII +dII nJg nJg nJg @@ -71258,16 +70749,16 @@ iDT iEU duS eOC -sFq +dII vsf dfm dfm tun -gpg +dII aVE xaP nhv -sFq +dII ivl wpJ ngo @@ -71515,7 +71006,7 @@ iEU nAO duS vPe -sFq +dII ftx dfm dfm @@ -71524,7 +71015,7 @@ azv bKX nKg kxL -gpg +dII akg vPe jDy @@ -71772,7 +71263,7 @@ iGn iEU duS izZ -gpg +dII bjl dfm dfm @@ -71992,35 +71483,35 @@ vPe izZ vPe vPe -jTt +rvs jWb jWb jWb -mer -mEu -mEu -mEu -mEu -oAu -mEu -mEu -kJP +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs qgr -mer -mEu -mEu -oAu -mEu -mEu -mEu -oAu -mEu -mEu -mEu -oAu -mEu -mEu -kJP +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs vPe vPe mpT @@ -72258,7 +71749,7 @@ mUV nrC nKy nrC -oEe +rvs oVZ puE oWS @@ -72266,15 +71757,15 @@ qhH oWS puE oVZ -oEe +rvs rvw rQN shc -oEe +rvs sGZ sGZ sGZ -oEe +rvs umd vPe meq @@ -72291,7 +71782,7 @@ dfm dfm dfm jtb -swu +dII nDx nKg wsI @@ -72515,7 +72006,7 @@ mVq nsg nKA ocs -oEe +rvs oWb pbN pbN @@ -72523,17 +72014,17 @@ pbN pbN pbN qQM -jYY +rvs rxy rxy rxy -jYY +rvs sIc sIc sIc -jYc -mEu -tVz +rvs +rvs +rvs fwl vPe wqQ @@ -72552,7 +72043,7 @@ wVt nKg nKg kPn -nGy +dII iEU iEU dTN @@ -72772,7 +72263,7 @@ mVq nsi nMF odT -oEe +rvs oWt pbN pbN @@ -72790,7 +72281,7 @@ tgO ryw tYh umN -oEe +rvs vPe iwb vPe @@ -72805,11 +72296,11 @@ dfm dfm dfm joS -nGy +dII xMN rfL drU -sFq +dII iEU iEU pKA @@ -73020,7 +72511,7 @@ vPe vPe izZ vPe -jWK +rvs kHn kHn mdt @@ -73029,7 +72520,7 @@ mYk ntx lGK lGE -oEe +rvs oWS pbN pRI @@ -73047,7 +72538,7 @@ tid ryw tYh umN -oEe +rvs vPe akg jiV @@ -73057,16 +72548,16 @@ iAZ nAO duS vPe -nGy +dII bSL dfm dfm dga -trP -oTY -oTY -oTY -sQb +dII +dII +dII +dII +dII iEU iEU hQg @@ -73277,16 +72768,16 @@ vPe vPe ivl vPe -jYc -kJP +rvs +rvs lDp -mer -mEu -kJP +rvs +rvs +rvs nuU nMT nuU -oEe +rvs oXD pbN pRX @@ -73304,7 +72795,7 @@ tik ryw tYh umN -oEe +rvs iwb iwb kLx @@ -73314,7 +72805,7 @@ iAZ iEU duS vPe -sFq +dII fxW dfm dfm @@ -73543,7 +73034,7 @@ kKP kKP kKP oeH -oEe +rvs oYg pbN pbN @@ -73561,7 +73052,7 @@ tnF ryw tYh umN -oEe +rvs vPe iwb vPe @@ -73571,7 +73062,7 @@ iAZ iEU duS ivl -sFq +dII cks dfm dfm @@ -73800,7 +73291,7 @@ mgd lDs kKP ofX -oEe +rvs oZd pbN pSU @@ -73808,16 +73299,16 @@ pbN pbN pbN qXw -jWK +rvs rzJ rzJ rzJ -jWK +rvs sLG sLG sLG -tYp -mEu +rvs +rvs rvs akg iwb @@ -73828,28 +73319,28 @@ iAZ iEU duS vPe -sFq +dII fEQ dfm dfm iuk -sKO -oTY -oTY -oTY -god -oTY -oTY -oTY -hPX +dII +dII +dII +dII +dII +dII +dII +dII +dII cKt -swu +dII wUJ -sKO -oTY -oTY -oTY -hPX +dII +dII +dII +dII +dII vPe vPe ivl @@ -74057,7 +73548,7 @@ nbp lDs kKP ogm -jYY +rvs oWS pbN pSU @@ -74065,15 +73556,15 @@ pSU pbN pbN qXK -oEe +rvs rAb rVF rAb -oEe +rvs sPd sPd sPd -oEe +rvs wzP nXS vPe @@ -74085,28 +73576,28 @@ iAZ iEU duS vPe -sFq +dII iiP dfm dfm cja -sFq +dII giw plV uUC -sFq +dII cfK tLv cfK -sFq +dII ena wbG dQE -sFq +dII cfK tLv cfK -sFq +dII vPe vPe wpJ @@ -74322,15 +73813,15 @@ pSU qCc pSU qXM -mzF -mEu -mEu -mEu -rqI -mEu -mEu -mEu -oJh +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs nKV sLT xaG @@ -74342,28 +73833,28 @@ iAZ nAO duS vPe -sFq +dII qnT dfm dfm muO -gpg +dII nKg nKg ghO -sFq +dII hDO kzy ncB -sFq +dII iSY mSv dQE -sFq +dII hDO kzy vTH -sFq +dII vPe vPe lPe @@ -74571,7 +74062,7 @@ nbC lDs kKP ogm -jWK +rvs oWS pbN pSU @@ -74579,15 +74070,15 @@ pSU pbN pbN qYf -oEe +rvs rAk rWt rAk -oEe +rvs sPi tqP tFQ -oEe +rvs nKV nXS xMR @@ -74599,7 +74090,7 @@ iAZ iEU duS ivl -sFq +dII fxW dfm dfm @@ -74608,19 +74099,19 @@ wVt nKg nKg tnt -sFq +dII ooP dfm woh -sFq +dII ena wbG dQE -sFq +dII ooP dfm oPc -sFq +dII vPe vPe vPe @@ -74828,7 +74319,7 @@ mgd lDs kKP ofX -oEe +rvs oZd pbN pSU @@ -74836,17 +74327,17 @@ pbN pbN pbN qYX -jYY +rvs rDb rDb rDb -jYY +rvs sRq sRq sRq -jYc -mEu -tVz +rvs +rvs +rvs iwb jEk meq @@ -74856,28 +74347,28 @@ iAZ iEU duS vPe -sFq +dII qqi dfm dfm xlF -nGy +dII aeq nKg ghO -sFq +dII azv rmG azv -gpg +dII tek -swu +dII kBd -gpg +dII azv rmG azv -sFq +dII vPe vPe vPe @@ -75085,7 +74576,7 @@ kKP kKP kKP oeH -oEe +rvs pcD pbN pbN @@ -75103,7 +74594,7 @@ tgO ryw tYq unV -oEe +rvs vPe akg uNb @@ -75113,16 +74604,16 @@ iAZ iEU duS vPe -sFq +dII bhW dfm dfm pBc -sFq +dII xJr ogw -sKO -sQb +dII +dII oDL jQm jQm @@ -75134,7 +74625,7 @@ kWe jQm jQm sfW -gpg +dII vPe vPe ivl @@ -75333,16 +74824,16 @@ vPe vPe vPe vPe -jWK +rvs kMm lFw mls mGA nbV -mer -mEu -mEu -oJh +rvs +rvs +rvs +rvs pdl pbN pUu @@ -75360,7 +74851,7 @@ tid ryw tYq uoF -oEe +rvs akg wLD eFO @@ -75370,15 +74861,15 @@ iAZ iEU duS vPe -csL +dII dII ivz tXq -eIp -sQb +dII +dII wgc yaI -gpg +dII usm dQq bDo @@ -75590,7 +75081,7 @@ vPe vPe vPe vPe -jYY +rvs kPd lGE lGK @@ -75599,7 +75090,7 @@ lGK nvA nMZ olg -oEe +rvs oWS pbN pRI @@ -75617,7 +75108,7 @@ tik ryw tYq uqo -oEe +rvs akg jiV akg @@ -75627,7 +75118,7 @@ iAZ nAO duS ivl -sFq +dII oiD dfm dfm @@ -75856,7 +75347,7 @@ nbY nvU lGE omB -oEe +rvs pdq pbN pbN @@ -75874,7 +75365,7 @@ tnF ryw tYq urU -oEe +rvs sMD vPe akg @@ -75884,7 +75375,7 @@ iAZ iEU duS vPe -sFq +dII oZs dfm dfm @@ -76113,7 +75604,7 @@ ncZ nwZ lGK opx -oEe +rvs pdO pbN pbN @@ -76121,16 +75612,16 @@ pbN pbN pbN qZt -jWK +rvs rDr rDr rDr -jWK +rvs sRC sRC sRC -tYp -mEu +rvs +rvs rvs akg xMR @@ -76141,15 +75632,15 @@ iAZ iEU duS vPe -csL +dII dII tXq tXq -eIp -oTY -oTY -oTY -hPX +dII +dII +dII +dII +dII rVB feu bDo @@ -76370,7 +75861,7 @@ lGE lGK lGE orb -oEe +rvs oVZ puO oWS @@ -76378,15 +75869,15 @@ pbN oWS puO oVZ -oEe +rvs rAk jGH rAk -oEe +rvs sSy tsX tFT -oEe +rvs vPe vPe vPe @@ -76398,7 +75889,7 @@ iAZ iEU duS vPe -sFq +dII trQ dfm dfm @@ -76406,8 +75897,8 @@ dfm gCK pJv gCK -trP -hPX +dII +dII oVF eGh eGh @@ -76419,7 +75910,7 @@ tls eGh eGh sas -nGy +dII vPe vPe vPe @@ -76618,32 +76109,32 @@ duS vPe vPe vPe -jTt +rvs jWb jWb jWb -jTt +rvs neu lGE lGK ory -mzF -mEu -mEu -kJP +rvs +rvs +rvs +rvs oHZ -mer -mEu -mEu -rqI -mEu -mEu -mEu -oJZ -mEu -mEu -mEu -oJh +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs vPe akg kLx @@ -76655,7 +76146,7 @@ iAZ iEU duS ivl -sFq +dII trQ gIz dfm @@ -76664,19 +76155,19 @@ dfm dfm dfm olI -sFq +dII azv rmG azv -nGy +dII azv rmG azv -nGy +dII azv rmG azv -sFq +dII vPe wpJ vPe @@ -76884,7 +76375,7 @@ nfd lGK lGE osm -oEe +rvs pEI pBt lDs @@ -76892,7 +76383,7 @@ lDs lDs pBt rbh -jYY +rvs rDS rWR rFP @@ -76900,7 +76391,7 @@ rFP rFP bll rFP -oEe +rvs vPe xMR jEk @@ -76912,7 +76403,7 @@ dlk iEU duS vPe -sFq +dII iRS dfm jCo @@ -76921,19 +76412,19 @@ dfm oPc dfm roK -sFq +dII ooP dfm dfm -sFq +dII ooP dfm dfm -sFq +dII ooP dfm oPc -sFq +dII vPe wpJ vPe @@ -77141,7 +76632,7 @@ lGK lGE lGK osJ -oEe +rvs pPN pek pek @@ -77153,11 +76644,11 @@ rro rFP rFP rFP -jWK +rvs sTm -jWK +rvs tFV -oEe +rvs xMR vPe kLx @@ -77169,7 +76660,7 @@ iAZ nAO duS vPe -sFq +dII trQ dfm oPc @@ -77178,19 +76669,19 @@ ptO dfm dfm pJe -sFq +dII hDO kzy vTH -sFq +dII hDO kzy vTH -sFq +dII hDO kzy vTH -sFq +dII vPe jiV vPe @@ -77398,7 +76889,7 @@ nfE nyW nNi otg -oEe +rvs pev pev pev @@ -77406,15 +76897,15 @@ qhO pev pev pev -jWK +rvs rHo rXb rXb -oEe +rvs sUh -oEe +rvs tJb -oEe +rvs xMR vPe sMD @@ -77426,7 +76917,7 @@ bHH iEU duS vPe -sFq +dII trQ oPc jOQ @@ -77435,19 +76926,19 @@ dLM qEp lvV hdT -sFq +dII cfK xaq cfK -sFq +dII cfK mYw cfK -sFq +dII cfK kSA fti -sFq +dII vPe vPe ivl @@ -77650,27 +77141,27 @@ iHN vPe vPe ivl -mer -mEu -mEu -mEu -mEu -oJZ -mEu -mEu -mEu -mEu -mEu -mEu -mEu -oJZ -mEu -mEu -mEu -oJZ -mEu -oJZ -mEu +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs +rvs rvs vPe vPe @@ -77683,28 +77174,28 @@ iAZ iEU duS ivl -trP -oTY -oTY -oTY -oTY -oTY -oTY -oTY -oTY -oyp -oTY -oTY -oTY -oyp -oTY -oTY -oTY -oyp -oTY -oTY -oTY -sQb +dII +dII +dII +dII +dII +dII +dII +dII +dII +dII +dII +dII +dII +dII +dII +dII +dII +dII +dII +dII +dII +dII vPe vPe vPe @@ -79065,27 +78556,27 @@ mVX dwR dwR dwR -dbC -dbC -dbC -dbC -dbC -dbC +dwR +dwR +dwR +dwR +dwR +dwR mVX mVX mVX mVX mVX mVX -dbC -dbC -dbC -dbC -dbC -dbC -dbC -dbC -dbC +dwR +dwR +dwR +dwR +dwR +dwR +dwR +dwR +dwR mVX mVX mVX @@ -79327,14 +78818,14 @@ ykS ykS ykS ykS -dbC -dbC +dwR +dwR mVX mVX mVX mVX -dbC -dbC +dwR +dwR ykS ykS ykS @@ -79342,8 +78833,8 @@ fDl ykS ykS ykS -dbC -dbC +dwR +dwR mVX mVX mVX @@ -79585,12 +79076,12 @@ tdj tdj ykS ykS -dbC -dbC +dwR +dwR mVX -dbC -dbC -dbC +dwR +dwR +dwR ykS ykS ykS @@ -79600,8 +79091,8 @@ fDl ykS ykS ykS -dbC -dbC +dwR +dwR mVX mVX mVX @@ -79843,9 +79334,9 @@ ykS fDl ykS rns -dbC -dbC -dbC +dwR +dwR +dwR ykS ykS ycO @@ -79858,7 +79349,7 @@ ykS ykS tdj ykS -dbC +dwR mVX mVX mVX @@ -80115,8 +79606,8 @@ tdj ycO ykS tdj -dbC -dbC +dwR +dwR mVX mVX mVX @@ -80342,7 +79833,7 @@ mVX mVX mVX mVX -dbC +dwR dwR ykS kjK @@ -80373,8 +79864,8 @@ ykS ykS ykS ykS -dbC -dbC +dwR +dwR mVX mVX mVX @@ -80598,8 +80089,8 @@ mVX mVX mVX mVX -dbC -dbC +dwR +dwR ykS cxG gGY @@ -80631,7 +80122,7 @@ fDl fDl emN ykS -dbC +dwR mVX mVX mVX @@ -80854,8 +80345,8 @@ mVX mVX mVX mVX -dbC -dbC +dwR +dwR ykS ykS kjK @@ -80888,8 +80379,8 @@ ykS ykS ykS ykS -dbC -dbC +dwR +dwR mVX mVX mVX @@ -81110,8 +80601,8 @@ mVX mVX mVX mVX -dbC -dbC +dwR +dwR ykS ykS cxG @@ -81146,8 +80637,8 @@ ykS fDl ykS ykS -dbC -dbC +dwR +dwR mVX mVX mVX @@ -81357,17 +80848,17 @@ mVX (121,1,1) = {" mVX mVX -dbC -dbC -dbC -dbC -dbC -dbC -dbC -dbC -dbC -dbC -dbC +dwR +dwR +dwR +dwR +dwR +dwR +dwR +dwR +dwR +dwR +dwR ykS ykS dLF @@ -81404,7 +80895,7 @@ ykS fDl ykS ykS -dbC +dwR mVX mVX mVX @@ -81613,8 +81104,8 @@ mVX "} (122,1,1) = {" mVX -dbC -dbC +dwR +dwR ykS tdj ykS @@ -81661,18 +81152,18 @@ ykS kQk ykS ykS -dbC -dbC -dbC -dbC -dbC -dbC -dbC -dbC -dbC -dbC -dbC -dbC +dwR +dwR +dwR +dwR +dwR +dwR +dwR +dwR +dwR +dwR +dwR +dwR mVX mVX mVX @@ -81869,8 +81360,8 @@ mVX mVX "} (123,1,1) = {" -dbC -dbC +dwR +dwR ykS adW ykS @@ -81929,8 +81420,8 @@ ykS tdj tdj ykS -dbC -dbC +dwR +dwR mVX mVX mVX @@ -82126,7 +81617,7 @@ mVX mVX "} (124,1,1) = {" -dbC +dwR ykS ykS ykS @@ -82187,8 +81678,8 @@ tdj emN ykS ykS -dbC -dbC +dwR +dwR mVX mVX mVX @@ -82383,7 +81874,7 @@ mVX mVX "} (125,1,1) = {" -dbC +dwR ykS ykS adW @@ -82445,8 +81936,8 @@ tdj tdj emN ykS -dbC -dbC +dwR +dwR mVX mVX pNM @@ -82640,7 +82131,7 @@ mVX mVX "} (126,1,1) = {" -dbC +dwR ykS ycO ykS @@ -82703,8 +82194,8 @@ tdj ykS ykS ykS -dbC -dbC +dwR +dwR mVX pNM mVX @@ -82897,7 +82388,7 @@ mVX mVX "} (127,1,1) = {" -dbC +dwR ykS ykS adW @@ -82961,8 +82452,8 @@ ykS ykS ykS ykS -dbC -dbC +dwR +dwR pNM mVX mVX @@ -83154,7 +82645,7 @@ mVX mVX "} (128,1,1) = {" -dbC +dwR ykS adW ykS @@ -83219,7 +82710,7 @@ ykS tdj ykS ykS -dbC +dwR pNM mVX mVX @@ -83411,20 +82902,20 @@ mVX mVX "} (129,1,1) = {" -dbC +dwR ykS awu ykS ykS tdj adW -buH -buH -buH -buH -buH -buH -buH +bVW +bVW +bVW +bVW +bVW +bVW +bVW dEs kjK dGF @@ -83476,7 +82967,7 @@ ykS tdj ykS ykS -dbC +dwR pNM mVX mVX @@ -83668,21 +83159,21 @@ mVX mVX "} (130,1,1) = {" -dbC +dwR emN axc rns tdj adW -buH -buH +bVW +bVW buJ buJ buJ buJ buJ -buH -buH +bVW +bVW dvt gGY lpu @@ -83733,7 +83224,7 @@ ykS ykS ykS ykS -dbC +dwR pNM mVX mVX @@ -83925,13 +83416,13 @@ mVX mVX "} (131,1,1) = {" -dbC +dwR ykS ykS ykS ykS -buH -buH +bVW +bVW buJ buJ chj @@ -83939,8 +83430,8 @@ cCT cCT buJ buJ -buH -buH +bVW +bVW dKH lpu hFk @@ -83990,7 +83481,7 @@ ykS tdj emN ykS -dbC +dwR pNM mVX mVX @@ -84182,12 +83673,12 @@ mVX mVX "} (132,1,1) = {" -dbC +dwR sQx ycO adW -buH -buH +bVW +bVW buJ buJ bRM @@ -84197,7 +83688,7 @@ bRM dmv buJ buJ -buH +bVW kjK lpu hFk @@ -84247,7 +83738,7 @@ tdj ykS tdj ykS -dbC +dwR pNM mVX mVX @@ -84439,11 +83930,11 @@ mVX mVX "} (133,1,1) = {" -dbC +dwR ykS ykS adW -buH +bVW buJ buJ bRM @@ -84454,7 +83945,7 @@ cQF dmv cmJ buJ -buH +bVW kjK lpu hFk @@ -84504,7 +83995,7 @@ tdj ykS tdj ykS -dbC +dwR pNM mVX mVX @@ -84696,11 +84187,11 @@ mVX mVX "} (134,1,1) = {" -dbC +dwR ykS ykS adW -buH +bVW buJ bRM bRM @@ -84711,7 +84202,7 @@ buJ cmJ cmJ buJ -buH +bVW kjK lpu hFk @@ -84761,7 +84252,7 @@ ykS ykS tdj ykS -dbC +dwR pNM mVX mVX @@ -84953,11 +84444,11 @@ mVX mVX "} (135,1,1) = {" -dbC +dwR ykS adW ykS -buH +bVW buJ nhl nhl @@ -84968,7 +84459,7 @@ buJ buJ dsX buJ -buH +bVW dVZ lpu hFk @@ -85018,7 +84509,7 @@ rns ykS ykS ykS -dbC +dwR pNM mVX mVX @@ -85210,11 +84701,11 @@ mVX mVX "} (136,1,1) = {" -dbC +dwR ykS axc ycO -buH +bVW buJ bhg bDR @@ -85225,7 +84716,7 @@ buJ buJ coI buJ -buH +bVW dTO eia hFk @@ -85275,7 +84766,7 @@ ykS ykS tdj ykS -dbC +dwR pNM mVX mVX @@ -85467,11 +84958,11 @@ mVX mVX "} (137,1,1) = {" -dbC +dwR ykS ykS ykS -buH +bVW buJ bht bRM @@ -85532,7 +85023,7 @@ ykS tdj ykS ykS -dbC +dwR pNM mVX mVX @@ -85724,11 +85215,11 @@ mVX mVX "} (138,1,1) = {" -dbC +dwR ykS ykS adW -buH +bVW buJ bhL bEB @@ -85789,7 +85280,7 @@ ykS ykS tdj ykS -dbC +dwR pNM mVX mVX @@ -85981,22 +85472,22 @@ mVX mVX "} (139,1,1) = {" -dbC +dwR ykS rns ykS -buH +bVW buJ buJ buJ buJ bBY -bAv +bAO bBY buJ buJ buJ -buH +bVW dUz eaU hFk @@ -86046,7 +85537,7 @@ ykS ykS emN ykS -dbC +dwR pNM mVX mVX @@ -86238,12 +85729,12 @@ mVX mVX "} (140,1,1) = {" -dbC +dwR ykS sQx ykS -buH -buH +bVW +bVW buJ bGZ cdX @@ -86253,7 +85744,7 @@ bDR dnc buJ buJ -buH +bVW dVZ lpu hFk @@ -86303,7 +85794,7 @@ nQm ykS tdj ykS -dbC +dwR pNM mVX mVX @@ -86495,12 +85986,12 @@ mVX mVX "} (141,1,1) = {" -dbC +dwR tdj adW ykS ykS -buH +bVW buJ bHo ceS @@ -86510,7 +86001,7 @@ bRM dnL duf buJ -buH +bVW kjK lpu hFk @@ -86560,7 +86051,7 @@ ykS ykS ykS ykS -dbC +dwR pNM mVX mVX @@ -86752,22 +86243,22 @@ mVX mVX "} (142,1,1) = {" -dbC +dwR tdj ykS aIz tdj -buH +bVW buJ bHR bRx cjy -bAv +bAO cRm bRM cqi buJ -buH +bVW kjK lpu hFk @@ -86817,7 +86308,7 @@ tdj ykS ykS ykS -dbC +dwR pNM mVX mVX @@ -87009,12 +86500,12 @@ mVX mVX "} (143,1,1) = {" -dbC +dwR ykS adW ykS tdj -buH +bVW buJ bHR bRM @@ -87024,7 +86515,7 @@ bGP bRx duk buJ -buH +bVW kjK lpu hFk @@ -87074,7 +86565,7 @@ ykS tdj tdj tdj -dbC +dwR pNM mVX mVX @@ -87266,12 +86757,12 @@ mVX mVX "} (144,1,1) = {" -dbC +dwR ykS hGJ tdj ykS -buH +bVW buJ bJL bRM @@ -87281,7 +86772,7 @@ bRM bRM dum buJ -buH +bVW dVZ lpu hFk @@ -87331,7 +86822,7 @@ ykS ykS ykS ykS -dbC +dwR pNM mVX mVX @@ -87523,12 +87014,12 @@ mVX mVX "} (145,1,1) = {" -dbC +dwR rns ykS tdj tdj -buH +bVW buJ buJ bVW @@ -87538,7 +87029,7 @@ bNc bVW buJ buJ -buH +bVW kjK lpu hFk @@ -87588,7 +87079,7 @@ ykS tdj emN ykS -dbC +dwR pNM mVX mVX @@ -87780,13 +87271,13 @@ mVX mVX "} (146,1,1) = {" -dbC +dwR tdj adW ykS sQx -buH -buH +bVW +bVW buJ buJ buJ @@ -87794,8 +87285,8 @@ buJ buJ buJ buJ -buH -buH +bVW +bVW kjK lpu hFk @@ -87845,7 +87336,7 @@ ykS ykS ykS ykS -dbC +dwR pNM mVX mVX @@ -88037,21 +87528,21 @@ mVX mVX "} (147,1,1) = {" -dbC +dwR kQk ykS adW hGJ tdj -buH -buH -buH -buH -buH -buH -buH -buH -buH +bVW +bVW +bVW +bVW +bVW +bVW +bVW +bVW +bVW cxG gGY lpu @@ -88102,7 +87593,7 @@ ykS ykS ykS ykS -dbC +dwR pNM mVX mVX @@ -88294,7 +87785,7 @@ mVX mVX "} (148,1,1) = {" -dbC +dwR ykS ykS ykS @@ -88358,8 +87849,8 @@ tdj ykS tdj ykS -dbC -dbC +dwR +dwR pNM mVX mVX @@ -88551,8 +88042,8 @@ mVX mVX "} (149,1,1) = {" -dbC -dbC +dwR +dwR kQk ykS hGJ @@ -88614,8 +88105,8 @@ ykS ykS ykS ykS -dbC -dbC +dwR +dwR mVX pNM mVX @@ -88809,8 +88300,8 @@ mVX "} (150,1,1) = {" mVX -dbC -dbC +dwR +dwR ykS awu kQk @@ -88870,8 +88361,8 @@ ykS tdj ykS ykS -dbC -dbC +dwR +dwR mVX mVX pNM @@ -89067,7 +88558,7 @@ mVX (151,1,1) = {" mVX mVX -dbC +dwR emN tdj kQk @@ -89126,8 +88617,8 @@ ykS tdj tdj ykS -dbC -dbC +dwR +dwR mVX mVX mVX @@ -89324,8 +88815,8 @@ mVX (152,1,1) = {" mVX mVX -dbC -dbC +dwR +dwR ykS aYy ykS @@ -89382,8 +88873,8 @@ ykS ykS emN ykS -dbC -dbC +dwR +dwR mVX mVX mVX @@ -89582,8 +89073,8 @@ mVX mVX mVX mVX -dbC -dbC +dwR +dwR ykS tdj tdj @@ -89628,18 +89119,18 @@ sQx tdj tdj ykS -dbC -dbC -dbC -dbC -dbC -dbC -dbC -dbC -dbC -dbC -dbC -dbC +dwR +dwR +dwR +dwR +dwR +dwR +dwR +dwR +dwR +dwR +dwR +dwR mVX mVX mVX @@ -89840,8 +89331,8 @@ mVX mVX mVX mVX -dbC -dbC +dwR +dwR tdj ykS ykS @@ -89885,7 +89376,7 @@ ykS ykS tdj ykS -dbC +dwR mVX mVX mVX @@ -90098,10 +89589,10 @@ mVX mVX mVX mVX -dbC -dbC -dbC -dbC +dwR +dwR +dwR +dwR byG ykS tdj @@ -90141,8 +89632,8 @@ tdj tdj ykS ykS -dbC -dbC +dwR +dwR mVX mVX mVX @@ -90358,8 +89849,8 @@ mVX mVX mVX mVX -dbC -dbC +dwR +dwR tdj ycO ykS @@ -90397,8 +89888,8 @@ rns tdj ykS ykS -dbC -dbC +dwR +dwR mVX mVX mVX @@ -90616,8 +90107,8 @@ mVX mVX mVX mVX -dbC -dbC +dwR +dwR tdj tdj dvt @@ -90653,8 +90144,8 @@ sQx ykS emN ykS -dbC -dbC +dwR +dwR mVX mVX mVX @@ -90874,8 +90365,8 @@ mVX mVX mVX mVX -dbC -dbC +dwR +dwR emN tdj kjK @@ -90910,7 +90401,7 @@ ykS ykS ykS tdj -dbC +dwR mVX mVX mVX @@ -91132,7 +90623,7 @@ mVX mVX mVX mVX -dbC +dwR tdj ykS kjK @@ -91166,8 +90657,8 @@ ykS ykS ykS tdj -dbC -dbC +dwR +dwR mVX mVX mVX @@ -91389,8 +90880,8 @@ mVX mVX mVX mVX -dbC -dbC +dwR +dwR rns kjK gGY @@ -91422,8 +90913,8 @@ ykS tdj tdj sQx -dbC -dbC +dwR +dwR mVX mVX mVX @@ -91647,7 +91138,7 @@ mVX mVX mVX mVX -dbC +dwR emN kjK gGY @@ -91663,10 +91154,10 @@ sQx tdj ykS emN -dbC -dbC -dbC -dbC +dwR +dwR +dwR +dwR ykS ykS tdj @@ -91678,8 +91169,8 @@ tdj ykS sQx ykS -dbC -dbC +dwR +dwR mVX mVX mVX @@ -91904,28 +91395,28 @@ mVX mVX mVX mVX -dbC dwR dwR dwR dwR dwR -dbC -dbC +dwR +dwR +dwR tdj tdj ykS ycO ykS ykS -dbC -dbC -dbC +dwR +dwR +dwR mVX mVX -dbC -dbC -dbC +dwR +dwR +dwR ykS ykS ykS @@ -91934,8 +91425,8 @@ tdj ykS ykS ykS -dbC -dbC +dwR +dwR mVX mVX mVX @@ -92168,30 +91659,30 @@ mVX mVX mVX mVX -dbC -dbC +dwR +dwR ykS tdj ykS emN -dbC -dbC +dwR +dwR mVX mVX mVX mVX mVX mVX -dbC -dbC -dbC -dbC +dwR +dwR +dwR +dwR emN ykS ykS -dbC -dbC -dbC +dwR +dwR +dwR mVX mVX mVX @@ -92426,12 +91917,12 @@ mVX mVX mVX mVX -dbC -dbC -dbC -dbC -dbC -dbC +dwR +dwR +dwR +dwR +dwR +dwR mVX mVX mVX @@ -92442,11 +91933,11 @@ mVX mVX mVX mVX -dbC -dbC -dbC -dbC -dbC +dwR +dwR +dwR +dwR +dwR mVX mVX mVX @@ -92663,40 +92154,40 @@ mVX mVX "} (165,1,1) = {" -eGA -eGA -eGA -eGA abm abm abm abm abm -eGA -eGA abm -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm mVX mVX mVX @@ -92920,7 +92411,7 @@ mVX mVX "} (166,1,1) = {" -eGA +abm ace axW aAL @@ -92934,7 +92425,7 @@ cIA cVs doL dxR -eGA +abm eWA eWA eWA @@ -92953,7 +92444,7 @@ eWA eWA eWA eWA -eGA +abm pNM pNM pNM @@ -93092,7 +92583,7 @@ tJC tle pNt onc -prX +aXP sFp kYb kPg @@ -93191,7 +92682,7 @@ cJq azG aAL dyM -eGA +abm eWA eWA eWA @@ -93210,7 +92701,7 @@ eWA eWA eWA eWA -eGA +abm mVX mVX mVX @@ -93349,7 +92840,7 @@ onc onc onc onc -aXP +iwS iwS iwS iwS @@ -93434,7 +92925,7 @@ mVX mVX "} (168,1,1) = {" -eGA +abm ads azG aAL @@ -93467,23 +92958,23 @@ eWA eWA eWA eWA -eGA +abm mVX mVX mVX -icm -iOx -jnr -jVO -kob +kKJ +kKJ +kKJ +kKJ +kKJ mVX mVX mVX -icm -iOx -jnr -jVO -kob +kKJ +kKJ +kKJ +kKJ +kKJ mVX mVX mVX @@ -93616,7 +93107,7 @@ ktZ vsV riL iwS -sVH +iwS aRW eZg kNj @@ -93691,15 +93182,15 @@ mVX mVX "} (169,1,1) = {" -eGA +abm aef aAL aAL aAL -eGA -eGA -eGA -eGA +abm +abm +abm +abm crD cKX azG @@ -93724,23 +93215,23 @@ eWA eWA eWA eWA -eGA +abm mVX mVX -hLV -igh +kKJ +kKJ iPF jsZ jXB -kps +kKJ kKJ mVX -hLV -igh +kKJ +kKJ lKy jsZ jXB -kps +kKJ kKJ mVX mVX @@ -93948,7 +93439,7 @@ mVX mVX "} (170,1,1) = {" -eGA +abm ahk aBj aAL @@ -93956,7 +93447,7 @@ aAL aZF bmM bmM -eGA +abm cmF azG azG @@ -93981,24 +93472,24 @@ eWA eWA eWA eWA -eGA +abm mVX mVX -hMy +kKJ ikC iPL jue iPL kru -kLh +kKJ mVX -hMy +kKJ lhU iPL lTj iPL kru -kLh +kKJ mVX mVX mVX @@ -94205,7 +93696,7 @@ mVX mVX "} (171,1,1) = {" -eGA +abm ahp azG aAL @@ -94213,7 +93704,7 @@ aXg aAL aAL bTY -eGA +abm cuh cMm cMm @@ -94238,24 +93729,24 @@ eWA eWA eWA eWA -eGA +abm mVX mVX -hMD +kKJ ikP iPL juD iPL ktf -kMQ +kKJ mVX -hMD +kKJ ljz iPL juD iPL ktf -kMQ +kKJ mVX mVX mVX @@ -94495,24 +93986,24 @@ eWA eWA eWA eWA -eGA +abm mVX mVX -hOM +kKJ ild iPL jvb iPL kuJ -kNN +kKJ mVX -hOM +kKJ lkD iPL lWT iPL kuJ -kNN +kKJ mVX mVX mVX @@ -94719,14 +94210,14 @@ mVX mVX "} (173,1,1) = {" -eGA +abm abm abm aJQ aJQ abm -eGA -eGA +abm +abm abm cuy aAL @@ -94752,24 +94243,24 @@ eWA eWA eWA eWA -eGA +abm mVX mVX -hQj -ilI +kKJ +kKJ iTp jxF iTp -kvR -kOn +kKJ +kKJ mVX -hQj -ilI +kKJ +kKJ iTp jxF iTp -kvR -kOn +kKJ +kKJ mVX mVX mVX @@ -94976,7 +94467,7 @@ mVX mVX "} (174,1,1) = {" -eGA +abm ahv aBL aAL @@ -94990,7 +94481,7 @@ aAL aAL aAL aBj -eGA +abm eWA eWA eWA @@ -95009,23 +94500,23 @@ eWA eWA eWA eWA -eGA +abm mVX mVX mVX -imX -iVo -jAl -jYQ -kwr +kKJ +kKJ +kKJ +kKJ +kKJ mVX mVX mVX -imX -iVo -jAl -jYQ -kwr +kKJ +kKJ +kKJ +kKJ +kKJ mVX mVX mVX @@ -95233,7 +94724,7 @@ mVX mVX "} (175,1,1) = {" -eGA +abm ahK aDf aAL @@ -95266,7 +94757,7 @@ eWA eWA eWA eWA -eGA +abm mVX mVX mVX @@ -95490,7 +94981,7 @@ mVX mVX "} (176,1,1) = {" -eGA +abm ahR aFT aAL @@ -95504,7 +94995,7 @@ aAL aAL aAL dCs -eGA +abm eWA eWA eWA @@ -95523,23 +95014,23 @@ eWA eWA eWA eWA -eGA +abm mVX mVX mVX -icm -iOx -jnr -jVO -kob +kKJ +kKJ +kKJ +kKJ +kKJ mVX mVX mVX -icm -iOx -jnr -jVO -kob +kKJ +kKJ +kKJ +kKJ +kKJ mVX mVX mVX @@ -95747,21 +95238,21 @@ mVX mVX "} (177,1,1) = {" -eGA +abm abm abm aJQ aJQ abm abm -eGA -eGA +abm +abm cuG aAL cYr aAL dCG -eGA +abm eWA eWA eWA @@ -95780,23 +95271,23 @@ eWA eWA eWA eWA -eGA +abm mVX mVX -hLV -igh +kKJ +kKJ jbL jsZ jXB -kps +kKJ kKJ mVX -hLV -igh +kKJ +kKJ lKZ jsZ jXB -kps +kKJ kKJ mVX mVX @@ -96012,12 +95503,12 @@ aAL aAL aAL bZP -eGA -eGA +abm +abm aJQ aJQ aJQ -eGA +abm abm eWA eWA @@ -96037,24 +95528,24 @@ eWA eWA eWA eWA -eGA +abm mVX mVX -hMy +kKJ inR iPL jKg iPL kru -kLh +kKJ mVX -hMy +kKJ luo iPL lXp iPL kru -kLh +kKJ mVX mVX mVX @@ -96269,13 +95760,13 @@ aXg aAL bry caw -eGA +abm cvi cNW cNW cNW dCI -eGA +abm eWA eWA eWA @@ -96294,24 +95785,24 @@ eWA eWA eWA eWA -eGA +abm mVX mVX -hMD +kKJ ioP iPL juD iPL kAj -kMQ +kKJ mVX -hMD +kKJ lAn iPL juD iPL ktf -kMQ +kKJ mVX mVX mVX @@ -96551,24 +96042,24 @@ eWA eWA eWA eWA -eGA +abm mVX mVX -hOM +kKJ ipu iPL jLP iPL kuJ -kNN +kKJ mVX -hOM +kKJ lAo iPL lYV iPL kuJ -kNN +kKJ mVX mVX mVX @@ -96775,7 +96266,7 @@ mVX mVX "} (181,1,1) = {" -eGA +abm amE aAL aAL @@ -96808,24 +96299,24 @@ eWA eWA eWA eWA -eGA +abm mVX mVX -hQj -ilI +kKJ +kKJ iTp jxF iTp -kvR -kOn +kKJ +kKJ mVX -hQj -ilI +kKJ +kKJ iTp jxF iTp -kvR -kOn +kKJ +kKJ mVX mVX mVX @@ -97065,23 +96556,23 @@ eWA eWA eWA eWA -eGA +abm mVX mVX mVX -imX -iVo -jAl -jYQ -kwr +kKJ +kKJ +kKJ +kKJ +kKJ mVX mVX mVX -imX -iVo -jAl -jYQ -kwr +kKJ +kKJ +kKJ +kKJ +kKJ mVX mVX mVX @@ -97303,7 +96794,7 @@ azG azG aAL dzW -eGA +abm eWA eWA eWA @@ -97322,7 +96813,7 @@ eWA eWA eWA eWA -eGA +abm mVX mVX mVX @@ -97546,7 +97037,7 @@ mVX mVX "} (184,1,1) = {" -eGA +abm arw aHO aLC @@ -97560,7 +97051,7 @@ azG cYN aAL dCY -eGA +abm eWA eWA eWA @@ -97579,7 +97070,7 @@ eWA eWA eWA eWA -eGA +abm mVX mVX mVX @@ -97803,40 +97294,40 @@ mVX mVX "} (185,1,1) = {" -eGA -eGA -eGA -eGA -eGA abm -eGA abm -eGA abm -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA -eGA +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm +abm mVX mVX mVX @@ -98772,7 +98263,7 @@ evD evD fgq nsM -vJu +nsM nAN nAN nAN @@ -99638,21 +99129,21 @@ mVX mVX mVX mVX -hQG -iqM -iqM -iqM -iqM -iqM -iqM -iqM -iqM -iqM -iqM -iqM -iqM -iqM -lHv +hSb +hSb +hSb +hSb +hSb +hSb +hSb +hSb +hSb +hSb +hSb +hSb +hSb +hSb +hSb mVX mVX mVX @@ -101437,16 +100928,16 @@ mVX mVX mVX mVX -hTb -iwJ +hSb +hSb jew jlR jlR jlR jlR kUf -lfU -lHv +hSb +hSb kBr jel jel @@ -101960,12 +101451,12 @@ kDU kRq jlR iuf -hTb -iwJ +hSb +hSb lZB mdh -lfU -lJp +hSb +hSb mVX mVX mVX @@ -102722,16 +102213,16 @@ mVX mVX mVX mVX -hTb -iwJ +hSb +hSb jmv jlR jlR jlR jlR kYu -lfU -lJp +hSb +hSb lSb mal mal @@ -102980,14 +102471,14 @@ mVX mVX mVX hSb -izV +hSb iuf ixO iuf kJG kRM iuf -izV +hSb hSb lSR mbZ @@ -103236,21 +102727,21 @@ mVX mVX mVX mVX -hUI -iqM -iqM -iqM -iqM -iqM -iqM -iqM -iqM -lKq -iqM -iqM -iqM -iqM -mAR +hSb +hSb +hSb +hSb +hSb +hSb +hSb +hSb +hSb +hSb +hSb +hSb +hSb +hSb +hSb mVX mVX mVX diff --git a/_maps/map_files/shuttles/admin_admin.dmm b/_maps/map_files/shuttles/admin_admin.dmm index 69eead89e69..bde0da6870a 100644 --- a/_maps/map_files/shuttles/admin_admin.dmm +++ b/_maps/map_files/shuttles/admin_admin.dmm @@ -23,7 +23,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/neutral, -/obj/structure/chair/comfy/lime{ +/obj/structure/chair/comfy/brown{ dir = 4 }, /turf/simulated/floor/shuttle{ @@ -57,7 +57,7 @@ }, /area/shuttle/administration) "av" = ( -/obj/structure/chair/comfy/lime, +/obj/structure/chair/comfy/brown, /turf/simulated/floor/shuttle{ icon = 'icons/turf/floors.dmi'; icon_state = "dark" @@ -127,7 +127,7 @@ }, /area/shuttle/administration) "aJ" = ( -/obj/structure/chair/comfy/lime{ +/obj/structure/chair/comfy/brown{ dir = 1 }, /turf/simulated/floor/shuttle{ @@ -200,7 +200,7 @@ /area/shuttle/administration) "aY" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/admin{ - dir = 1; + dir = 4; name = "NTV Argos shuttle navigation computer" }, /obj/effect/turf_decal/stripes/gold{ @@ -223,7 +223,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/neutral, -/obj/structure/chair/comfy/lime, +/obj/structure/chair/comfy/brown, /turf/simulated/floor/shuttle{ icon = 'icons/turf/floors.dmi'; icon_state = "dark" @@ -450,7 +450,10 @@ /area/shuttle/administration) "hF" = ( /obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/soda/upgraded, +/obj/machinery/chem_dispenser/soda/upgraded{ + dir = 1; + pixel_y = 4 + }, /obj/item/storage/box/drinkingglasses{ pixel_x = 1; pixel_y = 5 @@ -563,7 +566,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/neutral, -/obj/structure/chair/comfy/lime{ +/obj/structure/chair/comfy/brown{ dir = 1 }, /turf/simulated/floor/shuttle{ @@ -700,7 +703,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/neutral, -/obj/structure/chair/comfy/lime{ +/obj/structure/chair/comfy/brown{ dir = 8 }, /turf/simulated/floor/shuttle{ @@ -773,7 +776,7 @@ /area/shuttle/administration) "AE" = ( /obj/machinery/computer/card{ - dir = 1 + dir = 4 }, /obj/effect/turf_decal/stripes/gold{ dir = 5; @@ -876,7 +879,7 @@ /area/shuttle/administration) "GP" = ( /obj/machinery/computer/shuttle/admin{ - dir = 1; + dir = 4; name = "NTV Argos shuttle console" }, /obj/effect/turf_decal/stripes/gold{ @@ -919,7 +922,7 @@ /area/shuttle/administration) "HK" = ( /obj/machinery/computer/communications{ - dir = 1 + dir = 4 }, /obj/effect/turf_decal/stripes/gold{ dir = 6; @@ -1154,7 +1157,7 @@ /area/shuttle/administration) "XW" = ( /obj/machinery/computer/cloning{ - dir = 8 + dir = 1 }, /turf/simulated/floor/shuttle{ icon_state = "floor3" @@ -1162,7 +1165,10 @@ /area/shuttle/administration) "Yi" = ( /obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/beer/upgraded, +/obj/machinery/chem_dispenser/beer/upgraded{ + dir = 1; + pixel_y = 4 + }, /turf/simulated/floor/carpet/black, /area/shuttle/administration) "Ys" = ( diff --git a/_maps/map_files/shuttles/admin_armory.dmm b/_maps/map_files/shuttles/admin_armory.dmm index 80093d631b6..5ac7fb493af 100644 --- a/_maps/map_files/shuttles/admin_armory.dmm +++ b/_maps/map_files/shuttles/admin_armory.dmm @@ -36,7 +36,7 @@ /area/shuttle/administration) "bQ" = ( /obj/machinery/computer/communications{ - dir = 1 + dir = 4 }, /obj/effect/turf_decal/stripes/gold{ dir = 6; @@ -236,7 +236,7 @@ /area/shuttle/administration) "gh" = ( /obj/machinery/computer/shuttle/admin{ - dir = 1; + dir = 4; name = "NRV Sparta shuttle console" }, /obj/effect/turf_decal/stripes/gold{ @@ -269,7 +269,7 @@ /area/shuttle/administration) "hP" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/admin{ - dir = 1; + dir = 4; name = "NTV Argos shuttle navigation computer" }, /obj/effect/turf_decal/stripes/gold{ @@ -588,7 +588,7 @@ /area/shuttle/administration) "ua" = ( /obj/machinery/computer/card{ - dir = 1 + dir = 4 }, /obj/effect/turf_decal/stripes/gold{ dir = 5; @@ -1631,7 +1631,9 @@ color = "#22aab7"; dir = 4 }, -/obj/machinery/computer/secure_data, +/obj/machinery/computer/secure_data{ + dir = 8 + }, /turf/simulated/floor/shuttle{ icon = 'icons/turf/floors.dmi'; icon_state = "dark" diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 67e7f5ef76f..45d166a36e5 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -362,17 +362,20 @@ else return ..() -/obj/machinery/computer/scan_consolenew/New() - ..() +/obj/machinery/computer/scan_consolenew/Initialize(mapload) + . = ..() for(var/i=0;i<3;i++) buffers[i+1]=new /datum/dna2/record - spawn(5) - for(dir in list(NORTH,EAST,SOUTH,WEST)) - connected = locate(/obj/machinery/dna_scannernew, get_step(src, dir)) - if(!isnull(connected)) - break - spawn(250) - injector_ready = TRUE + addtimer(CALLBACK(src, PROC_REF(find_machine)), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(ready)), 25 SECONDS) + +/obj/machinery/computer/scan_consolenew/proc/find_machine() + for(var/obj/machinery/dna_scannernew/scanner in orange(1, src)) + connected = scanner + return + +/obj/machinery/computer/scan_consolenew/proc/ready() + injector_ready = TRUE /obj/machinery/computer/scan_consolenew/proc/all_dna_blocks(list/buffer) var/list/arr = list() diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 7202fc2bad8..ecfec661840 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -496,7 +496,6 @@ /obj/machinery/autolathe/security name = "Security Autolathe" desc = "Autolathe with preloaded open recipes" - icon = 'icons/obj/machines/sec_autolathe.dmi' /obj/machinery/autolathe/security/New() . = ..() diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 108414091a4..513ae318556 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -23,13 +23,11 @@ var/mob/living/carbon/currentPatient var/patientStatusHolder //Hold the last instance of table.patient.status. When table.patient.status no longer matches this variable, the computer should tell the doctor -/obj/machinery/computer/operating/New() - ..() - for(dir in list(NORTH,EAST,SOUTH,WEST)) - table = locate(/obj/machinery/optable, get_step(src, dir)) - if(table) - table.computer = src - break +/obj/machinery/computer/operating/Initialize(mapload) + . = ..() + table = locate(/obj/machinery/optable, orange(1, src)) + if(table) + table.computer = src /obj/machinery/computer/operating/Destroy() if(table) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 33b885728d8..b8c2796cae2 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -61,20 +61,15 @@ selected_pod = pods[1] /obj/machinery/computer/cloning/proc/findscanner() - var/obj/machinery/dna_scannernew/scannerf = null - //Try to find scanner on adjacent tiles first - for(dir in list(NORTH,EAST,SOUTH,WEST)) - scannerf = locate(/obj/machinery/dna_scannernew, get_step(src, dir)) - if(scannerf) - return scannerf + for(var/obj/machinery/dna_scannernew/scanner in orange(1, src)) + return scanner //Then look for a free one in the area - if(!scannerf) - for(var/obj/machinery/dna_scannernew/S in get_area(src)) - return S + for(var/obj/machinery/dna_scannernew/S in get_area(src)) + return S - return 0 + return FALSE /obj/machinery/computer/cloning/proc/releasecloner() for(var/obj/machinery/clonepod/P in pods) diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm index 6ba015fb4ec..6afb9296bf6 100644 --- a/code/game/objects/structures/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -78,7 +78,7 @@ name = "resin wall" desc = "Thick resin solidified into a wall." icon = 'icons/obj/smooth_structures/alien/resin_wall.dmi' - icon_state = "wall0" //same as resin, but consistency ho! + icon_state = "resin" //same as resin, but consistency ho! resintype = "wall" canSmoothWith = list(/obj/structure/alien/resin/wall, /obj/structure/alien/resin/membrane) diff --git a/code/game/turfs/simulated/walls_indestructible.dm b/code/game/turfs/simulated/walls_indestructible.dm index fc3c1de4c4f..fb024f742a8 100644 --- a/code/game/turfs/simulated/walls_indestructible.dm +++ b/code/game/turfs/simulated/walls_indestructible.dm @@ -21,7 +21,10 @@ /turf/simulated/wall/r_wall/coated, /turf/simulated/wall/indestructible, /turf/simulated/wall/indestructible/metal, - /turf/simulated/wall/indestructible/reinforced) + /turf/simulated/wall/indestructible/rusted, + /turf/simulated/wall/indestructible/reinforced, + /turf/simulated/wall/indestructible/reinforced/rusted, + /turf/simulated/wall/indestructible/fakeglass) smooth = SMOOTH_TRUE /turf/simulated/wall/indestructible/dismantle_wall(devastated = 0, explode = 0) @@ -87,7 +90,64 @@ icon_state = "fake_glass" opacity = FALSE smooth = SMOOTH_TRUE - canSmoothWith = list(/turf/simulated/wall/indestructible/fakeglass) + canSmoothWith = list( + /obj/structure/window/full/basic, + /obj/structure/window/full/reinforced, + /obj/structure/window/full/reinforced/tinted, + /obj/structure/window/full/reinforced/polarized, + /obj/structure/window/full/plasmabasic, + /obj/structure/window/full/plasmareinforced, + /turf/simulated/wall, + /turf/simulated/wall/r_wall, + /obj/structure/falsewall, + /obj/structure/falsewall/reinforced, + /obj/structure/falsewall/clockwork, + /turf/simulated/wall/rust, + /turf/simulated/wall/r_wall/rust, + /turf/simulated/wall/r_wall/coated, + /turf/simulated/wall/indestructible, + /turf/simulated/wall/indestructible/metal, + /turf/simulated/wall/indestructible/rusted, + /turf/simulated/wall/indestructible/reinforced, + /turf/simulated/wall/indestructible/reinforced/rusted, + /turf/simulated/wall/indestructible/fakeglass) + +/turf/simulated/wall/indestructible/fakeglass/plastitanium + name = "window" + icon = 'icons/turf/walls/fake_plastitanium_glass.dmi' + icon_state = "fake_glass" + opacity = FALSE + smooth = SMOOTH_TRUE + canSmoothWith = list( + /turf/simulated/wall/indestructible/fakeglass/plastitanium, + /turf/simulated/wall/indestructible/iron) + +/turf/simulated/wall/indestructible/rusted + name = "reinforced wall" + icon = 'icons/turf/walls/rusty_wall.dmi' + icon_state = "wall" + canSmoothWith = list( + /obj/structure/window/full/basic, + /obj/structure/window/full/reinforced, + /obj/structure/window/full/reinforced/tinted, + /obj/structure/window/full/reinforced/polarized, + /obj/structure/window/full/plasmabasic, + /obj/structure/window/full/plasmareinforced, + /turf/simulated/wall, + /turf/simulated/wall/r_wall, + /obj/structure/falsewall, + /obj/structure/falsewall/reinforced, + /obj/structure/falsewall/clockwork, + /turf/simulated/wall/rust, + /turf/simulated/wall/r_wall/rust, + /turf/simulated/wall/r_wall/coated, + /turf/simulated/wall/indestructible, + /turf/simulated/wall/indestructible/metal, + /turf/simulated/wall/indestructible/rusted, + /turf/simulated/wall/indestructible/reinforced, + /turf/simulated/wall/indestructible/reinforced/rusted, + /turf/simulated/wall/indestructible/fakeglass) + smooth = SMOOTH_TRUE /turf/simulated/wall/indestructible/reinforced name = "reinforced wall" @@ -110,7 +170,37 @@ /turf/simulated/wall/r_wall/coated, /turf/simulated/wall/indestructible, /turf/simulated/wall/indestructible/metal, - /turf/simulated/wall/indestructible/reinforced) + /turf/simulated/wall/indestructible/rusted, + /turf/simulated/wall/indestructible/reinforced, + /turf/simulated/wall/indestructible/reinforced/rusted, + /turf/simulated/wall/indestructible/fakeglass) + smooth = SMOOTH_TRUE + +/turf/simulated/wall/indestructible/reinforced/rusted + name = "reinforced wall" + icon = 'icons/turf/walls/rusty_reinforced_wall.dmi' + icon_state = "r_wall" + canSmoothWith = list( + /obj/structure/window/full/basic, + /obj/structure/window/full/reinforced, + /obj/structure/window/full/reinforced/tinted, + /obj/structure/window/full/reinforced/polarized, + /obj/structure/window/full/plasmabasic, + /obj/structure/window/full/plasmareinforced, + /turf/simulated/wall, + /turf/simulated/wall/r_wall, + /obj/structure/falsewall, + /obj/structure/falsewall/reinforced, + /obj/structure/falsewall/clockwork, + /turf/simulated/wall/rust, + /turf/simulated/wall/r_wall/rust, + /turf/simulated/wall/r_wall/coated, + /turf/simulated/wall/indestructible, + /turf/simulated/wall/indestructible/metal, + /turf/simulated/wall/indestructible/rusted, + /turf/simulated/wall/indestructible/reinforced, + /turf/simulated/wall/indestructible/reinforced/rusted, + /turf/simulated/wall/indestructible/fakeglass) smooth = SMOOTH_TRUE /turf/simulated/wall/indestructible/wood @@ -156,19 +246,47 @@ /turf/simulated/wall/indestructible/uranium icon = 'icons/turf/walls/uranium_wall.dmi' icon_state = "uranium" + smooth = SMOOTH_TRUE /turf/simulated/wall/indestructible/metal icon = 'icons/turf/walls/wall.dmi' icon_state = "wall" smooth = SMOOTH_TRUE + canSmoothWith = list( + /turf/simulated/wall/indestructible/metal, + /turf/simulated/wall/indestructible/fakeglass) /turf/simulated/wall/indestructible/abductor name = "alien wall" + icon = 'icons/turf/walls/abductor_wall.dmi' desc = "A wall with alien alloy plating." - icon_state = "alien1" + icon_state = "abductor" + canSmoothWith = list(/turf/simulated/wall/indestructible/abductor) + smooth = SMOOTH_TRUE /turf/simulated/wall/indestructible/splashcreen name = "Space Station 13" icon = 'config/title_screens/images/blank.png' icon_state = "" layer = FLY_LAYER + +/turf/simulated/wall/indestructible/sandstone + name = "sandstone wall" + icon = 'icons/turf/walls/sandstone_wall.dmi' + icon_state = "sandstone" + canSmoothWith = list(/turf/simulated/wall/indestructible/sandstone) + smooth = SMOOTH_TRUE +/turf/simulated/wall/indestructible/rock + name = "rock" + icon = 'icons/turf/walls/rock_wall.dmi' + icon_state = "rockEXAMPLE" + canSmoothWith = list(/turf/simulated/wall/indestructible/rock) + smooth = SMOOTH_TRUE +/turf/simulated/wall/indestructible/iron + name = "plastitanium wall" + icon = 'icons/turf/walls/plastitanium_wall.dmi' + icon_state = "shuttle" + canSmoothWith = list( + /turf/simulated/wall/indestructible/fakeglass/plastitanium, + /turf/simulated/wall/indestructible/iron) + smooth = SMOOTH_TRUE diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index d9216223d56..360a74d2226 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/obj/machines/monitors.dmi b/icons/obj/machines/monitors.dmi index 01dcc5f9392..b4c9e61e269 100644 Binary files a/icons/obj/machines/monitors.dmi and b/icons/obj/machines/monitors.dmi differ diff --git a/icons/obj/machines/robotics.dmi b/icons/obj/machines/robotics.dmi index 6726e1038a0..4c788a5d3bc 100644 Binary files a/icons/obj/machines/robotics.dmi and b/icons/obj/machines/robotics.dmi differ diff --git a/icons/obj/machines/sec_autolathe.dmi b/icons/obj/machines/sec_autolathe.dmi deleted file mode 100644 index 9f3b7cc8522..00000000000 Binary files a/icons/obj/machines/sec_autolathe.dmi and /dev/null differ diff --git a/icons/obj/machines/vending.dmi b/icons/obj/machines/vending.dmi index af97f0026f5..eb105ace990 100644 Binary files a/icons/obj/machines/vending.dmi and b/icons/obj/machines/vending.dmi differ diff --git a/icons/obj/pipes_and_stuff/atmospherics/atmos.dmi b/icons/obj/pipes_and_stuff/atmospherics/atmos.dmi index b2668980aec..b5bf546b983 100644 Binary files a/icons/obj/pipes_and_stuff/atmospherics/atmos.dmi and b/icons/obj/pipes_and_stuff/atmospherics/atmos.dmi differ diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi index 253ec7ffc48..aef2d3a801a 100644 Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ diff --git a/icons/turf/walls/fake_glass.dmi b/icons/turf/walls/fake_glass.dmi index be520d7a258..2697a6ecac6 100644 Binary files a/icons/turf/walls/fake_glass.dmi and b/icons/turf/walls/fake_glass.dmi differ