From 9852b463820497b3d90fcb99325d46f56b8204c2 Mon Sep 17 00:00:00 2001 From: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com> Date: Mon, 18 Nov 2024 07:54:23 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=B1=D1=83=D1=80=D0=B3=D0=B5=D1=80=20(#78?= =?UTF-8?q?4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/Entities/Structures/Doors/airlock_groups.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml index 93abaccc65..27ec6e658d 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml @@ -13,7 +13,7 @@ science: Structures/Doors/Airlocks/Standard/science.rsi security: Structures/Doors/Airlocks/Standard/security.rsi virology: Structures/Doors/Airlocks/Standard/virology.rsi - syndicate: Structures/Doors/Airlocks/Standard/syndicate.rsi + syndicate: Structures/Doors/Airlocks/Standard/syndicate.rsi # WD EDIT - type: AirlockGroup id: Glass @@ -30,7 +30,7 @@ medical: Structures/Doors/Airlocks/Glass/medical.rsi security: Structures/Doors/Airlocks/Glass/security.rsi virology: Structures/Doors/Airlocks/Glass/virology.rsi - syndicate: Structures/Doors/Airlocks/Glass/syndicate.rsi + syndicate: Structures/Doors/Airlocks/Glass/syndicate.rsi # WD EDIT - type: AirlockGroup id: Windoor @@ -61,6 +61,7 @@ iconPriority: 40 stylePaths: shuttle: Structures/Doors/Airlocks/Glass/shuttle.rsi + syndicate: Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi # WD EDIT # fun - type: airlockDepartments From a629b1d93c6a66eab96be3ca412e3ead91e47c52 Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Mon, 18 Nov 2024 04:55:26 +0000 Subject: [PATCH 2/2] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index fdbebd37e0..f48d62c24f 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,15 +1,4 @@ Entries: -- author: KettlebellOfCreation - changes: - - message: "\u0442\u0435\u043F\u0435\u0440\u044C, \u043A\u0430\u043A \u0442\u043E\ - \u043B\u044C\u043A\u043E \u0437\u0430\u043A\u0430\u043D\u0447\u0438\u0432\u0430\ - \u0435\u0442\u0441\u044F \u0442\u043E\u043F\u043B\u0438\u0432\u043E \u0443 \u0414\ - \u0410\u041C\u0430, \u0432\u044B\u043A\u043B\u044E\u0447\u0430\u0435\u0442\u0441\ - \u044F \u0432\u043F\u0440\u044B\u0441\u043A\u0438\u0432\u0430\u043D\u0438\u0435\ - ." - type: Add - id: 107 - time: '2023-03-06T20:39:05.0000000+00:00' - author: KettlebellOfCreation changes: - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0430\u043D\u0442\ @@ -8871,3 +8860,17 @@ id: 606 time: '2024-11-16T19:56:48.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/779 +- author: BIG_Zi_348 + changes: + - message: "\u0412 \u043A\u0440\u0430\u0441\u043A\u043E\u043F\u0443\u043B\u044C\ + \ \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u0435\u0449\u0451\ + \ \u043E\u0434\u043D\u043E \u0441\u043E\u0447\u0435\u0442\u0430\u043D\u0438\u0435\ + \ \u0446\u0432\u0435\u0442\u043E\u0432 \u043D\u0435\u0441\u043E\u043E\u0442\u0432\ + \u0435\u0442\u0441\u0442\u0432\u0443\u044E\u0449\u0435\u0435 \u043A\u043E\u0440\ + \u043F\u043E\u0440\u0430\u0442\u0438\u0432\u043D\u043E\u043C\u0443 \u0441\u0442\ + \u0430\u043D\u0434\u0430\u0440\u0442\u0443 \u041D\u0430\u043D\u043E\u0442\u0440\ + \u0430\u0437\u0435\u043D." + type: Add + id: 607 + time: '2024-11-18T04:54:23.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/784