diff --git a/Content.Client/ADT/BloodBrothers/BloodBrothersSystem.cs b/Content.Client/ADT/BloodBrothers/BloodBrothersSystem.cs deleted file mode 100644 index b789f85baa5..00000000000 --- a/Content.Client/ADT/BloodBrothers/BloodBrothersSystem.cs +++ /dev/null @@ -1,48 +0,0 @@ -using Content.Shared.StatusIcon.Components; -using Robust.Shared.Prototypes; -using Content.Shared.ADT.BloodBrothers; -using Robust.Client.Player; - -namespace Content.Client.ADT.BloodBrothers; - -/// -/// Used for the client to get status icons from other brothers. -/// -public sealed class BloodBrotherSystem : SharedBloodBrothersSystem -{ - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IPlayerManager _player = default!; - - public override void Initialize() - { - base.Initialize(); - SubscribeLocalEvent(GetBrotherIcon); - SubscribeLocalEvent(GetBrotherLeadIcon); - } - - private void GetBrotherIcon(Entity ent, ref GetStatusIconsEvent args) - { - var player = _player.LocalEntity; - - if (!TryComp(player, out var viewerBrother)) - return; - if (viewerBrother.Leader != ent.Comp.Leader) - return; - - if (_prototype.TryIndex(ent.Comp.StatusIcon, out var iconPrototype)) - args.StatusIcons.Add(iconPrototype); - } - private void GetBrotherLeadIcon(Entity ent, ref GetStatusIconsEvent args) - { - var player = _player.LocalEntity; - - if (!TryComp(player, out var viewerBrother)) - return; - - if (viewerBrother.Leader != ent.Owner) - return; - - if (_prototype.TryIndex(ent.Comp.StatusIcon, out var iconPrototype)) - args.StatusIcons.Add(iconPrototype); - } -} \ No newline at end of file diff --git a/Content.Server/ADT/BloodBrothers/BloodBrothersSystem.cs b/Content.Server/ADT/BloodBrothers/BloodBrothersSystem.cs deleted file mode 100644 index a432a7adbf5..00000000000 --- a/Content.Server/ADT/BloodBrothers/BloodBrothersSystem.cs +++ /dev/null @@ -1,75 +0,0 @@ -using Content.Server.Administration.Logs; -using Content.Server.Antag; -using Content.Server.Mind; -using Content.Server.Roles; -using Content.Shared.Database; -using Content.Shared.Flash; -using Content.Shared.Humanoid; -using Content.Shared.Mindshield.Components; -using Content.Shared.Mobs.Systems; -using Content.Shared.NPC.Prototypes; -using Content.Shared.NPC.Systems; -using Content.Shared.Zombies; -using Content.Server.ADT.Roles; -using Content.Shared.ADT.BloodBrothers; -using Robust.Shared.Prototypes; -using Content.Shared.Roles.Components; - -namespace Content.Server.ADT.BloodBrothers; - -public sealed class BloodBrotherSystem : SharedBloodBrothersSystem -{ - [Dependency] private readonly AntagSelectionSystem _antag = default!; - [Dependency] private readonly IAdminLogManager _adminLogManager = default!; - [Dependency] private readonly MindSystem _mind = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly NpcFactionSystem _npcFaction = default!; - [Dependency] private readonly RoleSystem _role = default!; - public ProtoId BloodBrotherFaction = "BloodBrotherFaction"; - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnPostFlash); - } - private void OnPostFlash(EntityUid uid, BloodBrotherLeaderComponent comp, ref AfterFlashedEvent ev) - { - if (uid != ev.User || !ev.Melee) - return; - if (!_mind.TryGetMind(ev.Target, out var mindId, out var mind)) - return; - - if (HasComp(ev.Target) || - HasComp(ev.Target) || - !HasComp(ev.Target) || - !_mobState.IsAlive(ev.Target) || - HasComp(ev.Target) || - comp.MaxConvertedCount <= comp.ConvertedCount) - { - return; - } - foreach(var antag in mind.MindRoleContainer.ContainedEntities) - { - if (TryComp(antag, out var role) && role.Antag) - return; - } - _npcFaction.AddFaction(ev.Target, BloodBrotherFaction); - EnsureComp(ev.Target, out var brocomp); - brocomp.Leader = uid; - if (ev.User != null) - { - _adminLogManager.Add(LogType.Mind, - LogImpact.Medium, - $"{ToPrettyString(ev.User.Value)} converted {ToPrettyString(ev.Target)} into a brotherhood"); - } - - if (mindId == default || !_role.MindHasRole(mindId)) - { - _role.MindAddRole(mindId, "MindRoleBloodBrother"); - } - - _antag.SendBriefing(ev.Target, Loc.GetString("brother-briefing"), Color.Red, comp.StartSound); - comp.ConvertedCount++; - Dirty(ev.Target, brocomp); - } -} diff --git a/Content.Server/ADT/Changeling/Systems/ChangelingSystem.Useful.cs b/Content.Server/ADT/Changeling/Systems/ChangelingSystem.Useful.cs index 8fbee8c2ccc..a35607b93a2 100644 --- a/Content.Server/ADT/Changeling/Systems/ChangelingSystem.Useful.cs +++ b/Content.Server/ADT/Changeling/Systems/ChangelingSystem.Useful.cs @@ -20,7 +20,6 @@ using Content.Shared.ADT.Stealth.Components; using Content.Server.Medical; using Content.Shared.Heretic; -using Content.Shared.ADT.BloodBrothers; using Content.Shared.Medical; namespace Content.Server.Changeling.EntitySystems; @@ -190,16 +189,6 @@ private void OnAbsorbDoAfter(EntityUid uid, ChangelingComponent component, Absor _store.UpdateUserInterface(uid, uid, store); } } - if (TryComp(target, out var bro)) - { - var selfMessage = Loc.GetString("changeling-dna-success-bro", ("target", Identity.Entity(target, EntityManager))); - _popup.PopupEntity(selfMessage, uid, uid, PopupType.Medium); - if (TryComp(uid, out var store)) - { - _store.TryAddCurrency(new Dictionary { { "EvolutionPoints", bro.ConvertedCount } }, uid, store); - _store.UpdateUserInterface(uid, uid, store); - } - } if (HasComp(target)) // Если это был другой генокрад, получим моментально 5 очков эволюции { var selfMessage = Loc.GetString("changeling-dna-success-ling", ("target", Identity.Entity(target, EntityManager))); diff --git a/Content.Server/ADT/Heretic/Ritual/CustomBehavior.AscensionSacrifice.cs b/Content.Server/ADT/Heretic/Ritual/CustomBehavior.AscensionSacrifice.cs index d2c9ef7bf50..bf750f7f213 100644 --- a/Content.Server/ADT/Heretic/Ritual/CustomBehavior.AscensionSacrifice.cs +++ b/Content.Server/ADT/Heretic/Ritual/CustomBehavior.AscensionSacrifice.cs @@ -6,7 +6,6 @@ using Content.Server.Medical.SuitSensors; using Content.Server.Objectives.Components; using Content.Server.Revolutionary.Components; -using Content.Shared.ADT.BloodBrothers; using Content.Shared.Changeling.Components; using Content.Shared.Chat; using Content.Shared.Damage.Systems; @@ -115,8 +114,6 @@ public override void Finalize(RitualData args) knowledgeGain += Math.Min(2, heretic.PathStage / 2 - 1); if (args.EntityManager.HasComponent(uids[i])) knowledgeGain += 2; - if (args.EntityManager.TryGetComponent(uids[i], out var bro)) - knowledgeGain += bro.ConvertedCount / 2; if (args.EntityManager.TryGetComponent(uids[i], out var rev)) knowledgeGain += rev.ConvertedCount / 3; diff --git a/Content.Server/ADT/Heretic/Ritual/CustomBehavior.Sacrifice.cs b/Content.Server/ADT/Heretic/Ritual/CustomBehavior.Sacrifice.cs index 03999ef4141..503f651e108 100644 --- a/Content.Server/ADT/Heretic/Ritual/CustomBehavior.Sacrifice.cs +++ b/Content.Server/ADT/Heretic/Ritual/CustomBehavior.Sacrifice.cs @@ -6,7 +6,6 @@ using Content.Server.Medical.SuitSensors; using Content.Server.Objectives.Components; using Content.Server.Revolutionary.Components; -using Content.Shared.ADT.BloodBrothers; using Content.Shared.Changeling.Components; using Content.Shared.Chat; using Content.Shared.Damage.Systems; @@ -102,7 +101,6 @@ private bool IsAntagonist(IEntityManager entMan, EntityUid uid) { return entMan.HasComponent(uid) || entMan.HasComponent(uid) - || entMan.HasComponent(uid) || entMan.HasComponent(uid); } @@ -125,8 +123,6 @@ public override void Finalize(RitualData args) knowledgeGain += Math.Min(2, heretic.PathStage / 2 - 1); if (args.EntityManager.HasComponent(uids[i])) knowledgeGain += 2; - if (args.EntityManager.TryGetComponent(uids[i], out var bro)) - knowledgeGain += bro.ConvertedCount / 2; if (args.EntityManager.TryGetComponent(uids[i], out var rev)) knowledgeGain += rev.ConvertedCount / 3; // Ganimed diff --git a/Content.Server/ADT/Roles/BloodBrotherRoleComponent.cs b/Content.Server/ADT/Roles/BloodBrotherRoleComponent.cs deleted file mode 100644 index cc8b5ab3b28..00000000000 --- a/Content.Server/ADT/Roles/BloodBrotherRoleComponent.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Content.Shared.Roles; -using Content.Shared.Roles.Components; - -namespace Content.Server.ADT.Roles; - -[RegisterComponent] -public sealed partial class BloodBrotherRoleComponent : BaseMindRoleComponent -{ -} diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs index 93e49af082b..4585de65646 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs @@ -22,7 +22,6 @@ public sealed partial class AdminVerbSystem [Dependency] private readonly GameTicker _gameTicker = default!; [Dependency] private readonly OutfitSystem _outfit = default!; - private static readonly EntProtoId DefaultBloodBrotherRule = "BloodBrother"; //ADT-tweak private static readonly EntProtoId DefaultTraitorRule = "TraitorOnly"; //ADT-tweak private static readonly EntProtoId DefaultInitialInfectedRule = "Zombie"; private static readonly EntProtoId DefaultNukeOpRule = "LoneOpsSpawn"; @@ -186,22 +185,6 @@ private void AddAntagVerbs(GetVerbsEvent args) args.Verbs.Add(changeling); // ADT-Changeling-Tweak-End - // ADT-blood-brothers-Tweak-Start - Verb bloodBrother = new() - { - Text = Loc.GetString("admin-verb-make-brother"), - Category = VerbCategory.Antag, - Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/ADT/Interface/Misc/job_icons.rsi"), "BloodBrotherLead"), - Act = () => - { - _antag.ForceMakeAntag(targetPlayer, DefaultBloodBrotherRule); - }, - Impact = LogImpact.High, - Message = string.Join(": ", traitorName, Loc.GetString("admin-verb-make-brother")), - }; - args.Verbs.Add(bloodBrother); - // ADT-blood-brothers-Tweak-End - // Paradox clone var paradoxCloneName = Loc.GetString("admin-verb-text-make-paradox-clone"); Verb paradox = new() diff --git a/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs index aabd5a33edb..4005de1f14f 100644 --- a/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs +++ b/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs @@ -35,19 +35,6 @@ public sealed partial class TraitorRuleComponent : Component /// [DataField] public bool GiveUplink = true; - //ADT-tweak-start - /// - /// Шанс на бразерс вместо трейтора - /// - // ADT-Tweak-Start - /// - /// Вероятность того, что предатель станет лидером кровных братьев вместо получения аплинка. - /// - [DataField] - public float BloodBrotherChance = 0f; - public ProtoId BloodBrotherFaction = "BloodBrotherFaction"; //ADT-tweak - public ProtoId BloodBrotherLeaderFaction = "BloodBrotherLeaderFaction"; //ADT-tweak - // ADT-Tweak-End /// /// Give this traitor the codewords. diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs index 6c23eb60a73..4c8b56a73cb 100644 --- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs @@ -18,7 +18,6 @@ using System.Linq; using System.Text; using Content.Server.Codewords; -using Content.Shared.ADT.BloodBrothers; using Content.Shared.Bed.Cryostorage; namespace Content.Server.GameTicking.Rules; @@ -64,11 +63,9 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component) Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - failed, no Mind found"); return false; } - var bloodBrother = _random.Prob(component.BloodBrotherChance);//ADT-tweak var briefing = ""; - if (component.GiveCodewords - && !bloodBrother) //ADT-tweak + if (component.GiveCodewords) { Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - added codewords flufftext to briefing"); briefing = Loc.GetString("traitor-role-codewords-short", ("codewords", string.Join(", ", factionCodewords))); @@ -79,8 +76,7 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component) // Uplink code will go here if applicable, but we still need the variable if there aren't any Note[]? code = null; - if (component.GiveUplink - && !bloodBrother)//ADT-tweak + if (component.GiveUplink) { Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Uplink start"); // Calculate the amount of currency on the uplink. @@ -102,29 +98,17 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component) } string[]? codewords = null; - if (component.GiveCodewords - && !bloodBrother) //ADT-tweak + if (component.GiveCodewords) { Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - set codewords from component"); codewords = factionCodewords; } - if (component.GiveBriefing && !bloodBrother) //ADT-tweak + if (component.GiveBriefing) { _antag.SendBriefing(traitor, GenerateBriefing(codewords, code, issuer), null, component.GreetSoundNotification); Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Sent the Briefing"); } - //ADT-tweak-start - else if (component.GiveBriefing && bloodBrother) - { - _antag.SendBriefing(traitor, Loc.GetString("brother-lead-briefing"), null, component.GreetSoundNotification); - Log.Debug($"MakeBrother {ToPrettyString(traitor)} - Sent the Briefing"); - EnsureComp(traitor); //лидера ВСЕГДА должно выдавать прежде чем простого брата - EnsureComp(traitor); - _npcFaction.AddFaction(traitor, component.BloodBrotherFaction); - _npcFaction.AddFaction(traitor, component.BloodBrotherLeaderFaction); - } - //ADT-tweak-end Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Adding TraitorMind"); component.TraitorMinds.Add(mindId); diff --git a/Content.Shared/ADT/BloodBrothers/BloodBrotherComponent.cs b/Content.Shared/ADT/BloodBrothers/BloodBrotherComponent.cs deleted file mode 100644 index dcbd1aa92e3..00000000000 --- a/Content.Shared/ADT/BloodBrothers/BloodBrotherComponent.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Robust.Shared.GameStates; -using Content.Shared.Antag; -using Robust.Shared.GameStates; -using Content.Shared.StatusIcon; -using Robust.Shared.Prototypes; -using Robust.Shared.Audio; - -namespace Content.Shared.ADT.BloodBrothers -{ - [RegisterComponent, NetworkedComponent, AutoGenerateComponentState] - public sealed partial class BloodBrotherComponent : Component - { - /// - /// The status icon prototype displayed for brothers - /// - [DataField, ViewVariables(VVAccess.ReadWrite)] - public ProtoId StatusIcon { get; set; } = "BloodBrotherFaction"; - - [AutoNetworkedField] - public EntityUid Leader; - } -} - - diff --git a/Content.Shared/ADT/BloodBrothers/BloodBrotherLeaderComponent.cs b/Content.Shared/ADT/BloodBrothers/BloodBrotherLeaderComponent.cs deleted file mode 100644 index 68c5632ee78..00000000000 --- a/Content.Shared/ADT/BloodBrothers/BloodBrotherLeaderComponent.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Robust.Shared.GameStates; -using Content.Shared.StatusIcon; -using Robust.Shared.Prototypes; -using Robust.Shared.Audio; - -namespace Content.Shared.ADT.BloodBrothers -{ - [RegisterComponent, NetworkedComponent, AutoGenerateComponentState] - public sealed partial class BloodBrotherLeaderComponent : Component - { - /// - /// The status icon prototype displayed for brothers - /// - [DataField, ViewVariables(VVAccess.ReadWrite)] - public ProtoId StatusIcon { get; set; } = "BloodBrotherLeaderFaction"; - /// - /// Sound that plays when you are chosen. (Placeholder until I find something cool I guess) - /// - [DataField] - public SoundSpecifier StartSound = new SoundCollectionSpecifier("ADTTraitorStart"); - [AutoNetworkedField] - - public int ConvertedCount = 0; - [DataField] - public int MaxConvertedCount = 3; - } -} - - diff --git a/Content.Shared/ADT/BloodBrothers/BloodBrotherSystem.cs b/Content.Shared/ADT/BloodBrothers/BloodBrotherSystem.cs deleted file mode 100644 index ff71a5ba859..00000000000 --- a/Content.Shared/ADT/BloodBrothers/BloodBrotherSystem.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace Content.Shared.ADT.BloodBrothers -{ - public abstract class SharedBloodBrothersSystem : EntitySystem - { - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(SetBrotherId); - - SubscribeLocalEvent(DirtyBrotherComps); - SubscribeLocalEvent(DirtyBrotherComps); - } - - private void DirtyBrotherComps(EntityUid someUid, T someComp, ComponentStartup ev) - { - var broComps = AllEntityQuery(); - while (broComps.MoveNext(out var uid, out var comp)) - { - Dirty(uid, comp); - } - - var broLeadComps = AllEntityQuery(); - while (broLeadComps.MoveNext(out var uid, out var comp)) - { - Dirty(uid, comp); - } - } - private void SetBrotherId(EntityUid uid, BloodBrotherComponent comp, MapInitEvent args) - { - if (HasComp(uid)) - { - comp.Leader = uid; - } - Dirty(uid, comp); - } - } -} \ No newline at end of file diff --git a/Resources/Prototypes/ADT/GameRules/roundstart.yml b/Resources/Prototypes/ADT/GameRules/roundstart.yml index 28f228bdf66..a0d55794f13 100644 --- a/Resources/Prototypes/ADT/GameRules/roundstart.yml +++ b/Resources/Prototypes/ADT/GameRules/roundstart.yml @@ -81,8 +81,6 @@ parent: BaseTraitorRule id: TraitorLightGameRule components: - - type: TraitorRule - bloodBrotherChance: 0 - type: GameRule minPlayers: 5 delay: @@ -217,8 +215,6 @@ - id: Heretic cost: 30 rerollChance: 0.5 - - id: BloodBrother - cost: 20 - id: Revolutionary cost: 45 # - id: Zombie вернуть после баффов @@ -262,8 +258,6 @@ cost: 15 - id: Changeling cost: 25 - - id: BloodBrother - cost: 25 - id: Heretic cost: 30 rerollChance: 0.5 @@ -300,8 +294,6 @@ cost: 10 - id: TraitorDuoGameRule cost: 10 - - id: BloodBrother - cost: 25 - id: TraitorLightGameRule cost: 15 - id: Changeling @@ -327,34 +319,6 @@ - type: GameRule - type: DynamicRandomRule -- type: entity - parent: BaseTraitorRule - id: BloodBrother - components: - - type: GameRule - minPlayers: 20 - delay: - min: 240 - max: 420 - - type: AntagSelection - selectionTime: IntraPlayerSpawn - definitions: - - prefRoles: [ BloodBrotherLeader ] - max: 4 - playerRatio: 20 - blacklist: - components: - - AntagImmune - lateJoinAdditional: true - mindRoles: - - MindRoleTraitor - - type: TraitorRule - bloodBrotherChance: 1 - - type: AntagRandomObjectives - sets: - - groups: BloodBrothersObjectiveGroups - maxDifficulty: 12 - #этот геймрул сделан только для выдачи трейтора - type: entity parent: BaseTraitorRule @@ -375,4 +339,3 @@ mindRoles: - MindRoleTraitor - type: TraitorRule - bloodBrotherChance: 0 diff --git a/Resources/Prototypes/ADT/Objectives/objectiveGroups.yml b/Resources/Prototypes/ADT/Objectives/objectiveGroups.yml index de0b559c547..275325a0969 100644 --- a/Resources/Prototypes/ADT/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/ADT/Objectives/objectiveGroups.yml @@ -65,14 +65,6 @@ DnaAbsorbObjective: 1 ChangelingAbsorbObjective: 1 -- type: weightedRandom - id: BloodBrothersObjectiveGroups - weights: - TraitorObjectiveGroupSteal: 1 - TraitorObjectiveGroupKill: 1 - TraitorObjectiveGroupSocial: 0.5 #Involves helping/harming others without killing them or stealing their stuff - TraitorObjectiveGroupNukieDisk: 0.01 #Corvax - - type: weightedRandom id: HereticObjectiveGroup weights: diff --git a/Resources/Prototypes/ADT/Roles/Antags/blood_brothers.yml b/Resources/Prototypes/ADT/Roles/Antags/blood_brothers.yml deleted file mode 100644 index 69d07e05006..00000000000 --- a/Resources/Prototypes/ADT/Roles/Antags/blood_brothers.yml +++ /dev/null @@ -1,22 +0,0 @@ -- type: antag - id: BloodBrotherLeader - name: role-subtype-brother-lead - antagonist: true - setPreference: true - objective: roles-antag-syndicate-agent-objective - requirements: - - !type:OverallPlaytimeRequirement - time: 108000 # 130h - -- type: antag - id: BloodBrother - name: role-subtype-brother - antagonist: true - setPreference: false - objective: roles-antag-syndicate-agent-objective - -- type: startingGear - id: BloodBrotherLeaderGear - storage: - back: - - Flash diff --git a/Resources/Prototypes/ADT/Roles/MindRoles/mind_roles.yml b/Resources/Prototypes/ADT/Roles/MindRoles/mind_roles.yml index e71e5ebf7df..b501dd3426b 100644 --- a/Resources/Prototypes/ADT/Roles/MindRoles/mind_roles.yml +++ b/Resources/Prototypes/ADT/Roles/MindRoles/mind_roles.yml @@ -30,25 +30,4 @@ # - type: MindRole # antagPrototype: Changeling # exclusiveAntag: true -# - type: ChangelingRole - -- type: entity - parent: BaseMindRoleAntag - id: MindRoleBloodBrotherLeader - name: Blood brother lead role - components: - - type: MindRole - antagPrototype: BloodBrotherLeader - exclusiveAntag: true - roleType: TeamAntagonist - subtype: role-subtype-brother - - type: BloodBrotherRole - -- type: entity - parent: MindRoleHeadRevolutionary - id: MindRoleBloodBrother - name: Blood brother role - components: - - type: MindRole - antagPrototype: BloodBrother - subtype: role-subtype-brother-lead \ No newline at end of file +# - type: ChangelingRole \ No newline at end of file diff --git a/Resources/Prototypes/ADT/StatusIcon/antag.yml b/Resources/Prototypes/ADT/StatusIcon/antag.yml index 84cee0bb6c9..2ad81d01b99 100644 --- a/Resources/Prototypes/ADT/StatusIcon/antag.yml +++ b/Resources/Prototypes/ADT/StatusIcon/antag.yml @@ -1,27 +1,3 @@ -- type: factionIcon - id: BloodBrotherFaction - isShaded: true - priority: 11 - showTo: - components: - - ShowAntagIcons - - BloodBrother - icon: - sprite: /Textures/ADT/Interface/Misc/job_icons.rsi - state: BloodBrother - -- type: factionIcon - id: BloodBrotherLeaderFaction - isShaded: true - priority: 11 - showTo: - components: - - ShowAntagIcons - - BloodBrother - icon: - sprite: /Textures/ADT/Interface/Misc/job_icons.rsi - state: BloodBrotherLead - - type: factionIcon id: PhantomVesselFaction priority: 11 diff --git a/Resources/Prototypes/ADT/ai_factions.yml b/Resources/Prototypes/ADT/ai_factions.yml index 4fb37467edc..08bb7eb9b2c 100644 --- a/Resources/Prototypes/ADT/ai_factions.yml +++ b/Resources/Prototypes/ADT/ai_factions.yml @@ -66,35 +66,3 @@ - Revolutionary - Heretic # goob edit - heretics - Ursus - -- type: npcFaction - id: BloodBrotherLeaderFaction - hostile: - - NanoTrasen - - SimpleHostile - - Xeno - - PetsNT - - Zombie - - Heretic # goob edit - heretics - - DroneAntag # ADT tweak - - Ursus # ADT tweak - - Dragon - - AllHostile - - Wizard - - Xenoborg - -- type: npcFaction - id: BloodBrotherFaction - hostile: - - NanoTrasen - - SimpleHostile - - Xeno - - PetsNT - - Zombie - - Heretic # goob edit - heretics - - DroneAntag # ADT tweak - - Ursus # ADT tweak - - Dragon - - AllHostile - - Wizard - - Xenoborg diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml index 06232c327af..bfc0ca15415 100644 --- a/Resources/Prototypes/GameRules/roundstart.yml +++ b/Resources/Prototypes/GameRules/roundstart.yml @@ -208,7 +208,6 @@ id: BaseTraitorRule components: - type: TraitorRule - bloodBrotherChance: 0 #ADT-tweak # TODO: codewords in yml # TODO: uplink in yml - type: AntagRandomObjectives diff --git a/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/BloodBrother.png b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/BloodBrother.png deleted file mode 100644 index e4e88b44ee2..00000000000 Binary files a/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/BloodBrother.png and /dev/null differ diff --git a/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/BloodBrotherLead.png b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/BloodBrotherLead.png deleted file mode 100644 index b9153c98060..00000000000 Binary files a/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/BloodBrotherLead.png and /dev/null differ diff --git a/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json index 1e885eff972..48494489520 100644 --- a/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json @@ -43,12 +43,6 @@ }, { "name": "Taumaturg" - }, - { - "name": "BloodBrother" - }, - { - "name": "BloodBrotherLead" } ] }