diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm index b5d6fe250df..5720ef32047 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm @@ -178,7 +178,7 @@ /turf/simulated/floor/wood, /area/ruin/powered/snow_cabin) "aO" = ( -/obj/machinery/door/airlock/multi_tile/glass/directional/east, +/obj/machinery/door/airlock/multi_tile/glass, /obj/structure/fans/tiny, /turf/simulated/floor/pod/dark, /area/ruin/powered/snow_biodome) @@ -341,7 +341,7 @@ /turf/simulated/floor/wood, /area/ruin/powered/snow_cabin) "vf" = ( -/obj/machinery/door/airlock/multi_tile/glass/directional/east, +/obj/machinery/door/airlock/multi_tile/glass, /obj/structure/fans/tiny, /turf/simulated/floor/pod/dark, /area/ruin/powered/snow_cabin) @@ -381,7 +381,7 @@ /area/ruin/powered/snow_biodome) "Ez" = ( /obj/structure/fans/tiny, -/obj/machinery/door/airlock/multi_tile/glass/directional/east, +/obj/machinery/door/airlock/multi_tile/glass, /turf/simulated/floor/pod/dark, /area/ruin/powered/snow_biodome) "FP" = ( diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm index 2ea20ea773b..5ad83222ad9 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm @@ -1496,7 +1496,7 @@ /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_excavation) "WH" = ( -/obj/machinery/door/poddoor/multi_tile/triple/directional/east, +/obj/machinery/door/poddoor/multi_tile/triple, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/althland_excavation) "Xl" = ( diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_nt.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_nt.dmm index 3dac1207bc5..dd4974cdeed 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_nt.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_nt.dmm @@ -1714,8 +1714,9 @@ }, /area/mine/outpost/hallway/west) "jQ" = ( -/obj/machinery/door/airlock/multi_tile/glass/directional/north{ - name = "Main Airlock" +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Main Airlock"; + dir = 4 }, /obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, @@ -3963,7 +3964,7 @@ /area/mine/outpost/production) "vP" = ( /obj/structure/fans/tiny, -/obj/machinery/door/airlock/multi_tile/glass/directional/east{ +/obj/machinery/door/airlock/multi_tile/glass{ name = "Main Airlock" }, /obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm b/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm index 59109028496..96d66fb60b7 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm @@ -507,7 +507,7 @@ /turf/simulated/floor/carpet/black, /area/ruin/space/powered/casino/floor) "mP" = ( -/obj/machinery/door/airlock/multi_tile/glass/directional/east, +/obj/machinery/door/airlock/multi_tile/glass, /turf/simulated/floor/plasteel/dark, /area/ruin/space/powered/casino/arrivals) "mW" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm index 458f3359137..1de1b1d5637 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm @@ -1515,7 +1515,7 @@ "hW" = ( /obj/structure/fans/tiny, /obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/multi_tile/impassable/directional/south{ +/obj/machinery/door/poddoor/impassable{ id_tag = "DS_Tram" }, /turf/simulated/floor/plating, @@ -3898,9 +3898,10 @@ "yb" = ( /obj/structure/fans/tiny, /obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/multi_tile/impassable/triple/directional/north{ +/obj/machinery/door/poddoor/multi_tile/impassable/triple{ id_tag = "DS_BossStorage"; - name = "warehouse valuables storage blast door" + name = "warehouse valuables storage blast door"; + dir = 4 }, /turf/simulated/floor/catwalk, /area/ruin/space/deepstorage) @@ -4295,7 +4296,7 @@ /obj/machinery/door/airlock/vault{ name = "Auxiliary Power Room" }, -/obj/machinery/door/poddoor/multi_tile/impassable/directional/south{ +/obj/machinery/door/poddoor/impassable{ id_tag = "DS_Engineering" }, /turf/simulated/floor/catwalk, @@ -4377,8 +4378,9 @@ }, /area/ruin/space/deepstorage) "AN" = ( -/obj/machinery/door/poddoor/multi_tile/impassable/triple/directional/north{ - id_tag = "DS_FrontGate" +/obj/machinery/door/poddoor/multi_tile/impassable/triple{ + id_tag = "DS_FrontGate"; + dir = 4 }, /turf/simulated/floor/catwalk/airless, /area/ruin/space/deepstorage) @@ -5855,7 +5857,7 @@ "LJ" = ( /obj/structure/fans/tiny, /obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/multi_tile/impassable/triple/directional/east{ +/obj/machinery/door/poddoor/multi_tile/impassable/triple{ id_tag = "DS_BossStorage"; name = "warehouse blast doors" }, @@ -6883,7 +6885,7 @@ "TK" = ( /obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage, /obj/machinery/door/airlock/highsecurity, -/obj/machinery/door/poddoor/multi_tile/impassable/directional/south{ +/obj/machinery/door/poddoor/impassable{ id_tag = "DS_Storage" }, /turf/simulated/floor/plasteel{ @@ -6960,7 +6962,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage, /obj/machinery/door/airlock/highsecurity, -/obj/machinery/door/poddoor/multi_tile/impassable/directional/south{ +/obj/machinery/door/poddoor/impassable{ id_tag = "DS_Storage" }, /turf/simulated/floor/plasteel{ diff --git a/_maps/map_files/RandomRuins/SpaceRuins/freighter.dmm b/_maps/map_files/RandomRuins/SpaceRuins/freighter.dmm index c91ff595726..9d6c4486ee0 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/freighter.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/freighter.dmm @@ -63,7 +63,7 @@ /turf/simulated/floor/plasteel, /area/ruin/space/powered) "jM" = ( -/obj/machinery/door/poddoor/multi_tile/impassable/triple/directional/east{ +/obj/machinery/door/poddoor/multi_tile/impassable/triple{ id_tag = "freighterblastdoor1" }, /obj/structure/fans/tiny, @@ -456,7 +456,9 @@ /turf/simulated/floor/wood, /area/ruin/space/powered) "Je" = ( -/obj/machinery/door/airlock/multi_tile/glass/directional/north, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm b/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm index de79d938e48..ff18f57dd56 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm @@ -679,7 +679,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/mech_transport) "Vp" = ( -/obj/machinery/door/poddoor/multi_tile/impassable/triple/directional/east{ +/obj/machinery/door/poddoor/multi_tile/impassable/triple{ id_tag = "mechtransport_ext" }, /turf/simulated/floor/plasteel/dark, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm index 3e3fc3e8573..7fd9fc9f35a 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm @@ -391,13 +391,13 @@ /area/ruin/space/moonbase19) "ba" = ( /obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, -/obj/machinery/door/airlock/multi_tile/glass/directional/east, +/obj/machinery/door/airlock/multi_tile/glass, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/ruin/space/moonbase19) "bb" = ( -/obj/machinery/door/airlock/multi_tile/glass/directional/east, +/obj/machinery/door/airlock/multi_tile/glass, /turf/simulated/floor/plasteel{ icon_state = "darkfull"; dir = 8 @@ -2573,8 +2573,9 @@ /area/ruin/space/moonbase19) "ij" = ( /obj/structure/fans/tiny, -/obj/machinery/door/poddoor/multi_tile/impassable/quad/directional/north{ - id_tag = "awaycargogate" +/obj/machinery/door/poddoor/multi_tile/impassable/quad{ + id_tag = "awaycargogate"; + dir = 4 }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) @@ -10784,7 +10785,7 @@ /area/ruin/space/moonbase19) "RD" = ( /obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, -/obj/machinery/door/airlock/multi_tile/glass/directional/east, +/obj/machinery/door/airlock/multi_tile/glass, /obj/structure/barricade/wooden/crude{ layer = 4 }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm index 7fceedd96b0..bb2f0165da3 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm @@ -4500,7 +4500,7 @@ /turf/template_noop, /area/space/nearstation) "rU" = ( -/obj/machinery/door/poddoor/multi_tile/impassable/double/directional/east{ +/obj/machinery/door/poddoor/multi_tile/impassable{ name = "prototype vault blast doors"; desc = "A heavy duty blast door that opens mechanically. It was hermetically sealed when the crew went into cryostasis."; id_tag = "prototype_vault" diff --git a/_maps/map_files/RandomRuins/SpaceRuins/sieged_lab.dmm b/_maps/map_files/RandomRuins/SpaceRuins/sieged_lab.dmm index efcfa584ed1..21c194894ee 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/sieged_lab.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/sieged_lab.dmm @@ -489,7 +489,7 @@ "xV" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/access/all/command/general, -/obj/machinery/door/poddoor/multi_tile/impassable/double/directional/east{ +/obj/machinery/door/poddoor/multi_tile/impassable{ id_tag = "SL_EndRoom" }, /turf/simulated/floor/plasteel{ @@ -780,7 +780,7 @@ }, /area/ruin/space/sieged_lab) "La" = ( -/obj/machinery/door/airlock/multi_tile/glass/directional/east, +/obj/machinery/door/airlock/multi_tile/glass, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -1063,8 +1063,9 @@ name = "Executive Suite" }, /obj/effect/mapping_helpers/airlock/access/all/command/general, -/obj/machinery/door/poddoor/multi_tile/impassable/double/directional/north{ - id_tag = "SL_EndRoom" +/obj/machinery/door/poddoor/multi_tile/impassable{ + id_tag = "SL_EndRoom"; + dir = 4 }, /turf/simulated/floor/plasteel, /area/ruin/space/sieged_lab) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm b/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm index 898bdfe01ce..18e2eb777f5 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm @@ -214,7 +214,7 @@ }, /area/ruin/space/powered/bar) "aX" = ( -/obj/machinery/door/airlock/multi_tile/glass/directional/east, +/obj/machinery/door/airlock/multi_tile/glass, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "black" @@ -234,7 +234,9 @@ /turf/template_noop, /area/space/nearstation) "ba" = ( -/obj/machinery/door/airlock/multi_tile/glass/directional/north, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 + }, /obj/structure/fans/tiny, /turf/simulated/floor/plasteel{ dir = 10; diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm index c798f73a54f..21fe1ed453d 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm @@ -313,7 +313,7 @@ }, /area/syndicate_depot/core) "aZ" = ( -/obj/machinery/door/poddoor/multi_tile/double/directional/east, +/obj/machinery/door/poddoor/multi_tile, /turf/simulated/floor/plasteel{ icon_state = "dark" }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm index 1068d241398..d71fccb6769 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm @@ -1775,7 +1775,7 @@ layer = 2.9; name = "Security Wing Lockdown" }, -/obj/machinery/door/airlock/multi_tile/glass/directional/east{ +/obj/machinery/door/airlock/multi_tile/glass{ name = "Security Wing" }, /turf/simulated/floor/plasteel{ diff --git a/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm index d3ef0aa4ab3..93b182f227b 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm @@ -102,7 +102,9 @@ /turf/simulated/floor/plating, /area/shuttle/abandoned) "tV" = ( -/obj/machinery/door/airlock/multi_tile/glass/directional/north, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 + }, /turf/simulated/floor/mineral/plastitanium, /area/shuttle/abandoned) "ux" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm index 059609e9157..e7919193839 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm @@ -576,7 +576,7 @@ "uH" = ( /obj/structure/fans/tiny, /obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor/multi_tile/impassable/triple/directional/east{ +/obj/machinery/door/poddoor/multi_tile/impassable/triple{ id_tag = "cargoshipblastdoor1" }, /turf/simulated/floor/plating, diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index 2b5afc58d7d..3d06e15e72b 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -780,8 +780,9 @@ /turf/simulated/floor/carpet/purple, /area/wizard_station) "cV" = ( -/obj/machinery/door/poddoor/multi_tile/impassable/double/directional/north{ - name = "Syndicate Base Blast Door" +/obj/machinery/door/poddoor/multi_tile/impassable{ + name = "Syndicate Base Blast Door"; + dir = 4 }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) @@ -3061,9 +3062,10 @@ /turf/simulated/wall/indestructible/opsglass, /area/syndicate_mothership/jail) "lh" = ( -/obj/machinery/door/poddoor/multi_tile/impassable/double/directional/north{ +/obj/machinery/door/poddoor/multi_tile/impassable{ id_tag = "nukeop_base"; - name = "Syndicate Base Docking Area Blast Door" + name = "Syndicate Base Docking Area Blast Door"; + dir = 4 }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) @@ -4226,8 +4228,9 @@ }, /area/centcom/specops) "oQ" = ( -/obj/machinery/door/poddoor/multi_tile/impassable/quad/directional/north{ - name = "Trading Satellite Central Access" +/obj/machinery/door/poddoor/multi_tile/impassable/quad{ + name = "Trading Satellite Central Access"; + dir = 4 }, /turf/simulated/floor/plating/airless, /area/trader_station/sol) @@ -5343,7 +5346,7 @@ /area/syndicate_mothership) "sE" = ( /obj/effect/mapping_helpers/airlock/access/all/syndicate, -/obj/machinery/door/airlock/multi_tile/glass/directional/east{ +/obj/machinery/door/airlock/multi_tile/glass{ name = "Equipment Room" }, /turf/simulated/floor/plasteel{ @@ -7896,7 +7899,7 @@ /turf/simulated/floor/plasteel, /area/centcom/evac) "Ck" = ( -/obj/machinery/door/airlock/multi_tile/glass/directional/east, +/obj/machinery/door/airlock/multi_tile/glass, /obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/wood, /area/ghost_bar) @@ -10194,7 +10197,7 @@ /area/ghost_bar) "Kb" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor/multi_tile/impassable/triple/directional/east{ +/obj/machinery/door/poddoor/multi_tile/impassable/triple{ id_tag = "sec"; name = "CentCom Security" }, @@ -10234,7 +10237,7 @@ /area/centcom/specops) "Ki" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor/multi_tile/impassable/triple/directional/east{ +/obj/machinery/door/poddoor/multi_tile/impassable/triple{ id_tag = "CC"; name = "Thunderdome Access" }, @@ -11574,7 +11577,7 @@ /turf/simulated/floor/plasteel/dark, /area/centcom/specops) "OB" = ( -/obj/machinery/door/airlock/multi_tile/glass/directional/east{ +/obj/machinery/door/airlock/multi_tile/glass{ name = "Badmin's Bar" }, /turf/simulated/floor/carpet/arcade, @@ -12086,7 +12089,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Qh" = ( -/obj/machinery/door/poddoor/multi_tile/impassable/quad/directional/east{ +/obj/machinery/door/poddoor/multi_tile/impassable/quad{ name = "Special Operations Engineering Storage"; id_tag = "SpecopsEngineering" }, @@ -12140,9 +12143,10 @@ /area/centcom/specops) "Qs" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor/multi_tile/impassable/triple/directional/north{ +/obj/machinery/door/poddoor/multi_tile/impassable/triple{ id_tag = "CCTELE"; - name = "Specops Teleporter" + name = "Specops Teleporter"; + dir = 4 }, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) @@ -12586,7 +12590,7 @@ }, /area/centcom/control) "RW" = ( -/obj/machinery/door/poddoor/multi_tile/impassable/triple/directional/east{ +/obj/machinery/door/poddoor/multi_tile/impassable/triple{ id_tag = "specopsoffice"; name = "Privacy Shield" }, @@ -13475,7 +13479,7 @@ /turf/simulated/floor/plasteel/dark, /area/centcom/specops) "VD" = ( -/obj/machinery/door/poddoor/multi_tile/impassable/double/directional/east{ +/obj/machinery/door/poddoor/multi_tile/impassable{ id_tag = "CCDOCK2"; name = "Special Operations Secondary Dock" }, @@ -14027,9 +14031,10 @@ }, /area/centcom/evac) "Xh" = ( -/obj/machinery/door/poddoor/multi_tile/impassable/double/directional/north{ +/obj/machinery/door/poddoor/multi_tile/impassable{ id_tag = "specopsoffice"; - name = "Privacy Shield" + name = "Privacy Shield"; + dir = 4 }, /turf/simulated/wall/indestructible/fakeglass, /area/centcom/specops) @@ -14037,7 +14042,7 @@ /turf/simulated/floor/transparent/glass, /area/centcom/specops) "Xk" = ( -/obj/machinery/door/airlock/multi_tile/glass/directional/east{ +/obj/machinery/door/airlock/multi_tile/glass{ name = "Badmin's Bar" }, /turf/simulated/floor/wood, @@ -14055,9 +14060,10 @@ /area/shuttle/escape) "Xn" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor/multi_tile/impassable/triple/directional/north{ +/obj/machinery/door/poddoor/multi_tile/impassable/triple{ id_tag = "SpecopsFerry"; - name = "Special Operations Ferry Hangar" + name = "Special Operations Ferry Hangar"; + dir = 4 }, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) @@ -14785,9 +14791,10 @@ /area/centcom/specops) "ZF" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor/multi_tile/impassable/quad/directional/north{ +/obj/machinery/door/poddoor/multi_tile/impassable/quad{ id_tag = "ASSAULT"; - name = "Assault Armor" + name = "Assault Armor"; + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "darkred" diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index cdf79f3c730..509108f105b 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -11565,7 +11565,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/multi_tile/glass/directional/east, +/obj/machinery/door/airlock/multi_tile/glass, /obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) @@ -16147,7 +16147,9 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/garden) "bdI" = ( -/obj/machinery/door/airlock/multi_tile/glass/directional/north, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 + }, /obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -44791,7 +44793,7 @@ /area/station/public/dorms) "djg" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/multi_tile/glass/directional/east, +/obj/machinery/door/airlock/multi_tile/glass, /obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel{ dir = 8; @@ -81340,7 +81342,7 @@ }, /area/station/science/robotics) "uxZ" = ( -/obj/machinery/door/airlock/multi_tile/directional/east{ +/obj/machinery/door/airlock/multi_tile{ name = "maintenance access" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 5e90a17dae7..ef5dd3d5652 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -9147,7 +9147,7 @@ /turf/simulated/floor/plasteel, /area/station/public/toilet/lockerroom) "bvF" = ( -/obj/machinery/door/poddoor/multi_tile/double/directional/east{ +/obj/machinery/door/poddoor/multi_tile{ name = "Command Emergency EVA Storage"; id_tag = "commandeva" }, @@ -22291,9 +22291,10 @@ }, /area/station/hallway/primary/aft/west) "dnY" = ( -/obj/machinery/door/poddoor/multi_tile/double/directional/north{ +/obj/machinery/door/poddoor/multi_tile{ name = "Medical Emergency EVA Storage"; - id_tag = "medeva" + id_tag = "medeva"; + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -27126,7 +27127,7 @@ /area/station/security/permabrig) "epT" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/multi_tile/glass/directional/east, +/obj/machinery/door/airlock/multi_tile/glass, /obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -37747,7 +37748,7 @@ }, /area/station/hallway/primary/aft/east) "gPT" = ( -/obj/machinery/door/airlock/multi_tile/glass/directional/east, +/obj/machinery/door/airlock/multi_tile/glass, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -40069,7 +40070,7 @@ /turf/simulated/floor/engine, /area/station/hallway/spacebridge/scidock) "hre" = ( -/obj/machinery/door/poddoor/multi_tile/double/directional/east{ +/obj/machinery/door/poddoor/multi_tile{ name = "Cargo Emergency EVA Storage"; id_tag = "cargoeva" }, @@ -41349,6 +41350,14 @@ icon_state = "neutralfull" }, /area/station/hallway/primary/port/north) +"hFS" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/autoname, +/turf/simulated/floor/wood, +/area/station/service/bar) "hGb" = ( /turf/simulated/floor/plating{ icon_state = "asteroidplating" @@ -60457,12 +60466,6 @@ /obj/structure/table/wood, /turf/simulated/floor/wood, /area/station/public/vacant_office) -"lGh" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/multi_tile/glass/directional/south, -/obj/effect/mapping_helpers/airlock/autoname, -/turf/simulated/floor/wood, -/area/station/service/bar) "lGj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -60943,7 +60946,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, -/obj/machinery/door/airlock/multi_tile/glass/directional/east, +/obj/machinery/door/airlock/multi_tile/glass, /obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel, /area/station/public/locker) @@ -63442,7 +63445,7 @@ "mpD" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, -/obj/machinery/door/airlock/multi_tile/glass/directional/east, +/obj/machinery/door/airlock/multi_tile/glass, /obj/effect/mapping_helpers/airlock/autoname, /obj/structure/cable/orange{ icon_state = "1-2" @@ -66057,7 +66060,7 @@ /turf/simulated/floor/wood/nitrogen, /area/station/maintenance/abandonedbar) "mUX" = ( -/obj/machinery/door/poddoor/multi_tile/triple/directional/east{ +/obj/machinery/door/poddoor/multi_tile/triple{ name = "Civilian Emergency EVA Storage"; id_tag = "civeva" }, @@ -68177,9 +68180,10 @@ /turf/simulated/floor/wood, /area/station/medical/psych) "nvX" = ( -/obj/machinery/door/poddoor/multi_tile/double/directional/north{ +/obj/machinery/door/poddoor/multi_tile{ id_tag = "arrivalseva"; - name = "Arrivals Emergency EVA Storage" + name = "Arrivals Emergency EVA Storage"; + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -85494,7 +85498,7 @@ }, /area/station/hallway/primary/fore/east) "rrI" = ( -/obj/machinery/door/poddoor/multi_tile/double/directional/east{ +/obj/machinery/door/poddoor/multi_tile{ name = "Science Emergency EVA Storage"; id_tag = "scieva" }, @@ -87270,7 +87274,7 @@ }, /area/station/hallway/primary/central/north) "rMg" = ( -/obj/machinery/door/airlock/multi_tile/glass/directional/east, +/obj/machinery/door/airlock/multi_tile/glass, /obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -109710,7 +109714,7 @@ /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/multi_tile/glass/directional/east, +/obj/machinery/door/airlock/multi_tile/glass, /obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel{ icon_state = "darkgreenfull" @@ -110332,7 +110336,7 @@ /turf/simulated/floor/wood, /area/station/command/office/hos) "wMQ" = ( -/obj/machinery/door/airlock/multi_tile/glass/directional/east, +/obj/machinery/door/airlock/multi_tile/glass, /obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -133911,8 +133915,8 @@ aZZ aZZ aZZ bjn -lGh xOB +hFS bjn aZZ aZZ diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index d6510ce5c30..729073dbfca 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -35848,7 +35848,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/multi_tile/glass/directional/east, +/obj/machinery/door/airlock/multi_tile/glass, /obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) @@ -74346,7 +74346,7 @@ "oll" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/multi_tile/glass/directional/east{ +/obj/machinery/door/airlock/multi_tile/glass{ name = "Cryogenic Dormitories" }, /obj/structure/cable{ diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index 2f940dbf33a..b0eed99a7c6 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -65906,7 +65906,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/security/fore) "nib" = ( -/obj/machinery/door/airlock/multi_tile/glass/directional/east, +/obj/machinery/door/airlock/multi_tile/glass, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel{ @@ -92821,7 +92821,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft2) "svF" = ( -/obj/machinery/door/airlock/multi_tile/directional/east{ +/obj/machinery/door/airlock/multi_tile{ name = "maintenance access" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, @@ -95004,7 +95004,7 @@ }, /area/station/legal/lawoffice) "sSv" = ( -/obj/machinery/door/airlock/multi_tile/glass/directional/east{ +/obj/machinery/door/airlock/multi_tile/glass{ locked = 1 }, /obj/structure/barricade/wooden, @@ -104350,7 +104350,7 @@ /turf/simulated/floor/bluegrid, /area/station/telecomms/computer) "uJn" = ( -/obj/machinery/door/airlock/multi_tile/directional/east{ +/obj/machinery/door/airlock/multi_tile{ name = "maintenance access" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, diff --git a/code/__DEFINES/mappers.dm b/code/__DEFINES/mappers.dm index dfd99145534..22b2da0c0fe 100644 --- a/code/__DEFINES/mappers.dm +++ b/code/__DEFINES/mappers.dm @@ -75,18 +75,3 @@ dir = WEST; \ pixel_x = offset_west; \ } - -#define MAPPING_DIRECTIONAL_HELPERS_MULTITILE(path, offset) ##path/directional/north {\ - dir = NORTH; \ -} \ -##path/directional/south {\ - dir = SOUTH; \ - pixel_y = -offset; \ -} \ -##path/directional/east {\ - dir = EAST; \ -} \ -##path/directional/west {\ - dir = WEST; \ - pixel_x = -offset; \ -} diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index bfb6d2c79f8..5d6de127162 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -661,50 +661,31 @@ assemblytype = /obj/structure/door_assembly/multi_tile paintable = FALSE -MAPPING_DIRECTIONAL_HELPERS_MULTITILE(/obj/machinery/door/airlock/multi_tile, 32) +/obj/machinery/door/airlock/multi_tile/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change) + . = ..() + update_bounds() /obj/machinery/door/airlock/multi_tile/narsie_act() return -MAPPING_DIRECTIONAL_HELPERS_MULTITILE(/obj/machinery/door/airlock/multi_tile/glass, 32) - /obj/machinery/door/airlock/multi_tile/glass opacity = FALSE glass = TRUE +/// Player view blocking fillers for multi-tile doors /obj/airlock_filler_object name = "airlock fluff" desc = "You shouldn't be able to see this fluff!" - icon = null - icon_state = null density = TRUE opacity = TRUE anchored = TRUE invisibility = INVISIBILITY_MAXIMUM - obj_integrity = INFINITY // our parent airlock/assembly will handle that - //atmos_canpass = CANPASS_DENSITY + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF /// The door/airlock this fluff panel is attached to var/obj/machinery/door/filled_airlock - /// The assembly this fluff panel is attached to - var/obj/structure/door_assembly/filled_assembly /obj/airlock_filler_object/Destroy() filled_airlock = null - filled_assembly = null - return ..() - -/obj/airlock_filler_object/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = TRUE, attack_dir, armour_penetration_flat = 0, armour_penetration_percentage = 0) - if(filled_airlock) - filled_airlock.take_damage(damage_amount, damage_type, damage_flag, sound_effect, attack_dir) - else if(filled_assembly) - filled_assembly.take_damage(damage_amount, damage_type, damage_flag, sound_effect, attack_dir) - return ..() - -/obj/airlock_filler_object/ex_act(severity) - if(filled_airlock) - filled_airlock.ex_act(severity) - else if(filled_assembly) - filled_assembly.ex_act(severity) return ..() /// Multi-tile airlocks pair with a filler panel, if one goes so does the other. @@ -715,31 +696,13 @@ MAPPING_DIRECTIONAL_HELPERS_MULTITILE(/obj/machinery/door/airlock/multi_tile/gla filled_airlock = parent_airlock RegisterSignal(filled_airlock, COMSIG_PARENT_QDELETING, PROC_REF(no_airlock)) -/obj/airlock_filler_object/proc/pair_assembly(obj/structure/door_assembly/parent_assembly) - if(isnull(parent_assembly)) - stack_trace("Attempted to pair an airlock filler with no parent assembly specified!") - - filled_assembly = parent_assembly - RegisterSignal(filled_assembly, COMSIG_PARENT_QDELETING, PROC_REF(no_assembly)) - /obj/airlock_filler_object/proc/no_airlock() UnregisterSignal(filled_airlock) qdel(src) -/obj/airlock_filler_object/proc/no_assembly() - UnregisterSignal(filled_assembly) - qdel(src) - -/// Multi-tile airlocks (using a filler panel) have special handling for movables with PASS_FLAG_GLASS +/// They only block our visuals, not movement /obj/airlock_filler_object/CanPass(atom/movable/mover, border_dir) - if(mover == filled_assembly) - return TRUE - . = ..() - if(.) - return - - if(istype(mover)) - return !opacity + return TRUE /obj/airlock_filler_object/singularity_act() return diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index bc33e513cb5..1c8044b4c8d 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -90,8 +90,9 @@ return update_icon() +/// We don't wanna end up getting ex_act() multiple times because we are located at multiple tiles /obj/machinery/door/ex_act() - if(width > 1 && fillers) + if(width > 1) if(!COOLDOWN_FINISHED(src, explosion_cooldown)) return COOLDOWN_START(src, explosion_cooldown, 1 SECONDS) @@ -442,9 +443,9 @@ /obj/machinery/door/proc/get_airlock_turfs() var/list/airlock_turfs = list(get_turf(src)) - if(width > 1 && fillers) - for(var/obj/F in fillers) - airlock_turfs |= get_turf(F) + if(width > 1) + for(var/i in 1 to width - 1) + airlock_turfs |= get_step(airlock_turfs[i], turn(dir, 90)) return airlock_turfs /obj/machinery/door/proc/check_for_mobs() @@ -561,12 +562,12 @@ QDEL_LIST_CONTENTS(fillers) - if(dir in list(EAST, WEST)) + if(dir in list(SOUTH, NORTH)) bound_width = width * world.icon_size bound_height = world.icon_size bound_y = 0 pixel_y = 0 - if(dir == WEST) + if(dir == NORTH) bound_x = -(width - 1) * world.icon_size pixel_x = -(width - 1) * world.icon_size else @@ -578,7 +579,7 @@ bound_height = width * world.icon_size bound_x = 0 pixel_x = 0 - if(dir == SOUTH) + if(dir == WEST) bound_y = -(width - 1) * world.icon_size pixel_y = -(width - 1) * world.icon_size else @@ -591,17 +592,13 @@ for(var/i in 1 to width - 1) var/obj/airlock_filler_object/filler - if(length(fillers) < i) - filler = new(src) - filler.pair_airlock(src) - fillers.Add(filler) - else - filler = fillers[i] - - filler.loc = get_step(last_filler, dir) + filler = new(src) + filler.pair_airlock(src) + filler.loc = get_step(last_filler, turn(dir, 90)) filler.density = density filler.set_opacity(opacity) + fillers += filler last_filler = filler /obj/machinery/door/proc/set_fillers_density(density) diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index 57b7f51f27c..f8f54b8c5aa 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -89,35 +89,25 @@ // Wise words. - Bxil /obj/machinery/door/poddoor/multi_tile name = "large pod door" + icon = 'icons/obj/doors/blastdoor_1x2.dmi' layer = CLOSED_BLASTDOOR_LAYER closingLayer = CLOSED_BLASTDOOR_LAYER - -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/door/poddoor/multi_tile, 0, 0) - -/obj/machinery/door/poddoor/multi_tile/double - icon = 'icons/obj/doors/blastdoor_1x2.dmi' width = 2 -MAPPING_DIRECTIONAL_HELPERS_MULTITILE(/obj/machinery/door/poddoor/multi_tile/double, 32) - /obj/machinery/door/poddoor/multi_tile/triple icon = 'icons/obj/doors/blastdoor_1x3.dmi' width = 3 -MAPPING_DIRECTIONAL_HELPERS_MULTITILE(/obj/machinery/door/poddoor/multi_tile/triple, 64) - /obj/machinery/door/poddoor/multi_tile/quad icon = 'icons/obj/doors/blastdoor_1x4.dmi' width = 4 -MAPPING_DIRECTIONAL_HELPERS_MULTITILE(/obj/machinery/door/poddoor/multi_tile/quad, 96) - /obj/machinery/door/poddoor/multi_tile/impassable desc = "A heavy duty blast door that opens mechanically. Looks even tougher than usual." + icon = 'icons/obj/doors/blastdoor_1x2.dmi' resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF move_resist = INFINITY - -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/door/poddoor/multi_tile/impassable, 0, 0) + width = 2 /obj/machinery/door/poddoor/multi_tile/impassable/hostile_lockdown() return @@ -129,20 +119,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/door/poddoor/multi_tile/impassable, 0 to_chat(user, "The electronic systems in this door are far too advanced for your primitive hacking peripherals.") return -/obj/machinery/door/poddoor/multi_tile/impassable/double - icon = 'icons/obj/doors/blastdoor_1x2.dmi' - width = 2 - -MAPPING_DIRECTIONAL_HELPERS_MULTITILE(/obj/machinery/door/poddoor/multi_tile/impassable/double, 32) - /obj/machinery/door/poddoor/multi_tile/impassable/triple icon = 'icons/obj/doors/blastdoor_1x3.dmi' width = 3 -MAPPING_DIRECTIONAL_HELPERS_MULTITILE(/obj/machinery/door/poddoor/multi_tile/impassable/triple, 64) - /obj/machinery/door/poddoor/multi_tile/impassable/quad icon = 'icons/obj/doors/blastdoor_1x4.dmi' width = 4 - -MAPPING_DIRECTIONAL_HELPERS_MULTITILE(/obj/machinery/door/poddoor/multi_tile/impassable/quad, 96) diff --git a/code/game/objects/structures/door_assembly_types.dm b/code/game/objects/structures/door_assembly_types.dm index a48abdf346c..3319a4df137 100644 --- a/code/game/objects/structures/door_assembly_types.dm +++ b/code/game/objects/structures/door_assembly_types.dm @@ -137,7 +137,6 @@ base_name = "large airlock" overlays_file = 'icons/obj/doors/airlocks/glass_large/overlays.dmi' var/width = 2 - var/list/fillers airlock_type = /obj/machinery/door/airlock/multi_tile glass_type = /obj/machinery/door/airlock/multi_tile/glass material_amt = 8 @@ -146,9 +145,12 @@ . = ..() if(direction) setDir(direction) + +/obj/structure/door_assembly/multi_tile/setDir(newdir) + . = ..() update_bounds() -/obj/structure/door_assembly/multi_tile/Move(new_loc, new_dir) +/obj/structure/door_assembly/multi_tile/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change) . = ..() update_bounds() @@ -156,12 +158,12 @@ if(width <= 1) return - if(dir in list(EAST, WEST)) + if(dir in list(SOUTH, NORTH)) bound_width = width * world.icon_size bound_height = world.icon_size bound_y = 0 pixel_y = 0 - if(dir == WEST) + if(dir == NORTH) bound_x = -(width - 1) * world.icon_size pixel_x = -(width - 1) * world.icon_size else @@ -173,32 +175,13 @@ bound_height = width * world.icon_size bound_x = 0 pixel_x = 0 - if(dir == SOUTH) + if(dir == WEST) bound_y = -(width - 1) * world.icon_size pixel_y = -(width - 1) * world.icon_size else bound_y = 0 pixel_y = 0 - QDEL_LIST_CONTENTS(fillers) - LAZYINITLIST(fillers) - - var/obj/last_filler = src - for(var/i in 1 to width - 1) - var/obj/airlock_filler_object/filler - - if(length(fillers) < i) - filler = new(src) - filler.pair_assembly(src) - fillers += filler - else - filler = fillers[i] - - filler.loc = get_step(last_filler, dir) - filler.set_opacity(opacity) - - last_filler = filler - /obj/structure/door_assembly/door_assembly_cult name = "cult airlock assembly" icon = 'icons/obj/doors/airlocks/cult/runed/cult.dmi' diff --git a/icons/obj/doors/airlocks/glass_large/glass_large.dmi b/icons/obj/doors/airlocks/glass_large/glass_large.dmi index 692335b89e1..7ca294f4bbd 100644 Binary files a/icons/obj/doors/airlocks/glass_large/glass_large.dmi and b/icons/obj/doors/airlocks/glass_large/glass_large.dmi differ diff --git a/icons/obj/doors/airlocks/glass_large/overlays.dmi b/icons/obj/doors/airlocks/glass_large/overlays.dmi index 3a4c3cb7f90..a7bee344ccb 100644 Binary files a/icons/obj/doors/airlocks/glass_large/overlays.dmi and b/icons/obj/doors/airlocks/glass_large/overlays.dmi differ diff --git a/icons/obj/doors/blastdoor_1x2.dmi b/icons/obj/doors/blastdoor_1x2.dmi index 8e9eb954468..ebf4928c542 100644 Binary files a/icons/obj/doors/blastdoor_1x2.dmi and b/icons/obj/doors/blastdoor_1x2.dmi differ diff --git a/icons/obj/doors/blastdoor_1x3.dmi b/icons/obj/doors/blastdoor_1x3.dmi index e1947750ef2..8ca38d42dcb 100644 Binary files a/icons/obj/doors/blastdoor_1x3.dmi and b/icons/obj/doors/blastdoor_1x3.dmi differ diff --git a/icons/obj/doors/blastdoor_1x4.dmi b/icons/obj/doors/blastdoor_1x4.dmi index 8b8b0d77f3a..e7dfb320fa6 100644 Binary files a/icons/obj/doors/blastdoor_1x4.dmi and b/icons/obj/doors/blastdoor_1x4.dmi differ diff --git a/icons/obj/doors/door2x1glass.dmi b/icons/obj/doors/door2x1glass.dmi index f2da356e500..18b1fa7df8e 100644 Binary files a/icons/obj/doors/door2x1glass.dmi and b/icons/obj/doors/door2x1glass.dmi differ diff --git a/icons/obj/doors/door_assembly2x1.dmi b/icons/obj/doors/door_assembly2x1.dmi index 0b83b172504..4fe0381587b 100644 Binary files a/icons/obj/doors/door_assembly2x1.dmi and b/icons/obj/doors/door_assembly2x1.dmi differ diff --git a/tools/UpdatePaths/Scripts/29551_non_dir_doors_part1.txt b/tools/UpdatePaths/Scripts/29551_non_dir_doors_part1.txt new file mode 100644 index 00000000000..9a16ee200d3 --- /dev/null +++ b/tools/UpdatePaths/Scripts/29551_non_dir_doors_part1.txt @@ -0,0 +1,9 @@ +/obj/machinery/door/poddoor/multi_tile/directional/north : /obj/machinery/door/poddoor{@OLD} +/obj/machinery/door/poddoor/multi_tile/directional/east : /obj/machinery/door/poddoor{@OLD} +/obj/machinery/door/poddoor/multi_tile/directional/west : /obj/machinery/door/poddoor{@OLD} +/obj/machinery/door/poddoor/multi_tile/directional/south : /obj/machinery/door/poddoor{@OLD} + +/obj/machinery/door/poddoor/multi_tile/impassable/directional/north : /obj/machinery/door/poddoor/impassable{@OLD} +/obj/machinery/door/poddoor/multi_tile/impassable/directional/east : /obj/machinery/door/poddoor/impassable{@OLD} +/obj/machinery/door/poddoor/multi_tile/impassable/directional/west : /obj/machinery/door/poddoor/impassable{@OLD} +/obj/machinery/door/poddoor/multi_tile/impassable/directional/south : /obj/machinery/door/poddoor/impassable{@OLD} diff --git a/tools/UpdatePaths/Scripts/29551_non_dir_doors_part2.txt b/tools/UpdatePaths/Scripts/29551_non_dir_doors_part2.txt new file mode 100644 index 00000000000..ff66c44954d --- /dev/null +++ b/tools/UpdatePaths/Scripts/29551_non_dir_doors_part2.txt @@ -0,0 +1,39 @@ +/obj/machinery/door/poddoor/multi_tile/quad/directional/north : /obj/machinery/door/poddoor/multi_tile/quad{@OLD;dir=4} +/obj/machinery/door/poddoor/multi_tile/quad/directional/south : /obj/machinery/door/poddoor/multi_tile/quad{@OLD;dir=8} +/obj/machinery/door/poddoor/multi_tile/quad/directional/east : /obj/machinery/door/poddoor/multi_tile/quad{@OLD;dir=@SKIP} +/obj/machinery/door/poddoor/multi_tile/quad/directional/west : /obj/machinery/door/poddoor/multi_tile/quad{@OLD;dir=1} + +/obj/machinery/door/poddoor/multi_tile/triple/directional/north : /obj/machinery/door/poddoor/multi_tile/triple{@OLD;dir=4} +/obj/machinery/door/poddoor/multi_tile/triple/directional/south : /obj/machinery/door/poddoor/multi_tile/triple{@OLD;dir=8} +/obj/machinery/door/poddoor/multi_tile/triple/directional/east : /obj/machinery/door/poddoor/multi_tile/triple{@OLD;dir=@SKIP} +/obj/machinery/door/poddoor/multi_tile/triple/directional/west : /obj/machinery/door/poddoor/multi_tile/triple{@OLD;dir=1} + +/obj/machinery/door/poddoor/multi_tile/double/directional/north : /obj/machinery/door/poddoor/multi_tile{@OLD;dir=4} +/obj/machinery/door/poddoor/multi_tile/double/directional/south : /obj/machinery/door/poddoor/multi_tile{@OLD;dir=8} +/obj/machinery/door/poddoor/multi_tile/double/directional/east : /obj/machinery/door/poddoor/multi_tile{@OLD;dir=@SKIP} +/obj/machinery/door/poddoor/multi_tile/double/directional/west : /obj/machinery/door/poddoor/multi_tile{@OLD;dir=1} + +/obj/machinery/door/poddoor/multi_tile/impassable/quad/directional/north : /obj/machinery/door/poddoor/multi_tile/impassable/quad{@OLD;dir=4} +/obj/machinery/door/poddoor/multi_tile/impassable/quad/directional/south : /obj/machinery/door/poddoor/multi_tile/impassable/quad{@OLD;dir=8} +/obj/machinery/door/poddoor/multi_tile/impassable/quad/directional/east : /obj/machinery/door/poddoor/multi_tile/impassable/quad{@OLD;dir=@SKIP} +/obj/machinery/door/poddoor/multi_tile/impassable/quad/directional/west : /obj/machinery/door/poddoor/multi_tile/impassable/quad{@OLD;dir=1} + +/obj/machinery/door/poddoor/multi_tile/impassable/triple/directional/north : /obj/machinery/door/poddoor/multi_tile/impassable/triple{@OLD;dir=4} +/obj/machinery/door/poddoor/multi_tile/impassable/triple/directional/south : /obj/machinery/door/poddoor/multi_tile/impassable/triple{@OLD;dir=8} +/obj/machinery/door/poddoor/multi_tile/impassable/triple/directional/east : /obj/machinery/door/poddoor/multi_tile/impassable/triple{@OLD;dir=@SKIP} +/obj/machinery/door/poddoor/multi_tile/impassable/triple/directional/west : /obj/machinery/door/poddoor/multi_tile/impassable/triple{@OLD;dir=1} + +/obj/machinery/door/poddoor/multi_tile/impassable/double/directional/north : /obj/machinery/door/poddoor/multi_tile/impassable{@OLD;dir=4} +/obj/machinery/door/poddoor/multi_tile/impassable/double/directional/south : /obj/machinery/door/poddoor/multi_tile/impassable{@OLD;dir=8} +/obj/machinery/door/poddoor/multi_tile/impassable/double/directional/east : /obj/machinery/door/poddoor/multi_tile/impassable{@OLD;dir=@SKIP} +/obj/machinery/door/poddoor/multi_tile/impassable/double/directional/west : /obj/machinery/door/poddoor/multi_tile/impassable{@OLD;dir=1} + +/obj/machinery/door/airlock/multi_tile/directional/north : /obj/machinery/door/airlock/multi_tile{@OLD;dir=4} +/obj/machinery/door/airlock/multi_tile/directional/south : /obj/machinery/door/airlock/multi_tile{@OLD;dir=8} +/obj/machinery/door/airlock/multi_tile/directional/east : /obj/machinery/door/airlock/multi_tile{@OLD;dir=@SKIP} +/obj/machinery/door/airlock/multi_tile/directional/west : /obj/machinery/door/airlock/multi_tile{@OLD;dir=1} + +/obj/machinery/door/airlock/multi_tile/glass/directional/north : /obj/machinery/door/airlock/multi_tile/glass{@OLD;dir=4} +/obj/machinery/door/airlock/multi_tile/glass/directional/south : /obj/machinery/door/airlock/multi_tile/glass{@OLD;dir=8} +/obj/machinery/door/airlock/multi_tile/glass/directional/east : /obj/machinery/door/airlock/multi_tile/glass{@OLD;dir=@SKIP} +/obj/machinery/door/airlock/multi_tile/glass/directional/west : /obj/machinery/door/airlock/multi_tile/glass{@OLD;dir=1} diff --git a/tools/maplint/lints/directional_airlocks.yml b/tools/maplint/lints/directional_airlocks.yml index 4b37590be75..a5ab204d34b 100644 --- a/tools/maplint/lints/directional_airlocks.yml +++ b/tools/maplint/lints/directional_airlocks.yml @@ -1,45 +1,13 @@ -help: "Use the specific directional subtypes for this poddoor. Run 28928_directional_doors.txt to fix this." +help: Multitile airlocks might have pixel offset after Initialize, use them only with directions of SOUTH or EAST /obj/machinery/door/poddoor/multi_tile: banned_variables: - - pixel_x - - pixel_y - - dir -=/obj/machinery/door/poddoor/multi_tile/double: - banned: TRUE -=/obj/machinery/door/poddoor/multi_tile/double/directional: - banned: TRUE -=/obj/machinery/door/poddoor/multi_tile/triple: - banned: TRUE -=/obj/machinery/door/poddoor/multi_tile/triple/directional: - banned: TRUE -=/obj/machinery/door/poddoor/multi_tile/quad: - banned: TRUE -=/obj/machinery/door/poddoor/multi_tile/quad/directional: - banned: TRUE -=/obj/machinery/door/poddoor/multi_tile/impassable: - banned: TRUE -=/obj/machinery/door/poddoor/multi_tile/impassable/double: - banned: TRUE -=/obj/machinery/door/poddoor/multi_tile/impassable/double/directional: - banned: TRUE -=/obj/machinery/door/poddoor/multi_tile/impassable/triple: - banned: TRUE -=/obj/machinery/door/poddoor/multi_tile/impassable/triple/directional: - banned: TRUE -=/obj/machinery/door/poddoor/multi_tile/impassable/quad: - banned: TRUE -=/obj/machinery/door/poddoor/multi_tile/impassable/quad/directional: - banned: TRUE + dir: + allow: [2, 4] + pixel_x: + pixel_y: /obj/machinery/door/airlock/multi_tile: banned_variables: - - pixel_x - - pixel_y - - dir -=/obj/machinery/door/airlock/multi_tile: - banned: TRUE -=/obj/machinery/door/airlock/multi_tile/directional: - banned: TRUE -=/obj/machinery/door/airlock/multi_tile/glass: - banned: TRUE -=/obj/machinery/door/airlock/multi_tile/glass/directional: - banned: TRUE + dir: + allow: [2, 4] + pixel_x: + pixel_y: