From 28593d67ed9f1b15b59a0edb4cd45e3fc11b9667 Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Fri, 27 Oct 2023 12:36:28 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=D0=90=D0=B2=D1=82=D0=BE=D0=BC=D0=B0=D1=82?= =?UTF-8?q?=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B0=D1=8F=20=D0=BA=D0=BE=D0=BC?= =?UTF-8?q?=D0=BF=D0=B8=D0=BB=D1=8F=D1=86=D0=B8=D1=8F=20=D1=87=D0=B5=D0=B9?= =?UTF-8?q?=D0=BD=D0=B4=D0=B6=D0=BB=D0=BE=D0=B3=D0=BE=D0=B2=20[ci=20skip]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html/changelog.html | 5 +++++ html/changelogs/.all_changelog.yml | 5 +++++ html/changelogs/AutoChangeLog-sierra-pr-1183.yml | 4 ---- html/changelogs/AutoChangeLog-sierra-pr-1185.yml | 4 ---- 4 files changed, 10 insertions(+), 8 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1183.yml delete mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1185.yml diff --git a/html/changelog.html b/html/changelog.html index 8cf04f19d118a..0c40a7e8700a0 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -33,6 +33,11 @@

Обновления SierraKomodo:

Arterial bleeds no longer cause confusion or blurred vision when they trigger.
+

Обновления SuhEugene:

+
+
Пофиксил двойные шлюзы новой карты.
+
Fixed airlock control terminal icon.
+

23.10 - 2023

