From e5ef1df4275ddcaa017d1d9773d27b5e20157f5c Mon Sep 17 00:00:00 2001 From: GayBot Date: Wed, 30 Oct 2024 20:23:46 +0300 Subject: [PATCH 1/2] Automatic changelog update --- Resources/Changelog/ChangelogSunrise.yml | 25 ++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml index 907ae22488..557844691a 100644 --- a/Resources/Changelog/ChangelogSunrise.yml +++ b/Resources/Changelog/ChangelogSunrise.yml @@ -5454,3 +5454,28 @@ type: Tweak id: 376 time: '2024-10-30T17:10:01.155021+00:00' +- author: VigersRay + changes: + - message: "\u0412 \u043B\u043E\u0431\u0431\u0438 \u0434\u043E\u0431\u0430\u0432\ + \u043B\u0435\u043D\u0430 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u043A\u0430\ + \ \u0444\u043E\u043D\u043E\u0432\u044B\u0445 \u0430\u043D\u0438\u043C\u0430\u0446\ + \u0438\u0439." + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E 45 \u0430\u043D\ + \u0438\u043C\u0430\u0446\u0438\u0439 \u0434\u043B\u044F \u043B\u043E\u0431\u0431\ + \u0438." + type: Add + - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0432\u044B \u043C\u043E\u0436\ + \u0435\u0442\u0435 \u0432\u044B\u0431\u0440\u0430\u0442\u044C \u0441\u043B\u0443\ + \u0447\u0430\u0439\u043D\u044B\u0439 \u0442\u0438\u043F \u0444\u043E\u043D\u0430\ + \ \u0432 \u043B\u043E\u0431\u0431\u0438." + type: Tweak + - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0432\u044B \u043C\u043E\u0436\ + \u0435\u0442\u0435 \u0432\u044B\u0431\u0438\u0440\u0430\u0442\u044C \u043A\u043E\ + \u043D\u043A\u0440\u0435\u0442\u043D\u044B\u0435 \u0444\u043E\u043D\u044B \u0434\ + \u043B\u044F \u043A\u0430\u0436\u0434\u043E\u0433\u043E \u0442\u0438\u043F\u0430\ + \ \u0444\u043E\u043D\u0430 \u0432 \u043B\u043E\u0431\u0431\u0438." + type: Tweak + id: 377 + time: '2024-10-30T17:14:26.0000000+00:00' + url: https://github.com/space-sunrise/space-station-14/pull/562 From c79517ba71284c8e79baa4c5901ac8f5eb287ba5 Mon Sep 17 00:00:00 2001 From: Rinary <72972221+Rinary1@users.noreply.github.com> Date: Wed, 30 Oct 2024 19:26:37 +0200 Subject: [PATCH 2/2] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D1=82=20=D0=BA=D1=80=D0=B0=D1=88=20=D1=81=D0=B5?= =?UTF-8?q?=D1=80=D0=B2=D0=B5=D1=80=D0=B0=20=D0=BF=D1=80=D0=B8=20=D0=B4?= =?UTF-8?q?=D0=B2=D0=BE=D0=B9=D0=BD=D0=BE=D0=B9=20=D0=B2=D1=8B=D0=B4=D0=B0?= =?UTF-8?q?=D1=87=D0=B5=20=D0=B3=D0=B5=D0=BD=D0=BE=D0=BA=D1=80=D0=B0=D0=B4?= =?UTF-8?q?=D0=B0.=20(#574)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Server/GameTicking/Rules/ChangelingRuleSystem.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Server/GameTicking/Rules/ChangelingRuleSystem.cs b/Content.Server/GameTicking/Rules/ChangelingRuleSystem.cs index dfb75ad59e..d6b1c9f3cf 100644 --- a/Content.Server/GameTicking/Rules/ChangelingRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/ChangelingRuleSystem.cs @@ -58,7 +58,8 @@ public sealed partial class ChangelingRuleSystem : GameRuleSystem(mindId, out var changelingRole); - if (changelingRole is not null) + _role.MindHasRole(mindId, out var briefingComp); + if (changelingRole is not null && briefingComp is null) { AddComp(changelingRole.Value.Owner); Comp(changelingRole.Value.Owner).Briefing = briefing;