diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm index 0e893c1882d..0a6ebba3305 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm @@ -176,7 +176,7 @@ /turf/open/floor/wood, /area/ruin/powered/snow_biodome) "aO" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /obj/structure/fans/tiny, /turf/open/floor/pod/dark, /area/ruin/powered/snow_biodome) @@ -360,7 +360,7 @@ /area/ruin/powered/snow_biodome) "Ez" = ( /obj/structure/fans/tiny, -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /turf/open/floor/pod/dark, /area/ruin/powered/snow_biodome) "EA" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm index 6584122df46..c70a28308c3 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm @@ -88,7 +88,7 @@ /turf/open/floor/iron/dark, /area/ruin/powered/seedvault) "as" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /turf/open/floor/iron/freezer, /area/ruin/powered/seedvault) "at" = ( diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/codealpha.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/codealpha.dmm index 9a068543601..de75f0b4d00 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/codealpha.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/codealpha.dmm @@ -316,7 +316,7 @@ /turf/open/floor/iron/dark/airless, /area/ruin/space/has_grav) "VZ" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /obj/structure/barricade/wooden/crude, /turf/open/floor/iron, /area/ruin/space/has_grav) diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm index d5ff1614dd3..f29c1f65a8a 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm @@ -1555,7 +1555,7 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/port_tarkon/kitchen) "iA" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/firedoor/solid, @@ -2166,7 +2166,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/port_tarkon/atmos) "lR" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 8 }, /obj/machinery/door/firedoor/solid, @@ -5702,7 +5702,7 @@ /turf/open/floor/cult, /area/ruin/space/has_grav/port_tarkon/observ) "Gk" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 8 }, /obj/machinery/door/firedoor/solid, @@ -6054,7 +6054,7 @@ /turf/open/floor/cult, /area/ruin/space/has_grav/port_tarkon/developement) "Ih" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /obj/machinery/door/firedoor/solid, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8746,7 +8746,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/port_tarkon/developement) "Xj" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /obj/machinery/door/firedoor/solid, /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/garden) diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm index 94c0e61a3ac..b96454d5683 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm @@ -1540,7 +1540,7 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/port_tarkon/kitchen) "iA" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt, @@ -2175,7 +2175,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/port_tarkon/atmos) "lR" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 8 }, /obj/machinery/door/firedoor/solid, @@ -5522,7 +5522,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/observ) "Gk" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 8 }, /obj/effect/turf_decal/tile/blue/half, @@ -5839,7 +5839,7 @@ /turf/open/misc/asteroid/airless, /area/solars/tarkon) "Ih" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /obj/machinery/door/firedoor/solid/closed, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8321,7 +8321,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/port_tarkon/developement) "Xj" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /obj/machinery/door/firedoor/solid, /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/garden) diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm index ec11376530e..bd86ef2b6fe 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm @@ -1338,7 +1338,7 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/port_tarkon/kitchen) "iA" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/firedoor/solid, @@ -1893,7 +1893,7 @@ /turf/open/floor/iron/dark/airless, /area/ruin/space/has_grav/port_tarkon/atmos) "lR" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 8 }, /obj/machinery/door/firedoor/solid, @@ -4824,7 +4824,7 @@ /turf/open/floor/iron/airless, /area/ruin/space/has_grav/port_tarkon/observ) "Gk" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 8 }, /obj/effect/turf_decal/tile/blue/half, @@ -5122,7 +5122,7 @@ /turf/open/misc/asteroid/airless, /area/solars/tarkon) "Ih" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /obj/machinery/door/firedoor/solid/closed, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7379,7 +7379,7 @@ /turf/open/floor/iron/dark/airless, /area/ruin/space/has_grav/port_tarkon/developement) "Xj" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /obj/machinery/door/firedoor/solid, /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/garden) diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm index 4fc54c04c25..6e1f260e2e6 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm @@ -1440,7 +1440,7 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/port_tarkon/kitchen) "iA" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/firedoor/solid, @@ -2071,7 +2071,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/port_tarkon/atmos) "lR" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 8 }, /obj/machinery/door/firedoor/solid, @@ -5249,7 +5249,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/observ) "Gk" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 8 }, /obj/effect/turf_decal/tile/blue/half, @@ -5576,7 +5576,7 @@ /turf/open/misc/asteroid/airless, /area/solars/tarkon) "Ih" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /obj/machinery/door/firedoor/solid, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8098,7 +8098,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/port_tarkon/developement) "Xj" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /obj/machinery/door/firedoor/solid, /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/garden) diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm index e0fcc65f046..ae488b2bcdd 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm @@ -1618,7 +1618,7 @@ dir = 8 }, /obj/structure/cable, -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4; id_tag = "HotelRoom8" }, @@ -5485,7 +5485,7 @@ /area/ruin/space/has_grav/hotel/power) "Fm" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4; id_tag = "HotelRoom8" }, diff --git a/_maps/RandomRuins/SpaceRuins/the_outlet.dmm b/_maps/RandomRuins/SpaceRuins/the_outlet.dmm index 7e238fe600d..1ed37f9df00 100644 --- a/_maps/RandomRuins/SpaceRuins/the_outlet.dmm +++ b/_maps/RandomRuins/SpaceRuins/the_outlet.dmm @@ -2006,7 +2006,7 @@ /turf/open/floor/plating/rust, /area/ruin/space/has_grav/the_outlet/researchrooms) "Wz" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /turf/open/floor/iron, /area/ruin/space/has_grav/the_outlet/storefront) "WC" = ( diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm index a40afa56077..cf2b35b3663 100644 --- a/_maps/RandomZLevels/SnowCabin.dmm +++ b/_maps/RandomZLevels/SnowCabin.dmm @@ -2594,7 +2594,7 @@ }, /area/awaymission/cabin/caves/sovietcave) "nM" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ name = "Medical Bay" }, /obj/structure/cable, diff --git a/_maps/RandomZLevels/blackmesa.dmm b/_maps/RandomZLevels/blackmesa.dmm index eeea136d811..ba7413ab26d 100644 --- a/_maps/RandomZLevels/blackmesa.dmm +++ b/_maps/RandomZLevels/blackmesa.dmm @@ -616,7 +616,7 @@ /area/awaymission/black_mesa/tram_room) "ahv" = ( /obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4 }, /turf/open/floor/iron/smooth_large, @@ -2100,7 +2100,7 @@ /turf/open/misc/xen, /area/awaymission/black_mesa/xen/crowbar_nook) "aBb" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /obj/structure/cable, /turf/open/floor/iron/dark, /area/awaymission/black_mesa/security_outpost) @@ -3385,7 +3385,7 @@ /turf/closed/indestructible/rock, /area/space) "aRa" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /turf/open/floor/iron/dark, /area/awaymission/black_mesa/security_outpost) "aRb" = ( @@ -4848,7 +4848,7 @@ /turf/closed/wall/r_wall, /area/awaymission/black_mesa/security_outpost) "cug" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa/hecu_zone_external_hall) "cuS" = ( @@ -5774,7 +5774,7 @@ /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa/entrance_internal_hall) "ecR" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4 }, /turf/open/floor/iron/textured, @@ -6424,7 +6424,7 @@ /turf/open/floor/iron/smooth, /area/awaymission/black_mesa/scientist_hall) "foy" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4 }, /obj/effect/mapping_helpers/airlock/locked, @@ -7286,7 +7286,7 @@ /turf/open/misc/xen, /area/awaymission/black_mesa/xen/vortigaunt_village) "hgp" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4 }, /obj/structure/barricade/wooden/crude, @@ -7564,7 +7564,7 @@ /turf/open/floor/iron/textured_half, /area/awaymission/black_mesa/hecu_zone_infirmary) "hFo" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /obj/structure/alien/weeds/xen, /turf/open/floor/iron/textured, /area/awaymission/black_mesa/scientist_hall) @@ -8605,7 +8605,7 @@ /turf/open/misc/xen, /area/awaymission/black_mesa/xen/entering_zone) "jCV" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4 }, /obj/structure/barricade/wooden, @@ -8730,7 +8730,7 @@ /turf/open/floor/iron/textured, /area/awaymission/black_mesa/black_ops_downstairs_atrium) "jRB" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4 }, /obj/effect/mapping_helpers/airlock/locked, @@ -8915,7 +8915,7 @@ /turf/open/misc/xen, /area/awaymission/black_mesa/xen/freeman_puzzle) "kjn" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /turf/open/floor/iron/textured, /area/awaymission/black_mesa/science_labs) "kjx" = ( @@ -9301,7 +9301,7 @@ /turf/open/misc/xen, /area/awaymission/black_mesa/xen/acid_lake) "kXb" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4 }, /obj/structure/alien/weeds/xen, @@ -10319,7 +10319,7 @@ /turf/open/misc/xen, /area/awaymission/black_mesa/xen/village_hallway) "mYQ" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /turf/open/floor/iron/smooth, /area/awaymission/black_mesa/hecu_zone_test_chambers) "mZP" = ( @@ -12258,7 +12258,7 @@ /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa/genetics_elevator) "qNc" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4 }, /turf/open/floor/iron/textured, @@ -12309,7 +12309,7 @@ /turf/open/floor/iron/textured, /area/awaymission/black_mesa/entrance_large_office) "qRp" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4 }, /turf/open/floor/iron/smooth, @@ -12831,7 +12831,7 @@ /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa/science_labs) "rOh" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4 }, /turf/open/floor/iron/smooth, @@ -13200,7 +13200,7 @@ /turf/open/floor/wood/parquet, /area/awaymission/black_mesa/employee_dorm_room) "swS" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4 }, /turf/open/floor/iron/smooth, @@ -13379,7 +13379,7 @@ /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa/high_security_armory) "sRQ" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /obj/structure/alien/weeds/xen, /turf/open/floor/iron/smooth, /area/awaymission/black_mesa/scientist_hall) @@ -15107,7 +15107,7 @@ /turf/open/floor/plating, /area/awaymission/black_mesa/genetics_sec) "wma" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /obj/structure/alien/weeds/xen, /turf/open/floor/iron/smooth, /area/awaymission/black_mesa/genetics_elevator) diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm index aab6e18eb21..2384fb60a35 100644 --- a/_maps/map_files/Birdshot/birdshot.dmm +++ b/_maps/map_files/Birdshot/birdshot.dmm @@ -7126,6 +7126,15 @@ }, /turf/open/floor/iron/smooth, /area/station/ai_monitored/turret_protected/aisat/teleporter) +"cQa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/multi_tile/public/glass{ + name = "Diner" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/textured_half, +/area/station/service/cafeteria) "cQb" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -26880,11 +26889,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/engineering/supermatter/room) -"jOc" = ( -/mob/living/basic/mining/basilisk, -/obj/effect/decal/cleanable/dirt, -/turf/open/misc/asteroid, -/area/station/maintenance/fore/greater) "jOh" = ( /obj/structure/cable, /obj/machinery/door/firedoor, @@ -37244,6 +37248,13 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) +"nxB" = ( +/obj/machinery/door/airlock/multi_tile/public/glass{ + name = "Theatre" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/textured_half, +/area/station/service/theater) "nxD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -39285,17 +39296,6 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/white/small, /area/station/science/ordnance/storage) -"ojk" = ( -/obj/effect/turf_decal/siding/wood, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Library" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/textured_half, -/area/station/service/library) "ojw" = ( /obj/item/kirbyplants/random, /obj/effect/mapping_helpers/broken_floor, @@ -51749,6 +51749,17 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/security/courtroom) +"snT" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/door/airlock/multi_tile/public/glass{ + name = "Library" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/textured_half, +/area/station/service/library) "snZ" = ( /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) @@ -53597,15 +53608,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/genetics) -"sTa" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Diner" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/textured_half, -/area/station/service/cafeteria) "sTf" = ( /obj/structure/window/spawner/directional/west, /obj/structure/chair/sofa/corp/left{ @@ -53682,13 +53684,6 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) -"sTW" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Theatre" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/textured_half, -/area/station/service/theater) "sUe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, @@ -66738,6 +66733,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/herringbone, /area/station/ai_monitored/command/nuke_storage) +"xcy" = ( +/mob/living/basic/mining/basilisk, +/obj/effect/decal/cleanable/dirt, +/turf/open/misc/asteroid, +/area/station/maintenance/fore/greater) "xcF" = ( /turf/open/floor/iron, /area/station/commons/dorms) @@ -92497,7 +92497,7 @@ xZS vrn ncL wQB -ojk +snT lql lKK lql @@ -96116,7 +96116,7 @@ rij xCu xCu xCu -sTa +cQa wEI tIL tYX @@ -97658,7 +97658,7 @@ rjb rKL siv sED -sTW +nxB tmV tIL tYX @@ -107641,7 +107641,7 @@ dDB dDB aJq jbm -jOc +xcy twN jbm jbm diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 03c008dc932..8a9c1750de8 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -4045,6 +4045,19 @@ /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, /area/station/engineering/main) +"aZo" = ( +/obj/structure/table/reinforced, +/obj/item/electronics/airalarm, +/obj/item/electronics/apc, +/obj/machinery/camera/directional/west{ + c_tag = "Technology Storage"; + name = "engineering camera" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) "aZp" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -22081,19 +22094,6 @@ /obj/structure/sign/poster/random/directional/east, /turf/open/floor/wood, /area/station/service/theater) -"fwl" = ( -/obj/structure/table/reinforced, -/obj/item/electronics/airalarm, -/obj/item/electronics/apc, -/obj/machinery/camera/directional/west{ - c_tag = "Technology Storage"; - name = "engineering camera" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/tech) "fwt" = ( /obj/effect/turf_decal/box/white/corners{ dir = 8 @@ -50457,18 +50457,6 @@ /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron, /area/station/service/kitchen/abandoned) -"mDO" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Laundromat" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/commons/dorms/laundry) "mDP" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm/directional/north, @@ -61969,19 +61957,6 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/white, /area/station/medical/medbay) -"pEM" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Laundromat" - }, -/turf/open/floor/iron, -/area/station/commons/dorms/laundry) "pEP" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -85250,6 +85225,19 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/wood, /area/station/commons/dorms) +"vqj" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/multi_tile/public/glass{ + name = "Laundromat" + }, +/turf/open/floor/iron, +/area/station/commons/dorms/laundry) "vqt" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -93542,6 +93530,18 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) +"xwm" = ( +/obj/machinery/door/airlock/multi_tile/public/glass{ + name = "Laundromat" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/commons/dorms/laundry) "xwo" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/lattice, @@ -125887,7 +125887,7 @@ tbf sdB kSn urC -fwl +aZo jPJ aEQ oUk @@ -145962,14 +145962,14 @@ pFO arL mVW cLm -mDO +xwm eJb oNy oNy vjz jcl cTc -pEM +vqj pLm vTd nyq diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 8e551dc4aef..ce4fc0c6b5c 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -1312,6 +1312,17 @@ }, /turf/open/floor/iron, /area/mine/laborcamp) +"avS" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/public/glass{ + name = "The Girly Boar" + }, +/turf/open/floor/iron/dark/textured_half, +/area/station/service/bar/atrium) "awa" = ( /turf/open/openspace, /area/station/science/ordnance) @@ -3650,6 +3661,26 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply, /turf/open/floor/iron/white, /area/station/medical/virology) +"bhK" = ( +/obj/structure/table, +/obj/item/folder/blue{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/pen{ + pixel_y = 1; + pixel_x = -1 + }, +/obj/item/paper_bin/carbon{ + pixel_x = 5; + pixel_y = 18 + }, +/obj/item/stamp/head/hop{ + pixel_y = 5; + pixel_x = 8 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "bhV" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -4648,14 +4679,6 @@ /obj/structure/cable/multilayer/multiz, /turf/open/floor/plating, /area/station/maintenance/fore) -"bxR" = ( -/obj/structure/table/reinforced, -/obj/item/storage/secure/briefcase{ - pixel_y = 5 - }, -/obj/machinery/status_display/evac/directional/west, -/turf/open/floor/iron, -/area/station/command/bridge) "bxU" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -8201,6 +8224,15 @@ /obj/effect/turf_decal/tile/blue/full, /turf/open/floor/iron/large, /area/station/medical/treatment_center) +"cyF" = ( +/obj/structure/table/wood, +/obj/machinery/recharger, +/obj/item/coin/plasma{ + pixel_y = 13; + pixel_x = -6 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) "cyG" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -9036,13 +9068,6 @@ /mob/living/simple_animal/bot/secbot/beepsky, /turf/open/floor/plating, /area/station/maintenance/fore) -"cKp" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Hydroponics" - }, -/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, -/turf/open/floor/iron/textured_half, -/area/station/service/hydroponics) "cKq" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -10491,6 +10516,14 @@ /obj/effect/turf_decal/tile/red/full, /turf/open/floor/iron/dark/smooth_large, /area/station/security/checkpoint/medical) +"dho" = ( +/obj/structure/table/reinforced, +/obj/item/storage/secure/briefcase{ + pixel_y = 5 + }, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron, +/area/station/command/bridge) "dhq" = ( /turf/closed/mineral/random/labormineral/ice, /area/icemoon/surface/outdoors/labor_camp) @@ -10813,6 +10846,11 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/service/bar/backroom) +"dmG" = ( +/obj/structure/table/wood, +/obj/item/camera, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) "dmI" = ( /obj/machinery/chem_master, /obj/effect/turf_decal/tile/yellow/full, @@ -10963,6 +11001,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood/large, /area/mine/eva/lower) +"doT" = ( +/obj/item/assembly/timer{ + pixel_y = 15; + pixel_x = -3 + }, +/obj/structure/table, +/turf/open/floor/wood, +/area/station/command/meeting_room) "dpc" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ @@ -16220,6 +16266,18 @@ }, /turf/open/floor/iron/dark, /area/station/medical/virology) +"eYT" = ( +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen{ + pixel_x = 11; + pixel_y = 2 + }, +/obj/structure/table/wood, +/turf/open/floor/carpet, +/area/station/command/meeting_room) "eYX" = ( /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 1 @@ -16604,14 +16662,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/security/execution/transfer) -"fgO" = ( -/obj/item/assembly/timer{ - pixel_y = 15; - pixel_x = -3 - }, -/obj/structure/table, -/turf/open/floor/wood, -/area/station/command/meeting_room) "fgQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/spawner/random/engineering/tracking_beacon, @@ -17397,6 +17447,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) +"fue" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_y = 14 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/book/manual/wiki/security_space_law{ + pixel_y = 5 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) "fum" = ( /obj/machinery/light/small/directional/north, /turf/open/floor/plating, @@ -18082,15 +18143,6 @@ }, /turf/open/floor/carpet/red, /area/station/commons/vacant_room/office) -"fGa" = ( -/obj/structure/table/wood, -/obj/item/clothing/mask/cigarette/cigar{ - pixel_y = 10; - pixel_x = 7 - }, -/obj/item/storage/box/matches, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/captain) "fGn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -20301,6 +20353,16 @@ /obj/structure/sign/warning/fire/directional/south, /turf/open/floor/glass/reinforced, /area/station/science/ordnance/office) +"grA" = ( +/obj/structure/table/reinforced, +/obj/item/assembly/flash/handheld, +/obj/item/assembly/flash/handheld, +/obj/machinery/newscaster/directional/west, +/obj/item/wrench{ + pixel_y = 17 + }, +/turf/open/floor/iron, +/area/station/command/bridge) "grD" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ @@ -20423,13 +20485,6 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"guu" = ( -/obj/structure/table/reinforced, -/obj/item/storage/medkit/regular{ - pixel_y = 5 - }, -/turf/open/floor/iron, -/area/station/command/bridge) "guS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -20988,23 +21043,6 @@ "gEE" = ( /turf/open/openspace, /area/station/service/chapel) -"gEH" = ( -/obj/structure/cable, -/obj/structure/table, -/obj/item/trapdoor_remote/preloaded{ - pixel_x = -5; - pixel_y = 2 - }, -/obj/machinery/recharger{ - pixel_x = 5; - pixel_y = 2 - }, -/obj/item/storage/wallet/random{ - pixel_x = 6; - pixel_y = -24 - }, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/hop) "gEL" = ( /obj/structure/table/glass, /obj/item/hand_labeler, @@ -21123,15 +21161,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, /area/station/science/genetics) -"gGy" = ( -/obj/structure/table/wood, -/obj/machinery/recharger, -/obj/item/coin/plasma{ - pixel_y = 13; - pixel_x = -6 - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain) "gGC" = ( /obj/structure/table, /obj/item/stack/sheet/glass/fifty, @@ -21351,6 +21380,14 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/iron/smooth_large, /area/station/cargo/warehouse) +"gKk" = ( +/obj/structure/table/reinforced, +/obj/item/storage/secure/safe/caps_spare/directional/east, +/obj/item/papercutter{ + pixel_x = 7 + }, +/turf/open/floor/iron, +/area/station/command/bridge) "gKl" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -22159,6 +22196,17 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark, /area/station/science/breakroom) +"gYz" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen{ + pixel_x = 12 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) "gYG" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -22184,6 +22232,23 @@ /mob/living/carbon/human/species/monkey, /turf/open/floor/grass, /area/station/medical/virology) +"gZj" = ( +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/emergency{ + pixel_y = 9 + }, +/obj/item/assembly/timer, +/obj/item/assembly/signaler{ + pixel_y = -7; + pixel_x = 7 + }, +/obj/item/assembly/signaler{ + pixel_y = -12; + pixel_x = -8 + }, +/obj/machinery/status_display/ai/directional/east, +/turf/open/floor/iron, +/area/station/command/bridge) "gZk" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance/four, @@ -22951,14 +23016,6 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"hoa" = ( -/obj/structure/table/reinforced, -/obj/item/storage/secure/safe/caps_spare/directional/east, -/obj/item/papercutter{ - pixel_x = 7 - }, -/turf/open/floor/iron, -/area/station/command/bridge) "hos" = ( /obj/structure/disposalpipe/trunk/multiz/down{ dir = 1 @@ -23004,6 +23061,22 @@ "hpd" = ( /turf/open/floor/plating, /area/station/engineering/engine_smes) +"hpe" = ( +/obj/structure/table/wood, +/obj/machinery/camera/directional/east{ + c_tag = "Captain's Office" + }, +/obj/item/storage/lockbox/medal{ + pixel_y = 8 + }, +/obj/item/pinpointer/nuke{ + pixel_y = -9 + }, +/obj/item/disk/nuclear{ + pixel_y = -8 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) "hpm" = ( /obj/machinery/camera/directional/north{ c_tag = "Starboard Primary Hallway East" @@ -23825,6 +23898,14 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/stone, /area/station/commons/lounge) +"hCV" = ( +/obj/structure/table/wood, +/obj/item/hand_tele{ + pixel_y = 11 + }, +/obj/item/melee/chainofcommand, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) "hDb" = ( /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron, @@ -27135,17 +27216,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"iFY" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_y = 14 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/item/book/manual/wiki/security_space_law{ - pixel_y = 5 - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain) "iGa" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27474,13 +27544,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"iLS" = ( -/obj/structure/table, -/obj/item/hand_labeler{ - pixel_y = 2 - }, -/turf/open/floor/wood, -/area/station/command/meeting_room) "iLY" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 @@ -27504,17 +27567,6 @@ /obj/machinery/duct, /turf/open/floor/wood/tile, /area/station/service/theater) -"iMh" = ( -/obj/effect/turf_decal/siding/wood, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/multi_tile/glass{ - name = "The Girly Boar" - }, -/turf/open/floor/iron/dark/textured_half, -/area/station/service/bar/atrium) "iMj" = ( /obj/structure/closet/lasertag/blue, /obj/effect/landmark/start/hangover/closet, @@ -29001,11 +29053,6 @@ }, /turf/open/floor/iron/smooth, /area/mine/mechbay) -"jlc" = ( -/obj/structure/table/wood, -/obj/item/camera, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain) "jle" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, @@ -30570,6 +30617,17 @@ "jNp" = ( /turf/closed/wall/r_wall, /area/station/security/holding_cell) +"jNq" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/public/glass{ + name = "The Girly Boar" + }, +/turf/open/floor/iron/dark/textured_half, +/area/station/service/bar/atrium) "jNA" = ( /obj/structure/cable, /obj/structure/disposalpipe/junction{ @@ -31144,26 +31202,6 @@ /obj/structure/sign/departments/rndserver/directional/south, /turf/open/floor/iron/white, /area/station/science/research) -"jVU" = ( -/obj/structure/table, -/obj/item/folder/blue{ - pixel_x = -6; - pixel_y = 3 - }, -/obj/item/pen{ - pixel_y = 1; - pixel_x = -1 - }, -/obj/item/paper_bin/carbon{ - pixel_x = 5; - pixel_y = 18 - }, -/obj/item/stamp/head/hop{ - pixel_y = 5; - pixel_x = 8 - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "jWl" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -32376,6 +32414,15 @@ }, /turf/open/floor/iron/smooth, /area/station/security/holding_cell) +"kpp" = ( +/obj/structure/table/wood, +/obj/item/clothing/mask/cigarette/cigar{ + pixel_y = 10; + pixel_x = 7 + }, +/obj/item/storage/box/matches, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain) "kpu" = ( /obj/effect/spawner/random/trash/mess, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -33096,6 +33143,17 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"kzD" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/item/multitool{ + pixel_x = 9; + pixel_y = 4 + }, +/turf/open/floor/iron, +/area/station/command/bridge) "kzG" = ( /obj/structure/sign/poster/random/directional/north, /turf/open/floor/iron/white/side{ @@ -33225,6 +33283,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/circuit, /area/station/science/robotics/mechbay) +"kBr" = ( +/obj/structure/table/reinforced, +/obj/item/storage/medkit/regular{ + pixel_y = 5 + }, +/turf/open/floor/iron, +/area/station/command/bridge) "kBL" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -33445,22 +33510,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) -"kFm" = ( -/obj/structure/table/wood, -/obj/machinery/camera/directional/east{ - c_tag = "Captain's Office" - }, -/obj/item/storage/lockbox/medal{ - pixel_y = 8 - }, -/obj/item/pinpointer/nuke{ - pixel_y = -9 - }, -/obj/item/disk/nuclear{ - pixel_y = -8 - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain) "kFu" = ( /obj/structure/table, /obj/item/stack/sheet/iron/fifty, @@ -36879,6 +36928,16 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/science/breakroom) +"lIp" = ( +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/obj/machinery/light/small/directional/north, +/obj/item/razor{ + pixel_x = 8; + pixel_y = 8 + }, +/turf/open/floor/iron/freezer, +/area/station/command/heads_quarters/captain) "lIs" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -37758,16 +37817,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"lYN" = ( -/obj/structure/table/reinforced, -/obj/item/aicard{ - pixel_y = 6 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/command/bridge) "lYR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -38436,17 +38485,6 @@ }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) -"mkL" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/obj/item/multitool{ - pixel_x = 9; - pixel_y = 4 - }, -/turf/open/floor/iron, -/area/station/command/bridge) "mld" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -38598,6 +38636,13 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"mnD" = ( +/obj/machinery/door/airlock/multi_tile/public/glass{ + name = "Hydroponics" + }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, +/turf/open/floor/iron/textured_half, +/area/station/service/hydroponics) "mnE" = ( /obj/item/vending_refill/cigarette, /obj/structure/table/wood, @@ -39424,6 +39469,14 @@ }, /turf/open/floor/plating, /area/station/hallway/primary/starboard) +"mBX" = ( +/obj/structure/table/wood, +/obj/machinery/airalarm/directional/east, +/obj/item/storage/photo_album{ + pixel_y = -1 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) "mCw" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/hatch{ @@ -41726,14 +41779,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos/storage) -"noS" = ( -/obj/structure/table, -/obj/item/papercutter{ - pixel_y = 6; - pixel_x = 8 - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "noW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -43152,6 +43197,14 @@ "nKa" = ( /turf/closed/wall, /area/station/security/checkpoint/medical) +"nKe" = ( +/obj/structure/table, +/obj/item/hand_tele{ + pixel_y = 13; + pixel_x = 3 + }, +/turf/open/floor/iron, +/area/station/command/teleporter) "nKj" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/machinery/rnd/production/circuit_imprinter, @@ -43803,14 +43856,6 @@ }, /turf/open/floor/iron/dark/textured_edge, /area/station/security/prison) -"nUU" = ( -/obj/structure/table, -/obj/item/hand_tele{ - pixel_y = 13; - pixel_x = 3 - }, -/turf/open/floor/iron, -/area/station/command/teleporter) "nVc" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/yellow/filled/corner{ @@ -44746,17 +44791,6 @@ }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) -"okK" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_y = 14 - }, -/obj/item/reagent_containers/cup/glass/flask/gold{ - pixel_x = 6; - pixel_y = 5 - }, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/captain) "okU" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, @@ -46688,6 +46722,14 @@ dir = 9 }, /area/station/science/lab) +"oPt" = ( +/obj/structure/table, +/obj/item/papercutter{ + pixel_y = 6; + pixel_x = 8 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "oPv" = ( /obj/machinery/turretid{ control_area = "/area/station/ai_monitored/turret_protected/aisat/service"; @@ -51267,14 +51309,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/medical/morgue) -"qnA" = ( -/obj/structure/table/wood, -/obj/item/hand_tele{ - pixel_y = 11 - }, -/obj/item/melee/chainofcommand, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain) "qnC" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/ce) @@ -54524,6 +54558,16 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/iron/textured, /area/station/security/brig) +"rns" = ( +/obj/structure/table/reinforced, +/obj/item/aicard{ + pixel_y = 6 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/bridge) "rnt" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -54738,18 +54782,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/lobby) -"rqL" = ( -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen{ - pixel_x = 11; - pixel_y = 2 - }, -/obj/structure/table/wood, -/turf/open/floor/carpet, -/area/station/command/meeting_room) "rqT" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron, @@ -58658,6 +58690,13 @@ "sEi" = ( /turf/open/floor/carpet, /area/station/service/library) +"sEl" = ( +/obj/structure/table, +/obj/item/hand_labeler{ + pixel_y = 2 + }, +/turf/open/floor/wood, +/area/station/command/meeting_room) "sEp" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -61004,6 +61043,23 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"tuz" = ( +/obj/structure/cable, +/obj/structure/table, +/obj/item/trapdoor_remote/preloaded{ + pixel_x = -5; + pixel_y = 2 + }, +/obj/machinery/recharger{ + pixel_x = 5; + pixel_y = 2 + }, +/obj/item/storage/wallet/random{ + pixel_x = 6; + pixel_y = -24 + }, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) "tuH" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -64088,12 +64144,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/command/heads_quarters/rd) -"uvV" = ( -/obj/structure/table/wood, -/obj/item/storage/secure/safe/directional/east, -/obj/machinery/light/directional/east, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain) "uvX" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -64182,16 +64232,6 @@ dir = 4 }, /area/station/engineering/lobby) -"uxt" = ( -/obj/structure/sink/directional/west, -/obj/structure/mirror/directional/east, -/obj/machinery/light/small/directional/north, -/obj/item/razor{ - pixel_x = 8; - pixel_y = 8 - }, -/turf/open/floor/iron/freezer, -/area/station/command/heads_quarters/captain) "uxx" = ( /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output{ dir = 1 @@ -64355,16 +64395,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) -"uAU" = ( -/obj/structure/table/reinforced, -/obj/item/assembly/flash/handheld, -/obj/item/assembly/flash/handheld, -/obj/machinery/newscaster/directional/west, -/obj/item/wrench{ - pixel_y = 17 - }, -/turf/open/floor/iron, -/area/station/command/bridge) "uBi" = ( /turf/closed/wall, /area/station/ai_monitored/turret_protected/ai) @@ -64978,17 +65008,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"uKS" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen{ - pixel_x = 12 - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain) "uKW" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -70134,23 +70153,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/storage/mining) -"wqo" = ( -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/emergency{ - pixel_y = 9 - }, -/obj/item/assembly/timer, -/obj/item/assembly/signaler{ - pixel_y = -7; - pixel_x = 7 - }, -/obj/item/assembly/signaler{ - pixel_y = -12; - pixel_x = -8 - }, -/obj/machinery/status_display/ai/directional/east, -/turf/open/floor/iron, -/area/station/command/bridge) "wqx" = ( /turf/closed/wall/r_wall, /area/station/hallway/primary/fore) @@ -70482,6 +70484,12 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"wwB" = ( +/obj/structure/table/wood, +/obj/item/storage/secure/safe/directional/east, +/obj/machinery/light/directional/east, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) "wwI" = ( /obj/structure/chair, /obj/effect/turf_decal/stripes/line{ @@ -71194,17 +71202,6 @@ /obj/structure/table, /turf/open/floor/plating, /area/station/maintenance/aft/greater) -"wJd" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/multi_tile/glass{ - name = "The Girly Boar" - }, -/turf/open/floor/iron/dark/textured_half, -/area/station/service/bar/atrium) "wJe" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 @@ -71292,6 +71289,17 @@ /obj/item/radio/off, /turf/open/floor/iron/cafeteria, /area/station/hallway/secondary/exit/departure_lounge) +"wKw" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_y = 14 + }, +/obj/item/reagent_containers/cup/glass/flask/gold{ + pixel_x = 6; + pixel_y = 5 + }, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain) "wKA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -76006,14 +76014,6 @@ "yiL" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/security/armory) -"yiP" = ( -/obj/structure/table/wood, -/obj/machinery/airalarm/directional/east, -/obj/item/storage/photo_album{ - pixel_y = -1 - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain) "yjh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -232810,8 +232810,8 @@ qjm dxK hbp oyp -fgO -iLS +doT +sEl qRs jST wUX @@ -233582,7 +233582,7 @@ dxK fbw hue lVZ -rqL +eYT vdi oMP iYb @@ -233849,9 +233849,9 @@ iYb rpu ybI nnR -gEH -noS -jVU +tuz +oPt +bhK rAA cpm mpy @@ -234857,8 +234857,8 @@ dnq kgD utR uEQ -bxR -uAU +dho +grA cEv nOH gxU @@ -235886,7 +235886,7 @@ rcj utR tmQ eOw -lYN +rns mkA nOH aAv @@ -236400,7 +236400,7 @@ oBs utR tmQ axf -mkL +kzD kJP lhv heS @@ -237427,9 +237427,9 @@ dnq nfk utR tmQ -wqo -hoa -guu +gZj +gKk +kBr lhv iGH bGm @@ -237695,7 +237695,7 @@ mjs hsx hpR pIk -uKS +gYz tHi iLu lpM @@ -238209,7 +238209,7 @@ rCD uEm uEm mvc -qnA +hCV nkb ptB mvc @@ -238218,7 +238218,7 @@ anu jly fXb mhQ -nUU +nKe jUD nZb lRf @@ -238466,14 +238466,14 @@ xxx xbo xbo anu -iFY -jlc -gGy +fue +dmG +cyF xLF lpM oGQ -okK -fGa +wKw +kpp mhQ hUV aks @@ -238985,7 +238985,7 @@ qjx heX viQ lpM -uxt +lIp axB lrD mhQ @@ -239493,9 +239493,9 @@ lpM eEC aTw iFL -kFm -uvV -yiP +hpe +wwB +mBX uEm viQ dGU @@ -241025,7 +241025,7 @@ idw eZj iuE bPg -cKp +mnD kDP kmQ xgy @@ -242566,13 +242566,13 @@ tGZ tqZ mrF iFc -wJd +avS mIB uUV fmD fmD fmD -iMh +jNq lso lso lCi diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index 08d85054a3e..79719c699a2 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -13784,6 +13784,17 @@ /obj/machinery/light/directional/west, /turf/open/misc/dirt/jungle, /area/station/security/prison/garden) +"dAu" = ( +/obj/structure/table, +/obj/item/plate, +/obj/item/knife/plastic{ + pixel_x = 16 + }, +/obj/item/food/donkpocket/warm/berry{ + pixel_y = 7 + }, +/turf/open/floor/iron/kitchen, +/area/station/command/heads_quarters/rd) "dAB" = ( /obj/structure/closet/firecloset, /turf/open/floor/iron/smooth_large, @@ -17161,14 +17172,6 @@ }, /turf/open/floor/pod/dark, /area/station/maintenance/floor1/port) -"euZ" = ( -/obj/effect/mapping_helpers/airlock/access/any/supply/mining, -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Xenoflora" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/textured_large, -/area/station/cargo/miningdock) "evi" = ( /obj/machinery/door/airlock/science{ name = "Monkey Atrium" @@ -43211,12 +43214,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/pod/dark, /area/station/maintenance/floor2/port) -"lpi" = ( -/obj/structure/cable, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/station/hallway/secondary/exit) "lpq" = ( /obj/structure/bookcase/random/nonfiction, /turf/open/floor/carpet/royalblack, @@ -46869,16 +46866,6 @@ /obj/structure/sign/poster/contraband/clown, /turf/closed/wall, /area/station/service/theater) -"mmk" = ( -/obj/machinery/light/small/directional/west, -/obj/machinery/camera/directional/west{ - c_tag = "Command - Research Director's Quarters #1" - }, -/obj/effect/baseturf_helper/reinforced_plating/ceiling, -/obj/machinery/newscaster/directional/west, -/obj/item/kirbyplants/random/dead/research_director, -/turf/open/floor/iron/large, -/area/station/command/heads_quarters/rd) "mms" = ( /obj/machinery/space_heater/improvised_chem_heater, /obj/effect/turf_decal/tile/blue/half, @@ -55595,14 +55582,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, /area/station/maintenance/floor1/port/aft) -"oxD" = ( -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/computer/security/telescreen/rd{ - pixel_x = -30 - }, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/rd) "oxJ" = ( /obj/structure/railing{ dir = 8 @@ -55841,6 +55820,16 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/mineral/silver, /area/station/service/chapel) +"oAF" = ( +/obj/machinery/light/small/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Command - Research Director's Quarters #1" + }, +/obj/effect/baseturf_helper/reinforced_plating/ceiling, +/obj/machinery/newscaster/directional/west, +/obj/item/kirbyplants/random/dead/research_director, +/turf/open/floor/iron/large, +/area/station/command/heads_quarters/rd) "oAH" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 8 @@ -65528,6 +65517,12 @@ }, /turf/open/floor/glass/reinforced, /area/station/service/library) +"rdZ" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/hallway/secondary/exit) "rec" = ( /obj/structure/cable, /turf/open/floor/iron/dark/side{ @@ -66088,6 +66083,14 @@ /obj/machinery/computer/records/medical, /turf/open/floor/iron/dark/textured, /area/station/medical/paramedic) +"rmg" = ( +/obj/effect/mapping_helpers/airlock/access/any/supply/mining, +/obj/machinery/door/airlock/multi_tile/public/glass{ + name = "Xenoflora" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/textured_large, +/area/station/cargo/miningdock) "rmm" = ( /obj/structure/table, /obj/machinery/camera/autoname/directional/north, @@ -71924,6 +71927,14 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/service/library/lounge) +"sTm" = ( +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/computer/security/telescreen/rd{ + pixel_x = -30 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/rd) "sTq" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, @@ -76726,17 +76737,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) -"ufR" = ( -/obj/structure/table, -/obj/item/plate, -/obj/item/knife/plastic{ - pixel_x = 16 - }, -/obj/item/food/donkpocket/warm/berry{ - pixel_y = 7 - }, -/turf/open/floor/iron/kitchen, -/area/station/command/heads_quarters/rd) "ufV" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/machinery/door/firedoor/border_only{ @@ -107280,7 +107280,7 @@ eSX ylE qiy hhx -lpi +rdZ bfX tqx svs @@ -123710,7 +123710,7 @@ cwG qly pEv pnr -euZ +rmg tQf qzm gtX @@ -186409,7 +186409,7 @@ hge hge hge oiO -oxD +sTm pKO aiN jDc @@ -253232,7 +253232,7 @@ qVO plz bYJ rWT -mmk +oAF vQs rWT lEo @@ -254261,7 +254261,7 @@ hUT iHm rWT rWT -ufR +dAu iHm kgT qrd diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 89d0715e4be..1f8314543d2 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -988,7 +988,7 @@ /area/station/engineering/atmos/pumproom) "aoB" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ name = "Entertainment Center" }, /turf/open/floor/iron/large, @@ -11510,7 +11510,7 @@ /turf/open/floor/iron/white/diagonal, /area/station/science/research) "dxr" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ name = "Arrivals" }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -21470,7 +21470,7 @@ /area/station/maintenance/port/greater) "gmL" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ name = "Recreation Area" }, /obj/structure/disposalpipe/segment, @@ -25670,7 +25670,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ name = "Medbay" }, /obj/structure/disposalpipe/segment, @@ -26936,7 +26936,7 @@ /area/station/cargo/miningdock) "hQx" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4; name = "Arrivals" }, @@ -29280,7 +29280,7 @@ /area/station/maintenance/aft/upper) "ixm" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ name = "Pool" }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -43865,7 +43865,7 @@ /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/solars/port/aft) "myv" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ name = "Cargo Lobby" }, /obj/machinery/door/firedoor, @@ -45427,7 +45427,7 @@ /area/station/hallway/primary/aft) "mUU" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4; name = "Gun Range" }, @@ -52458,7 +52458,7 @@ }, /area/station/engineering/main) "oTc" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4; name = "Cargo Lobby" }, @@ -52689,7 +52689,7 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/port/aft) "oVP" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ name = "Recreation Area" }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -53225,7 +53225,7 @@ /area/station/commons/dorms) "pcK" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4; name = "Entertainment Center" }, @@ -56126,7 +56126,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4; name = "Library" }, @@ -56946,7 +56946,7 @@ "qbl" = ( /obj/effect/turf_decal/siding/thinplating, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4; name = "Arrivals" }, @@ -62916,7 +62916,7 @@ /turf/open/floor/iron/freezer, /area/station/medical/chemistry) "rLK" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ name = "Recreation Area" }, /obj/machinery/door/firedoor, @@ -71112,7 +71112,7 @@ /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/electrical) "tWY" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ name = "Primary Tool Storage" }, /obj/machinery/door/firedoor, @@ -78728,7 +78728,7 @@ /area/station/hallway/primary/fore) "wbx" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4; name = "Arrivals" }, @@ -81865,7 +81865,7 @@ /area/station/ai_monitored/command/storage/eva) "wUC" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4; name = "Game Room" }, diff --git a/_maps/map_files/generic/CentCom_skyrat_z2.dmm b/_maps/map_files/generic/CentCom_skyrat_z2.dmm index dde99c8d276..4ee78940736 100644 --- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm +++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm @@ -1841,7 +1841,7 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding/cafedorms) "aAe" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4 }, /turf/open/floor/mineral/titanium, @@ -4512,7 +4512,7 @@ }, /area/centcom/holding/cafe) "bwP" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ name = "Interlink Longue" }, /obj/effect/turf_decal/siding/wood, @@ -5484,7 +5484,7 @@ /turf/open/floor/iron/dark/textured_large, /area/cruiser_dock) "dPd" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4; name = "Interlink Locker Room" }, @@ -5571,7 +5571,7 @@ /turf/open/floor/wood, /area/centcom/interlink) "dXN" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ name = "Interlink Bar" }, /turf/open/floor/iron/cafeteria, @@ -6049,7 +6049,7 @@ /turf/open/floor/iron, /area/centcom/interlink) "fua" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 8; name = "Interlink Longue" }, @@ -6206,7 +6206,7 @@ }, /area/centcom/holding/cafe) "fOv" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ name = "Interlink Public Garden" }, /obj/effect/turf_decal/siding/white{ @@ -7184,7 +7184,7 @@ /turf/open/misc/beach/sand, /area/centcom/holding/cafepark) "iwK" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4; name = "Interlink Cafe" }, @@ -7857,7 +7857,7 @@ /turf/open/floor/iron/dark/textured_large, /area/cruiser_dock) "kfb" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ name = "Interlink Locker Room" }, /turf/open/floor/iron, @@ -7906,7 +7906,7 @@ }, /area/centcom/interlink) "kmV" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ name = "Interlink Access" }, /obj/machinery/door/poddoor/shutters/indestructible{ @@ -10151,7 +10151,7 @@ }, /area/centcom/holding/cafe) "pPI" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ name = "Interlink" }, /obj/effect/turf_decal/siding/dark, @@ -10270,7 +10270,7 @@ /turf/open/floor/wood, /area/centcom/holding/cafe) "qbk" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ name = "Interlink Access" }, /obj/machinery/door/poddoor/shutters/indestructible{ @@ -10602,7 +10602,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4; name = "Interlink Cafe" }, @@ -10827,7 +10827,7 @@ /turf/open/floor/iron/dark, /area/centcom/interlink) "rGI" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4; name = "Interlink Aux Garden" }, @@ -12494,7 +12494,7 @@ /turf/closed/indestructible/rock, /area/centcom/interlink) "vLY" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4; name = "Interlink Bar" }, @@ -12513,7 +12513,7 @@ /turf/open/misc/dirt/planet, /area/centcom/holding/cafepark) "vRf" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4; name = "Interlink Garden" }, @@ -13178,7 +13178,7 @@ /area/centcom/holding/cafepark) "xIR" = ( /obj/effect/turf_decal/siding/wood, -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ name = "Interlink Cafe" }, /turf/open/floor/wood/parquet, @@ -13352,7 +13352,7 @@ /turf/open/misc/asteroid, /area/cruiser_dock) "xYp" = ( -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ name = "Interlink Cafe" }, /obj/effect/turf_decal/siding/wood, diff --git a/_maps/templates/battlecruiser_starfury.dmm b/_maps/templates/battlecruiser_starfury.dmm index 66fa9cba9ab..d3f72900fd4 100644 --- a/_maps/templates/battlecruiser_starfury.dmm +++ b/_maps/templates/battlecruiser_starfury.dmm @@ -1028,7 +1028,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/pod/light, /area/shuttle/sbc_starfury) @@ -1590,14 +1590,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/firedoor/heavy, /obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /turf/open/floor/pod/light, /area/shuttle/sbc_starfury) "fF" = ( /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /obj/machinery/door/firedoor/heavy, /obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /turf/open/floor/pod/light, /area/shuttle/sbc_starfury) "fG" = ( @@ -4457,7 +4457,7 @@ "AJ" = ( /obj/machinery/door/firedoor/heavy, /obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/public/glass, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/pod/light, /area/shuttle/sbc_starfury) diff --git a/_maps/templates/lazy_templates/nukie_base.dmm b/_maps/templates/lazy_templates/nukie_base.dmm index 1fda7034220..9815d45806b 100644 --- a/_maps/templates/lazy_templates/nukie_base.dmm +++ b/_maps/templates/lazy_templates/nukie_base.dmm @@ -647,7 +647,7 @@ dir = 1 }, /obj/effect/turf_decal/siding/wideplating, -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/airlock/multi_tile/public/glass{ name = "Disembarkents" }, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 48f44c113ca..946dd00ddce 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1806,9 +1806,7 @@ /obj/structure/fluff/airlock_filler/singularity_pull(S, current_size) return -/* - Station Airlocks Regular -*/ +// Station Airlocks Regular /obj/machinery/door/airlock/command icon = 'icons/obj/doors/airlocks/station/command.dmi' @@ -1870,10 +1868,7 @@ icon = 'icons/obj/doors/airlocks/station/virology.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_viro -////////////////////////////////// -/* - Station Airlocks Glass -*/ +// Station Airlocks Glass /obj/machinery/door/airlock/glass opacity = FALSE @@ -1961,10 +1956,7 @@ glass = TRUE normal_integrity = 200 -////////////////////////////////// -/* - Station Airlocks Mineral -*/ +// Station Airlocks Mineral /obj/machinery/door/airlock/gold name = "gold airlock" @@ -2114,14 +2106,13 @@ assemblytype = /obj/structure/door_assembly/door_assembly_bronze/seethru opacity = FALSE glass = TRUE -////////////////////////////////// -/* - Station2 Airlocks -*/ + + +// Public Airlocks /obj/machinery/door/airlock/public - icon = 'icons/obj/doors/airlocks/station2/glass.dmi' - overlays_file = 'icons/obj/doors/airlocks/station2/overlays.dmi' + icon = 'icons/obj/doors/airlocks/public/glass.dmi' + overlays_file = 'icons/obj/doors/airlocks/public/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_public /obj/machinery/door/airlock/public/glass @@ -2140,10 +2131,7 @@ name = "Turbine Exterior Airlock" id_tag = INCINERATOR_ATMOS_AIRLOCK_EXTERIOR -////////////////////////////////// -/* - External Airlocks -*/ +// External Airlocks /obj/machinery/door/airlock/external name = "external airlock" @@ -2194,20 +2182,16 @@ return ..() -/// Access free external airlock +// Access free external airlocks /obj/machinery/door/airlock/external/ruin /obj/machinery/door/airlock/external/glass opacity = FALSE glass = TRUE -/// Access free external glass airlock /obj/machinery/door/airlock/external/glass/ruin -////////////////////////////////// -/* - CentCom Airlocks -*/ +// CentCom Airlocks /obj/machinery/door/airlock/centcom //Use grunge as a station side version, as these have special effects related to them via phobias and such. icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi' @@ -2222,10 +2206,8 @@ overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_grunge -////////////////////////////////// -/* - Vault Airlocks -*/ + +// Vault Airlocks /obj/machinery/door/airlock/vault name = "vault door" @@ -2236,10 +2218,8 @@ normal_integrity = 400 // reverse engieneerd: 400 * 1.5 (sec lvl 6) = 600 = original security_level = 6 -////////////////////////////////// -/* - Hatch Airlocks -*/ + +// Hatch Airlocks /obj/machinery/door/airlock/hatch name = "airtight hatch" @@ -2255,10 +2235,7 @@ note_overlay_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_mhatch -////////////////////////////////// -/* - High Security Airlocks -*/ +// High Security Airlocks /obj/machinery/door/airlock/highsecurity name = "high tech security airlock" @@ -2270,10 +2247,7 @@ security_level = 1 damage_deflection = 30 -////////////////////////////////// -/* - Shuttle Airlocks -*/ +// Shuttle Airlocks /obj/machinery/door/airlock/shuttle name = "shuttle airlock" @@ -2299,10 +2273,7 @@ normal_integrity = 700 security_level = 1 -////////////////////////////////// -/* - Cult Airlocks -*/ +// Cult Airlocks /obj/machinery/door/airlock/cult name = "cult airlock" @@ -2406,11 +2377,8 @@ damage_deflection = 5 armor_type = /datum/armor/none +// Material Airlocks -////////////////////////////////// -/* - Material Airlocks -*/ /obj/machinery/door/airlock/material name = "Airlock" material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_GREYSCALE | MATERIAL_AFFECT_STATISTICS @@ -2434,18 +2402,14 @@ opacity = FALSE glass = TRUE -////////////////////////////////// -/* - Misc Airlocks -*/ +// Multi-tile (Large) Airlocks -/obj/machinery/door/airlock/multi_tile/glass +/obj/machinery/door/airlock/multi_tile + icon = 'icons/obj/doors/airlocks/multi_tile/public/glass.dmi' + overlays_file = 'icons/obj/doors/airlocks/multi_tile/public/overlays.dmi' + assemblytype = /obj/structure/door_assembly/multi_tile/door_assembly_public multi_tile = TRUE - name = "large glass airlock" - icon = 'icons/obj/doors/airlocks/glass_large/glass_large.dmi' - overlays_file = 'icons/obj/doors/airlocks/glass_large/overlays.dmi' opacity = FALSE - assemblytype = /obj/structure/door_assembly/multi_tile/glass glass = TRUE bound_width = 64 // 2x1 @@ -2462,10 +2426,17 @@ /// The door/airlock this fluff panel is attached to var/obj/machinery/door/filled_airlock +/obj/machinery/door/airlock/multi_tile/public/glass + /obj/machinery/door/airlock/multi_tile/narsie_act() return -/// Subtype used in unit tests to ensure instant airlock opening/closing. Pretty much just excises everything that would delay the process or is un-needed for the sake of the test (sleeps, icon animations). +/* + * Subtype used in unit tests to ensure instant airlock opening/closing. + * + * Pretty much just excises everything that would delay the process or is un-needed + * for the sake of the test (sleeps, icon animations). +*/ /obj/machinery/door/airlock/instant // set_density on both open and close procs has a check and return builtin. diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index b09dd7a5f83..3fc6fd8c63e 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -34,8 +34,16 @@ var/material_amt = 4 /obj/structure/door_assembly/multi_tile + name = "large airlock assembly" + icon = 'icons/obj/doors/airlocks/multi_tile/public/glass.dmi' + overlays_file = 'icons/obj/doors/airlocks/multi_tile/public/overlays.dmi' + base_name = "large airlock" + glass_type = /obj/machinery/door/airlock/multi_tile/public/glass + airlock_type = /obj/machinery/door/airlock/multi_tile/public/glass dir = EAST multi_tile = TRUE + glass = TRUE + nomineral = TRUE /obj/structure/door_assembly/Initialize(mapload) . = ..() diff --git a/code/game/objects/structures/door_assembly_types.dm b/code/game/objects/structures/door_assembly_types.dm index 05efc4ae489..74a77443b28 100644 --- a/code/game/objects/structures/door_assembly_types.dm +++ b/code/game/objects/structures/door_assembly_types.dm @@ -1,7 +1,7 @@ /obj/structure/door_assembly/door_assembly_public name = "public airlock assembly" - icon = 'icons/obj/doors/airlocks/station2/glass.dmi' - overlays_file = 'icons/obj/doors/airlocks/station2/overlays.dmi' + icon = 'icons/obj/doors/airlocks/public/glass.dmi' + overlays_file = 'icons/obj/doors/airlocks/public/overlays.dmi' glass_type = /obj/machinery/door/airlock/public/glass airlock_type = /obj/machinery/door/airlock/public @@ -267,14 +267,9 @@ nomineral = TRUE material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_GREYSCALE | MATERIAL_AFFECT_STATISTICS -/obj/structure/door_assembly/multi_tile/glass - name = "large glass airlock assembly" - base_name = "large glass airlock" - icon = 'icons/obj/doors/airlocks/glass_large/glass_large.dmi' - overlays_file = 'icons/obj/doors/airlocks/glass_large/overlays.dmi' - airlock_type = /obj/machinery/door/airlock/multi_tile/glass - glass_type = /obj/machinery/door/airlock/multi_tile/glass - +/obj/structure/door_assembly/multi_tile/door_assembly_public + name = "large public airlock assembly" + base_name = "large public airlock" /obj/structure/door_assembly/door_assembly_material/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) diff --git a/code/modules/asset_cache/assets/rcd.dm b/code/modules/asset_cache/assets/rcd.dm index 6662caa183b..e4c54929dae 100644 --- a/code/modules/asset_cache/assets/rcd.dm +++ b/code/modules/asset_cache/assets/rcd.dm @@ -27,7 +27,7 @@ //for each airlock type we create its overlayed version with the suffix Glass in the sprite name var/list/airlocks = list( "Standard" = 'icons/obj/doors/airlocks/station/public.dmi', - "Public" = 'icons/obj/doors/airlocks/station2/glass.dmi', + "Public" = 'icons/obj/doors/airlocks/public/glass.dmi', "Engineering" = 'icons/obj/doors/airlocks/station/engineering.dmi', "Atmospherics" = 'icons/obj/doors/airlocks/station/atmos.dmi', "Security" = 'icons/obj/doors/airlocks/station/security.dmi', diff --git a/icons/obj/doors/airlocks/glass_large/glass_large.dmi b/icons/obj/doors/airlocks/multi_tile/public/glass.dmi similarity index 100% rename from icons/obj/doors/airlocks/glass_large/glass_large.dmi rename to icons/obj/doors/airlocks/multi_tile/public/glass.dmi diff --git a/icons/obj/doors/airlocks/glass_large/overlays.dmi b/icons/obj/doors/airlocks/multi_tile/public/overlays.dmi similarity index 100% rename from icons/obj/doors/airlocks/glass_large/overlays.dmi rename to icons/obj/doors/airlocks/multi_tile/public/overlays.dmi diff --git a/icons/obj/doors/airlocks/station2/glass.dmi b/icons/obj/doors/airlocks/public/glass.dmi similarity index 100% rename from icons/obj/doors/airlocks/station2/glass.dmi rename to icons/obj/doors/airlocks/public/glass.dmi diff --git a/icons/obj/doors/airlocks/station2/overlays.dmi b/icons/obj/doors/airlocks/public/overlays.dmi similarity index 100% rename from icons/obj/doors/airlocks/station2/overlays.dmi rename to icons/obj/doors/airlocks/public/overlays.dmi diff --git a/tools/UpdatePaths/Scripts/76732_multi-tile_airlocks.txt b/tools/UpdatePaths/Scripts/76732_multi-tile_airlocks.txt index dffbbbe93d2..6541efbe8c9 100644 --- a/tools/UpdatePaths/Scripts/76732_multi-tile_airlocks.txt +++ b/tools/UpdatePaths/Scripts/76732_multi-tile_airlocks.txt @@ -1,3 +1,4 @@ -#comment New path for large glass airlock. +#comment Repathing for new multi-tile airlocks. -/obj/machinery/door/airlock/glass_large : /obj/machinery/door/airlock/multi_tile/glass{@OLD} \ No newline at end of file +/obj/machinery/door/airlock/multi_tile/glass : /obj/machinery/door/airlock/multi_tile/public/glass{@OLD} +/obj/machinery/door/airlock/glass_large : /obj/machinery/door/airlock/multi_tile/public/glass{@OLD} \ No newline at end of file