Обновления CuddleAndTea:

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index b9903b85916a6..ce44fccd98e29 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -22088,3 +22088,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY sierra_genchangelog.p SierraKomodo: - balance: Arterial bleeds no longer cause confusion or blurred vision when they trigger. + SuhEugene: + - bugfix: "\u041F\u043E\u0444\u0438\u043A\u0441\u0438\u043B \u0434\u0432\u043E\u0439\ + \u043D\u044B\u0435 \u0448\u043B\u044E\u0437\u044B \u043D\u043E\u0432\u043E\u0439\ + \ \u043A\u0430\u0440\u0442\u044B." + - bugfix: Fixed airlock control terminal icon. diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1183.yml b/html/changelogs/AutoChangeLog-sierra-pr-1183.yml deleted file mode 100644 index 66b0485f913ba..0000000000000 --- a/html/changelogs/AutoChangeLog-sierra-pr-1183.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: SuhEugene -changes: - - {bugfix: Fixed airlock control terminal icon.} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1185.yml b/html/changelogs/AutoChangeLog-sierra-pr-1185.yml deleted file mode 100644 index 6f3e350781e6e..0000000000000 --- a/html/changelogs/AutoChangeLog-sierra-pr-1185.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: SuhEugene -changes: - - {bugfix: Пофиксил двойные шлюзы новой карты.} -delete-after: true From 14efbd28b9ca61f3216881567905638d7e72462f Mon Sep 17 00:00:00 2001 From: SuhEugene <32931701+SuhEugene@users.noreply.github.com> Date: Fri, 27 Oct 2023 15:59:15 +0300 Subject: [PATCH 2/2] Revert "Fix breaking arilock dirs" This reverts commit 774cdf54460378f4520ced05bad7d2e7fbf8b4e5. --- maps/sierra/_references/map-refs.dmm | 1 + maps/sierra/z1-z5_sierra.dmm | 89 +++++++++++++++++++++------- maps/sierra/z6_admin.dmm | 4 +- 3 files changed, 73 insertions(+), 21 deletions(-) diff --git a/maps/sierra/_references/map-refs.dmm b/maps/sierra/_references/map-refs.dmm index c65b0ddd04a46..e0ca170b5dce9 100644 --- a/maps/sierra/_references/map-refs.dmm +++ b/maps/sierra/_references/map-refs.dmm @@ -155,6 +155,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/multi_tile/glass/research{ + dir = 8; icon_state = "closed"; id_tag = "PetrovAccess"; name = "Petrov Access" diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm index 07f6ccc465d9e..a2895c58d58f0 100644 --- a/maps/sierra/z1-z5_sierra.dmm +++ b/maps/sierra/z1-z5_sierra.dmm @@ -3641,7 +3641,9 @@ /turf/simulated/floor/tiled, /area/crew_quarters/docking) "aBp" = ( -/obj/machinery/door/airlock/multi_tile/maintenance, +/obj/machinery/door/airlock/multi_tile/maintenance{ + dir = 8 + }, /obj/machinery/door/firedoor, /obj/floor_decal/techfloor, /obj/structure/cable{ @@ -14036,7 +14038,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/multi_tile/maintenance, +/obj/machinery/door/airlock/multi_tile/maintenance{ + dir = 8 + }, /obj/machinery/door/firedoor{ dir = 4 }, @@ -17297,6 +17301,7 @@ name = "Infirmary Entry Shutters" }, /obj/machinery/door/airlock/multi_tile/glass/medical{ + dir = 8; id_tag = "MedbayER"; name = "Treatment Center" }, @@ -18830,7 +18835,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/multi_tile/maintenance, +/obj/machinery/door/airlock/multi_tile/maintenance{ + dir = 8 + }, /obj/machinery/door/firedoor{ dir = 4 }, @@ -21178,7 +21185,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/multi_tile/maintenance, +/obj/machinery/door/airlock/multi_tile/maintenance{ + dir = 8 + }, /obj/machinery/door/firedoor{ dir = 4 }, @@ -33926,7 +33935,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/multi_tile/maintenance, +/obj/machinery/door/airlock/multi_tile/maintenance{ + dir = 8 + }, /obj/machinery/door/firedoor{ dir = 4 }, @@ -39629,7 +39640,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/multi_tile/maintenance, +/obj/machinery/door/airlock/multi_tile/maintenance{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virology/atmos) "fZy" = ( @@ -40934,7 +40947,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/multi_tile/maintenance, +/obj/machinery/door/airlock/multi_tile/maintenance{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -43273,7 +43288,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/multi_tile/maintenance, +/obj/machinery/door/airlock/multi_tile/maintenance{ + dir = 8 + }, /obj/machinery/door/firedoor{ dir = 4 }, @@ -59047,6 +59064,7 @@ /area/rnd/toxins) "jdY" = ( /obj/machinery/door/airlock/multi_tile/research{ + dir = 8; frequency = 1379; id_tag = "xenolow_airlock_inner"; locked = 1; @@ -63047,7 +63065,9 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/multi_tile/maintenance, +/obj/machinery/door/airlock/multi_tile/maintenance{ + dir = 8 + }, /obj/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/primary/seconddeck/center) @@ -79793,7 +79813,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/multi_tile/maintenance, +/obj/machinery/door/airlock/multi_tile/maintenance{ + dir = 8 + }, /obj/machinery/door/firedoor{ dir = 4 }, @@ -81413,7 +81435,9 @@ icon_state = "4-8" }, /obj/floor_decal/industrial/hatch/yellow, -/obj/machinery/door/airlock/multi_tile/maintenance, +/obj/machinery/door/airlock/multi_tile/maintenance{ + dir = 8 + }, /obj/machinery/door/firedoor{ dir = 4 }, @@ -84300,6 +84324,7 @@ /obj/machinery/door/firedoor, /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/airlock/multi_tile/research{ + dir = 8; frequency = null; id_tag = null; name = "Xenobiology Atmospherics" @@ -84704,7 +84729,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/multi_tile/maintenance, +/obj/machinery/door/airlock/multi_tile/maintenance{ + dir = 8 + }, /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor{ dir = 4 @@ -92729,7 +92756,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/multi_tile/maintenance, +/obj/machinery/door/airlock/multi_tile/maintenance{ + dir = 8 + }, /obj/machinery/door/firedoor{ dir = 4 }, @@ -94093,7 +94122,9 @@ /obj/machinery/door/firedoor{ dir = 4 }, -/obj/machinery/door/airlock/multi_tile/maintenance, +/obj/machinery/door/airlock/multi_tile/maintenance{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/thirddeck/aftstarboard) "ozF" = ( @@ -96372,6 +96403,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/multi_tile/maintenance{ + dir = 8; req_access = newlist() }, /obj/machinery/door/firedoor{ @@ -96526,6 +96558,7 @@ }, /obj/machinery/door/airlock/multi_tile/glass/security{ id_tag = "security_entry_airlock_enter"; + dir = 8; name = "Security Entry" }, /turf/simulated/floor/tiled/monotile, @@ -106845,6 +106878,7 @@ }, /obj/machinery/door/airlock/multi_tile/glass/security{ id_tag = "security_entry_airlock_exit"; + dir = 8; name = "Security Exit" }, /turf/simulated/floor/tiled/monotile, @@ -112381,7 +112415,9 @@ /area/engineering/gravitaional_generator) "rpl" = ( /obj/floor_decal/industrial/hatch/yellow, -/obj/machinery/door/airlock/multi_tile/glass/maintenance, +/obj/machinery/door/airlock/multi_tile/glass/maintenance{ + dir = 8 + }, /obj/machinery/door/firedoor{ dir = 4 }, @@ -116475,7 +116511,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/multi_tile/glass/engineering, +/obj/machinery/door/airlock/multi_tile/glass/engineering{ + dir = 8 + }, /obj/machinery/door/firedoor{ dir = 4 }, @@ -117029,7 +117067,9 @@ /area/maintenance/seconddeck/foreport) "rZZ" = ( /obj/floor_decal/industrial/hatch/yellow, -/obj/machinery/door/airlock/multi_tile/maintenance, +/obj/machinery/door/airlock/multi_tile/maintenance{ + dir = 8 + }, /obj/machinery/door/firedoor{ dir = 4 }, @@ -124571,6 +124611,7 @@ dir = 4 }, /obj/machinery/door/airlock/multi_tile/medical{ + dir = 8; door_color = "#4c535b" }, /turf/simulated/floor/tiled/dark/monotile, @@ -131754,6 +131795,7 @@ "une" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/multi_tile/civilian{ + dir = 8; name = "Holodeck" }, /obj/floor_decal/industrial/hatch/yellow, @@ -132579,6 +132621,7 @@ dir = 4 }, /obj/machinery/door/airlock/multi_tile/glass/research{ + dir = 8; id_tag = "PetrovAccess"; name = "Petrov Access" }, @@ -134675,6 +134718,7 @@ "uKy" = ( /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/airlock/multi_tile/maintenance{ + dir = 8; autoset_access = 0 }, /obj/machinery/door/firedoor{ @@ -142313,7 +142357,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/multi_tile/glass/engineering, +/obj/machinery/door/airlock/multi_tile/glass/engineering{ + dir = 8 + }, /obj/machinery/door/firedoor{ dir = 4 }, @@ -146174,7 +146220,8 @@ "wxd" = ( /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/airlock/multi_tile/glass/engineering{ - req_access = newlist() + req_access = newlist(); + dir = 8 }, /obj/machinery/door/firedoor{ dir = 4 @@ -152117,6 +152164,7 @@ dir = 4 }, /obj/machinery/door/airlock/multi_tile/atmos{ + dir = 8; name = "Bridge Atmospherics Supply" }, /turf/simulated/floor/tiled/techfloor/grid, @@ -153633,7 +153681,8 @@ /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/airlock/multi_tile/medical{ id_tag = "MedbayER2"; - name = "Critical Wing" + name = "Critical Wing"; + dir = 8 }, /turf/simulated/floor/tiled/dark/monotile, /area/medical/sleeper) diff --git a/maps/sierra/z6_admin.dmm b/maps/sierra/z6_admin.dmm index 79014d184a5b4..f091791a697c9 100644 --- a/maps/sierra/z6_admin.dmm +++ b/maps/sierra/z6_admin.dmm @@ -12116,7 +12116,9 @@ }, /area/centcom/living) "kTF" = ( -/obj/machinery/door/airlock/multi_tile, +/obj/machinery/door/airlock/multi_tile{ + dir = 8 + }, /obj/structure/disposalpipe/segment{ dir = 4 },