rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Vigers Ray 2024-10-30 20:32:34 +03:00
commit fdc4c8c60c
2 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Content.Server/GameTicking/Rules/ChangelingRuleSystem.cs
View file

@ -58,7 +58,8 @@ public sealed partial class ChangelingRuleSystem : GameRuleSystem<ChangelingRule
_antag.SendBriefing(target, briefing, Color.Yellow, BriefingSound);
_role.MindHasRole<ChangelingRoleComponent>(mindId, out var changelingRole);
if (changelingRole is not null)
_role.MindHasRole<RoleBriefingComponent>(mindId, out var briefingComp);
if (changelingRole is not null && briefingComp is null)
{
AddComp<RoleBriefingComponent>(changelingRole.Value.Owner);
Comp<RoleBriefingComponent>(changelingRole.Value.Owner).Briefing = briefing;

25
Resources/Changelog/ChangelogSunrise.yml
View file

@ -5466,3 +5466,28 @@
type: Tweak
id: 377
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