diff --git a/Content.Server/GameTicking/Rules/ChangelingRuleSystem.cs b/Content.Server/GameTicking/Rules/ChangelingRuleSystem.cs index 70bd37bfd0c..3a89b115739 100644 --- a/Content.Server/GameTicking/Rules/ChangelingRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/ChangelingRuleSystem.cs @@ -26,6 +26,7 @@ using Robust.Shared.Random; using Robust.Shared.Timing; using Content.Server.Actions; +using Content.Shared.Tag; namespace Content.Server.GameTicking.Rules; @@ -44,6 +45,7 @@ public sealed class ChangelingRuleSystem : GameRuleSystem _cfg.GetCVar(CCVars.ChangelingPlayersPerChangeling); private int MaxChangelings => _cfg.GetCVar(CCVars.ChangelingMaxChangelings); @@ -148,6 +150,12 @@ public bool MakeChangeling(ICommonSession changeling) return false; } + if (_tagSystem.HasTag(mind.OwnedEntity.Value, "ChangelingBlacklist")) // Убираю КПБ и новакидов генокрадов + { + Log.Error($"Player {changeling.Name} can't be a changeling."); + return false; + } + var briefing = Loc.GetString("changeling-role-greeting-short", ("character-name", Identity.Entity(entity, EntityManager))); // Prepare changeling role @@ -226,6 +234,8 @@ private void HandleLatejoin(PlayerSpawnCompleteEvent ev) continue; if (!job.CanBeAntag) continue; + if (_tagSystem.HasTag(uid, "ChangelingBlacklist")) // Убираю КПБ и новакидов генокрадов + continue; // the nth player we adjust our probabilities around var target = PlayersPerLing * ling.TotalChangelings + 1; @@ -293,4 +303,4 @@ private void OnObjectivesTextGetInfo(EntityUid uid, ChangelingRuleComponent comp return changelings; } -} \ No newline at end of file +} diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 2488a1f25ab..899450914b5 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1558,3 +1558,9 @@ Entries: - { message: "Починка - type: Firestarter", type: Fix} id: 55716 #костыль отображения в Обновлениях time: '2024-03-29T08:20:00.0000000+00:00' + +- author: Котя + changes: + - { message: "КПБ и новакиды больше не должны становиться генокрадами.", type: Fix} + id: 55717 #костыль отображения в Обновлениях + time: '2024-04-01T08:20:00.0000000+00:00'