diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm index ad67beb0ed..7a591a48fa 100644 --- a/_maps/map_files/debug/runtimestation.dmm +++ b/_maps/map_files/debug/runtimestation.dmm @@ -39,13 +39,6 @@ "ak" = ( /turf/closed/wall/r_wall, /area/engine/gravity_generator) -"al" = ( -/obj/machinery/airalarm/unlocked{ - pixel_y = 23 - }, -/obj/structure/closet/secure_closet/atmospherics, -/turf/open/floor/plating, -/area/engine/atmos) "am" = ( /obj/machinery/atmospherics/components/unary/tank/air, /turf/open/floor/plating, @@ -75,7 +68,9 @@ dir = 8; pixel_x = -24 }, -/obj/structure/closet/secure_closet/engineering_electrical, +/obj/structure/closet/secure_closet/engineering_electrical{ + locked = 0 + }, /obj/structure/cable{ icon_state = "0-4" }, @@ -93,7 +88,9 @@ /turf/open/floor/plasteel, /area/engine/engineering) "ar" = ( -/obj/structure/closet/secure_closet/engineering_welding, +/obj/structure/closet/secure_closet/engineering_welding{ + locked = 0 + }, /turf/open/floor/plasteel, /area/engine/engineering) "as" = ( @@ -220,6 +217,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/closet/radiation, /turf/open/floor/plasteel, /area/engine/gravity_generator) "aH" = ( @@ -248,20 +246,6 @@ }, /turf/open/floor/plasteel/dark, /area/engine/gravity_generator) -"aK" = ( -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/engine/gravity_generator) -"aL" = ( -/turf/open/floor/plasteel/vault{ - dir = 4 - }, -/area/engine/gravity_generator) -"aM" = ( -/obj/machinery/suit_storage_unit/ce, -/turf/open/floor/plating, -/area/engine/atmos) "aN" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 @@ -375,12 +359,6 @@ }, /turf/open/floor/plasteel/dark, /area/engine/gravity_generator) -"aZ" = ( -/obj/structure/tank_dispenser{ - pixel_x = -1 - }, -/turf/open/floor/plating, -/area/engine/atmos) "ba" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plating, @@ -425,7 +403,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/announcement_system, /turf/open/floor/plasteel, /area/engine/gravity_generator) "bh" = ( @@ -448,24 +425,12 @@ }, /turf/open/floor/plasteel/dark, /area/engine/gravity_generator) -"bj" = ( -/obj/machinery/power/apc{ - dir = 8; - pixel_x = -24 - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/light, -/obj/structure/table, -/obj/item/analyzer, -/obj/item/wrench, -/turf/open/floor/plasteel, -/area/engine/atmos) "bk" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable{ + icon_state = "1-2" }, +/obj/machinery/door/airlock, /turf/open/floor/plating, /area/engine/atmos) "bl" = ( @@ -481,13 +446,6 @@ }, /turf/open/floor/plating, /area/engine/atmos) -"bn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/obj/machinery/light, -/turf/open/floor/plating, -/area/engine/atmos) "bo" = ( /obj/structure/table, /obj/item/screwdriver/power, @@ -510,23 +468,29 @@ /turf/open/floor/plasteel, /area/engine/gravity_generator) "br" = ( -/obj/structure/closet/radiation, /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/machinery/announcement_system, /turf/open/floor/plasteel, /area/engine/gravity_generator) "bs" = ( +/obj/machinery/airalarm/unlocked{ + pixel_y = 23 + }, +/obj/machinery/rnd/destructive_analyzer, +/turf/open/floor/plasteel, +/area/science) +"bt" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable{ icon_state = "1-2" }, -/turf/closed/wall/r_wall, -/area/hallway/primary/central) -"bt" = ( -/obj/machinery/door/airlock, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/open/floor/plasteel, -/area/engine/atmos) +/area/science) "bu" = ( /turf/closed/wall/r_wall, /area/bridge) @@ -553,18 +517,7 @@ /turf/closed/wall/r_wall, /area/science) "bB" = ( -/obj/machinery/power/apc{ - dir = 8; - pixel_x = -24 - }, -/obj/structure/cable, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/airalarm/unlocked{ - pixel_y = 23 - }, -/obj/machinery/autolathe/hacked, +/obj/machinery/mecha_part_fabricator, /turf/open/floor/plasteel, /area/science) "bC" = ( @@ -574,10 +527,6 @@ /turf/open/floor/plasteel, /area/security/brig) "bD" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/mecha_part_fabricator, /turf/open/floor/plasteel, /area/science) "bE" = ( @@ -598,7 +547,9 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/structure/closet/secure_closet/captains, +/obj/structure/closet/secure_closet/captains{ + locked = 0 + }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -644,7 +595,9 @@ /turf/open/floor/plasteel, /area/bridge) "bM" = ( -/obj/structure/closet/secure_closet/hop, +/obj/structure/closet/secure_closet/hop{ + locked = 0 + }, /obj/machinery/camera/autoname, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -739,7 +692,7 @@ }, /area/medical/medbay) "bX" = ( -/obj/machinery/sleeper/syndie, +/obj/machinery/sleeper/syndie/fullupgrade, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -756,19 +709,14 @@ /turf/open/floor/plating, /area/hallway/primary/central) "ca" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, +/obj/machinery/autolathe/hacked, /turf/open/floor/plasteel, /area/science) "cb" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/plasteel, /area/science) "cc" = ( @@ -861,20 +809,18 @@ "cm" = ( /turf/open/floor/plasteel, /area/medical/medbay) -"cn" = ( -/obj/machinery/door/airlock, -/turf/open/floor/plating, -/area/medical/medbay) "co" = ( /obj/machinery/light{ dir = 4 }, -/obj/structure/closet/syndicate/resources/everything, +/obj/machinery/ore_silo, /turf/open/floor/plasteel, /area/science) "cp" = ( /obj/machinery/light, -/obj/structure/closet/secure_closet/engineering_chief, +/obj/structure/closet/secure_closet/engineering_chief{ + locked = 0 + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, @@ -896,7 +842,9 @@ /area/bridge) "cr" = ( /obj/machinery/light, -/obj/structure/closet/secure_closet/hos, +/obj/structure/closet/secure_closet/hos{ + locked = 0 + }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -1031,8 +979,9 @@ /turf/open/floor/plasteel, /area/security/brig) "cJ" = ( -/obj/item/gun/magic/staff/healing, -/obj/item/gun/magic/wand/resurrection/debug, +/obj/machinery/computer/operating{ + dir = 1 + }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -1046,14 +995,9 @@ /turf/open/floor/plasteel/white/corner, /area/medical/medbay) "cL" = ( -/obj/machinery/computer/cloning, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white/corner, -/area/medical/medbay) -"cM" = ( -/obj/machinery/clonepod, +/obj/structure/table, +/obj/item/storage/backpack/duffelbag/syndie/surgery, +/obj/item/disk/surgery/debug, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -1176,9 +1120,7 @@ /turf/open/floor/plasteel, /area/security/brig) "dg" = ( -/obj/machinery/airalarm/unlocked{ - pixel_x = 32 - }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/plasteel, /area/security/brig) "dh" = ( @@ -1566,13 +1508,20 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "er" = ( -/obj/structure/table/optable, +/obj/item/gun/magic/staff/healing, +/obj/item/gun/magic/wand/resurrection/debug, /turf/open/floor/plasteel, /area/medical/medbay) "es" = ( /obj/machinery/light, -/obj/machinery/computer/operating, -/turf/open/floor/plasteel, +/obj/machinery/clonepod, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel/white/corner, /area/medical/medbay) "et" = ( /turf/closed/wall/r_wall, @@ -1597,10 +1546,7 @@ /turf/open/floor/plating, /area/hallway/secondary/entry) "ey" = ( -/obj/machinery/status_display{ - name = "cargo display"; - supply_display = 1 - }, +/obj/machinery/status_display/supply, /turf/closed/wall, /area/quartermaster/storage) "ez" = ( @@ -1953,7 +1899,7 @@ /obj/machinery/camera/autoname{ dir = 4 }, -/obj/machinery/computer/cargo/express{ +/obj/machinery/computer/bounty{ dir = 4 }, /turf/open/floor/plasteel, @@ -1962,7 +1908,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/computer/bounty{ +/obj/machinery/computer/cargo/express{ dir = 4 }, /turf/open/floor/plasteel, @@ -2062,10 +2008,7 @@ /turf/open/floor/plasteel, /area/storage/primary) "fB" = ( -/obj/machinery/status_display{ - name = "cargo display"; - supply_display = 1 - }, +/obj/machinery/status_display/supply, /turf/closed/wall/r_wall, /area/quartermaster/storage) "fC" = ( @@ -2142,11 +2085,7 @@ "fI" = ( /obj/machinery/door/airlock, /turf/open/floor/plating, -/area/hallway/secondary/entry) -"fJ" = ( -/obj/machinery/door/airlock, -/turf/open/floor/plating, -/area/hallway/secondary/exit/departure_lounge) +/area/maintenance/aft) "fK" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2212,7 +2151,7 @@ /area/hallway/secondary/exit/departure_lounge) "fQ" = ( /obj/machinery/computer/communications, -/obj/machinery/status_display{ +/obj/machinery/status_display/evac{ pixel_y = 32 }, /turf/open/floor/plasteel, @@ -2237,6 +2176,9 @@ /area/hallway/secondary/exit/departure_lounge) "fT" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, /area/science) "fU" = ( @@ -2575,6 +2517,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, /area/science) "hD" = ( @@ -2589,22 +2534,28 @@ /area/medical/chemistry) "jb" = ( /obj/machinery/door/airlock, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, /area/science) +"jE" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/turf/open/floor/plating, +/area/engine/atmos) "jU" = ( /obj/structure/table, /obj/item/melee/transforming/energy/axe, /turf/open/floor/plasteel, /area/storage/primary) "kn" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/light{ dir = 1 }, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "2-4" }, /turf/open/floor/plasteel, /area/hallway/primary/central) @@ -2619,6 +2570,9 @@ dir = 1; pixel_y = 25 }, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "lg" = ( @@ -2641,6 +2595,10 @@ /obj/item/storage/toolbox/syndicate, /turf/open/floor/plasteel, /area/storage/primary) +"ou" = ( +/obj/machinery/airalarm/directional/west, +/turf/open/floor/plating, +/area/engine/atmos) "oV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -2665,6 +2623,10 @@ }, /turf/open/floor/plasteel, /area/medical/chemistry) +"qb" = ( +/obj/machinery/door/airlock, +/turf/open/floor/plating, +/area/engine/atmos) "qn" = ( /obj/structure/cable{ icon_state = "0-2" @@ -2676,6 +2638,18 @@ /obj/structure/cable, /turf/open/floor/plating/airless, /area/space/nearstation) +"ut" = ( +/obj/structure/closet/secure_closet/atmospherics{ + locked = 0 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating, +/area/engine/atmos) +"vm" = ( +/turf/closed/wall/r_wall, +/area/maintenance/aft) "vv" = ( /obj/machinery/door/airlock, /turf/open/floor/plating, @@ -2711,11 +2685,17 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"zo" = ( +/obj/machinery/power/apc/auto_name/south, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plasteel, +/area/engine/atmos) "AP" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, -/obj/machinery/rnd/production/techfab/department, /turf/open/floor/plasteel, /area/science) "Bl" = ( @@ -2725,13 +2705,18 @@ /turf/closed/wall/r_wall, /area/engine/gravity_generator) "BB" = ( -/obj/item/storage/backpack/duffelbag/syndie/surgery, -/obj/structure/table, -/obj/item/disk/surgery/debug, -/turf/open/floor/plasteel, +/obj/machinery/computer/cloning{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel/white/corner, /area/medical/medbay) "BD" = ( -/obj/structure/closet/secure_closet/CMO, +/obj/structure/closet/secure_closet/CMO{ + locked = 0 + }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -2748,7 +2733,7 @@ /turf/open/floor/plasteel, /area/medical/chemistry) "Ct" = ( -/obj/machinery/rnd/production/circuit_imprinter/department, +/obj/structure/closet/syndicate/resources/everything, /turf/open/floor/plasteel, /area/science) "CV" = ( @@ -2768,21 +2753,23 @@ }, /turf/open/floor/plasteel, /area/bridge) -"If" = ( -/obj/structure/cable{ - icon_state = "1-2" +"ES" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, -/obj/machinery/rnd/destructive_analyzer, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"If" = ( +/obj/machinery/rnd/production/techfab/department, /turf/open/floor/plasteel, /area/science) -"In" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/closed/wall/r_wall, -/area/science) "Iy" = ( -/obj/structure/closet/secure_closet/RD, +/obj/structure/closet/secure_closet/RD{ + locked = 0 + }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -2795,14 +2782,32 @@ }, /turf/open/floor/plasteel, /area/medical/chemistry) +"Kx" = ( +/obj/structure/table, +/obj/item/analyzer, +/obj/item/wrench, +/obj/machinery/light, +/turf/open/floor/plating, +/area/engine/atmos) "Ly" = ( /obj/machinery/chem_dispenser/chem_synthesizer, /turf/open/floor/plasteel/dark, /area/medical/chemistry) +"MY" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel, +/area/engine/atmos) "NZ" = ( /obj/machinery/rnd/production/protolathe/department, /turf/open/floor/plasteel, /area/science) +"OU" = ( +/obj/item/disk/tech_disk/debug, +/turf/open/floor/plasteel, +/area/science) "PI" = ( /obj/structure/fans/tiny/invisible, /turf/open/space/basic, @@ -2814,6 +2819,10 @@ /obj/machinery/door/airlock/external/glass, /turf/open/floor/plating, /area/medical/medbay) +"Rb" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/maintenance/aft) "RC" = ( /obj/machinery/power/rtg/advanced, /obj/structure/cable{ @@ -2821,15 +2830,20 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) -"RY" = ( -/obj/structure/cable{ - icon_state = "4-8" +"Sj" = ( +/obj/structure/table/optable, +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/item/disk/tech_disk/debug, -/turf/open/floor/plasteel, -/area/science) +/turf/open/floor/plasteel/white/corner, +/area/medical/medbay) +"Tt" = ( +/turf/open/floor/plating, +/area/maintenance/aft) "Ut" = ( -/obj/structure/closet/secure_closet/medical3, +/obj/structure/closet/secure_closet/medical3{ + locked = 0 + }, /obj/item/healthanalyzer/advanced, /turf/open/floor/plasteel, /area/medical/medbay) @@ -2850,6 +2864,10 @@ /obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/engine/engineering) +"Wh" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/engine/atmos) "WT" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2866,6 +2884,50 @@ }, /turf/open/floor/plasteel, /area/medical/chemistry) +"Xp" = ( +/obj/machinery/light, +/obj/structure/tank_dispenser{ + pixel_x = -1 + }, +/turf/open/floor/plasteel, +/area/engine/atmos) +"XC" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel, +/area/science) +"XR" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/turf/open/floor/plating, +/area/engine/atmos) +"XU" = ( +/obj/machinery/atmospherics/components/unary/tank/air, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating, +/area/engine/atmos) +"Yy" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/rnd/production/circuit_imprinter/department, +/obj/machinery/power/apc/auto_name/north, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plasteel, +/area/science) +"ZD" = ( +/obj/machinery/suit_storage_unit/ce, +/turf/open/floor/plasteel, +/area/engine/atmos) (1,1,1) = {" aa @@ -6100,10 +6162,9 @@ aa aa aa aa -ad -dH ah ah +qb ah ah ah @@ -6112,6 +6173,7 @@ ah bA bA bA +gd bA bZ ft @@ -6192,19 +6254,19 @@ aa aa aa aa -ad -af ah -al +ut aw -aM -aZ -bj +ou +aw +aw +Kx +ah bs bB ca If -In +bA kn fu bO @@ -6222,8 +6284,8 @@ dy dm dK cN -af -ad +Tt +vm fg aa aa @@ -6284,13 +6346,13 @@ aa aa aa aa -ad -af ah am ax aw ba +jE +MY bk bt fT @@ -6314,8 +6376,8 @@ dn dn dL cN -af -ad +Tt +vm fg aa aa @@ -6376,20 +6438,20 @@ aa aa aa aa -ad -af ah dS ay aN bb bl +zo ah +Yy bD -cc +XC gY jb -cA +ES bE bE cQ @@ -6406,8 +6468,8 @@ dn dn dL cN -af -ad +Tt +vm fg aa aa @@ -6468,16 +6530,16 @@ aa aa aa aa -ad -af ah am ay aO bc bm +ZD ah bF +OU cc Ct gd @@ -6498,8 +6560,8 @@ dn dn dL cN -af -ad +Tt +vm fg aa aa @@ -6560,17 +6622,17 @@ aa aa aa aa -ad -af ah -am +XU az aP aP -bn +XR +Xp ah NZ -RY +bD +cc co bA wS @@ -6590,8 +6652,8 @@ dn dn dL cN -af -ad +Tt +vm fg aa aa @@ -6652,11 +6714,11 @@ aa aa aa aa -ad -bY -ah +ah +Wh ah ah +Wh ah ah ah @@ -6682,8 +6744,8 @@ dn dn dL cN -af -ad +Tt +vm fg aa aa @@ -6774,8 +6836,8 @@ dn dn dZ cN -af -bY +Tt +Rb fg aa aa @@ -6866,8 +6928,8 @@ dn dn dL cN -af -bY +Tt +Rb fg aa aa @@ -6958,8 +7020,8 @@ dn dn dL cN -af -bY +Tt +Rb fg aa aa @@ -7050,8 +7112,8 @@ dn dn dL cN -af -bY +Tt +Rb fg aa aa @@ -7142,8 +7204,8 @@ dn dn dL cN -af -bY +Tt +Rb fg aa aa @@ -7234,8 +7296,8 @@ dz do dM cN -af -bY +Tt +Rb fg aa aa @@ -7326,7 +7388,7 @@ cS cS cS cS -fJ +fI ga ga ga @@ -8323,7 +8385,7 @@ cm cm cm cm -cK +Sj by dA dJ @@ -8507,7 +8569,7 @@ eU cy Ut cm -cM +cK by dB dx @@ -8594,7 +8656,7 @@ ak ak by by -cn +dH by Qt by