From 59459bfda5d0bf594a95641bb7ab04b15577584d Mon Sep 17 00:00:00 2001 From: Red <96445749+TheShuEd@users.noreply.github.com> Date: Sat, 26 Jul 2025 15:10:06 +0300 Subject: [PATCH] Remove Lumera (#1578) * remove vampire * remove lumera * move aura imprint folder * remove armor * delete textures * Revert "delete textures" This reverts commit 2fd90e0898111b23bc9d7f96928d7da552fb8625. * Revert "remove armor" This reverts commit c44bd1bc32685b65176bf564887590f37ba65495. --- .../Systems/AdminVerbSystem.Antags.cs | 20 ------------------- .../CP14AuraImprintComponent.cs | 0 .../CP14SharedAuraImprintSystem.cs | 0 Resources/Prototypes/_CP14/Maps/comoss.yml | 2 -- .../Prototypes/_CP14/Maps/venicialis.yml | 2 -- .../_CP14/Roles/Jobs/Demigods/lumera.yml | 2 +- .../_CP14/Roles/Jobs/departments.yml | 2 +- 7 files changed, 2 insertions(+), 26 deletions(-) rename Content.Shared/_CP14/{AuraDNA => AuraImrint}/CP14AuraImprintComponent.cs (100%) rename Content.Shared/_CP14/{AuraDNA => AuraImrint}/CP14SharedAuraImprintSystem.cs (100%) diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs index 182ba1ecdb..990262f928 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs @@ -44,11 +44,6 @@ public sealed partial class AdminVerbSystem private readonly EntProtoId _paradoxCloneRuleId = "ParadoxCloneSpawn"; - //CP14 - [ValidatePrototypeId] - private const string CP14VampireRule = "CP14Vampire"; - //CP14 end - // All antag verbs have names so invokeverb works. private void AddAntagVerbs(GetVerbsEvent args) { @@ -65,21 +60,6 @@ public sealed partial class AdminVerbSystem var targetPlayer = targetActor.PlayerSession; - Verb vampire = new() - { - Text = Loc.GetString("cp14-admin-verb-text-make-vampire"), - Category = VerbCategory.Antag, - Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/_CP14/Actions/Spells/vampire.rsi"), - "bite"), - Act = () => - { - _antag.ForceMakeAntag(targetPlayer, CP14VampireRule); - }, - Impact = LogImpact.High, - Message = Loc.GetString("cp14-admin-verb-make-vampire"), - }; - args.Verbs.Add(vampire); - /* CP14 disable default antags var traitorName = Loc.GetString("admin-verb-text-make-traitor"); Verb traitor = new() diff --git a/Content.Shared/_CP14/AuraDNA/CP14AuraImprintComponent.cs b/Content.Shared/_CP14/AuraImrint/CP14AuraImprintComponent.cs similarity index 100% rename from Content.Shared/_CP14/AuraDNA/CP14AuraImprintComponent.cs rename to Content.Shared/_CP14/AuraImrint/CP14AuraImprintComponent.cs diff --git a/Content.Shared/_CP14/AuraDNA/CP14SharedAuraImprintSystem.cs b/Content.Shared/_CP14/AuraImrint/CP14SharedAuraImprintSystem.cs similarity index 100% rename from Content.Shared/_CP14/AuraDNA/CP14SharedAuraImprintSystem.cs rename to Content.Shared/_CP14/AuraImrint/CP14SharedAuraImprintSystem.cs diff --git a/Resources/Prototypes/_CP14/Maps/comoss.yml b/Resources/Prototypes/_CP14/Maps/comoss.yml index 01bda71485..064810bedc 100644 --- a/Resources/Prototypes/_CP14/Maps/comoss.yml +++ b/Resources/Prototypes/_CP14/Maps/comoss.yml @@ -13,8 +13,6 @@ mapNameTemplate: "Comoss island" - type: StationJobs availableJobs: - #Demigods - CP14GodLumera: [ 1, 1 ] #Mercenary #CP14Guildmaster: [1, 1] CP14Adventurer: [ -1, -1 ] diff --git a/Resources/Prototypes/_CP14/Maps/venicialis.yml b/Resources/Prototypes/_CP14/Maps/venicialis.yml index 8cdcd27241..89f0711a38 100644 --- a/Resources/Prototypes/_CP14/Maps/venicialis.yml +++ b/Resources/Prototypes/_CP14/Maps/venicialis.yml @@ -13,8 +13,6 @@ mapNameTemplate: "Venicialis fort" - type: StationJobs availableJobs: - #Demigods - CP14GodLumera: [ 1, 1 ] #Mercenary #CP14Guildmaster: [1, 1] CP14Adventurer: [ -1, -1 ] diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Demigods/lumera.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Demigods/lumera.yml index 88cfc32447..90c4e7e1ca 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Demigods/lumera.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Demigods/lumera.yml @@ -2,7 +2,7 @@ id: CP14GodLumera name: cp14-job-name-god-lumera description: cp14-job-desc-god-lumera - setPreference: true + setPreference: false playTimeTracker: CP14GodLumera requirements: - !type:OverallPlaytimeRequirement diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml b/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml index e599e351ce..bf61469660 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml @@ -4,7 +4,7 @@ description: department-CP14Demigods-desc weight: 666 # >:) color: "#ffffff" - editorHidden: false + editorHidden: true roles: - CP14GodLumera - CP14GodMerkas