From 68b3df8c46938471bf3935d1ceab1689018e104b Mon Sep 17 00:00:00 2001 From: konushi <139562134+konushi@users.noreply.github.com> Date: Wed, 19 Jun 2024 15:11:28 +0300 Subject: [PATCH] Fix: awaymissions id issue (#1329) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Что этот PR делает После обновления эксплореров у старых ID карт доступ стал ACCESS_THETA_STATION (301). Появление тетовцев в гейтах маловероятно, поэтому просто поменял доступы машинерии на 301. Убрал забытые активные турфы в гейте космобитва. ## Почему это хорошо для игры Машинерия с доступами снова работает в гейтах. ## Изображения изменений ## Тестирование ## Changelog :cl: fix: Починил сломанные доступы в гейтах. /:cl: --- .../RandomZLevels/gate_lizard.dmm | 99 +++++++++++-------- .../RandomZLevels/spacebattle.dmm | 38 +++++-- 2 files changed, 86 insertions(+), 51 deletions(-) diff --git a/_maps/map_files220/RandomZLevels/gate_lizard.dmm b/_maps/map_files220/RandomZLevels/gate_lizard.dmm index aa36cd8bb0d9..134220ff847e 100644 --- a/_maps/map_files220/RandomZLevels/gate_lizard.dmm +++ b/_maps/map_files220/RandomZLevels/gate_lizard.dmm @@ -143,7 +143,7 @@ /obj/effect/turf_decal/delivery/white, /obj/machinery/door_control/shutter/north{ id = "Main in"; - req_access = list(271) + req_access = list(301) }, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) @@ -246,7 +246,7 @@ /obj/item/clothing/accessory/stethoscope, /obj/machinery/door_control/shutter/west{ id = "CMDgate"; - req_access = list(271) + req_access = list(301) }, /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ @@ -570,8 +570,8 @@ "aRy" = ( /obj/machinery/door/airlock/mining{ locked = 1; - name = "Main Hangar"; - req_access = list(271); + name = "main Hangar"; + req_access = list(301); id_tag = "commanddoor" }, /obj/machinery/door/firedoor, @@ -1775,11 +1775,11 @@ }, /obj/machinery/door/airlock/mining{ name = "second hangar"; - req_access = list(271) + req_access = list(301) }, /obj/machinery/door_control/shutter/north{ id = "Cargo out"; - req_access = list(271) + req_access = list(301) }, /turf/simulated/floor/plasteel{ dir = 4; @@ -2171,7 +2171,7 @@ /obj/machinery/door/airlock/engineering{ locked = 1; name = "engineering"; - req_access = list(271) + req_access = list(301) }, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) @@ -2960,7 +2960,7 @@ /obj/machinery/door_control/shutter/north{ name = "Armory Shutters-control"; id = "Arm in"; - req_access = list(271) + req_access = list(301) }, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ @@ -3722,7 +3722,7 @@ "eRi" = ( /obj/machinery/door_control/shutter/east{ id = "Right in"; - req_access = list(271) + req_access = list(301) }, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) @@ -5170,6 +5170,22 @@ name = "ground" }, /area/awaymission/jungle_planet/outside/cave) +"gUi" = ( +/obj/machinery/door/airlock/mining{ + name = "second hangar"; + locked = 1; + req_access = list(301); + id_tag = "hang2in" + }, +/obj/machinery/door/poddoor/shutters{ + dir = 8; + id_tag = "Cargo in" + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkneutralfull" + }, +/area/awaymission/jungle_planet/inside) "gUQ" = ( /obj/effect/spawner/random_spawners/dirt_maybe, /obj/item/shovel{ @@ -5291,7 +5307,7 @@ "hbL" = ( /obj/machinery/door/airlock/medical{ name = "morgue"; - req_access = list(271) + req_access = list(301) }, /turf/simulated/floor/plasteel{ dir = 5; @@ -6172,7 +6188,7 @@ /obj/machinery/door/airlock/security{ locked = 1; name = "security"; - req_access = list(271) + req_access = list(301) }, /obj/machinery/door/poddoor/shutters{ id_tag = "Sec in"; @@ -6243,7 +6259,7 @@ /obj/machinery/door/airlock/mining{ locked = 1; name = "main hangar"; - req_access = list(271) + req_access = list(301) }, /obj/machinery/door/poddoor/shutters{ dir = 2; @@ -6511,7 +6527,7 @@ "iAq" = ( /obj/machinery/door/airlock/medical{ name = "medbay"; - req_access = list(271) + req_access = list(301) }, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel, @@ -7458,7 +7474,7 @@ /obj/effect/decal/cleanable/blood/old, /obj/machinery/door_control/shutter/south{ id = "Cargo in"; - req_access = list(271) + req_access = list(301) }, /turf/simulated/floor/plasteel{ dir = 4; @@ -7649,7 +7665,7 @@ /obj/machinery/door_control/shutter/south{ id = "Sec in"; name = "Security Shutters-control"; - req_access = list(271) + req_access = list(301) }, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ @@ -8360,9 +8376,9 @@ /area/awaymission/jungle_planet/inside/complex) "kLd" = ( /obj/machinery/economy/vending/medical{ - req_access = list(271) + req_access = list(301) }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random_spawners/dirt_maybe, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -9204,7 +9220,7 @@ }, /obj/machinery/door/airlock/mining{ name = "second hangar"; - req_access = list(271) + req_access = list(301) }, /turf/simulated/floor/plasteel{ dir = 4; @@ -9532,13 +9548,9 @@ /obj/machinery/door/airlock/mining{ name = "second hangar"; locked = 1; - req_access = list(271); + req_access = list(301); id_tag = "hang2in" }, -/obj/machinery/door/poddoor/shutters{ - dir = 8; - id_tag = "Cargo in" - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -9556,7 +9568,7 @@ /obj/machinery/door/airlock/security{ locked = 1; name = "security"; - req_access = list(271) + req_access = list(301) }, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel, @@ -10255,19 +10267,20 @@ pixel_x = 8; id = "Command"; name = "command shsutters control"; - req_access = list(271) + req_access = list(301) }, /obj/machinery/door_control/shutter{ pixel_x = -8; name = "shutters control"; id = "Hang in"; - req_access = list(271) + req_access = list(301) }, /obj/machinery/door_control/bolt_control{ pixel_y = 8; in_use = 1; desiredstate_open = 1; - id = "commanddoor" + id = "commanddoor"; + req_access = list(301) }, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) @@ -11331,7 +11344,7 @@ }, /obj/machinery/door/airlock/mining{ name = "second hangar"; - req_access = list(271) + req_access = list(301) }, /turf/simulated/floor/plasteel{ dir = 4; @@ -11779,7 +11792,7 @@ /obj/machinery/door/airlock/command{ locked = 1; name = "command"; - req_access = list(271) + req_access = list(301) }, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, @@ -12925,7 +12938,7 @@ /obj/machinery/door/airlock/mining{ locked = 1; name = "main hangar"; - req_access = list(271) + req_access = list(301) }, /obj/machinery/door/poddoor/shutters{ dir = 8; @@ -13047,7 +13060,7 @@ /obj/machinery/door/firedoor/closed, /obj/machinery/door/airlock/engineering{ name = "engineering"; - req_access = list(271) + req_access = list(301) }, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) @@ -13740,7 +13753,7 @@ }, /obj/machinery/door/airlock/mining{ name = "main hangar"; - req_access = list(271) + req_access = list(301) }, /obj/machinery/door/poddoor/shutters{ dir = 2; @@ -13964,7 +13977,7 @@ "rNJ" = ( /obj/machinery/door_control/shutter/south{ id = "Main in"; - req_access = list(271); + req_access = list(301); interact_offline = 1 }, /obj/effect/spawner/random_spawners/dirt_maybe, @@ -14830,7 +14843,7 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/door_control/shutter/south{ id = "Cargo in"; - req_access = list(271) + req_access = list(301) }, /turf/simulated/floor/plasteel{ dir = 4; @@ -15378,7 +15391,7 @@ /obj/machinery/door/airlock/mining{ name = "second hangar"; locked = 1; - req_access = list(271); + req_access = list(301); id_tag = "hang2in" }, /obj/effect/decal/cleanable/blood/writing{ @@ -15724,7 +15737,7 @@ /obj/machinery/door/airlock/mining{ locked = 1; name = "main hangar"; - req_access = list(271) + req_access = list(301) }, /turf/simulated/floor/plasteel{ dir = 4; @@ -17250,7 +17263,7 @@ /obj/machinery/door/airlock/security{ locked = 1; name = "security"; - req_access = list(271) + req_access = list(301) }, /turf/simulated/floor/plasteel{ dir = 1; @@ -18325,7 +18338,7 @@ /obj/machinery/door/airlock/command{ locked = 1; name = "command"; - req_access = list(271); + req_access = list(301); id_tag = "commanddoor" }, /obj/machinery/door/firedoor/closed, @@ -18346,7 +18359,7 @@ /obj/machinery/door/airlock/security{ locked = 1; name = "security"; - req_access = list(271) + req_access = list(301) }, /turf/simulated/floor/plasteel{ dir = 4; @@ -18427,7 +18440,7 @@ /obj/machinery/door_control/shutter/south{ name = "Armory Shutters-control"; id = "Arm in"; - req_access = list(271) + req_access = list(301) }, /turf/simulated/floor/plasteel{ dir = 8; @@ -18898,7 +18911,7 @@ "xPr" = ( /obj/machinery/door/airlock/research{ name = "robotech"; - req_access = list(271) + req_access = list(301) }, /obj/machinery/door/firedoor/closed, /turf/simulated/floor/plasteel, @@ -19003,7 +19016,7 @@ /obj/machinery/door/airlock/security{ locked = 1; name = "security"; - req_access = list(271) + req_access = list(301) }, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) @@ -27991,7 +28004,7 @@ wJh wJh fQm fQm -mky +gUi tzH mky vPN diff --git a/_maps/map_files220/RandomZLevels/spacebattle.dmm b/_maps/map_files220/RandomZLevels/spacebattle.dmm index 0e1ec223118a..060e90b7f1f4 100644 --- a/_maps/map_files220/RandomZLevels/spacebattle.dmm +++ b/_maps/map_files220/RandomZLevels/spacebattle.dmm @@ -324,6 +324,13 @@ icon_state = "floor_large" }, /area/awaymission/space_battle/cruiser) +"aX" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/deliveryChute, +/turf/simulated/floor/plating, +/area/awaymission/space_battle/hallway11) "aY" = ( /obj/structure/table/reinforced{ color = "#444444" @@ -1818,7 +1825,8 @@ dir = 8 }, /obj/machinery/door/window/reinforced/normal{ - dir = 1 + dir = 1; + req_access = list(301) }, /obj/structure/rack, /turf/simulated/floor/plasteel/dark, @@ -2233,7 +2241,8 @@ dir = 8 }, /obj/machinery/door/window/reinforced/normal{ - dir = 1 + dir = 1; + req_access = list(301) }, /obj/structure/rack, /obj/item/ammo_box/magazine/enforcer/lethal, @@ -6363,7 +6372,8 @@ dir = 8 }, /obj/machinery/door/window/reinforced/normal{ - dir = 1 + dir = 1; + req_access = list(301) }, /obj/structure/rack, /obj/item/clothing/head/helmet, @@ -6886,6 +6896,16 @@ /obj/structure/lattice, /turf/space, /area/awaymission/space_battle/hallway2) +"vx" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/transit_tube, +/obj/machinery/constructable_frame{ + layer = 4; + icon = 'icons/obj/singularity.dmi'; + icon_state = "TheSingGen" + }, +/turf/simulated/floor/plating, +/area/awaymission/space_battle/hallway11) "vy" = ( /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plasteel{ @@ -10743,7 +10763,7 @@ "Hk" = ( /obj/machinery/door/airlock/security{ name = "Armory"; - req_access = list(271) + req_access = list(301) }, /turf/simulated/floor/plasteel, /area/awaymission/space_battle/hallway8) @@ -11723,7 +11743,8 @@ /obj/machinery/door/airlock/highsecurity, /obj/machinery/door/poddoor{ layer = 3.2; - id_tag = "GATE" + id_tag = "GATE"; + interact_offline = 1 }, /turf/simulated/floor/plasteel, /area/awaymission/space_battle/sec_storage) @@ -14441,7 +14462,8 @@ dir = 8 }, /obj/machinery/door/window/reinforced/normal{ - dir = 1 + dir = 1; + req_access = list(301) }, /obj/structure/rack, /obj/item/clothing/shoes/jackboots/noisy{ @@ -40596,8 +40618,8 @@ yG Iq bb XG -pq -cq +vx +aX vS ND mf