diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 8d91f419b02..7e54cfe3e58 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -503,8 +503,8 @@ }, /area/shuttle/abandoned) "abp" = ( -/turf/space, /obj/machinery/porta_turret/syndicate, +/turf/space, /turf/simulated/shuttle/wall{ dir = 8; icon_state = "diagonalWall3" @@ -570,8 +570,8 @@ /turf/simulated/shuttle/plating, /area/shuttle/syndicate) "abu" = ( -/turf/space, /obj/machinery/porta_turret/syndicate, +/turf/space, /turf/simulated/shuttle/wall{ dir = 1; icon_state = "diagonalWall3" @@ -661,13 +661,13 @@ }, /area/shuttle/syndicate) "abG" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/auxsolarstarboard) "abH" = ( @@ -847,7 +847,6 @@ }, /area/shuttle/syndicate) "ace" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -860,10 +859,10 @@ icon_state = "2-4"; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/auxsolarstarboard) "acf" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -881,31 +880,31 @@ d2 = 8; icon_state = "4-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/auxsolarstarboard) "acg" = ( -/turf/space, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/auxsolarstarboard) "ach" = ( -/turf/space, /obj/structure/cable, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/auxsolarstarboard) "aci" = ( -/turf/space, /obj/structure/cable{ icon_state = "0-4"; d2 = 4 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/auxsolarstarboard) "acj" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -922,6 +921,7 @@ d2 = 8; icon_state = "4-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/auxsolarstarboard) "ack" = ( @@ -1077,11 +1077,11 @@ /turf/simulated/floor/plating, /area/hallway/secondary/entry) "acE" = ( -/turf/space, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "acF" = ( @@ -1089,11 +1089,11 @@ /turf/simulated/floor/plating/airless/catwalk, /area/space) "acG" = ( -/turf/space, /obj/structure/cable{ icon_state = "0-4"; d2 = 4 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "acH" = ( @@ -1644,16 +1644,16 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "adL" = ( -/turf/simulated/floor/plating, /obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/floor/plating, /turf/simulated/shuttle/wall{ icon_state = "swall_f5"; dir = 2 }, /area/shuttle/pod_1) "adM" = ( -/turf/simulated/floor/plating, /obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/floor/plating, /turf/simulated/shuttle/wall{ icon_state = "swall_f9"; dir = 2 @@ -1685,16 +1685,16 @@ /turf/simulated/shuttle/floor, /area/shuttle/pod_2) "adQ" = ( -/turf/simulated/floor/plating, /obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/floor/plating, /turf/simulated/shuttle/wall{ icon_state = "swall_f5"; dir = 2 }, /area/shuttle/pod_2) "adR" = ( -/turf/simulated/floor/plating, /obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/floor/plating, /turf/simulated/shuttle/wall{ icon_state = "swall_f9"; dir = 2 @@ -1766,7 +1766,6 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "aec" = ( -/turf/space, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1379; @@ -1776,6 +1775,7 @@ pixel_y = -25; req_access_txt = "10;13" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/auxsolarstarboard) "aed" = ( @@ -1816,12 +1816,12 @@ /turf/simulated/shuttle/floor, /area/shuttle/pod_2) "aeh" = ( -/turf/space, /obj/structure/shuttle/engine/propulsion{ tag = "icon-propulsion (NORTH)"; icon_state = "propulsion"; dir = 1 }, +/turf/space, /turf/simulated/shuttle/wall/interior{ tag = "icon-swall_f6"; icon_state = "swall_f6" @@ -2674,12 +2674,12 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "afL" = ( -/turf/space, /obj/structure/shuttle/engine/propulsion{ tag = "icon-propulsion (NORTH)"; icon_state = "propulsion"; dir = 1 }, +/turf/space, /turf/simulated/shuttle/wall/interior{ tag = "icon-swall_f10"; icon_state = "swall_f10" @@ -8921,17 +8921,16 @@ /turf/simulated/floor/plating, /area/maintenance/disposal) "asU" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/auxsolarport) "asV" = ( -/turf/space, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -8944,6 +8943,7 @@ icon_state = "1-4"; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/auxsolarport) "asW" = ( @@ -8984,7 +8984,6 @@ }, /area/hallway/secondary/entry) "ata" = ( -/turf/space, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -9002,19 +9001,20 @@ d2 = 8; icon_state = "4-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/auxsolarport) "atb" = ( -/turf/space, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/auxsolarport) "atc" = ( -/turf/space, /obj/structure/cable, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/auxsolarport) "atd" = ( @@ -9350,15 +9350,14 @@ /turf/simulated/floor/plating, /area/maintenance/fsmaint) "atK" = ( -/turf/space, /obj/structure/cable{ icon_state = "0-4"; d2 = 4 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/auxsolarport) "atL" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -9375,6 +9374,7 @@ d2 = 8; icon_state = "4-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/auxsolarport) "atM" = ( @@ -9484,7 +9484,6 @@ }, /area/maintenance/disposal) "atU" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -9496,6 +9495,7 @@ d2 = 8; icon_state = "2-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/auxsolarport) "atV" = ( @@ -12855,10 +12855,10 @@ /turf/simulated/floor/greengrid, /area/engine/supermatter) "aAe" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 6 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "aAf" = ( @@ -12904,10 +12904,10 @@ /turf/simulated/floor/plasteel, /area/engine/controlroom) "aAi" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 4 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "aAj" = ( @@ -13819,10 +13819,10 @@ }, /area/hallway/primary/fore) "aBV" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 5 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "aBW" = ( @@ -14705,10 +14705,10 @@ }, /area/maintenance/fsmaint) "aDC" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 10 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "aDD" = ( @@ -14979,34 +14979,34 @@ /turf/simulated/floor/plating, /area/quartermaster/storage) "aDZ" = ( -/turf/space, /obj/machinery/atmospherics/unary/outlet_injector/on{ dir = 8 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/engine/controlroom) "aEa" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 9 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "aEb" = ( -/turf/space, /obj/structure/cable{ icon_state = "0-2"; d2 = 2 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/auxsolarport) "aEc" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/auxsolarport) "aEd" = ( @@ -15769,10 +15769,10 @@ /turf/simulated/wall, /area/crew_quarters/sleep) "aFz" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 10 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "aFA" = ( @@ -18102,13 +18102,13 @@ /turf/simulated/floor/plasteel, /area/security/prison) "aJy" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/heat_exchanging, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "aJz" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/visible/yellow, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "aJA" = ( @@ -19461,7 +19461,6 @@ }, /area/crew_quarters/bar) "aLQ" = ( -/turf/space, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1379; @@ -19475,6 +19474,7 @@ d2 = 4; icon_state = "0-4" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/auxsolarport) "aLR" = ( @@ -19493,8 +19493,8 @@ }, /area/crew_quarters/bar/atrium) "aLT" = ( -/turf/space, /obj/item/wrench, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "aLU" = ( @@ -21048,10 +21048,10 @@ /turf/simulated/floor/plating, /area/security/prison) "aOU" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 5 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "aOV" = ( @@ -21062,10 +21062,10 @@ /turf/simulated/floor/plating, /area/security/prison) "aOW" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "aOX" = ( @@ -25718,13 +25718,13 @@ }, /area/security/prison) "aWR" = ( -/turf/space, /obj/structure/disposalpipe/trunk{ dir = 4 }, /obj/structure/disposaloutlet{ dir = 8 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/incinerator) "aWS" = ( @@ -27679,13 +27679,13 @@ /turf/simulated/floor/plasteel, /area/security/prison) "aZY" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "aZZ" = ( @@ -27700,7 +27700,6 @@ }, /area/crew_quarters/bar/atrium) "baa" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, @@ -27708,6 +27707,7 @@ dir = 8; icon_state = "pipe-c" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "bab" = ( @@ -28079,11 +28079,11 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) "baN" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4; level = 2 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/atmos) "baO" = ( @@ -28612,11 +28612,11 @@ /turf/simulated/floor/plating, /area/security/prison) "bbF" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4; level = 2 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/atmos) "bbG" = ( @@ -36121,10 +36121,10 @@ }, /area/construction/hallway) "bpr" = ( -/turf/simulated/floor/plating, /obj/structure/shuttle/engine/propulsion/burst{ dir = 8 }, +/turf/simulated/floor/plating, /turf/simulated/shuttle/wall{ tag = "icon-swall_f6"; icon_state = "swall_f6"; @@ -39475,11 +39475,11 @@ }, /area/hallway/primary/central) "buX" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4; level = 2 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/atmos) "buY" = ( @@ -40560,10 +40560,10 @@ /turf/simulated/wall/r_wall, /area/engine/gravitygenerator) "bwO" = ( -/turf/simulated/floor/plating, /obj/structure/shuttle/engine/propulsion/burst{ dir = 8 }, +/turf/simulated/floor/plating, /turf/simulated/shuttle/wall{ tag = "icon-swall_f5"; icon_state = "swall_f5"; @@ -52894,10 +52894,10 @@ /turf/simulated/floor/plasteel, /area/security/warden) "bRm" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 9 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "bRn" = ( @@ -53130,11 +53130,11 @@ /turf/simulated/wall/r_wall, /area/turret_protected/aisat) "bRG" = ( -/turf/space, /obj/structure/window/reinforced{ dir = 1; layer = 2.9 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "bRH" = ( @@ -54795,7 +54795,6 @@ }, /area/hallway/primary/port) "bUb" = ( -/turf/space, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1379; @@ -54805,6 +54804,7 @@ pixel_y = -20; req_access_txt = "32" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "bUc" = ( @@ -55188,7 +55188,6 @@ }, /area/hallway/primary/port) "bUJ" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -55199,6 +55198,7 @@ dir = 4; level = 1 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "bUK" = ( @@ -55447,7 +55447,6 @@ }, /area/hallway/primary/central) "bVf" = ( -/turf/space, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -55457,6 +55456,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "bVg" = ( @@ -55664,7 +55664,6 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/chief) "bVs" = ( -/turf/space, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -55674,6 +55673,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "bVt" = ( @@ -57169,7 +57169,6 @@ }, /area/security/checkpoint/engineering) "bXF" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -57189,16 +57188,17 @@ pixel_y = 20; req_access_txt = "10;13" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "bXG" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "bXH" = ( @@ -57384,7 +57384,6 @@ /turf/simulated/wall, /area/engine/engineering) "bYa" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -57392,6 +57391,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "bYb" = ( @@ -57464,7 +57464,6 @@ /turf/simulated/floor/plating, /area/library) "bYl" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -57475,10 +57474,10 @@ dir = 5; level = 1 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "bYm" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -57489,6 +57488,7 @@ dir = 4; level = 1 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "bYn" = ( @@ -57689,7 +57689,6 @@ /turf/simulated/floor/plating, /area/crew_quarters/courtroom) "bYJ" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -57698,6 +57697,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "bYK" = ( @@ -57915,10 +57915,10 @@ /turf/simulated/floor/plasteel, /area/security/armoury) "bZf" = ( -/turf/space, /obj/structure/window/reinforced{ dir = 4 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "bZg" = ( @@ -58086,7 +58086,6 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "bZw" = ( -/turf/space, /obj/structure/window/reinforced{ dir = 8 }, @@ -58094,6 +58093,7 @@ dir = 4; level = 1 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "bZx" = ( @@ -62775,11 +62775,11 @@ /turf/simulated/wall/rust, /area/teleporter) "chw" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4; level = 1 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "chx" = ( @@ -63818,7 +63818,6 @@ /turf/simulated/floor/plating, /area/lawoffice) "cjl" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4; level = 1 @@ -63831,6 +63830,7 @@ tag = "icon-D-SE"; icon_state = "D-SE" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "cjm" = ( @@ -66335,7 +66335,6 @@ /turf/simulated/floor/plasteel, /area/teleporter) "cnH" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4; level = 1 @@ -66344,6 +66343,7 @@ tag = "icon-E-SW-NW"; icon_state = "E-SW-NW" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "cnI" = ( @@ -66559,7 +66559,6 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "coi" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4; level = 1 @@ -66567,6 +66566,7 @@ /obj/structure/transit_tube{ icon_state = "E-W-Pass" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "coj" = ( @@ -69028,12 +69028,12 @@ /turf/simulated/floor/plating, /area/engine/engineering) "csr" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4; level = 1 }, /obj/structure/transit_tube, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "css" = ( @@ -69086,7 +69086,6 @@ /turf/simulated/floor/plating, /area/engine/engine_smes) "csy" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4; level = 1 @@ -69095,6 +69094,7 @@ tag = "icon-W-SE"; icon_state = "W-SE" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "csz" = ( @@ -69730,7 +69730,6 @@ }, /area/library) "ctI" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4; level = 1 @@ -69742,10 +69741,10 @@ /obj/structure/window/reinforced{ dir = 4 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "ctJ" = ( -/turf/space, /obj/structure/transit_tube{ tag = "icon-E-NW"; icon_state = "E-NW" @@ -69753,6 +69752,7 @@ /obj/structure/window/reinforced{ dir = 4 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "ctK" = ( @@ -69896,12 +69896,12 @@ /turf/simulated/floor/plasteel, /area/ai_monitored/storage/eva) "ctY" = ( -/turf/space, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "ctZ" = ( @@ -72995,12 +72995,12 @@ }, /area/maintenance/fpmaint2) "czw" = ( -/turf/space, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "czx" = ( @@ -74432,7 +74432,6 @@ }, /area/crew_quarters/locker) "cBU" = ( -/turf/space, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -74443,6 +74442,7 @@ d2 = 8; icon_state = "4-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "cBV" = ( @@ -77530,12 +77530,12 @@ }, /area/maintenance/fpmaint2) "cHt" = ( -/turf/space, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "cHu" = ( @@ -78377,12 +78377,12 @@ /turf/space, /area/engine/engineering) "cJe" = ( -/turf/space, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "cJf" = ( @@ -78819,7 +78819,6 @@ }, /area/maintenance/fpmaint2) "cKj" = ( -/turf/space, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -78830,6 +78829,7 @@ d2 = 4; icon_state = "1-4" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "cKk" = ( @@ -78843,8 +78843,8 @@ /turf/simulated/floor/plasteel, /area/toxins/xenobiology) "cKl" = ( -/turf/space, /obj/structure/window/reinforced, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "cKm" = ( @@ -80265,7 +80265,6 @@ /turf/simulated/floor/plasteel, /area/toxins/xenobiology) "cNn" = ( -/turf/space, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -80281,6 +80280,7 @@ d2 = 4; icon_state = "1-4" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "cNo" = ( @@ -80739,7 +80739,6 @@ }, /area/medical/medbay) "cNZ" = ( -/turf/space, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -80750,6 +80749,7 @@ d2 = 4; icon_state = "2-4" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "cOa" = ( @@ -80920,12 +80920,12 @@ /turf/simulated/wall, /area/medical/medbay) "cOm" = ( -/turf/space, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "cOn" = ( @@ -81674,7 +81674,6 @@ }, /area/medical/medbay) "cPK" = ( -/turf/space, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -81685,6 +81684,7 @@ d2 = 8; icon_state = "4-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "cPL" = ( @@ -81847,16 +81847,15 @@ }, /area/medical/medbay2) "cPX" = ( -/turf/space, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; icon_state = "1-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "cPY" = ( -/turf/space, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1379; @@ -81866,6 +81865,7 @@ pixel_y = 24; req_access_txt = "0" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "cPZ" = ( @@ -107523,7 +107523,6 @@ }, /area/shuttle/escape) "dKx" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -107538,6 +107537,7 @@ pixel_y = 25; req_access_txt = "13" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/auxsolarstarboard) "dKy" = ( @@ -110238,12 +110238,12 @@ /turf/simulated/floor/plating, /area/medical/virology) "dPn" = ( -/turf/space, /obj/structure/cable{ d2 = 2; icon_state = "0-2"; pixel_y = 0 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/auxsolarstarboard) "dPo" = ( @@ -114992,7 +114992,6 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dXX" = ( -/turf/space, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1379; @@ -115002,6 +115001,7 @@ pixel_y = 24; req_access_txt = "0" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "dXY" = ( @@ -115335,24 +115335,23 @@ /turf/simulated/floor/plasteel, /area/medical/research) "dYI" = ( -/turf/space, /obj/structure/cable{ icon_state = "0-4"; d2 = 4 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/portsolar) "dYJ" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/portsolar) "dYK" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -115367,10 +115366,10 @@ pixel_y = 25; req_access_txt = "13" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/portsolar) "dYL" = ( -/turf/space, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -115383,10 +115382,10 @@ icon_state = "1-4"; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/portsolar) "dYM" = ( -/turf/space, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -115404,18 +115403,18 @@ d2 = 8; icon_state = "4-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/portsolar) "dYN" = ( -/turf/space, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/portsolar) "dYO" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -115432,10 +115431,10 @@ d2 = 8; icon_state = "4-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/portsolar) "dYP" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -115447,10 +115446,10 @@ d2 = 8; icon_state = "2-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/portsolar) "dYQ" = ( -/turf/space, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1379; @@ -115460,25 +115459,26 @@ pixel_y = 24; req_access_txt = "10;13" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "dYR" = ( -/turf/space, /obj/structure/cable{ d2 = 2; icon_state = "0-2"; pixel_y = 0 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/portsolar) "dYS" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/portsolar) "dYT" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm index 7b07b479e41..c1740c983de 100644 --- a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm +++ b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm @@ -15,8 +15,8 @@ /turf/space, /area/space) "aac" = ( -/turf/space, /obj/machinery/porta_turret/syndicate, +/turf/space, /turf/simulated/shuttle/wall{ dir = 8; icon_state = "diagonalWall3" @@ -82,8 +82,8 @@ /turf/simulated/shuttle/plating, /area/shuttle/syndicate) "aah" = ( -/turf/space, /obj/machinery/porta_turret/syndicate, +/turf/space, /turf/simulated/shuttle/wall{ dir = 1; icon_state = "diagonalWall3" @@ -760,12 +760,12 @@ }, /area/shuttle/syndicate) "abA" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "abB" = ( @@ -867,12 +867,11 @@ }, /area/shuttle/syndicate) "abL" = ( -/turf/space, /obj/structure/cable, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "abM" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -883,6 +882,7 @@ d2 = 4; icon_state = "2-4" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "abN" = ( @@ -943,7 +943,6 @@ }, /area/shuttle/syndicate) "abU" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -959,14 +958,15 @@ d2 = 4; icon_state = "2-4" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "abV" = ( -/turf/space, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "abW" = ( @@ -974,15 +974,14 @@ /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "abX" = ( -/turf/space, /obj/structure/cable{ icon_state = "0-4"; d2 = 4 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "abY" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -998,10 +997,10 @@ d2 = 8; icon_state = "1-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "abZ" = ( -/turf/space, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -1012,6 +1011,7 @@ d2 = 8; icon_state = "1-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "aca" = ( @@ -1054,8 +1054,8 @@ }, /area/solar/auxport) "acf" = ( -/turf/space, /obj/item/stack/cable_coil, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "acg" = ( @@ -1265,11 +1265,11 @@ /turf/space, /area/space) "acz" = ( -/turf/space, /obj/effect/landmark{ name = "xeno_spawn"; pixel_x = -1 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "acA" = ( @@ -1519,8 +1519,8 @@ }, /area/security/permabrig) "acY" = ( -/turf/simulated/floor/plating, /obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/floor/plating, /turf/simulated/shuttle/wall{ tag = "icon-swall_f5"; icon_state = "swall_f5"; @@ -1604,8 +1604,8 @@ }, /area/security/permabrig) "adg" = ( -/turf/simulated/floor/plating, /obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/floor/plating, /turf/simulated/shuttle/wall{ tag = "icon-swall_f9"; icon_state = "swall_f9"; @@ -1623,20 +1623,20 @@ /turf/simulated/shuttle/floor, /area/shuttle/pod_2) "adi" = ( -/turf/space, /obj/structure/cable{ icon_state = "0-2"; d2 = 2 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "adj" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxstarboard) "adk" = ( @@ -1989,8 +1989,8 @@ }, /area/shuttle/vox) "adP" = ( -/turf/space, /obj/structure/cable, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxstarboard) "adQ" = ( @@ -2125,7 +2125,6 @@ /turf/space, /area/space) "aeg" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -2136,6 +2135,7 @@ d2 = 4; icon_state = "2-4" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxstarboard) "aeh" = ( @@ -2404,7 +2404,6 @@ }, /area/security/permabrig) "aeA" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -2420,6 +2419,7 @@ d2 = 4; icon_state = "2-4" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxstarboard) "aeB" = ( @@ -2889,11 +2889,11 @@ /turf/simulated/shuttle/plating/vox, /area/shuttle/vox) "afo" = ( -/turf/space, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxstarboard) "afp" = ( @@ -2914,11 +2914,11 @@ }, /area/security/permabrig) "afq" = ( -/turf/space, /obj/structure/cable{ icon_state = "0-4"; d2 = 4 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxstarboard) "afr" = ( @@ -3109,7 +3109,6 @@ name = "\improper Recreation Area" }) "afG" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -3125,6 +3124,7 @@ d2 = 8; icon_state = "2-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxstarboard) "afH" = ( @@ -3375,7 +3375,6 @@ /turf/simulated/floor/engine, /area/security/podbay) "age" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -3386,6 +3385,7 @@ d2 = 8; icon_state = "2-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxstarboard) "agf" = ( @@ -3446,12 +3446,12 @@ }, /area/security/permabrig) "agn" = ( -/turf/space, /obj/structure/cable{ icon_state = "0-2"; pixel_y = 1; d2 = 2 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "ago" = ( @@ -3653,8 +3653,8 @@ name = "\improper Recreation Area" }) "agH" = ( -/turf/space, /obj/item/stack/cable_coil, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxstarboard) "agI" = ( @@ -3694,12 +3694,12 @@ /turf/simulated/floor/plating, /area/security/hos) "agM" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "agN" = ( @@ -5100,21 +5100,21 @@ }, /area/security/armoury) "aiQ" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "aiR" = ( -/turf/space, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "aiS" = ( @@ -5385,10 +5385,10 @@ /turf/simulated/shuttle/floor4/vox, /area/shuttle/vox) "ajr" = ( -/turf/simulated/floor/plating, /obj/structure/shuttle/engine/propulsion/burst{ dir = 8 }, +/turf/simulated/floor/plating, /turf/simulated/shuttle/wall{ icon_state = "swall_f6"; dir = 2 @@ -5682,10 +5682,10 @@ }, /area/security/permabrig) "ajS" = ( -/turf/simulated/floor/plating, /obj/structure/shuttle/engine/propulsion/burst{ dir = 8 }, +/turf/simulated/floor/plating, /turf/simulated/shuttle/wall{ icon_state = "swall_f5"; dir = 2 @@ -6292,11 +6292,11 @@ /turf/simulated/floor/plasteel, /area/security/armoury) "akX" = ( -/turf/space, /obj/effect/landmark{ name = "xeno_spawn"; pixel_x = -1 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxstarboard) "akY" = ( @@ -11638,11 +11638,11 @@ name = "Port Maintenance" }) "auv" = ( -/turf/space, /obj/structure/cable{ icon_state = "0-2"; d2 = 2 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/maintenance/auxsolarstarboard) "auw" = ( @@ -27719,13 +27719,13 @@ name = "Arrivals" }) "aWE" = ( +/obj/structure/shuttle/engine/propulsion/burst{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "vault"; dir = 5 }, -/obj/structure/shuttle/engine/propulsion/burst{ - dir = 8 - }, /turf/simulated/shuttle/wall{ icon_state = "swall_f6"; dir = 2 @@ -27742,13 +27742,13 @@ /turf/simulated/shuttle/floor, /area/shuttle/pod_1) "aWG" = ( +/obj/structure/shuttle/engine/propulsion/burst{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "vault"; dir = 5 }, -/obj/structure/shuttle/engine/propulsion/burst{ - dir = 8 - }, /turf/simulated/shuttle/wall{ icon_state = "swall_f5"; dir = 2 @@ -31843,8 +31843,8 @@ name = "\improper MiniSat Exterior" }) "bdO" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/construction/hallway{ name = "\improper MiniSat Exterior" @@ -35755,8 +35755,8 @@ }, /area/shuttle/arrival/station) "bkj" = ( -/turf/simulated/floor/plating, /obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/floor/plating, /turf/simulated/shuttle/wall{ tag = "icon-swall_f5"; icon_state = "swall_f5"; @@ -36476,8 +36476,8 @@ name = "\improper Cargo Office" }) "bly" = ( -/turf/simulated/floor/plating, /obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/floor/plating, /turf/simulated/shuttle/wall{ tag = "icon-swall_f9"; icon_state = "swall_f9"; @@ -43938,7 +43938,6 @@ /turf/simulated/floor/plating/airless, /area/space) "bxm" = ( -/turf/space, /obj/structure/transit_tube{ icon_state = "W-NE-SE" }, @@ -43951,10 +43950,10 @@ d2 = 8; icon_state = "4-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "bxn" = ( -/turf/space, /obj/structure/transit_tube{ tag = "icon-D-SW"; icon_state = "D-SW" @@ -43972,10 +43971,10 @@ d2 = 8; icon_state = "4-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "bxo" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4; level = 1 @@ -43985,6 +43984,7 @@ d2 = 8; icon_state = "4-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "bxp" = ( @@ -44013,7 +44013,6 @@ name = "\improper MiniSat Exterior" }) "bxq" = ( -/turf/space, /obj/structure/window/reinforced{ dir = 4 }, @@ -44026,6 +44025,7 @@ d2 = 8; icon_state = "4-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "bxr" = ( @@ -49927,12 +49927,12 @@ /turf/simulated/floor/plasteel, /area/atmos) "bGW" = ( -/turf/space, /obj/structure/shuttle/engine/propulsion{ dir = 8; icon_state = "propulsion"; tag = "icon-propulsion (EAST)" }, +/turf/space, /turf/simulated/shuttle/wall{ icon_state = "swall_f6"; dir = 2 @@ -53183,12 +53183,12 @@ }, /area/tcommsat/server) "bMv" = ( -/turf/space, /obj/structure/shuttle/engine/propulsion{ dir = 8; icon_state = "propulsion"; tag = "icon-propulsion (EAST)" }, +/turf/space, /turf/simulated/shuttle/wall{ icon_state = "swall_f5"; dir = 2 @@ -65912,8 +65912,8 @@ }, /area/hydroponics) "ciB" = ( -/turf/space, /obj/structure/cable, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/port) "ciC" = ( @@ -67032,11 +67032,11 @@ /turf/space, /area/space) "ckr" = ( -/turf/space, /obj/structure/cable{ icon_state = "0-2"; d2 = 2 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/port) "cks" = ( @@ -68466,12 +68466,12 @@ name = "\improper Secure Lab" }) "cmH" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/port) "cmI" = ( @@ -74372,7 +74372,6 @@ }, /area/solar/port) "cvQ" = ( -/turf/space, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -74383,6 +74382,7 @@ d2 = 4; icon_state = "1-4" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/port) "cvR" = ( @@ -76922,7 +76922,6 @@ name = "Aft Maintenance" }) "cAf" = ( -/turf/space, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -76938,6 +76937,7 @@ d2 = 8; icon_state = "4-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/port) "cAg" = ( @@ -77552,11 +77552,11 @@ }, /area/medical/chemistry) "cBe" = ( -/turf/space, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/port) "cBf" = ( @@ -77575,11 +77575,11 @@ }, /area/crew_quarters/hor) "cBg" = ( -/turf/space, /obj/structure/cable{ icon_state = "0-4"; d2 = 4 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/port) "cBh" = ( @@ -78214,7 +78214,6 @@ name = "Aft Maintenance" }) "cCf" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -78230,6 +78229,7 @@ d2 = 8; icon_state = "4-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/port) "cCg" = ( @@ -78302,7 +78302,6 @@ }, /area/medical/genetics) "cCj" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -78313,6 +78312,7 @@ d2 = 8; icon_state = "2-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/port) "cCk" = ( @@ -78462,8 +78462,8 @@ }, /area/medical/surgeryobs) "cCw" = ( -/turf/space, /obj/item/stack/cable_coil, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/port) "cCx" = ( @@ -78493,11 +78493,11 @@ }, /area/medical/surgeryobs) "cCz" = ( -/turf/space, /obj/structure/cable/yellow{ d2 = 4; icon_state = "0-4" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "cCA" = ( @@ -78809,12 +78809,12 @@ }, /area/medical/cryo) "cCZ" = ( -/turf/space, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "cDa" = ( @@ -82331,12 +82331,12 @@ name = "\improper Toxins Lab" }) "cIN" = ( -/turf/space, /obj/effect/landmark{ name = "xeno_spawn"; pixel_x = -1 }, /obj/structure/cable, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/port) "cIO" = ( @@ -86868,11 +86868,11 @@ name = "Aft Maintenance" }) "cPU" = ( -/turf/space, /obj/structure/cable/yellow{ d2 = 8; icon_state = "0-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "cPV" = ( @@ -91758,12 +91758,12 @@ name = "\improper Departure Lounge" }) "cXN" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "cXO" = ( @@ -92024,12 +92024,12 @@ }, /area/chapel/main) "cYi" = ( -/turf/space, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "cYj" = ( @@ -92221,12 +92221,12 @@ name = "\improper Recreation Area" }) "cYA" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "cYB" = ( @@ -92482,8 +92482,8 @@ name = "\improper Departure Lounge" }) "cYY" = ( -/turf/space, /obj/structure/cable, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "cYZ" = ( @@ -92523,7 +92523,6 @@ }, /area/solar/starboard) "cZc" = ( -/turf/space, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -92534,10 +92533,10 @@ d2 = 4; icon_state = "1-4" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "cZd" = ( -/turf/space, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -92553,6 +92552,7 @@ d2 = 8; icon_state = "4-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "cZe" = ( @@ -92596,11 +92596,11 @@ name = "\improper Arcade" }) "cZj" = ( -/turf/space, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "cZk" = ( @@ -92807,8 +92807,8 @@ name = "\improper Arcade" }) "cZA" = ( -/turf/space, /obj/item/stack/cable_coil, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "cZB" = ( @@ -93002,11 +93002,11 @@ /turf/simulated/shuttle/plating, /area/shuttle/escape) "cZW" = ( -/turf/space, /obj/structure/cable{ icon_state = "0-4"; d2 = 4 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "cZX" = ( @@ -94632,7 +94632,6 @@ name = "\improper Secure Lab" }) "dcv" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -94648,6 +94647,7 @@ d2 = 8; icon_state = "4-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "dcw" = ( @@ -94845,7 +94845,6 @@ /turf/simulated/shuttle/floor, /area/shuttle/escape) "dcN" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -94856,6 +94855,7 @@ d2 = 8; icon_state = "2-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "dcO" = ( @@ -95128,11 +95128,11 @@ /turf/space, /area/space) "ddw" = ( -/turf/space, /obj/effect/landmark{ name = "xeno_spawn"; pixel_x = -1 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "ddx" = ( @@ -95200,11 +95200,11 @@ name = "\improper Secure Lab" }) "ddD" = ( -/turf/space, /obj/structure/cable{ icon_state = "0-2"; d2 = 2 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "ddE" = ( diff --git a/_maps/map_files/MetaStation/z2.dmm b/_maps/map_files/MetaStation/z2.dmm index 25a1d408e93..5533ba2af8d 100644 --- a/_maps/map_files/MetaStation/z2.dmm +++ b/_maps/map_files/MetaStation/z2.dmm @@ -231,8 +231,8 @@ }, /area/holodeck/source_desert) "aJ" = ( -/turf/simulated/floor/holofloor/grass, /obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/holofloor/grass, /turf/simulated/floor/holofloor{ tag = "icon-wood_siding2 (EAST)"; icon_state = "wood_siding2"; @@ -248,8 +248,8 @@ /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) "aM" = ( -/turf/simulated/floor/holofloor/grass, /obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/holofloor/grass, /turf/simulated/floor/holofloor{ tag = "icon-wood_siding2 (EAST)"; icon_state = "wood_siding2"; @@ -315,8 +315,8 @@ }, /area/holodeck/source_picnicarea) "aU" = ( -/turf/simulated/floor/holofloor/grass, /obj/structure/flora/ausbushes/grassybush, +/turf/simulated/floor/holofloor/grass, /turf/simulated/floor/holofloor{ tag = "icon-wood_siding5"; icon_state = "wood_siding5"; @@ -336,8 +336,8 @@ }, /area/holodeck/source_picnicarea) "aX" = ( -/turf/simulated/floor/holofloor/grass, /obj/structure/flora/ausbushes/grassybush, +/turf/simulated/floor/holofloor/grass, /turf/simulated/floor/holofloor{ tag = "icon-wood_siding9"; icon_state = "wood_siding9"; @@ -388,8 +388,8 @@ }, /area/holodeck/source_desert) "bf" = ( -/turf/simulated/floor/holofloor/grass, /obj/structure/flora/ausbushes/grassybush, +/turf/simulated/floor/holofloor/grass, /turf/simulated/floor/holofloor{ tag = "icon-wood_siding6"; icon_state = "wood_siding6"; @@ -397,8 +397,8 @@ }, /area/holodeck/source_picnicarea) "bg" = ( -/turf/simulated/floor/holofloor/grass, /obj/structure/flora/ausbushes/grassybush, +/turf/simulated/floor/holofloor/grass, /turf/simulated/floor/holofloor{ tag = "icon-wood_siding10"; icon_state = "wood_siding10"; @@ -452,8 +452,8 @@ }, /area/holodeck/source_theatre) "bo" = ( -/turf/simulated/floor/holofloor/grass, /obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/holofloor/grass, /turf/simulated/floor/holofloor{ tag = "icon-wood_siding1"; icon_state = "wood_siding1"; @@ -461,8 +461,8 @@ }, /area/holodeck/source_picnicarea) "bp" = ( -/turf/simulated/floor/holofloor/grass, /obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/holofloor/grass, /turf/simulated/floor/holofloor{ tag = "icon-wood_siding1"; icon_state = "wood_siding1"; @@ -867,10 +867,10 @@ }, /area/holodeck/source_meetinghall) "cq" = ( -/turf/unsimulated/floor/snow, /obj/structure/flora/tree/pine{ pixel_x = 1 }, +/turf/unsimulated/floor/snow, /turf/unsimulated/floor/snow{ icon_state = "gravsnow_corner" }, @@ -3619,10 +3619,10 @@ }, /area/syndicate_mothership) "jZ" = ( -/turf/unsimulated/floor/snow, /obj/structure/flora/tree/pine{ pixel_x = 1 }, +/turf/unsimulated/floor/snow, /turf/unsimulated/floor/snow{ tag = "icon-gravsnow_corner (WEST)"; icon_state = "gravsnow_corner"; @@ -3757,8 +3757,8 @@ /turf/space/transit, /area/wizard_station) "kr" = ( -/turf/unsimulated/floor/snow, /obj/structure/flora/tree/pine, +/turf/unsimulated/floor/snow, /turf/unsimulated/floor/snow{ icon_state = "gravsnow_corner" }, @@ -3772,8 +3772,8 @@ /turf/simulated/floor/plating/airless, /area/wizard_station) "kt" = ( -/turf/unsimulated/floor/snow, /obj/structure/flora/grass/brown, +/turf/unsimulated/floor/snow, /turf/unsimulated/floor/snow{ icon_state = "gravsnow_corner" }, @@ -3961,8 +3961,8 @@ /turf/unsimulated/wall, /area/tdome/tdomeobserve) "kW" = ( -/turf/unsimulated/floor/snow, /obj/structure/flora/grass/brown, +/turf/unsimulated/floor/snow, /turf/unsimulated/floor/snow{ tag = "icon-gravsnow_corner (SOUTHWEST)"; icon_state = "gravsnow_corner"; @@ -4507,8 +4507,8 @@ /turf/unsimulated/floor/abductor, /area/abductor_ship) "mB" = ( -/turf/unsimulated/floor/snow, /obj/structure/flora/grass/brown, +/turf/unsimulated/floor/snow, /turf/unsimulated/floor/snow{ tag = "icon-gravsnow_corner (EAST)"; icon_state = "gravsnow_corner"; @@ -4801,9 +4801,9 @@ }, /area/syndicate_mothership) "nh" = ( +/obj/machinery/porta_turret/syndicate/pod, /turf/simulated/floor/pod, /turf/space, -/obj/machinery/porta_turret/syndicate/pod, /turf/simulated/shuttle/wall{ dir = 8; icon_state = "diagonalWall3" @@ -4819,9 +4819,9 @@ /turf/simulated/floor/plating, /area/shuttle/assault_pod) "nj" = ( +/obj/machinery/porta_turret/syndicate/pod, /turf/simulated/floor/pod, /turf/space, -/obj/machinery/porta_turret/syndicate/pod, /turf/simulated/shuttle/wall{ dir = 1; icon_state = "diagonalWall3" @@ -5099,8 +5099,8 @@ /turf/unsimulated/floor/snow, /area/syndicate_mothership) "nP" = ( -/turf/unsimulated/floor/snow, /obj/structure/flora/grass/brown, +/turf/unsimulated/floor/snow, /turf/unsimulated/floor/snow{ tag = "icon-gravsnow_corner (WEST)"; icon_state = "gravsnow_corner"; @@ -5201,9 +5201,9 @@ }, /area/syndicate_mothership) "oa" = ( +/obj/machinery/porta_turret/syndicate/pod, /turf/simulated/floor/pod, /turf/space, -/obj/machinery/porta_turret/syndicate/pod, /turf/simulated/shuttle/wall{ tag = "icon-diagonalWall3"; icon_state = "diagonalWall3"; @@ -5211,9 +5211,9 @@ }, /area/shuttle/assault_pod) "ob" = ( +/obj/machinery/porta_turret/syndicate/pod, /turf/simulated/floor/pod, /turf/space, -/obj/machinery/porta_turret/syndicate/pod, /turf/simulated/shuttle/wall{ dir = 4; icon_state = "diagonalWall3" @@ -5339,8 +5339,8 @@ }, /area/syndicate_mothership) "os" = ( -/turf/unsimulated/floor/snow, /obj/structure/flora/bush, +/turf/unsimulated/floor/snow, /turf/unsimulated/floor/snow{ tag = "icon-gravsnow_corner (NORTH)"; icon_state = "gravsnow_corner"; @@ -5520,8 +5520,8 @@ }, /area/wizard_station) "oS" = ( -/turf/unsimulated/floor/snow, /obj/structure/flora/bush, +/turf/unsimulated/floor/snow, /turf/unsimulated/floor/snow{ tag = "icon-gravsnow_corner (WEST)"; icon_state = "gravsnow_corner"; diff --git a/_maps/map_files/MetaStation/z4.dmm b/_maps/map_files/MetaStation/z4.dmm index 3f3b3ae1ab9..95277b92bf9 100644 --- a/_maps/map_files/MetaStation/z4.dmm +++ b/_maps/map_files/MetaStation/z4.dmm @@ -4863,8 +4863,8 @@ /turf/simulated/floor/plating/airless, /area/derelict/se_solar) "nv" = ( -/turf/space, /obj/structure/cable, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/derelict_aft) "nw" = ( @@ -4896,11 +4896,11 @@ /turf/simulated/floor/plating/airless, /area/derelict/hallway/secondary) "nA" = ( -/turf/space, /obj/structure/cable{ icon_state = "0-2"; d2 = 2 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/derelict_aft) "nB" = ( @@ -4915,13 +4915,13 @@ /turf/simulated/floor/plating/airless, /area/solar/derelict_aft) "nC" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/derelict_aft) "nD" = ( @@ -4941,7 +4941,6 @@ /turf/simulated/floor/plating/airless, /area/solar/derelict_aft) "nF" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -4957,10 +4956,10 @@ d2 = 4; icon_state = "2-4" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/derelict_aft) "nG" = ( -/turf/space, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -4971,19 +4970,19 @@ d2 = 4; icon_state = "1-4" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/derelict_aft) "nH" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/derelict_aft) "nI" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -5000,10 +4999,10 @@ icon_state = "1-2"; pixel_y = 0 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/derelict_aft) "nJ" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -5014,10 +5013,10 @@ d2 = 8; icon_state = "1-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/derelict_aft) "nK" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -5033,11 +5032,12 @@ d2 = 8; icon_state = "1-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/derelict_aft) "nL" = ( -/turf/space, /obj/item/stack/cable_coil/cut, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "nM" = ( @@ -5146,7 +5146,6 @@ /turf/simulated/floor/plating/airless, /area/derelict/hallway/secondary) "of" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -5157,6 +5156,7 @@ d2 = 4; icon_state = "2-4" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/derelict_aft) "og" = ( @@ -5175,7 +5175,6 @@ /turf/simulated/floor/plating/airless, /area/space) "oj" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -5186,6 +5185,7 @@ d2 = 8; icon_state = "2-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/derelict_aft) "ok" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm index 296c5013867..8ce28e665a2 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm @@ -1809,7 +1809,6 @@ }, /area/ruin/space/ancientstation/engi) "eK" = ( -/turf/simulated/floor/plating/airless, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -1820,6 +1819,7 @@ d2 = 8; icon_state = "2-8" }, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk, /area/template_noop) "eL" = ( @@ -2997,12 +2997,12 @@ }, /area/ruin/space/ancientstation/sec) "hf" = ( -/turf/simulated/floor/plating/airless, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk, /area/template_noop) "hg" = ( @@ -3117,7 +3117,6 @@ }, /area/ruin/space/ancientstation/kitchen) "hs" = ( -/turf/simulated/floor/plating/airless, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -3131,6 +3130,7 @@ d2 = 4; icon_state = "2-4" }, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk, /area/template_noop) "ht" = ( @@ -3302,7 +3302,6 @@ }, /area/ruin/space/ancientstation/kitchen) "hJ" = ( -/turf/simulated/floor/plating/airless, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -3311,6 +3310,7 @@ d2 = 8; icon_state = "4-8" }, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk, /area/template_noop) "hK" = ( @@ -3704,7 +3704,6 @@ /turf/simulated/floor/plating, /area/ruin/space/ancientstation/deltacorridor) "iB" = ( -/turf/simulated/floor/plating/airless, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -3723,6 +3722,7 @@ d2 = 4; icon_state = "1-4" }, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk, /area/template_noop) "iC" = ( @@ -3826,21 +3826,21 @@ /turf/simulated/floor/plasteel, /area/ruin/space/ancientstation/powered) "iO" = ( -/turf/simulated/floor/plating, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/turf/simulated/floor/plating, /turf/simulated/floor/plating/airless/catwalk, /area/template_noop) "iP" = ( -/turf/simulated/floor/plating, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; icon_state = "1-8" }, +/turf/simulated/floor/plating, /turf/simulated/floor/plating/airless/catwalk, /area/template_noop) "iQ" = ( @@ -4130,12 +4130,12 @@ }, /area/ruin/space/ancientstation/proto) "jw" = ( -/turf/simulated/floor/plating/airless, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; icon_state = "1-8" }, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk, /area/template_noop) "jx" = ( @@ -4483,12 +4483,12 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/ancientstation/atmo) "kl" = ( -/turf/simulated/floor/plating/airless, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk, /area/template_noop) "km" = ( @@ -4579,12 +4579,12 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/ancientstation/atmo) "kv" = ( -/turf/simulated/floor/plating, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/turf/simulated/floor/plating, /turf/simulated/floor/plating/airless/catwalk, /area/template_noop) "kw" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm b/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm index da654b419ba..54e511a4373 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm @@ -143,8 +143,8 @@ name = "Space Bar" }) "aA" = ( -/turf/simulated/floor/plating, /obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/floor/plating, /turf/simulated/shuttle/wall{ icon_state = "swall_f5"; dir = 2 @@ -157,8 +157,8 @@ /turf/simulated/shuttle/floor, /area/ruin/powered) "aC" = ( -/turf/simulated/floor/plating, /obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/floor/plating, /turf/simulated/shuttle/wall{ icon_state = "swall_f9"; dir = 2 @@ -442,8 +442,8 @@ /turf/simulated/floor/plating, /area/ruin/powered) "bp" = ( -/turf/simulated/floor/plating/airless/asteroid, /obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/floor/plating/airless/asteroid, /turf/simulated/shuttle/wall{ icon_state = "swall_f5"; dir = 2 @@ -464,8 +464,8 @@ /turf/simulated/floor/plating, /area/ruin/powered) "bs" = ( -/turf/simulated/floor/plating/airless/asteroid, /obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/floor/plating/airless/asteroid, /turf/simulated/shuttle/wall{ icon_state = "swall_f9"; dir = 2 diff --git a/_maps/map_files/RandomZLevels/centcomAway.dmm b/_maps/map_files/RandomZLevels/centcomAway.dmm index f252a7a79ee..bd6b40c51de 100644 --- a/_maps/map_files/RandomZLevels/centcomAway.dmm +++ b/_maps/map_files/RandomZLevels/centcomAway.dmm @@ -1052,7 +1052,6 @@ /turf/simulated/floor/plating, /area/awaymission/centcomAway/maint) "cN" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -1060,10 +1059,10 @@ pixel_x = 0; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/awaymission/centcomAway/maint) "cO" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -1083,6 +1082,7 @@ pixel_x = 0; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/awaymission/centcomAway/maint) "cP" = ( @@ -1538,7 +1538,6 @@ }, /area/awaymission/centcomAway/hangar) "dU" = ( -/turf/space, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -1552,6 +1551,7 @@ pixel_x = 0; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/awaymission/centcomAway/maint) "dV" = ( @@ -1639,7 +1639,6 @@ }, /area/awaymission/centcomAway/hangar) "eh" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -1647,6 +1646,7 @@ pixel_y = 0; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/awaymission/centcomAway/maint) "ei" = ( @@ -1692,9 +1692,9 @@ /turf/simulated/floor/plating, /area/awaymission/centcomAway/hangar) "eo" = ( -/turf/space, /obj/structure/cable, /obj/machinery/power/tracker, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/awaymission/centcomAway/maint) "ep" = ( @@ -4679,20 +4679,20 @@ }, /area/awaymission/centcomAway/general) "ls" = ( -/turf/simulated/floor/plating, /obj/structure/shuttle/engine/propulsion/burst{ dir = 8 }, +/turf/simulated/floor/plating, /turf/simulated/shuttle/wall{ icon_state = "swall_f6"; dir = 2 }, /area/awaymission/centcomAway/hangar) "lt" = ( -/turf/simulated/floor/plating, /obj/structure/shuttle/engine/propulsion/burst{ dir = 8 }, +/turf/simulated/floor/plating, /turf/simulated/shuttle/wall{ icon_state = "swall_f5"; dir = 2 diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 579e69c9762..ac402732149 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -619,8 +619,8 @@ }, /area/shuttle/abandoned) "abG" = ( -/turf/space, /obj/machinery/porta_turret/syndicate, +/turf/space, /turf/simulated/shuttle/wall{ dir = 8; icon_state = "diagonalWall3" @@ -686,8 +686,8 @@ /turf/simulated/shuttle/plating, /area/shuttle/syndicate) "abL" = ( -/turf/space, /obj/machinery/porta_turret/syndicate, +/turf/space, /turf/simulated/shuttle/wall{ dir = 1; icon_state = "diagonalWall3" @@ -2151,6 +2151,7 @@ }, /area/shuttle/syndicate_sit) "aey" = ( +/obj/machinery/computer/brigcells, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkred" @@ -6056,13 +6057,14 @@ /turf/simulated/floor/plasteel, /area/security/permabrig) "akN" = ( -/obj/item/twohanded/required/kirbyplants, /obj/machinery/newscaster{ pixel_y = 30 }, /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = 32 }, +/obj/structure/closet/secure_closet/hos, +/obj/item/reagent_containers/food/drinks/flask/barflask, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -6581,12 +6583,12 @@ /turf/simulated/floor/plating, /area/security/hos) "alD" = ( -/turf/space, /obj/structure/cable{ icon_state = "0-2"; d2 = 2 }, /obj/machinery/power/tracker, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxstarboard) "alE" = ( @@ -7003,7 +7005,6 @@ /turf/simulated/floor/plasteel, /area/security/main) "amo" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -7011,6 +7012,7 @@ pixel_y = 0; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxstarboard) "amp" = ( @@ -7070,8 +7072,6 @@ /turf/simulated/floor/plating, /area/security/permabrig) "amt" = ( -/obj/structure/closet/secure_closet/hos, -/obj/item/reagent_containers/food/drinks/flask/barflask, /obj/machinery/requests_console{ announcementConsole = 1; department = "Head of Security's Desk"; @@ -7080,6 +7080,7 @@ pixel_x = 30; pixel_y = 0 }, +/obj/machinery/computer/brigcells, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -7385,12 +7386,12 @@ }, /area/security/hos) "amU" = ( -/turf/space, /obj/structure/cable{ icon_state = "0-2"; d2 = 2 }, /obj/machinery/power/tracker, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "amV" = ( @@ -7542,8 +7543,8 @@ }, /area/security/permabrig) "ann" = ( -/turf/space, /obj/structure/cable, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxstarboard) "ano" = ( @@ -7783,7 +7784,6 @@ /turf/simulated/floor/plasteel, /area/security/seceqstorage) "anG" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -7791,6 +7791,7 @@ pixel_y = 0; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "anH" = ( @@ -8160,7 +8161,7 @@ }, /area/security/evidence) "aom" = ( -/obj/machinery/computer/station_alert/all, +/obj/machinery/computer/brigcells, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkred" @@ -8456,7 +8457,6 @@ /turf/simulated/floor/plasteel, /area/security/main) "aoK" = ( -/turf/space, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -8469,6 +8469,7 @@ icon_state = "2-4"; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxstarboard) "aoL" = ( @@ -8826,7 +8827,6 @@ /turf/simulated/floor/plating, /area/security/main) "apn" = ( -/turf/space, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -8845,6 +8845,7 @@ icon_state = "1-2"; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxstarboard) "apo" = ( @@ -9793,8 +9794,8 @@ }, /area/lawoffice) "arb" = ( -/turf/space, /obj/structure/cable, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "arc" = ( @@ -10293,7 +10294,6 @@ }, /area/security/evidence) "arL" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -10306,10 +10306,10 @@ icon_state = "2-4"; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "arM" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -10329,14 +10329,15 @@ icon_state = "2-4"; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "arN" = ( -/turf/space, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "arO" = ( @@ -10405,11 +10406,11 @@ /turf/simulated/floor/plating, /area/maintenance/fsmaint) "arU" = ( -/turf/space, /obj/structure/cable{ icon_state = "0-4"; d2 = 4 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "arV" = ( @@ -11004,7 +11005,6 @@ }, /area/shuttle/trade/sol) "asL" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -11024,10 +11024,10 @@ icon_state = "1-8"; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "asM" = ( -/turf/space, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -11040,6 +11040,7 @@ icon_state = "1-8"; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "asN" = ( @@ -13075,7 +13076,6 @@ }, /area/security/permabrig) "avM" = ( -/turf/space, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1450; @@ -13085,6 +13085,7 @@ pixel_y = -25; req_access_txt = "13" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "avN" = ( @@ -13418,7 +13419,6 @@ /turf/simulated/floor/plasteel, /area/security/processing) "awk" = ( -/turf/space, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1379; @@ -13433,6 +13433,7 @@ pixel_y = 1; d2 = 2 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxport) "awl" = ( @@ -13711,10 +13712,10 @@ }, /area/security/permabrig) "awP" = ( -/turf/simulated/floor/plating, /obj/structure/shuttle/engine/propulsion/burst{ dir = 8 }, +/turf/simulated/floor/plating, /turf/simulated/shuttle/wall{ tag = "icon-swall_f6"; icon_state = "swall_f6"; @@ -13722,20 +13723,20 @@ }, /area/shuttle/pod_3) "awQ" = ( -/turf/space, /obj/structure/cable{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxstarboard) "awR" = ( -/turf/space, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxstarboard) "awS" = ( @@ -14008,13 +14009,13 @@ }, /area/lawoffice) "axq" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxstarboard) "axr" = ( @@ -14330,10 +14331,10 @@ }, /area/security/prison/cell_block/A) "axN" = ( -/turf/simulated/floor/plating, /obj/structure/shuttle/engine/propulsion/burst{ dir = 8 }, +/turf/simulated/floor/plating, /turf/simulated/shuttle/wall{ tag = "icon-swall_f5"; icon_state = "swall_f5"; @@ -14809,7 +14810,6 @@ }, /area/security/execution) "ayE" = ( -/turf/space, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1379; @@ -14825,6 +14825,7 @@ icon_state = "1-2"; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/auxstarboard) "ayF" = ( @@ -15159,7 +15160,6 @@ /turf/simulated/wall/r_wall, /area/security/processing) "azb" = ( -/turf/space, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1450; @@ -15169,6 +15169,7 @@ pixel_y = -25; req_access_txt = "13" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "azc" = ( @@ -16525,7 +16526,6 @@ /turf/simulated/floor/plating, /area/maintenance/fsmaint) "aBx" = ( -/turf/space, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1379; @@ -16535,6 +16535,7 @@ pixel_y = 0; req_access_txt = "13" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "aBy" = ( @@ -18243,7 +18244,6 @@ /turf/simulated/floor/plating, /area/maintenance/fpmaint2) "aEM" = ( -/turf/space, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1379; @@ -18253,6 +18253,7 @@ pixel_y = -25; req_access_txt = "13" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "aEN" = ( @@ -22882,16 +22883,16 @@ /turf/simulated/floor/plating, /area/maintenance/electrical) "aON" = ( -/turf/simulated/floor/plating, /obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/floor/plating, /turf/simulated/shuttle/wall{ icon_state = "swall_f5"; dir = 2 }, /area/shuttle/pod_1) "aOO" = ( -/turf/simulated/floor/plating, /obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/floor/plating, /turf/simulated/shuttle/wall{ icon_state = "swall_f9"; dir = 2 @@ -23349,8 +23350,8 @@ /turf/simulated/wall, /area/maintenance/electrical) "aPP" = ( -/turf/simulated/floor/plating, /obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/floor/plating, /turf/simulated/shuttle/wall{ icon_state = "swall_f5"; dir = 2 @@ -23404,8 +23405,8 @@ }, /area/hallway/secondary/entry) "aPU" = ( -/turf/simulated/floor/plating, /obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/floor/plating, /turf/simulated/shuttle/wall{ icon_state = "swall_f9"; dir = 2 @@ -33753,6 +33754,13 @@ }, /area/hydroponics) "bje" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "asteroid"; @@ -33763,13 +33771,6 @@ icon_state = "siding2"; dir = 1 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /turf/simulated/floor/plasteel{ tag = "icon-siding1 (NORTH)"; icon_state = "siding1"; @@ -33781,16 +33782,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "bjg" = ( -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "asteroid"; - tag = "icon-asteroid (NORTH)" - }, -/turf/simulated/floor/plasteel{ - tag = "icon-siding1 (NORTH)"; - icon_state = "siding1"; - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -33798,13 +33789,6 @@ dir = 4 }, /mob/living/simple_animal/pig, -/turf/simulated/floor/plasteel{ - tag = "icon-siding2 (NORTH)"; - icon_state = "siding2"; - dir = 1 - }, -/area/hydroponics) -"bjh" = ( /turf/simulated/floor/plasteel{ dir = 2; icon_state = "asteroid"; @@ -33815,12 +33799,29 @@ icon_state = "siding1"; dir = 1 }, +/turf/simulated/floor/plasteel{ + tag = "icon-siding2 (NORTH)"; + icon_state = "siding2"; + dir = 1 + }, +/area/hydroponics) +"bjh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "asteroid"; + tag = "icon-asteroid (NORTH)" + }, +/turf/simulated/floor/plasteel{ + tag = "icon-siding1 (NORTH)"; + icon_state = "siding1"; + dir = 1 + }, /turf/simulated/floor/plasteel{ tag = "icon-siding2 (NORTH)"; icon_state = "siding2"; @@ -40653,12 +40654,12 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "bwX" = ( -/turf/space, /obj/structure/shuttle/engine/propulsion{ dir = 8; icon_state = "propulsion"; tag = "icon-propulsion (EAST)" }, +/turf/space, /turf/simulated/shuttle/wall{ icon_state = "swall_f6"; dir = 2 @@ -41449,12 +41450,12 @@ }, /area/hallway/primary/central/ne) "bys" = ( -/turf/space, /obj/structure/shuttle/engine/propulsion{ dir = 8; icon_state = "propulsion"; tag = "icon-propulsion (EAST)" }, +/turf/space, /turf/simulated/shuttle/wall{ icon_state = "swall_f5"; dir = 2 @@ -66710,7 +66711,6 @@ /turf/simulated/floor/plating, /area/medical/virology) "cpz" = ( -/turf/space, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -66723,6 +66723,7 @@ icon_state = "2-4"; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/port) "cpA" = ( @@ -80064,7 +80065,6 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint) "cMB" = ( -/turf/space, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -80083,6 +80083,7 @@ icon_state = "1-2"; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/port) "cMC" = ( @@ -80625,11 +80626,11 @@ /turf/simulated/floor/plating, /area/maintenance/aft) "cNE" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 10; level = 2 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "cNF" = ( @@ -81634,13 +81635,13 @@ /turf/simulated/floor/plasteel, /area/assembly/assembly_line) "cPw" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/visible/yellow, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "cPx" = ( -/turf/space, /obj/structure/cable, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/port) "cPy" = ( @@ -81683,12 +81684,12 @@ /turf/simulated/floor/plasteel, /area/atmos/distribution) "cPC" = ( -/turf/space, /obj/machinery/power/tracker, /obj/structure/cable{ icon_state = "0-4"; d2 = 4 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/port) "cPD" = ( @@ -81728,29 +81729,29 @@ }, /area/toxins/xenobiology) "cPG" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/port) "cPH" = ( -/turf/space, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/port) "cPI" = ( -/turf/space, /obj/structure/cable{ icon_state = "0-4"; d2 = 4 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/port) "cPJ" = ( @@ -81919,7 +81920,6 @@ /turf/simulated/floor/plating, /area/atmos/distribution) "cQa" = ( -/turf/space, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1379; @@ -81935,6 +81935,7 @@ icon_state = "4-8"; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/port) "cQb" = ( @@ -82065,11 +82066,11 @@ /turf/space, /area/space) "cQq" = ( -/turf/space, /obj/structure/cable{ icon_state = "0-2"; d2 = 2 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/port) "cQr" = ( @@ -82565,7 +82566,6 @@ /turf/simulated/floor/plasteel, /area/atmos/distribution) "cRe" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -82584,6 +82584,7 @@ icon_state = "1-2"; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/port) "cRf" = ( @@ -83266,7 +83267,6 @@ /turf/simulated/floor/plating, /area/maintenance/aft) "cSk" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -83279,6 +83279,7 @@ icon_state = "1-4"; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/port) "cSl" = ( @@ -84244,7 +84245,6 @@ /turf/simulated/floor/plasteel, /area/maintenance/asmaint) "cTR" = ( -/turf/space, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1450; @@ -84254,6 +84254,7 @@ pixel_y = 8; req_access_txt = "13" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "cTS" = ( @@ -86905,12 +86906,12 @@ /turf/simulated/floor/plasteel, /area/maintenance/turbine) "cYz" = ( -/turf/space, /obj/machinery/access_button/airlock_exterior{ master_tag = "atmospherics_south"; pixel_x = -25; pixel_y = -8 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "cYA" = ( @@ -89472,7 +89473,6 @@ /turf/simulated/floor/plasteel, /area/maintenance/turbine) "ddA" = ( -/turf/space, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1379; @@ -89489,6 +89489,7 @@ pixel_y = 0; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "ddB" = ( @@ -89499,19 +89500,18 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "ddC" = ( -/turf/space, /obj/structure/transit_tube{ icon_state = "E-W-Pass" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "ddD" = ( -/turf/space, /obj/item/wrench, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "ddE" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -89519,6 +89519,7 @@ pixel_y = 0; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "ddF" = ( @@ -89572,7 +89573,6 @@ /turf/space, /area/space) "ddM" = ( -/turf/space, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1379; @@ -89582,23 +89582,23 @@ pixel_y = 25; req_access_txt = "75;13" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "ddN" = ( -/turf/space, /obj/structure/cable, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "ddO" = ( -/turf/space, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 6; level = 2 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/space) "ddP" = ( -/turf/space, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -89611,10 +89611,10 @@ icon_state = "1-4"; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "ddQ" = ( -/turf/space, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -89634,14 +89634,15 @@ pixel_x = 0; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "ddR" = ( -/turf/space, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "ddS" = ( @@ -89649,15 +89650,14 @@ /turf/simulated/floor/plating, /area/engine/engineering) "ddT" = ( -/turf/space, /obj/structure/cable{ icon_state = "0-4"; d2 = 4 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "ddU" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -89677,10 +89677,10 @@ pixel_x = 0; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "ddV" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -89693,13 +89693,14 @@ icon_state = "2-8"; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "ddW" = ( -/turf/simulated/floor/plating, /obj/structure/shuttle/engine/propulsion/burst{ dir = 8 }, +/turf/simulated/floor/plating, /turf/simulated/shuttle/wall{ tag = "icon-swall_f6"; icon_state = "swall_f6"; @@ -89707,7 +89708,6 @@ }, /area/shuttle/pod_4) "ddX" = ( -/turf/space, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1450; @@ -89717,16 +89717,17 @@ pixel_y = 25; req_access_txt = "13" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk{ tag = "icon-catwalk0"; icon_state = "catwalk0" }, /area/space) "ddY" = ( -/turf/simulated/floor/plating, /obj/structure/shuttle/engine/propulsion/burst{ dir = 8 }, +/turf/simulated/floor/plating, /turf/simulated/shuttle/wall{ tag = "icon-swall_f5"; icon_state = "swall_f5"; @@ -89755,7 +89756,6 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "deb" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -89766,6 +89766,7 @@ d2 = 8; icon_state = "2-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "dec" = ( @@ -89773,15 +89774,14 @@ /turf/simulated/floor/plasteel, /area/atmos) "ded" = ( -/turf/space, /obj/structure/cable{ icon_state = "0-2"; d2 = 2 }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "dee" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -89789,10 +89789,10 @@ pixel_x = 0; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "def" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -89811,12 +89811,13 @@ icon_state = "1-2"; tag = "" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "deg" = ( -/turf/space, /obj/structure/cable, /obj/machinery/power/tracker, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/solar/starboard) "deh" = ( diff --git a/_maps/map_files/cyberiad/z2.dmm b/_maps/map_files/cyberiad/z2.dmm index 4b46b076295..0dc62cde008 100644 --- a/_maps/map_files/cyberiad/z2.dmm +++ b/_maps/map_files/cyberiad/z2.dmm @@ -410,8 +410,8 @@ }, /area/holodeck/source_meetinghall) "bg" = ( -/turf/simulated/floor/holofloor/grass, /obj/structure/flora/ausbushes/grassybush, +/turf/simulated/floor/holofloor/grass, /turf/simulated/floor/holofloor{ tag = "icon-wood_siding5"; icon_state = "wood_siding5"; @@ -441,8 +441,8 @@ /turf/unsimulated/floor/plating/vox, /area/vox_station) "bm" = ( -/turf/simulated/floor/holofloor/grass, /obj/structure/flora/ausbushes/grassybush, +/turf/simulated/floor/holofloor/grass, /turf/simulated/floor/holofloor{ tag = "icon-wood_siding9"; icon_state = "wood_siding9"; @@ -516,8 +516,8 @@ }, /area/holodeck/source_meetinghall) "bw" = ( -/turf/simulated/floor/holofloor/grass, /obj/structure/flora/ausbushes/grassybush, +/turf/simulated/floor/holofloor/grass, /turf/simulated/floor/holofloor{ tag = "icon-wood_siding6"; icon_state = "wood_siding6"; @@ -743,8 +743,8 @@ }, /area/space) "cd" = ( -/turf/simulated/floor/holofloor/grass, /obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/holofloor/grass, /turf/simulated/floor/holofloor{ dir = 2; icon_state = "wood_siding4"; @@ -838,8 +838,8 @@ }, /area/space) "cs" = ( -/turf/simulated/floor/holofloor/grass, /obj/structure/flora/ausbushes/grassybush, +/turf/simulated/floor/holofloor/grass, /turf/simulated/floor/holofloor{ dir = 2; icon_state = "wood_siding10"; @@ -847,8 +847,8 @@ }, /area/holodeck/source_picnicarea) "ct" = ( -/turf/simulated/floor/holofloor/grass, /obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/holofloor/grass, /turf/simulated/floor/holofloor{ dir = 2; icon_state = "wood_siding8"; @@ -2882,10 +2882,10 @@ }, /area/syndicate_mothership) "ht" = ( -/turf/unsimulated/floor/snow, /obj/structure/flora/tree/pine{ pixel_x = 1 }, +/turf/unsimulated/floor/snow, /turf/unsimulated/floor/snow{ tag = "icon-gravsnow_corner (SOUTHWEST)"; icon_state = "gravsnow_corner"; @@ -3038,8 +3038,8 @@ }, /area/syndicate_mothership) "hP" = ( -/turf/unsimulated/floor/snow, /obj/structure/flora/grass/brown, +/turf/unsimulated/floor/snow, /turf/unsimulated/floor/snow{ tag = "icon-gravsnow_corner (EAST)"; icon_state = "gravsnow_corner"; @@ -3207,8 +3207,8 @@ }, /area/syndicate_mothership) "ip" = ( -/turf/unsimulated/floor/snow, /obj/structure/flora/grass/brown, +/turf/unsimulated/floor/snow, /turf/unsimulated/floor/snow{ tag = "icon-gravsnow_corner (SOUTHWEST)"; icon_state = "gravsnow_corner"; @@ -3362,10 +3362,10 @@ /turf/simulated/floor/plating/airless, /area/syndicate_mothership) "iH" = ( -/turf/unsimulated/floor/snow, /obj/structure/flora/tree/pine{ pixel_x = 1 }, +/turf/unsimulated/floor/snow, /turf/unsimulated/floor/snow{ icon_state = "gravsnow_corner" }, @@ -3422,9 +3422,9 @@ }, /area/syndicate_mothership) "iO" = ( +/obj/machinery/porta_turret/syndicate/pod, /turf/simulated/floor/pod, /turf/space, -/obj/machinery/porta_turret/syndicate/pod, /turf/simulated/shuttle/wall{ dir = 8; icon_state = "diagonalWall3" @@ -3440,9 +3440,9 @@ /turf/simulated/floor/plating, /area/shuttle/assault_pod) "iQ" = ( +/obj/machinery/porta_turret/syndicate/pod, /turf/simulated/floor/pod, /turf/space, -/obj/machinery/porta_turret/syndicate/pod, /turf/simulated/shuttle/wall{ dir = 1; icon_state = "diagonalWall3" @@ -3885,9 +3885,9 @@ }, /area/syndicate_mothership) "kc" = ( +/obj/machinery/porta_turret/syndicate/pod, /turf/simulated/floor/pod, /turf/space, -/obj/machinery/porta_turret/syndicate/pod, /turf/simulated/shuttle/wall{ tag = "icon-diagonalWall3"; icon_state = "diagonalWall3"; @@ -3916,9 +3916,9 @@ }, /area/wizard_station) "kh" = ( +/obj/machinery/porta_turret/syndicate/pod, /turf/simulated/floor/pod, /turf/space, -/obj/machinery/porta_turret/syndicate/pod, /turf/simulated/shuttle/wall{ dir = 4; icon_state = "diagonalWall3" @@ -3978,8 +3978,8 @@ }, /area/syndicate_mothership) "ko" = ( -/turf/unsimulated/floor/snow, /obj/structure/flora/bush, +/turf/unsimulated/floor/snow, /turf/unsimulated/floor/snow{ tag = "icon-gravsnow_corner (NORTH)"; icon_state = "gravsnow_corner"; @@ -5439,26 +5439,26 @@ }, /area/syndicate_mothership) "nX" = ( -/turf/unsimulated/floor/snow, /obj/structure/flora/tree/pine, +/turf/unsimulated/floor/snow, /turf/unsimulated/floor/snow{ icon_state = "gravsnow_corner" }, /area/syndicate_mothership) "nY" = ( -/turf/unsimulated/floor/snow, /obj/structure/flora/grass/brown, +/turf/unsimulated/floor/snow, /turf/unsimulated/floor/snow{ icon_state = "gravsnow_corner" }, /area/syndicate_mothership) "nZ" = ( -/turf/unsimulated/floor{ - icon_state = "engine" - }, /obj/structure/window/reinforced{ dir = 1 }, +/turf/unsimulated/floor{ + icon_state = "engine" + }, /turf/unsimulated/wall{ dir = 1; icon = 'icons/turf/shuttle.dmi'; @@ -5466,12 +5466,12 @@ }, /area/admin) "oa" = ( -/turf/unsimulated/floor{ - icon_state = "engine" - }, /obj/structure/window/reinforced{ dir = 1 }, +/turf/unsimulated/floor{ + icon_state = "engine" + }, /turf/unsimulated/wall{ dir = 8; icon = 'icons/turf/shuttle.dmi'; diff --git a/_maps/map_files/cyberiad/z4.dmm b/_maps/map_files/cyberiad/z4.dmm index 9edf8b675d0..e533422b39a 100644 --- a/_maps/map_files/cyberiad/z4.dmm +++ b/_maps/map_files/cyberiad/z4.dmm @@ -908,12 +908,12 @@ }, /area/engiestation/solars) "cu" = ( -/turf/simulated/floor/plating/airless, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk{ tag = "icon-catwalk3"; icon_state = "catwalk3" @@ -930,7 +930,6 @@ }, /area/engiestation/solars) "cw" = ( -/turf/simulated/floor/plating/airless, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -941,6 +940,7 @@ d2 = 4; icon_state = "2-4" }, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk{ tag = "icon-catwalk3"; icon_state = "catwalk3" @@ -972,7 +972,6 @@ /turf/simulated/floor/plasteel/airless, /area/constructionsite/hallway/center) "cA" = ( -/turf/simulated/floor/plating/airless, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -983,13 +982,13 @@ d2 = 8; icon_state = "2-8" }, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk{ tag = "icon-catwalk3"; icon_state = "catwalk3" }, /area/engiestation/solars) "cB" = ( -/turf/simulated/floor/plating/airless, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -1005,6 +1004,7 @@ d2 = 4; icon_state = "2-4" }, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk{ tag = "icon-catwalk3"; icon_state = "catwalk3" @@ -1093,7 +1093,6 @@ }, /area/engiestation/solars) "cN" = ( -/turf/simulated/floor/plating/airless, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -1104,13 +1103,13 @@ d2 = 8; icon_state = "2-8" }, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk{ tag = "icon-catwalk1"; icon_state = "catwalk1" }, /area/engiestation/solars) "cO" = ( -/turf/simulated/floor/plating/airless, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -1126,6 +1125,7 @@ d2 = 4; icon_state = "2-4" }, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk{ tag = "icon-catwalk1"; icon_state = "catwalk1" @@ -1332,7 +1332,6 @@ }, /area/engiestation/solars) "dp" = ( -/turf/simulated/floor/plating/airless, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -1343,13 +1342,13 @@ d2 = 4; icon_state = "1-4" }, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk{ tag = "icon-catwalk12"; icon_state = "catwalk12" }, /area/engiestation/solars) "dq" = ( -/turf/simulated/floor/plating/airless, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -1366,13 +1365,13 @@ d2 = 4; icon_state = "1-4" }, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk{ tag = "icon-catwalk12"; icon_state = "catwalk12" }, /area/engiestation/solars) "dr" = ( -/turf/simulated/floor/plating/airless, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -1389,6 +1388,7 @@ d2 = 4; icon_state = "1-4" }, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk{ tag = "icon-catwalk8"; icon_state = "catwalk8" @@ -1487,7 +1487,6 @@ }, /area/engiestation) "dy" = ( -/turf/simulated/floor/plating/airless, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -1504,13 +1503,13 @@ icon_state = "4-8"; pixel_x = 0 }, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk{ tag = "icon-catwalk4"; icon_state = "catwalk4" }, /area/engiestation/solars) "dz" = ( -/turf/simulated/floor/plating/airless, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -1527,13 +1526,13 @@ icon_state = "4-8"; pixel_x = 0 }, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk{ tag = "icon-catwalk12"; icon_state = "catwalk12" }, /area/engiestation/solars) "dA" = ( -/turf/simulated/floor/plating/airless, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -1544,6 +1543,7 @@ d2 = 8; icon_state = "2-8" }, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk{ tag = "icon-catwalk12"; icon_state = "catwalk12" @@ -1702,19 +1702,18 @@ /turf/simulated/floor/plating/airless, /area/constructionsite/ai) "dS" = ( -/turf/simulated/floor/plating/airless, /obj/structure/cable{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk{ tag = "icon-catwalk12"; icon_state = "catwalk12" }, /area/engiestation/solars) "dT" = ( -/turf/simulated/floor/plating/airless, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -1726,13 +1725,13 @@ d2 = 4; icon_state = "2-4" }, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk{ tag = "icon-catwalk12"; icon_state = "catwalk12" }, /area/engiestation/solars) "dU" = ( -/turf/simulated/floor/plating/airless, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -1744,6 +1743,7 @@ d2 = 4; icon_state = "2-4" }, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk{ tag = "icon-catwalk8"; icon_state = "catwalk8" @@ -1792,7 +1792,6 @@ }, /area/engiestation) "ea" = ( -/turf/simulated/floor/plating/airless, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -1804,13 +1803,13 @@ icon_state = "4-8"; pixel_x = 0 }, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk{ tag = "icon-catwalk4"; icon_state = "catwalk4" }, /area/engiestation/solars) "eb" = ( -/turf/simulated/floor/plating/airless, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -1822,18 +1821,19 @@ icon_state = "4-8"; pixel_x = 0 }, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk{ tag = "icon-catwalk12"; icon_state = "catwalk12" }, /area/engiestation/solars) "ec" = ( -/turf/simulated/floor/plating/airless, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk{ tag = "icon-catwalk12"; icon_state = "catwalk12" @@ -2642,8 +2642,8 @@ }, /area/space) "fR" = ( -/turf/simulated/floor/plating/airless, /obj/item/lighter/zippo, +/turf/simulated/floor/plating/airless, /turf/simulated/floor/plating/airless/catwalk{ tag = "icon-catwalk8"; icon_state = "catwalk8" diff --git a/_maps/map_files/cyberiad/z6.dmm b/_maps/map_files/cyberiad/z6.dmm index 268339344ab..08f7dc62ebe 100644 --- a/_maps/map_files/cyberiad/z6.dmm +++ b/_maps/map_files/cyberiad/z6.dmm @@ -61,7 +61,6 @@ /turf/simulated/floor/plating, /area/djstation) "an" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -77,6 +76,7 @@ d2 = 8; icon_state = "2-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/djstation/solars) "ao" = ( @@ -88,12 +88,12 @@ /turf/space, /area/space) "ap" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/djstation/solars) "aq" = ( @@ -120,12 +120,12 @@ /turf/simulated/floor/plating, /area/djstation) "as" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/djstation) "at" = ( @@ -297,7 +297,6 @@ /turf/simulated/floor/plating, /area/derelict/bridge) "aQ" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -313,10 +312,10 @@ d2 = 4; icon_state = "1-4" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/djstation) "aR" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -332,19 +331,19 @@ d2 = 4; icon_state = "1-4" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/djstation/solars) "aS" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/djstation/solars) "aT" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -360,6 +359,7 @@ d2 = 8; icon_state = "2-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/djstation/solars) "aU" = ( @@ -371,7 +371,6 @@ /turf/simulated/floor/plating, /area/djstation) "aV" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -387,6 +386,7 @@ d2 = 8; icon_state = "2-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/djstation) "aW" = ( @@ -4329,11 +4329,11 @@ name = "Derelict Annex" }) "jj" = ( +/obj/effect/landmark/burnturf, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cautionfull" }, -/obj/effect/landmark/burnturf, /turf/simulated/wall/mineral/titanium/nodecon/tileblend{ fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "cautionfull"); icon_state = "4-i" @@ -4587,7 +4587,6 @@ name = "Derelict Annex" }) "jK" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -4603,6 +4602,7 @@ d2 = 8; icon_state = "2-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/derelict/solar_control) "jL" = ( @@ -6688,12 +6688,12 @@ }, /area/syndicate_depot/core) "oS" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/derelict/solar_control) "oT" = ( @@ -7746,16 +7746,15 @@ }, /area/derelict/crew_quarters) "rm" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/derelict/solar_control) "rn" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -7766,6 +7765,7 @@ d2 = 8; icon_state = "1-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/derelict/solar_control) "ro" = ( @@ -7978,7 +7978,6 @@ }, /area/derelict/crew_quarters) "rF" = ( -/turf/space, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -7994,6 +7993,7 @@ d2 = 8; icon_state = "1-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/derelict/solar_control) "rG" = ( @@ -8262,7 +8262,6 @@ }, /area/derelict/crew_quarters) "sh" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -8273,6 +8272,7 @@ d2 = 4; icon_state = "2-4" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/derelict/solar_control) "si" = ( @@ -8996,7 +8996,6 @@ }, /area/derelict/crew_quarters) "tE" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -9007,6 +9006,7 @@ d2 = 8; icon_state = "2-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/derelict/solar_control) "tF" = ( @@ -9025,7 +9025,6 @@ }, /area/derelict/arrival) "tH" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -9041,6 +9040,7 @@ d2 = 8; icon_state = "2-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/derelict/solar_control) "tI" = ( @@ -9547,7 +9547,6 @@ name = "Derelict Annex" }) "uI" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -9564,6 +9563,7 @@ d2 = 8; icon_state = "1-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/derelict/solar_control) "uJ" = ( @@ -9704,13 +9704,13 @@ name = "Derelict Annex" }) "uV" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteredfull" }, -/obj/structure/window/reinforced{ - dir = 1 - }, /turf/simulated/wall/mineral/titanium/nodecon/tileblend{ fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "whiteredfull"); icon_state = "4-i" @@ -9838,13 +9838,13 @@ name = "Derelict Annex" }) "vi" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteredfull" }, -/obj/structure/window/reinforced{ - dir = 8 - }, /turf/simulated/wall/mineral/titanium/nodecon/tileblend{ fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "whiteredfull"); icon_state = "4-i" @@ -9880,7 +9880,6 @@ /turf/space, /area/derelict/arrival) "vm" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -9896,6 +9895,7 @@ d2 = 4; icon_state = "1-4" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/derelict/solar_control) "vn" = ( @@ -10452,7 +10452,6 @@ name = "Derelict Annex" }) "wl" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -10463,10 +10462,10 @@ d2 = 8; icon_state = "1-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/derelict/solar_control) "wm" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -10477,6 +10476,7 @@ d2 = 4; icon_state = "1-4" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/derelict/solar_control) "wn" = ( @@ -10487,7 +10487,6 @@ }, /area/derelict/crew_quarters) "wo" = ( -/turf/space, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -10503,10 +10502,10 @@ d2 = 8; icon_state = "2-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/derelict/solar_control) "wp" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -10522,10 +10521,10 @@ d2 = 4; icon_state = "1-4" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/derelict/solar_control) "wq" = ( -/turf/space, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -10541,6 +10540,7 @@ d2 = 8; icon_state = "1-8" }, +/turf/space, /turf/simulated/floor/plating/airless/catwalk, /area/derelict/solar_control) "wr" = ( diff --git a/_maps/map_files/shuttles/emergency_narnar.dmm b/_maps/map_files/shuttles/emergency_narnar.dmm index e8e89240ff7..b6bfe0376d6 100644 --- a/_maps/map_files/shuttles/emergency_narnar.dmm +++ b/_maps/map_files/shuttles/emergency_narnar.dmm @@ -296,13 +296,13 @@ /turf/simulated/floor/engine/cult, /area/shuttle/escape) "aR" = ( +/obj/effect/spawner/window/reinforced{ + color = "red" + }, /turf/simulated/shuttle/wall{ icon_state = "swall3"; dir = 2 }, -/obj/effect/spawner/window/reinforced{ - color = "red" - }, /turf/simulated/wall/cult, /area/shuttle/escape) "aS" = ( diff --git a/_maps/map_files/shuttles/ferry_base.dmm b/_maps/map_files/shuttles/ferry_base.dmm index 87658df37bf..a5e2d5aef05 100644 --- a/_maps/map_files/shuttles/ferry_base.dmm +++ b/_maps/map_files/shuttles/ferry_base.dmm @@ -3,12 +3,12 @@ /turf/space, /area/space) "b" = ( -/turf/space, /obj/structure/shuttle/engine/propulsion{ dir = 8; icon_state = "propulsion"; tag = "icon-propulsion (EAST)" }, +/turf/space, /turf/simulated/shuttle/wall{ icon_state = "swall_f6"; dir = 2 @@ -98,12 +98,12 @@ /turf/simulated/shuttle/floor, /area/shuttle/transport) "o" = ( -/turf/space, /obj/structure/shuttle/engine/propulsion{ dir = 8; icon_state = "propulsion"; tag = "icon-propulsion (EAST)" }, +/turf/space, /turf/simulated/shuttle/wall{ icon_state = "swall_f5"; dir = 2 diff --git a/_maps/map_files/shuttles/ferry_meat.dmm b/_maps/map_files/shuttles/ferry_meat.dmm index 1a085c97f7d..a4008980d4a 100644 --- a/_maps/map_files/shuttles/ferry_meat.dmm +++ b/_maps/map_files/shuttles/ferry_meat.dmm @@ -3,12 +3,12 @@ /turf/space, /area/space) "b" = ( -/turf/space, /obj/structure/shuttle/engine/propulsion{ dir = 8; icon_state = "propulsion"; tag = "icon-propulsion (EAST)" }, +/turf/space, /turf/simulated/shuttle/wall{ icon_state = "swall_f6"; dir = 2 @@ -153,12 +153,12 @@ /turf/simulated/shuttle/floor, /area/shuttle/transport) "s" = ( -/turf/space, /obj/structure/shuttle/engine/propulsion{ dir = 8; icon_state = "propulsion"; tag = "icon-propulsion (EAST)" }, +/turf/space, /turf/simulated/shuttle/wall{ icon_state = "swall_f5"; dir = 2 diff --git a/code/LINDA/LINDA_turf_tile.dm b/code/LINDA/LINDA_turf_tile.dm index bb212b17138..6ab83750f3c 100644 --- a/code/LINDA/LINDA_turf_tile.dm +++ b/code/LINDA/LINDA_turf_tile.dm @@ -311,7 +311,9 @@ /atom/movable/proc/experience_pressure_difference(pressure_difference, direction) if(last_forced_movement >= SSair.times_fired) return 0 - else if(!anchored && !pulledby) + if(anchored || move_resist == INFINITY) + return 0 + else if(!pulledby) var/turf/target = get_turf(src) var/datum/gas_mixture/target_air = target.return_air() if(isspaceturf(target) || isunsimulatedturf(target) || pressure_resistance > target_air.return_pressure()) diff --git a/code/__DEFINES/components.dm b/code/__DEFINES/components.dm index 87b9094b47e..02b36614cb5 100644 --- a/code/__DEFINES/components.dm +++ b/code/__DEFINES/components.dm @@ -274,4 +274,12 @@ //Ouch my toes! #define CALTROP_BYPASS_SHOES 1 -#define CALTROP_IGNORE_WALKERS 2 \ No newline at end of file +#define CALTROP_IGNORE_WALKERS 2 + +//Xenobio hotkeys +#define COMSIG_XENO_SLIME_CLICK_CTRL "xeno_slime_click_ctrl" //from slime CtrlClickOn(): (/mob) +#define COMSIG_XENO_SLIME_CLICK_ALT "xeno_slime_click_alt" //from slime AltClickOn(): (/mob) +#define COMSIG_XENO_SLIME_CLICK_SHIFT "xeno_slime_click_shift" //from slime ShiftClickOn(): (/mob) +#define COMSIG_XENO_TURF_CLICK_SHIFT "xeno_turf_click_shift" //from turf ShiftClickOn(): (/mob) +#define COMSIG_XENO_TURF_CLICK_CTRL "xeno_turf_click_alt" //from turf AltClickOn(): (/mob) +#define COMSIG_XENO_MONKEY_CLICK_CTRL "xeno_monkey_click_ctrl" //from monkey CtrlClickOn(): (/mob) \ No newline at end of file diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm index d36fd9449d4..54fd47a220d 100644 --- a/code/__HELPERS/time.dm +++ b/code/__HELPERS/time.dm @@ -102,6 +102,10 @@ proc/isDay(var/month, var/day) var/numMinutes = (seconds - numSeconds) / 60 return "[numMinutes] [numMinutes > 1 ? "minutes" : "minute"] and [numSeconds] seconds." +//Take a value in seconds and makes it display like a clock +/proc/seconds_to_clock(var/seconds as num) + return "[add_zero(num2text((seconds / 60) % 60), 2)]:[add_zero(num2text(seconds % 60), 2)]" + //Takes a value of time in deciseconds. //Returns a text value of that number in hours, minutes, or seconds. /proc/DisplayTimeText(time_value) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 97978fe6832..d9039e8c004 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1487,10 +1487,11 @@ var/mob/dview/dview_mob = new /mob/dview invisibility = 101 density = 0 - + move_force = 0 + pull_force = 0 move_resist = INFINITY simulated = 0 - + canmove = FALSE see_in_dark = 1e6 /mob/dview/New() //For whatever reason, if this isn't called, then BYOND will throw a type mismatch runtime when attempting to add this to the mobs list. -Fox diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm index 78148aee00e..c7217221585 100644 --- a/code/_globalvars/lists/objects.dm +++ b/code/_globalvars/lists/objects.dm @@ -13,6 +13,7 @@ GLOBAL_LIST_INIT(singularities, list()) //list of all singularities GLOBAL_LIST_INIT(janitorial_equipment, list()) //list of janitorial equipment GLOBAL_LIST_INIT(crafting_recipes, list()) //list of all crafting recipes GLOBAL_LIST_INIT(prisoncomputer_list, list()) +GLOBAL_LIST_INIT(celltimers_list, list()) // list of all cell timers GLOBAL_LIST_INIT(cell_logs, list()) GLOBAL_LIST_INIT(navigation_computers, list()) diff --git a/code/game/machinery/computer/brigcells.dm b/code/game/machinery/computer/brigcells.dm new file mode 100644 index 00000000000..d322e99ae4b --- /dev/null +++ b/code/game/machinery/computer/brigcells.dm @@ -0,0 +1,58 @@ +/obj/machinery/computer/brigcells + name = "cell management computer" + desc = "Used to manage prison cells." + icon_keyboard = "security_key" + icon_screen = "cell_monitor" + use_power = IDLE_POWER_USE + idle_power_usage = 250 + active_power_usage = 500 + circuit = /obj/item/circuitboard/brigcells + light_color = LIGHT_COLOR_DARKRED + req_access = list(access_brig) + +/obj/machinery/computer/brigcells/attack_ai(mob/user) + attack_hand(user) + ui_interact(user) + +/obj/machinery/computer/brigcells/attack_hand(mob/user) + add_fingerprint(user) + if(stat & (BROKEN|NOPOWER)) + return + if(!allowed(user)) + to_chat(user, "Access denied.") + return + ui_interact(user) + +/obj/machinery/computer/brigcells/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "brig_cells.tmpl", "Brig Cell Management", 1000, 400) + ui.open() + ui.set_auto_update(1) + +/obj/machinery/computer/brigcells/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) + var/data[0] + var/list/timers = list() + for(var/obj/machinery/door_timer/T in GLOB.celltimers_list) + var/timer = list() + timer["cell_id"] = T.name + timer["occupant"] = T.occupant + timer["crimes"] = T.crimes + timer["brigged_by"] = T.officer + if(T.time == 0) + timer["background"] = "'background-color:#007f47'" + else + timer["background"] = "'background-color:#890E26'" + timer["time_set"] = seconds_to_clock(T.time / 10) + timer["time_left"] = seconds_to_clock(T.timeleft()) + timer["ref"] = "\ref[T]" + timers[++timers.len] += timer + timers = sortByKey(timers, "cell_id") + data["cells"] = timers + return data + +/obj/machinery/computer/brigcells/Topic(href, href_list) + if(href_list["release"]) + var/obj/machinery/door_timer/T = locate(href_list["release"]) + T.timer_end() + T.Radio.autosay("Timer stopped manually from a cell management console.", T.name, "Security", list(z)) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 9060833d585..2b294db78c9 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -219,6 +219,9 @@ /obj/item/circuitboard/prisoner name = "Circuit board (Prisoner Management)" build_path = /obj/machinery/computer/prisoner +/obj/item/circuitboard/brigcells + name = "Circuit board (Brig Cell Control)" + build_path = /obj/machinery/computer/brigcells // RD console circuits, so that {de,re}constructing one of the special consoles doesn't ruin everything forever diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index ea684d9596b..672ebed32e4 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/prisoner - name = "prisoner management console" + name = "implant management console" icon = 'icons/obj/computer.dmi' icon_keyboard = "security_key" icon_screen = "explosive" diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index df20e6fcf37..eb536953b45 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -31,6 +31,18 @@ maptext_height = 26 maptext_width = 32 maptext_y = -1 + var/occupant = "None" + var/crimes = "None" + var/time = 0 + var/officer = "None" + +/obj/machinery/door_timer/New() + GLOB.celltimers_list += src + return ..() + +/obj/machinery/door_timer/Destroy() + GLOB.celltimers_list -= src + return ..() /obj/machinery/door_timer/proc/print_report() var/logname = input(usr, "Name of the guilty?","[id] log name") @@ -38,6 +50,10 @@ if(!logname || !logcharges) return 0 + occupant = logname + crimes = logcharges + time = timetoset + officer = usr.name for(var/obj/machinery/computer/prisoner/C in GLOB.prisoncomputer_list) var/obj/item/paper/P = new /obj/item/paper(C.loc) @@ -121,6 +137,7 @@ if(timing) if(timeleft() <= 0) Radio.autosay("Timer has expired. Releasing prisoner.", name, "Security", list(z)) + occupant = "None" timer_end() // open doors, reset timer, clear status screen timing = 0 . = PROCESS_KILL @@ -181,7 +198,11 @@ if(stat & (NOPOWER|BROKEN)) return 0 - // Reset releasetime + // Reset vars + occupant = "None" + crimes = "None" + time = 0 + officer = "None" releasetime = 0 printed = 0 if(prisoner) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index dd214c7a673..8ad7fae6d2d 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -526,6 +526,9 @@ REAGENT SCANNER materials = list(MAT_METAL=30, MAT_GLASS=20) /obj/item/slime_scanner/attack(mob/living/M as mob, mob/living/user as mob) + slime_scan(M, user) + +/proc/slime_scan(mob/living/carbon/slime/M, mob/living/user) if(!isslime(M)) user.show_message("This device can only scan slimes!", 1) return diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 175743e79aa..ce76dc4e282 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -671,6 +671,8 @@ var/global/nologevent = 0 alert("Unable to start the game as it is not set up.") return if(ticker.current_state == GAME_STATE_PREGAME) + if(alert(usr, "Are you sure you want to start now?", "Start game", "Yes", "No") != "Yes") + return ticker.current_state = GAME_STATE_SETTING_UP log_admin("[key_name(usr)] has started the game.") message_admins("[key_name_admin(usr)] has started the game.") diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm index 8fe5d2cf4d8..1b8f61bb7bf 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm @@ -1,3 +1,5 @@ +GLOBAL_LIST_EMPTY(monkey_recyclers) + /obj/machinery/monkey_recycler name = "Monkey Recycler" desc = "A machine used for recycling dead monkeys into monkey cubes." @@ -14,6 +16,7 @@ var/cube_production = 1 var/cycle_through = 0 var/obj/item/reagent_containers/food/snacks/monkeycube/cube_type = /obj/item/reagent_containers/food/snacks/monkeycube + var/list/connected = list() /obj/machinery/monkey_recycler/New() ..() @@ -21,8 +24,15 @@ component_parts += new /obj/item/circuitboard/monkey_recycler(null) component_parts += new /obj/item/stock_parts/manipulator(null) component_parts += new /obj/item/stock_parts/matter_bin(null) + GLOB.monkey_recyclers += src RefreshParts() +/obj/machinery/monkey_recycler/Destroy() + GLOB.monkey_recyclers -= src + for(var/obj/machinery/computer/camera_advanced/xenobio/console in connected) + console.connected_recycler = null + return ..() + /obj/machinery/monkey_recycler/RefreshParts() var/req_grind = 5 var/cubes_made = 1 @@ -47,21 +57,25 @@ default_deconstruction_crowbar(O) if(istype(O, /obj/item/multitool)) - cycle_through++ - switch(cycle_through) - if(1) - cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/farwacube - if(2) - cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/wolpincube - if(3) - cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/stokcube - if(4) - cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/neaeracube - if(5) - cube_type = /obj/item/reagent_containers/food/snacks/monkeycube - cycle_through = 0 - to_chat(user, "You change the monkeycube type to [initial(cube_type.name)].") - + if(!panel_open) + cycle_through++ + switch(cycle_through) + if(1) + cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/farwacube + if(2) + cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/wolpincube + if(3) + cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/stokcube + if(4) + cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/neaeracube + if(5) + cube_type = /obj/item/reagent_containers/food/snacks/monkeycube + cycle_through = 0 + to_chat(user, "You change the monkeycube type to [initial(cube_type.name)].") + else + var/obj/item/multitool/M = O + M.buffer = src + to_chat(user, "You log [src] in the [M]'s buffer.") if(stat != 0) //NOPOWER etc return if(istype(O, /obj/item/grab)) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 7d396a7e7ea..e91c79e46c9 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -235,9 +235,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp ..() -/mob/dead/observer/experience_pressure_difference() - return 0 - /mob/dead/observer/can_use_hands() return 0 /mob/dead/observer/Stat() diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 0e921e7953e..d72e5b6e2af 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -442,6 +442,10 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, if(!do_after(src, 45, target = src)) return + if(buckled) + to_chat(src, "You cannot crawl into a vent while buckled to something!") + return + if(!client) return diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm index aa457938afc..afbc94a9455 100644 --- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm +++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm @@ -250,7 +250,7 @@ /datum/chemical_reaction/slimestabilizer/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[type]") - var/obj/item/slimepotion/stabilizer/P = new /obj/item/slimepotion/stabilizer + var/obj/item/slimepotion/slime/stabilizer/P = new /obj/item/slimepotion/slime/stabilizer P.forceMove(get_turf(holder.my_atom)) //Dark Blue @@ -380,7 +380,7 @@ /datum/chemical_reaction/slimepsteroid/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[type]") - var/obj/item/slimepotion/steroid/P = new /obj/item/slimepotion/steroid + var/obj/item/slimepotion/slime/steroid/P = new /obj/item/slimepotion/slime/steroid P.forceMove(get_turf(holder.my_atom)) /datum/chemical_reaction/slimejam @@ -423,7 +423,7 @@ /datum/chemical_reaction/slimemutator/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[type]") - var/obj/item/slimepotion/mutator/P = new /obj/item/slimepotion/mutator + var/obj/item/slimepotion/slime/mutator/P = new /obj/item/slimepotion/slime/mutator P.forceMove(get_turf(holder.my_atom)) /datum/chemical_reaction/slimebloodlust @@ -469,7 +469,7 @@ /datum/chemical_reaction/docility/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[type]") - var/obj/item/slimepotion/docility/P = new /obj/item/slimepotion/docility + var/obj/item/slimepotion/slime/docility/P = new /obj/item/slimepotion/slime/docility P.forceMove(get_turf(holder.my_atom)) diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm index 57da7142b7c..9d555d8cf32 100644 --- a/code/modules/research/designs/comp_board_designs.dm +++ b/code/modules/research/designs/comp_board_designs.dm @@ -212,6 +212,16 @@ build_path = /obj/item/circuitboard/prisoner category = list("Computer Boards") +/datum/design/brigcells + name = "Console Board (Brig Cell Management Console)" + desc = "Allows for the construction of circuit boards used to build a brig cell management console." + id = "brigcells" + req_tech = list("programming" = 2) + build_type = IMPRINTER + materials = list(MAT_GLASS = 1000) + build_path = /obj/item/circuitboard/brigcells + category = list("Computer Boards") + /datum/design/rdconsole name = "Console Board (R&D Console)" desc = "Allows for the construction of circuit boards used to build a new R&D console. Can be swiped with a Scientist level ID to manage access levels." diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index 29a3cd26600..b695ca3a1b4 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -26,14 +26,33 @@ var/datum/action/innate/slime_pick_up/slime_up_action = new var/datum/action/innate/feed_slime/feed_slime_action = new var/datum/action/innate/monkey_recycle/monkey_recycle_action = new + var/datum/action/innate/slime_scan/scan_action = new + var/datum/action/innate/feed_potion/potion_action = new + var/datum/action/innate/hotkey_help/hotkey_help = new var/list/stored_slimes = list() var/max_slimes = 5 var/monkeys = 0 + var/obj/item/slimepotion/slime/current_potion + var/obj/machinery/monkey_recycler/connected_recycler icon_screen = "slime_comp" icon_keyboard = "rd_key" +/obj/machinery/computer/camera_advanced/xenobio/New() + ..() + for(var/obj/machinery/monkey_recycler/recycler in GLOB.monkey_recyclers) + if(get_area(recycler.loc) == get_area(loc)) + connected_recycler = recycler + connected_recycler.connected += src + +/obj/machinery/computer/camera_advanced/xenobio/Destroy() + QDEL_NULL(current_potion) + for(var/mob/living/carbon/slime/S in stored_slimes) + S.forceMove(drop_location()) + stored_slimes.Cut() + return ..() + /obj/machinery/computer/camera_advanced/xenobio/CreateEye() eyeobj = new /mob/camera/aiEye/remote/xenobio(get_turf(src)) eyeobj.origin = src @@ -43,26 +62,63 @@ /obj/machinery/computer/camera_advanced/xenobio/GrantActions(mob/living/carbon/user) ..() + if(slime_up_action) slime_up_action.target = src slime_up_action.Grant(user) actions += slime_up_action - + if(slime_place_action) slime_place_action.target = src slime_place_action.Grant(user) actions += slime_place_action - + if(feed_slime_action) feed_slime_action.target = src feed_slime_action.Grant(user) actions += feed_slime_action - + if(monkey_recycle_action) monkey_recycle_action.target = src monkey_recycle_action.Grant(user) actions += monkey_recycle_action + if(scan_action) + scan_action.target = src + scan_action.Grant(user) + actions += scan_action + + if(potion_action) + potion_action.target = src + potion_action.Grant(user) + actions += potion_action + + if(hotkey_help) + hotkey_help.target = src + hotkey_help.Grant(user) + actions += hotkey_help + + RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_CTRL, .proc/XenoSlimeClickCtrl) + RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_ALT, .proc/XenoSlimeClickAlt) + RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_SHIFT, .proc/XenoSlimeClickShift) + RegisterSignal(user, COMSIG_XENO_TURF_CLICK_SHIFT, .proc/XenoTurfClickShift) + RegisterSignal(user, COMSIG_XENO_TURF_CLICK_CTRL, .proc/XenoTurfClickCtrl) + RegisterSignal(user, COMSIG_XENO_MONKEY_CLICK_CTRL, .proc/XenoMonkeyClickCtrl) + + if(!connected_recycler) + for(var/obj/machinery/monkey_recycler/recycler in GLOB.monkey_recyclers) + if(get_area(recycler.loc) == get_area(loc)) + connected_recycler = recycler + connected_recycler.connected += src + +/obj/machinery/computer/camera_advanced/xenobio/remove_eye_control(mob/living/user) + UnregisterSignal(user, COMSIG_XENO_SLIME_CLICK_CTRL) + UnregisterSignal(user, COMSIG_XENO_SLIME_CLICK_ALT) + UnregisterSignal(user, COMSIG_XENO_SLIME_CLICK_SHIFT) + UnregisterSignal(user, COMSIG_XENO_TURF_CLICK_SHIFT) + UnregisterSignal(user, COMSIG_XENO_TURF_CLICK_CTRL) + UnregisterSignal(user, COMSIG_XENO_MONKEY_CLICK_CTRL) + ..() /obj/machinery/computer/camera_advanced/xenobio/attack_hand(mob/user) if(!ishuman(user)) //AIs using it might be weird @@ -71,11 +127,20 @@ /obj/machinery/computer/camera_advanced/xenobio/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube)) - monkeys++ - to_chat(user, "You feed [O] to [src]. It now has [monkeys] monkey cubes stored.") - user.drop_item() - qdel(O) - return + if(user.drop_item()) + monkeys++ + to_chat(user, "You feed [O] to [src]. It now has [monkeys] monkey cubes stored.") + qdel(O) + return + else if(istype(O, /obj/item/slimepotion/slime)) + var/replaced = FALSE + if(user.drop_item()) + if(!QDELETED(current_potion)) + current_potion.forceMove(drop_location()) + replaced = TRUE + current_potion = O + to_chat(user, "You load [O] in the console's potion slot[replaced ? ", replacing the one that was there before" : ""].") + return else if(istype(O, /obj/item/storage/bag)) var/obj/item/storage/P = O var/loaded = 0 @@ -87,6 +152,13 @@ if(loaded) to_chat(user, "You fill [src] with the monkey cubes stored in [O]. [src] now has [monkeys] monkey cubes stored.") return + else if(ismultitool(O)) + var/obj/item/multitool/I = O + if(istype(I.buffer, /obj/machinery/monkey_recycler)) + to_chat(user, "You link [src] with [I.buffer] in [I] buffer.") + connected_recycler = I.buffer + connected_recycler.connected += src + return ..() /datum/action/innate/slime_place @@ -163,12 +235,201 @@ var/mob/living/carbon/human/C = owner var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = target - + var/obj/machinery/monkey_recycler/recycler = X.connected_recycler + + if(!recycler) + to_chat(owner, "There is no connected monkey recycler. Use a multitool to link one.") + return if(cameranet.checkTurfVis(remote_eye.loc)) for(var/mob/living/carbon/human/M in remote_eye.loc) if(issmall(M) && M.stat) M.visible_message("[M] vanishes as [M.p_theyre()] reclaimed for recycling!") - X.monkeys = round(X.monkeys + 0.2,0.1) + recycler.use_power(500) + X.monkeys = round(X.monkeys + recycler.cube_production/recycler.required_grind, 0.1) qdel(M) else - to_chat(owner, "Target is not near a camera. Cannot proceed.") \ No newline at end of file + to_chat(owner, "Target is not near a camera. Cannot proceed.") + +/datum/action/innate/slime_scan + name = "Scan Slime" + button_icon_state = "slime_scan" + +/datum/action/innate/slime_scan/Activate() + if(!target || !isliving(owner)) + return + var/mob/living/C = owner + var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control + + if(cameranet.checkTurfVis(remote_eye.loc)) + for(var/mob/living/carbon/slime/S in remote_eye.loc) + slime_scan(S, C) + else + to_chat(owner, "Target is not near a camera. Cannot proceed.") + +/datum/action/innate/feed_potion + name = "Apply Potion" + button_icon_state = "slime_potion" + +/datum/action/innate/feed_potion/Activate() + if(!target || !ishuman(owner)) + return + + var/mob/living/carbon/human/C = owner + var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control + var/obj/machinery/computer/camera_advanced/xenobio/X = target + + if(QDELETED(X.current_potion)) + to_chat(owner, "No potion loaded.") + return + + if(cameranet.checkTurfVis(remote_eye.loc)) + for(var/mob/living/carbon/slime/S in remote_eye.loc) + X.current_potion.attack(S, C) + break + else + to_chat(owner, "Target is not near a camera. Cannot proceed.") + +/datum/action/innate/hotkey_help + name = "Hotkey Help" + button_icon_state = "hotkey_help" + +/datum/action/innate/hotkey_help/Activate() + if(!target || !isliving(owner)) + return + to_chat(owner, "Click shortcuts:") + to_chat(owner, "Shift-click a slime to pick it up, or the floor to drop all held slimes.") + to_chat(owner, "Ctrl-click a slime to scan it.") + to_chat(owner, "Alt-click a slime to feed it a potion.") + to_chat(owner, "Ctrl-click or a dead monkey to recycle it, or the floor to place a new monkey.") + +// +// Alternate clicks for slime, monkey and open turf if using a xenobio console + +// Scans slime +/mob/living/carbon/slime/CtrlClick(mob/user) + SEND_SIGNAL(user, COMSIG_XENO_SLIME_CLICK_CTRL, src) + ..() + +//Feeds a potion to slime +/mob/living/carbon/slime/AltClick(mob/user) + SEND_SIGNAL(user, COMSIG_XENO_SLIME_CLICK_ALT, src) + ..() + +//Picks up slime +/mob/living/carbon/slime/ShiftClick(mob/user) + SEND_SIGNAL(user, COMSIG_XENO_SLIME_CLICK_SHIFT, src) + ..() + +//Place slimes +/turf/simulated/ShiftClick(mob/user) + SEND_SIGNAL(user, COMSIG_XENO_TURF_CLICK_SHIFT, src) + ..() + +//Place monkey +/turf/simulated/CtrlClick(mob/user) + SEND_SIGNAL(user, COMSIG_XENO_TURF_CLICK_CTRL, src) + ..() + +//Pick up monkey +/mob/living/carbon/monkey/CtrlClick(mob/user) + SEND_SIGNAL(user, COMSIG_XENO_MONKEY_CLICK_CTRL, src) + ..() + +// Scans slime +/obj/machinery/computer/camera_advanced/xenobio/proc/XenoSlimeClickCtrl(mob/living/user, mob/living/carbon/slime/S) + if(!cameranet.checkTurfVis(S.loc)) + to_chat(user, "Target is not near a camera. Cannot proceed.") + return + var/mob/living/C = user + var/mob/camera/aiEye/remote/xenobio/E = C.remote_control + var/area/mobarea = get_area(S.loc) + if(mobarea.name == E.allowed_area || mobarea.xenobiology_compatible) + slime_scan(S, C) + +//Feeds a potion to slime +/obj/machinery/computer/camera_advanced/xenobio/proc/XenoSlimeClickAlt(mob/living/user, mob/living/carbon/slime/S) + if(!cameranet.checkTurfVis(S.loc)) + to_chat(user, "Target is not near a camera. Cannot proceed.") + return + var/mob/living/C = user + var/mob/camera/aiEye/remote/xenobio/E = C.remote_control + var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin + var/area/mobarea = get_area(S.loc) + if(QDELETED(X.current_potion)) + to_chat(C, "No potion loaded.") + return + if(mobarea.name == E.allowed_area || mobarea.xenobiology_compatible) + X.current_potion.attack(S, C) + +//Picks up slime +/obj/machinery/computer/camera_advanced/xenobio/proc/XenoSlimeClickShift(mob/living/user, mob/living/carbon/slime/S) + if(!cameranet.checkTurfVis(S.loc)) + to_chat(user, "Target is not near a camera. Cannot proceed.") + return + var/mob/living/C = user + var/mob/camera/aiEye/remote/xenobio/E = C.remote_control + var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin + var/area/mobarea = get_area(S.loc) + if(mobarea.name == E.allowed_area || mobarea.xenobiology_compatible) + if(X.stored_slimes.len >= X.max_slimes) + return + if(!S.ckey) + if(S.buckled) + S.buckled.unbuckle_mob() + S.Feedstop() + S.visible_message("[S] vanishes in a flash of light!") + S.forceMove(X) + X.stored_slimes += S + +//Place slimes +/obj/machinery/computer/camera_advanced/xenobio/proc/XenoTurfClickShift(mob/living/user, turf/T) + if(!cameranet.checkTurfVis(T)) + to_chat(user, "Target is not near a camera. Cannot proceed.") + return + var/mob/living/C = user + var/mob/camera/aiEye/remote/xenobio/E = C.remote_control + var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin + var/area/turfarea = get_area(T) + if(turfarea.name == E.allowed_area || turfarea.xenobiology_compatible) + for(var/mob/living/carbon/slime/S in X.stored_slimes) + S.forceMove(T) + S.visible_message("[S] warps in!") + X.stored_slimes -= S + +//Place monkey +/obj/machinery/computer/camera_advanced/xenobio/proc/XenoTurfClickCtrl(mob/living/user, turf/T) + if(!cameranet.checkTurfVis(T)) + to_chat(user, "Target is not near a camera. Cannot proceed.") + return + var/mob/living/C = user + var/mob/camera/aiEye/remote/xenobio/E = C.remote_control + var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin + var/area/turfarea = get_area(T) + + if(turfarea.name == E.allowed_area || turfarea.xenobiology_compatible) + if(X.monkeys >= 1) + var/mob/living/carbon/human/monkey/food = new /mob/living/carbon/human/monkey(T) + food.LAssailant = C + X.monkeys -- + X.monkeys = round(X.monkeys, 0.1) + to_chat(user, "[X] now has [X.monkeys] monkeys left.") + +//Pick up monkey +/obj/machinery/computer/camera_advanced/xenobio/proc/XenoMonkeyClickCtrl(mob/living/user, mob/living/carbon/monkey/M) + if(!cameranet.checkTurfVis(M.loc)) + to_chat(user, "Target is not near a camera. Cannot proceed.") + return + var/mob/living/C = user + var/mob/camera/aiEye/remote/xenobio/E = C.remote_control + var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin + var/area/mobarea = get_area(M.loc) + var/obj/machinery/monkey_recycler/recycler = X.connected_recycler + if(!recycler) + to_chat(C, "There is no connected monkey recycler. Use a multitool to link one.") + return + if(mobarea.name == E.allowed_area || mobarea.xenobiology_compatible) + if(issmall(M) && M.stat) + M.visible_message("[M] vanishes as [M.p_theyre()] reclaimed for recycling!") + recycler.use_power(500) + X.monkeys = round(X.monkeys + recycler.cube_production/recycler.required_grind, 0.1) + qdel(M) diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 02e6b155025..0c67888b444 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -132,14 +132,14 @@ to_chat(user, "You cannot transfer [src] to [target]! It appears the potion must be given directly to a slime to absorb.") // le fluff faec return -/obj/item/slimepotion/docility +/obj/item/slimepotion/slime/docility name = "docility potion" desc = "A potent chemical mix that nullifies a slime's hunger, causing it to become docile and tame." icon = 'icons/obj/chemical.dmi' icon_state = "bottle19" var/being_used = 0 -/obj/item/slimepotion/docility/attack(mob/living/carbon/slime/M, mob/user) +/obj/item/slimepotion/slime/docility/attack(mob/living/carbon/slime/M, mob/user) if(!isslime(M)) to_chat(user, "The potion only works on slimes!") return @@ -260,13 +260,13 @@ SM.name = "[SM.name] as [user.real_name]" qdel(src) -/obj/item/slimepotion/steroid +/obj/item/slimepotion/slime/steroid name = "slime steroid" desc = "A potent chemical mix that will cause a baby slime to generate more extract." icon = 'icons/obj/chemical.dmi' icon_state = "bottle16" -/obj/item/slimepotion/steroid/attack(mob/living/carbon/slime/M, mob/user) +/obj/item/slimepotion/slime/steroid/attack(mob/living/carbon/slime/M, mob/user) if(!isslime(M))//If target is not a slime. to_chat(user, "The steroid only works on baby slimes!") return ..() @@ -290,13 +290,13 @@ icon = 'icons/obj/chemical.dmi' icon_state = "bottle17" -/obj/item/slimepotion/stabilizer +/obj/item/slimepotion/slime/stabilizer name = "slime stabilizer" desc = "A potent chemical mix that will reduce the chance of a slime mutating." icon = 'icons/obj/chemical.dmi' icon_state = "bottle15" -/obj/item/slimepotion/stabilizer/attack(mob/living/carbon/slime/M, mob/user) +/obj/item/slimepotion/slime/stabilizer/attack(mob/living/carbon/slime/M, mob/user) if(!isslime(M)) to_chat(user, "The stabilizer only works on slimes!") return ..() @@ -311,13 +311,13 @@ M.mutation_chance = Clamp(M.mutation_chance-15,0,100) qdel(src) -/obj/item/slimepotion/mutator +/obj/item/slimepotion/slime/mutator name = "slime mutator" desc = "A potent chemical mix that will increase the chance of a slime mutating." icon = 'icons/obj/chemical.dmi' icon_state = "bottle3" -/obj/item/slimepotion/mutator/attack(mob/living/carbon/slime/M, mob/user) +/obj/item/slimepotion/slime/mutator/attack(mob/living/carbon/slime/M, mob/user) if(!isslime(M)) to_chat(user, "The mutator only works on slimes!") return ..() diff --git a/html/changelog.html b/html/changelog.html index 5b695b422d5..7af41ad83c8 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,27 @@ -->
+

17 March 2019

+

AffectedArc07 and Alonefromhell updated:

+ +

Jazz23 updated:

+ +

Kyep updated:

+ +

farie82 updated:

+ +

16 March 2019

Ty-Omaha and Ionward updated: