diff --git a/Content.Client/_WL/Conspirators/EntitySystems/ConspiratorSystem.cs b/Content.Client/_WL/Conspirators/EntitySystems/ConspiratorSystem.cs deleted file mode 100644 index 333d996c22..0000000000 --- a/Content.Client/_WL/Conspirators/EntitySystems/ConspiratorSystem.cs +++ /dev/null @@ -1,34 +0,0 @@ -using Content.Shared._WL.Conspirators.Components; -using Content.Shared._WL.Conspirators.EntitySystems; -using Content.Shared.Antag; -using Content.Shared.StatusIcon.Components; -using Robust.Client.Player; -using Robust.Shared.Prototypes; - -namespace Content.Client._WL.Conspirators.EntitySystems; - -public sealed class ConspiratorSystem : SharedConspiratorSystem -{ - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnConspiratorGetIcons); - } - - private void OnConspiratorGetIcons(Entity entity, ref GetStatusIconsEvent args) - { - if (_playerManager.LocalSession?.AttachedEntity is { } playerEntity) - { - if (!HasComp(playerEntity) && - !HasComp(playerEntity)) - return; - } - - if (_prototypeManager.TryIndex(entity.Comp.ConspiratorIcon, out var iconPrototype)) - args.StatusIcons.Add(iconPrototype); - } -} diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs index 86ce64bf3f..f9e6f8def0 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs @@ -13,7 +13,6 @@ using Robust.Shared.Player; using Robust.Shared.Prototypes; using Robust.Shared.Utility; using Content.Shared.Roles.Components; -using Content.Server._WL.GameTicking.Rules.Components; // WL-Changes: Conspirators namespace Content.Server.Administration.Systems; @@ -33,7 +32,6 @@ public sealed partial class AdminVerbSystem private static readonly EntProtoId ParadoxCloneRuleId = "ParadoxCloneSpawn"; private static readonly EntProtoId DefaultWizardRule = "Wizard"; private static readonly EntProtoId DefaultNinjaRule = "NinjaSpawn"; - private static readonly EntProtoId DefaultConspiratorRule = "Conspirators"; // WL-Changes: Conspirators private static readonly ProtoId PirateGearId = "PirateGear"; // All antag verbs have names so invokeverb works. @@ -227,23 +225,6 @@ public sealed partial class AdminVerbSystem }; args.Verbs.Add(ninja); - //WL-Changes: Conspiratrs start - var conspiratorName = Loc.GetString("admin-verb-text-make-conspirator"); - Verb conspirator = new() - { - Text = conspiratorName, - Category = VerbCategory.Antag, - Icon = new SpriteSpecifier.Rsi(new("/Textures/_WL/Interface/Misc/job_icons.rsi"), "Conspirator"), - Act = () => - { - _antag.ForceMakeAntag(targetPlayer, DefaultConspiratorRule); - }, - Impact = LogImpact.High, - Message = string.Join(": ", conspiratorName, Loc.GetString("admin-verb-make-conspirator")), - }; - args.Verbs.Add(conspirator); - //WL-Changes: Conspiratrs end - if (HasComp(args.Target)) // only humanoids can be cloned args.Verbs.Add(paradox); } diff --git a/Content.Server/_WL/GameTicking/Rules/Components/ConspiratorRuleComponent.cs b/Content.Server/_WL/GameTicking/Rules/Components/ConspiratorRuleComponent.cs deleted file mode 100644 index 610a6c9b0e..0000000000 --- a/Content.Server/_WL/GameTicking/Rules/Components/ConspiratorRuleComponent.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Content.Shared.Random; -using Robust.Shared.Prototypes; - -namespace Content.Server._WL.GameTicking.Rules.Components; - -/// -/// Game rule for conspirators. Handles their shared objective. -/// -[RegisterComponent, Access(typeof(ConspiratorRuleSystem))] -public sealed partial class ConspiratorRuleComponent : Component -{ - [DataField] - public EntProtoId? Objective = null; - - [DataField] - public ProtoId ObjectiveGroup = "ConspiratorObjectiveGroup"; -} diff --git a/Content.Server/_WL/GameTicking/Rules/ConspiratorRuleSystem.cs b/Content.Server/_WL/GameTicking/Rules/ConspiratorRuleSystem.cs deleted file mode 100644 index fd7ff60ba8..0000000000 --- a/Content.Server/_WL/GameTicking/Rules/ConspiratorRuleSystem.cs +++ /dev/null @@ -1,99 +0,0 @@ -using Content.Server._WL.GameTicking.Rules.Components; -using Content.Server.Antag; -using Content.Server.GameTicking; -using Content.Server.GameTicking.Rules; -using Content.Server.Roles; -using Content.Shared._WL.Conspirators.Components; -using Content.Shared._WL.Roles.Components; -using Content.Shared.GameTicking.Components; -using Content.Shared.Mind; -using Content.Shared.Random.Helpers; -using Robust.Shared.Prototypes; -using Robust.Shared.Random; -using Robust.Shared.Utility; -using System.Diagnostics.CodeAnalysis; - -namespace Content.Server._WL.GameTicking.Rules; - -public sealed class ConspiratorRuleSystem : GameRuleSystem -{ - [Dependency] private readonly AntagSelectionSystem _antag = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IRobustRandom _random = default!; - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnGetBriefing); - SubscribeLocalEvent(OnAntagSelected); - } - - protected override void AppendRoundEndText(EntityUid uid, - ConspiratorRuleComponent component, - GameRuleComponent gameRule, - ref RoundEndTextAppendEvent args) - { - base.AppendRoundEndText(uid, component, gameRule, ref args); - - var sessionData = _antag.GetAntagIdentifiers(uid); - args.AddLine(Loc.GetString("conspirator-count", ("count", sessionData.Count))); - foreach (var (_, data, name) in sessionData) - { - args.AddLine(Loc.GetString("conspirator-name-user", - ("name", name), - ("username", data.UserName))); - } - - if (!_proto.TryIndex(component.Objective, out var objectiveProto)) - return; - - args.AddLine(Loc.GetString("conspirator-objective", ("objective", objectiveProto.Name))); - } - - private void OnGetBriefing(Entity ent, ref GetBriefingEvent args) - { - args.Append(Loc.GetString("conspirator-identities")); - - var conspirators = AllEntityQuery(); - while (conspirators.MoveNext(out var id, out _)) - { - args.Append(Loc.GetString("conspirator-name", ("name", Name(id)))); - } - - args.Append(Loc.GetString("conspirator-radio-implant")); - } - - private void OnAntagSelected(Entity ent, ref AfterAntagEntitySelectedEvent args) - { - if (!_mind.TryGetMind(args.Session, out var mindId, out var mind)) - return; - - if (ent.Comp.Objective is null) - { - if (GetRandomObjectivePrototype(ent.Comp, out var objectiveProtoId)) - ent.Comp.Objective = objectiveProtoId; - } - - if (ent.Comp.Objective is not null) - _mind.TryAddObjective(mindId, mind, ent.Comp.Objective); - } - - private bool GetRandomObjectivePrototype(ConspiratorRuleComponent comp, [NotNullWhen(true)] out EntProtoId? objectiveProto) - { - objectiveProto = null; - - if (!_proto.TryIndex(comp.ObjectiveGroup, out var group)) - return false; - - var objectives = group.Weights.ShallowClone(); - while (_random.TryPickAndTake(objectives, out var proto)) - { - objectiveProto = proto!; - return true; - } - - return false; - } -} diff --git a/Content.Server/_WL/Objectives/Components/NoCompletionObjectiveComponent.cs b/Content.Server/_WL/Objectives/Components/NoCompletionObjectiveComponent.cs deleted file mode 100644 index d94e9942c5..0000000000 --- a/Content.Server/_WL/Objectives/Components/NoCompletionObjectiveComponent.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Content.Server._WL.Objectives.Systems; - -namespace Content.Server._WL.Objectives.Components; - -/// -/// This objective will always show as 0% complete as it is not intended to be tracked. Used for Conspirator objectives. -/// -[RegisterComponent, Access(typeof(NoCompletionObjectiveSystem))] -public sealed partial class NoCompletionObjectiveComponent : Component; diff --git a/Content.Server/_WL/Objectives/Systems/NoCompletionObjectiveSystem.cs b/Content.Server/_WL/Objectives/Systems/NoCompletionObjectiveSystem.cs deleted file mode 100644 index e5f2aa39d5..0000000000 --- a/Content.Server/_WL/Objectives/Systems/NoCompletionObjectiveSystem.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Content.Server._WL.Objectives.Components; -using Content.Shared.Objectives.Components; - -namespace Content.Server._WL.Objectives.Systems; - -public sealed class NoCompletionObjectiveSystem : EntitySystem -{ - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnGetProgress); - } - - private void OnGetProgress(Entity entity, ref ObjectiveGetProgressEvent args) - { - args.Progress = 0f; - } -} diff --git a/Content.Shared/Conspirators/Components/ConspiratorComponent.cs b/Content.Shared/Conspirators/Components/ConspiratorComponent.cs deleted file mode 100644 index 071dbe835d..0000000000 --- a/Content.Shared/Conspirators/Components/ConspiratorComponent.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Content.Shared.StatusIcon; -using Robust.Shared.GameStates; -using Robust.Shared.Prototypes; - -namespace Content.Shared._WL.Conspirators.Components; - -[RegisterComponent, NetworkedComponent] -public sealed partial class ConspiratorComponent : Component -{ - [DataField] - public ProtoId ConspiratorIcon = "ConspiratorFaction"; - - public override bool SessionSpecific => true; -} diff --git a/Content.Shared/Conspirators/EntitySystems/SharedConspiratorSystem.cs b/Content.Shared/Conspirators/EntitySystems/SharedConspiratorSystem.cs deleted file mode 100644 index 2d7f8ba36c..0000000000 --- a/Content.Shared/Conspirators/EntitySystems/SharedConspiratorSystem.cs +++ /dev/null @@ -1,31 +0,0 @@ -using Content.Shared._WL.Conspirators.Components; -using Content.Shared.Antag; -using Robust.Shared.GameStates; -using Robust.Shared.Player; - -namespace Content.Shared._WL.Conspirators.EntitySystems; - -public abstract class SharedConspiratorSystem : EntitySystem // looking at blood bound to see how the icons work -{ - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnConspiratorAttemptGetState); - } - - private void OnConspiratorAttemptGetState( - Entity entity, - ref ComponentGetStateAttemptEvent args) - { - args.Cancelled = !CanGetState(args.Player); - } - - private bool CanGetState(ICommonSession? player) - { - if (player?.AttachedEntity is not { } uid) - return true; - - return HasComp(uid) || HasComp(uid); - } -} diff --git a/Content.Shared/_WL/Roles/Components/ConspiratorRoleComponent.cs b/Content.Shared/_WL/Roles/Components/ConspiratorRoleComponent.cs deleted file mode 100644 index 214ca2fa00..0000000000 --- a/Content.Shared/_WL/Roles/Components/ConspiratorRoleComponent.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Content.Shared.Roles.Components; -using Robust.Shared.GameStates; - -namespace Content.Shared._WL.Roles.Components; - -/// -/// Added to mind role entities to tag that they are a conspirator. -/// -[RegisterComponent, NetworkedComponent] -public sealed partial class ConspiratorRoleComponent : BaseMindRoleComponent; diff --git a/Resources/Audio/_WL/Misc/attributions.yml b/Resources/Audio/_WL/Misc/attributions.yml deleted file mode 100644 index 31901f682d..0000000000 --- a/Resources/Audio/_WL/Misc/attributions.yml +++ /dev/null @@ -1,4 +0,0 @@ -- files: ["conspirator_greeting.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from TG station as heretic_gain.ogg" - source: "https://github.com/tgstation/tgstation/commit/436ba869ebcd0b60b63973fb7562f447ee655205" diff --git a/Resources/Audio/_WL/Misc/conspirator_greeting.ogg b/Resources/Audio/_WL/Misc/conspirator_greeting.ogg deleted file mode 100644 index 08fb32c766..0000000000 Binary files a/Resources/Audio/_WL/Misc/conspirator_greeting.ogg and /dev/null differ diff --git a/Resources/Audio/_WL/Misc/illuminati.ogg b/Resources/Audio/_WL/Misc/illuminati.ogg deleted file mode 100644 index 5691b72f1b..0000000000 Binary files a/Resources/Audio/_WL/Misc/illuminati.ogg and /dev/null differ diff --git a/Resources/Locale/ru-RU/_WL/administration/antag.ftl b/Resources/Locale/ru-RU/_WL/administration/antag.ftl deleted file mode 100644 index 4b57aaf9ee..0000000000 --- a/Resources/Locale/ru-RU/_WL/administration/antag.ftl +++ /dev/null @@ -1,2 +0,0 @@ -admin-verb-make-conspirator = Сделать цель Заговорщиком. -admin-verb-text-make-conspirator = Сделать Заговорщиком diff --git a/Resources/Locale/ru-RU/_WL/entities/objects/misc.ftl b/Resources/Locale/ru-RU/_WL/entities/objects/misc.ftl deleted file mode 100644 index 06115134ea..0000000000 --- a/Resources/Locale/ru-RU/_WL/entities/objects/misc.ftl +++ /dev/null @@ -1,5 +0,0 @@ -ent-RadioImplanterConspiracy = заговорческий радио-имплантер - .desc = { ent-BaseImplantOnlyImplanter.desc } - -ent-RadioImplantConspiracy = заговорческий радио-имплант - .desc = Даёт доступ к радио-каналу заговорщиков. diff --git a/Resources/Locale/ru-RU/_WL/game-ticking/game-presets/preset-conspirator.ftl b/Resources/Locale/ru-RU/_WL/game-ticking/game-presets/preset-conspirator.ftl deleted file mode 100644 index 3b3179dfdb..0000000000 --- a/Resources/Locale/ru-RU/_WL/game-ticking/game-presets/preset-conspirator.ftl +++ /dev/null @@ -1,13 +0,0 @@ -conspirator-objective-issuer = [color=#724F29]Заговорщики[/color] -conspirator-role-greeting = - Вы заговорщик. - Вы начинаешь, зная всех других заговорщиков и с имплантом радио-связи для коммуникации с ними. - Сотрудничайте и не останавливайтесь ни перед чем для воплощения заговора в реальность. -conspirator-count = Всего было {$count} заговорщиков: -conspirator-name-user = [color=white]{CAPITALIZE($name)}[/color] ([color=gray]{$username}[/color]) был заговорщиком. -conspirator-objective = Целью заговорщиков было: [color=white]{$objective}[/color]. -conspirator-identities = Заговорщики это: -conspirator-name = {$name} заговорщик. -conspirator-radio-implant = Используйте свой радио-имплант для общения с другими заговорщиками (:з). -conspiracy-title = Заговор -conspiracy-description = ЗАГОВОРЩИК ПОДТВЕРЖДЁН diff --git a/Resources/Locale/ru-RU/_WL/guidebook/guides.ftl b/Resources/Locale/ru-RU/_WL/guidebook/guides.ftl deleted file mode 100644 index 0d3b53afea..0000000000 --- a/Resources/Locale/ru-RU/_WL/guidebook/guides.ftl +++ /dev/null @@ -1 +0,0 @@ -guide-entry-conspirators = Заговорщики diff --git a/Resources/Locale/ru-RU/_WL/headset/headset-component.ftl b/Resources/Locale/ru-RU/_WL/headset/headset-component.ftl index 09cf02897e..a101dd6f00 100644 --- a/Resources/Locale/ru-RU/_WL/headset/headset-component.ftl +++ b/Resources/Locale/ru-RU/_WL/headset/headset-component.ftl @@ -1,2 +1 @@ chat-radio-hitin = Хитин -chat-radio-conspiracy = Заговорщики diff --git a/Resources/Locale/ru-RU/_WL/mind/role-types.ftl b/Resources/Locale/ru-RU/_WL/mind/role-types.ftl deleted file mode 100644 index 8113256131..0000000000 --- a/Resources/Locale/ru-RU/_WL/mind/role-types.ftl +++ /dev/null @@ -1 +0,0 @@ -role-subtype-conspirator = Заговорщик diff --git a/Resources/Locale/ru-RU/_WL/objectives/conspirators.ftl b/Resources/Locale/ru-RU/_WL/objectives/conspirators.ftl deleted file mode 100644 index 9b5091645d..0000000000 --- a/Resources/Locale/ru-RU/_WL/objectives/conspirators.ftl +++ /dev/null @@ -1,23 +0,0 @@ -ent-ConspiratorUnionObjective = Захват одного из отделов станции - .desc = Захватите один из отделов станции и объявите независимость от НТ! - -ent-ConspiratorGameshowObjective = Устройте шоу насмерть - .desc = Заставьте экипаж стать частью смертельного ТВ-шоу! - -ent-ConspiratorTechnologyObjective = Захватите все технологии станции - .desc = Покажите экипажу прелести простой жизни. Потому что только вы достойны технологического прогресса! - -ent-ConspiratorArmsObjective = Разоружите СБ и вооружитесь сами - .desc = Отберите у СБ всё оружие и вооружитесь сами. Этим корпоратским крысам ничего нельзя доверить... - -ent-ConspiratorThiefObjective = Совершите величайшее ограбление всех времён! - .desc = Впишите свои имена в историю преступного мира, ограбив вашу станцию. - -ent-ConspiratorMafiaObjective = Станьте криминальной семьёй - .desc = Заберитесь на вершину преступного мира станции и зацементируйте ваше превосходство над ним! - -ent-ConspiratorArrestObjective = Заставьте СБ арестовывать невиновных - .desc = Продемонстрируйте корпоративную некомпетентность, показав как легко их обмануть. - -ent-ConspiratorCameraObjective = Ослепите НТ на станции - .desc = Верните обычным рабочим и пассажирам право на частную жизнь. diff --git a/Resources/Locale/ru-RU/_WL/prototypes/roles/antags.ftl b/Resources/Locale/ru-RU/_WL/prototypes/roles/antags.ftl deleted file mode 100644 index 815c8aeac7..0000000000 --- a/Resources/Locale/ru-RU/_WL/prototypes/roles/antags.ftl +++ /dev/null @@ -1,2 +0,0 @@ -roles-antag-conspirator-name = Заговорщик -roles-antag-conspirator-objective = Сотрудничайте и не останавливайтесь ни перед чем для воплощения заговора в реальность. diff --git a/Resources/Locale/ru-RU/_WL/roles/mind_roles.ftl b/Resources/Locale/ru-RU/_WL/roles/mind_roles.ftl deleted file mode 100644 index 64df7263c9..0000000000 --- a/Resources/Locale/ru-RU/_WL/roles/mind_roles.ftl +++ /dev/null @@ -1 +0,0 @@ -ent-MindRoleConspirator = Роль Заговорщика diff --git a/Resources/Prototypes/Guidebook/antagonist.yml b/Resources/Prototypes/Guidebook/antagonist.yml index cab077b331..66cb65218a 100644 --- a/Resources/Prototypes/Guidebook/antagonist.yml +++ b/Resources/Prototypes/Guidebook/antagonist.yml @@ -11,7 +11,6 @@ - Wizard - Zombies - Xenoborgs - - Conspirators # WL-Changes: Conspirators - MinorAntagonists - type: guideEntry diff --git a/Resources/Prototypes/_WL/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/_WL/Entities/Objects/Misc/implanters.yml deleted file mode 100644 index ce13905acb..0000000000 --- a/Resources/Prototypes/_WL/Entities/Objects/Misc/implanters.yml +++ /dev/null @@ -1,7 +0,0 @@ -- type: entity - parent: BaseImplantOnlyImplanter # it's weird because this neither an NT or syndicate implanter. it's completely unobtainable though and exists more for playtesting convenience than anything - id: RadioImplanterConspiracy - name: conspiracy radio implanter - components: - - type: Implanter - implant: RadioImplantConspiracy diff --git a/Resources/Prototypes/_WL/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/_WL/Entities/Objects/Misc/subdermal_implants.yml deleted file mode 100644 index af0786c347..0000000000 --- a/Resources/Prototypes/_WL/Entities/Objects/Misc/subdermal_implants.yml +++ /dev/null @@ -1,11 +0,0 @@ -- type: entity - parent: BaseSubdermalImplant - id: RadioImplantConspiracy - categories: [ HideSpawnMenu ] - name: conspiracy radio implant - description: This implant grants access to the Conspiracy channel without a headset. - components: - - type: SubdermalImplant - - type: RadioImplant - radioChannels: - - Conspiracy diff --git a/Resources/Prototypes/_WL/GameRules/roundstart.yml b/Resources/Prototypes/_WL/GameRules/roundstart.yml deleted file mode 100644 index bbfd3e85b6..0000000000 --- a/Resources/Prototypes/_WL/GameRules/roundstart.yml +++ /dev/null @@ -1,25 +0,0 @@ -- type: entity - parent: BaseGameRule - id: Conspirators - components: - - type: GameRule - minPlayers: 28 # minimum of 4 conspirators - - type: ConspiratorRule - - type: AntagSelection - selectionTime: IntraPlayerSpawn - definitions: - - prefRoles: [ Conspirator ] - min: 4 - max: 7 - playerRatio: 7 - briefing: - text: conspirator-role-greeting - color: "#724F29" - sound: /Audio/_WL/Misc/illuminati.ogg - components: - - type: Conspirator - - type: AutoImplant - implants: - - RadioImplantConspiracy - mindRoles: - - MindRoleConspirator diff --git a/Resources/Prototypes/_WL/Guidebook/antagonist.yml b/Resources/Prototypes/_WL/Guidebook/antagonist.yml deleted file mode 100644 index 6119a25adc..0000000000 --- a/Resources/Prototypes/_WL/Guidebook/antagonist.yml +++ /dev/null @@ -1,4 +0,0 @@ -- type: guideEntry - id: Conspirators - name: guide-entry-conspirators - text: "/ServerInfo/Guidebook/_WL/Antagonist/Conspirators.xml" diff --git a/Resources/Prototypes/_WL/Objectives/conspirators.yml b/Resources/Prototypes/_WL/Objectives/conspirators.yml deleted file mode 100644 index 1ede293eaf..0000000000 --- a/Resources/Prototypes/_WL/Objectives/conspirators.yml +++ /dev/null @@ -1,100 +0,0 @@ -- type: entity - abstract: true - parent: BaseObjective - id: BaseConspiratorObjective - components: - - type: Objective - issuer: conspirator-objective-issuer - difficulty: 0 # uses own system for assignment - - type: RoleRequirement - roles: - - ConspiratorRole - - type: NoCompletionObjective - -- type: entity - parent: BaseConspiratorObjective - id: ConspiratorUnionObjective - name: Forcefully seize control of a department - description: Assume direct control over a department and declare independence from Nanotrasen. - components: - - type: Objective - icon: - sprite: Objects/Weapons/Melee/stunprod.rsi - state: stunprod_off - -- type: entity - parent: BaseConspiratorObjective - id: ConspiratorGameshowObjective - name: Run a life-or-death game show - description: Force the crew to take part in a game show with incredible stakes. - components: - - type: Objective - icon: - sprite: Structures/Machines/computers.rsi - state: television - -- type: entity - parent: BaseConspiratorObjective - id: ConspiratorTechnologyObjective - name: Seize all station technology - description: Show the crew the merits of a simpler life. Because only you deserve the wonders of technology. - components: - - type: Objective - icon: - sprite: Structures/Machines/autolathe.rsi - state: icon - -- type: entity - parent: BaseConspiratorObjective - id: ConspiratorArmsObjective - name: Disarm Security and arm yourselves instead - description: Take the guns from Security and give them to yourselves. They cannot be trusted with them. - components: - - type: Objective - icon: - sprite: Objects/Weapons/Guns/Pistols/mk58.rsi - state: icon - -- type: entity - parent: BaseConspiratorObjective - id: ConspiratorThiefObjective - name: Pull off the greatest heist of all time - description: Get your names written in the history books for what you take from this station. - components: - - type: Objective - icon: - sprite: Objects/Tools/thief_beacon.rsi - state: extraction_point - -- type: entity - parent: BaseConspiratorObjective - id: ConspiratorMafiaObjective - name: Form a crime family - description: Become the leaders of crime on this station and cement your reputation as a group not to be messed with. - components: - - type: Objective - icon: - sprite: Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi - state: brassknuckleduster - -- type: entity - parent: BaseConspiratorObjective - id: ConspiratorArrestObjective - name: Trick Security into arresting innocent people - description: Demonstrate their incompetence by showing just how easy they are to fool. - components: - - type: Objective - icon: - sprite: Objects/Weapons/Melee/stunbaton.rsi - state: stunbaton_off - -- type: entity - parent: BaseConspiratorObjective - id: ConspiratorCameraObjective - name: Dismantle the surveillance state - description: Bring back the right to privacy for Nanotrasen employees. - components: - - type: Objective - icon: - sprite: Mobs/Silicon/station_ai.rsi - state: ai_camera diff --git a/Resources/Prototypes/_WL/Objectives/objectiveGroups.yml b/Resources/Prototypes/_WL/Objectives/objectiveGroups.yml deleted file mode 100644 index c996fd98a6..0000000000 --- a/Resources/Prototypes/_WL/Objectives/objectiveGroups.yml +++ /dev/null @@ -1,11 +0,0 @@ -- type: weightedRandom - id: ConspiratorObjectiveGroup # if you want to add another objective, feel free - weights: - ConspiratorUnionObjective: 1 - ConspiratorGameshowObjective: 1 - ConspiratorTechnologyObjective: 1 - ConspiratorArmsObjective: 1 - ConspiratorThiefObjective: 1 - ConspiratorMafiaObjective: 1 - ConspiratorArrestObjective: 1 - ConspiratorCameraObjective: 1 diff --git a/Resources/Prototypes/_WL/Roles/Antags/conspirator.yml b/Resources/Prototypes/_WL/Roles/Antags/conspirator.yml deleted file mode 100644 index 939d7e724a..0000000000 --- a/Resources/Prototypes/_WL/Roles/Antags/conspirator.yml +++ /dev/null @@ -1,7 +0,0 @@ -- type: antag - id: Conspirator - name: roles-antag-conspirator-name - antagonist: true - setPreference: true - objective: roles-antag-conspirator-objective - guides: [ Conspirators ] diff --git a/Resources/Prototypes/_WL/Roles/MindRoles/mind_roles.yml b/Resources/Prototypes/_WL/Roles/MindRoles/mind_roles.yml deleted file mode 100644 index d0efb73f65..0000000000 --- a/Resources/Prototypes/_WL/Roles/MindRoles/mind_roles.yml +++ /dev/null @@ -1,11 +0,0 @@ -- type: entity - parent: BaseMindRoleAntag - id: MindRoleConspirator - name: Conspirator Role - components: - - type: ConspiratorRole - - type: MindRole - antagPrototype: Conspirator - exclusiveAntag: true - roleType: TeamAntagonist - subtype: role-subtype-conspirator diff --git a/Resources/Prototypes/_WL/StatusIcon/faction.yml b/Resources/Prototypes/_WL/StatusIcon/faction.yml deleted file mode 100644 index aba29ae962..0000000000 --- a/Resources/Prototypes/_WL/StatusIcon/faction.yml +++ /dev/null @@ -1,11 +0,0 @@ -- type: factionIcon - id: ConspiratorFaction - isShaded: true - priority: 11 - showTo: - components: - - ShowAntagIcons - - Conspirator - icon: - sprite: /Textures/_WL/Interface/Misc/job_icons.rsi - state: Conspirator diff --git a/Resources/Prototypes/_WL/ai_factions.yml b/Resources/Prototypes/_WL/ai_factions.yml deleted file mode 100644 index a3b9f3e66b..0000000000 --- a/Resources/Prototypes/_WL/ai_factions.yml +++ /dev/null @@ -1,10 +0,0 @@ -- type: npcFaction - id: Conspirator - hostile: - - NanoTrasen - - Zombie - - SimpleHostile - - Dragon - - AllHostile - - Wizard - - Xenoborg diff --git a/Resources/Prototypes/_WL/game_presets.yml b/Resources/Prototypes/_WL/game_presets.yml deleted file mode 100644 index b777afddc3..0000000000 --- a/Resources/Prototypes/_WL/game_presets.yml +++ /dev/null @@ -1,14 +0,0 @@ -- type: gamePreset - id: Conspiracy - alias: - - conspirators - - conspirator - name: conspiracy-title - description: conspiracy-description - showInVote: false # secret - rules: - - Conspirators - - BasicStationEventScheduler - - MeteorSwarmScheduler - - SpaceTrafficControlEventScheduler - - BasicRoundstartVariation diff --git a/Resources/Prototypes/_WL/radio_channels.yml b/Resources/Prototypes/_WL/radio_channels.yml index a9c74289b0..d2b2540523 100644 --- a/Resources/Prototypes/_WL/radio_channels.yml +++ b/Resources/Prototypes/_WL/radio_channels.yml @@ -5,11 +5,3 @@ frequency: 4944 color: "#cc7722" longRange: true - -- type: radioChannel - id: Conspiracy - name: chat-radio-conspiracy - keycode: 'з' - frequency: 1174 - color: "#724F29" - longRange: true diff --git a/Resources/Prototypes/secret_weights.yml b/Resources/Prototypes/secret_weights.yml index e9bbba56d9..21312fa69a 100644 --- a/Resources/Prototypes/secret_weights.yml +++ b/Resources/Prototypes/secret_weights.yml @@ -3,8 +3,7 @@ weights: Extended: 0.29 Nukeops: 0.15 - Traitor: 0.3 - Conspirators: 0.1 # WL-Changes: Conspirators + Traitor: 0.4 #Zombie: 0.04 #Zombieteors: 0.01 Survival: 0.1 diff --git a/Resources/ServerInfo/Guidebook/_WL/Antagonist/Conspirators.xml b/Resources/ServerInfo/Guidebook/_WL/Antagonist/Conspirators.xml deleted file mode 100644 index a0c6d09cf9..0000000000 --- a/Resources/ServerInfo/Guidebook/_WL/Antagonist/Conspirators.xml +++ /dev/null @@ -1,16 +0,0 @@ - - # Заговорщики - - - [color=#999999][italic]"Мы — холодный ветер в зимний день. Мы — тень в безлунной ночи. Мы — яд в твоём чае и шёпот у твоего уха. Мы везде."[/italic][/color] - - Заговорщики — это группа из членов экипажа, которые кооперируются для воплощения заговора в жизнь. Заговорщики неотличимы от обычных работников станции, но они знают друг друга и имеют [color=cyan]заговорческий радио-имплант[/color], позволяющий им общаться друг с другом. - - ## Игра за заговорщика - - Заговор — это просто! - - Проверьте ваше меню персонажа, узнайте личности других заговорщиков и вашу общую [bold]цель[/bold]. Эта цель является лишь предложением. Если все заговорщики пожелают сделать что-то другое, вы можете заняться уже этим. - - Используйте имплант радиосвязи [color=yellow][bold](:з)[/color][/bold] для общения с другими заговорщиками. - - Работайте с друг другом, воплощая свои замыслы в жизнь за счёт экипажа. - - Постарайтесь выбрать себе главу, ведь любой заговор нуждается в оргнизаторе. - diff --git a/Resources/Textures/_WL/Interface/Misc/job_icons.rsi/Conspirator.png b/Resources/Textures/_WL/Interface/Misc/job_icons.rsi/Conspirator.png deleted file mode 100644 index 4825a06782..0000000000 Binary files a/Resources/Textures/_WL/Interface/Misc/job_icons.rsi/Conspirator.png and /dev/null differ diff --git a/Resources/Textures/_WL/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/_WL/Interface/Misc/job_icons.rsi/meta.json index cd4be22a1d..4d3786eae2 100644 --- a/Resources/Textures/_WL/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/_WL/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "By ReArtInt. Conspirator made by SuperGDPWYL (GitHub).", + "copyright": "By ReArtInt", "size": { "x": 8, "y": 8 @@ -9,10 +9,6 @@ "states": [ { "name": "Adjutant" - - }, - { - "name": "Conspirator" } ] }