From 224d96bd34a3c6f2c0fa98fcf7e1bc1dc5a7bc55 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Wed, 19 Feb 2025 21:56:29 +0300 Subject: [PATCH] Sociopath delete (#917) * fuck sociopath and grass seel position * Update PostMapInitTest.cs * fix --- .../Tests/PostMapInitTest.cs | 1 + .../Systems/AdminVerbSystem.Antags.cs | 17 --------------- .../_CP14/Roles/CP14SociopathRoleComponent.cs | 11 ---------- .../en-US/_CP14/administration/antag.ftl | 2 -- .../Locale/en-US/_CP14/antags/antags.ftl | 3 --- .../positions_sell_special.ftl | 3 --- .../ru-RU/_CP14/administration/antag.ftl | 2 -- .../Locale/ru-RU/_CP14/antags/antags.ftl | 3 --- .../position_sell_special.ftl | 3 --- Resources/Maps/Nonstations/meteor-arena.yml | 2 +- .../Catalog/Cargo/Store/sell_special.yml | 13 ------------ .../Prototypes/_CP14/GameRules/roundstart.yml | 21 ------------------- Resources/Prototypes/_CP14/Maps/arenas.yml | 2 +- .../_CP14/Roles/Antags/Sociopath.yml | 18 ---------------- .../_CP14/Roles/MindRoles/mind_roles.yml | 14 ------------- Resources/Prototypes/_CP14/game_presets.yml | 1 - 16 files changed, 3 insertions(+), 113 deletions(-) delete mode 100644 Content.Server/_CP14/Roles/CP14SociopathRoleComponent.cs delete mode 100644 Resources/Locale/en-US/_CP14/administration/antag.ftl delete mode 100644 Resources/Locale/en-US/_CP14/antags/antags.ftl delete mode 100644 Resources/Locale/ru-RU/_CP14/administration/antag.ftl delete mode 100644 Resources/Locale/ru-RU/_CP14/antags/antags.ftl delete mode 100644 Resources/Prototypes/_CP14/Roles/Antags/Sociopath.yml diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs index af091af4b0..3cb064c8f0 100644 --- a/Content.IntegrationTests/Tests/PostMapInitTest.cs +++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs @@ -48,6 +48,7 @@ namespace Content.IntegrationTests.Tests { //CrystallEdge Map replacement "/Maps/_CP14/dev_map.yml", + "/Maps/_CP14/Dungeon/artifact_room.yml", //CrystallEdge Map replacement end "/Maps/centcomm.yml", "/Maps/bagel.yml", // Contains mime's rubber stamp --> Either fix this, remove the category, or remove this comment if intentional. diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs index 8264b67d51..c69c865d84 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs @@ -1,4 +1,3 @@ -using Content.Server._CP14.Roles; using Content.Server.Administration.Commands; using Content.Server.Antag; using Content.Server.GameTicking.Rules.Components; @@ -53,22 +52,6 @@ public sealed partial class AdminVerbSystem var targetPlayer = targetActor.PlayerSession; - - Verb CP14Sociopath = new() - { - Text = Loc.GetString("cp14-admin-verb-text-make-sociopath"), - Category = VerbCategory.Antag, - Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Clothing/Hands/Gloves/Color/black.rsi"), - "icon"), //TODO - Act = () => - { - //_antag.ForceMakeAntag(targetPlayer, "CP14Bandit"); //TODO - }, - Impact = LogImpact.High, - Message = Loc.GetString("cp14-admin-verb-make-sociopath"), - }; - args.Verbs.Add(CP14Sociopath); - /* CP14 disable default antags Verb traitor = new() { diff --git a/Content.Server/_CP14/Roles/CP14SociopathRoleComponent.cs b/Content.Server/_CP14/Roles/CP14SociopathRoleComponent.cs deleted file mode 100644 index dda830709f..0000000000 --- a/Content.Server/_CP14/Roles/CP14SociopathRoleComponent.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Content.Shared.Roles; - -namespace Content.Server._CP14.Roles; - -/// -/// Added to mind role entities to tag that they are a sociopath. -/// -[RegisterComponent] -public sealed partial class CP14SociopathRoleComponent : BaseMindRoleComponent -{ -} diff --git a/Resources/Locale/en-US/_CP14/administration/antag.ftl b/Resources/Locale/en-US/_CP14/administration/antag.ftl deleted file mode 100644 index a5d5636ba9..0000000000 --- a/Resources/Locale/en-US/_CP14/administration/antag.ftl +++ /dev/null @@ -1,2 +0,0 @@ -cp14-admin-verb-text-make-sociopath = Make sociopath -cp14-admin-verb-make-sociopath = Add to target antagonist role “Sociopath” diff --git a/Resources/Locale/en-US/_CP14/antags/antags.ftl b/Resources/Locale/en-US/_CP14/antags/antags.ftl deleted file mode 100644 index 5c9656cb7d..0000000000 --- a/Resources/Locale/en-US/_CP14/antags/antags.ftl +++ /dev/null @@ -1,3 +0,0 @@ -cp14-roles-antag-sociopath-name = Sociopath -cp14-roles-antag-sociopath-objective = You don't understand morality or empathy. As long as other people are constrained by them, you don't have to worry about exactly how to accomplish your tasks. -cp14-roles-antag-sociopath-briefing = From birth you don't know what emotion, morality or empathy are. You only know that other people are constrained by them, and this prevents them from being effective. You have certain goals - and you can strive to accomplish them by ANY means. \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/travelingStoreship/positions_sell_special.ftl b/Resources/Locale/en-US/_CP14/travelingStoreship/positions_sell_special.ftl index b6d885b5d8..41acce258d 100644 --- a/Resources/Locale/en-US/_CP14/travelingStoreship/positions_sell_special.ftl +++ b/Resources/Locale/en-US/_CP14/travelingStoreship/positions_sell_special.ftl @@ -10,9 +10,6 @@ cp14-store-sell-special-meat-desc = Any kind of meat will do. Lambs, goats, cows cp14-store-sell-special-torch-name = 20 torches cp14-store-sell-special-torch-desc = The settlement of Grimstroke is requesting a large shipment of torches from the Empire! We're making a big march on the Great Tomb of Lazaric! And we have nothing to light it with. -cp14-store-sell-special-flora-name = 15 flora material -cp14-store-sell-special-flora-desc = Battle HQ 14 requesting support! Orders have been received to 'Green the area surrounding the HQ'. Unfortunately, the HQ is located in the desert. Requesting grass to spread all over the area. - cp14-store-sell-special-ash-name = 10 ashes cp14-store-sell-special-ash-desc = The Mermaid Council is requesting a shipment of ash to their oceanic domain for the reason, quote ‘Where do you think we should get ash from underwater?’ diff --git a/Resources/Locale/ru-RU/_CP14/administration/antag.ftl b/Resources/Locale/ru-RU/_CP14/administration/antag.ftl deleted file mode 100644 index 784be5aaf1..0000000000 --- a/Resources/Locale/ru-RU/_CP14/administration/antag.ftl +++ /dev/null @@ -1,2 +0,0 @@ -cp14-admin-verb-text-make-sociopath = Сделать социопатом -cp14-admin-verb-make-sociopath = Добавить цели роль антагониста "Социопат" diff --git a/Resources/Locale/ru-RU/_CP14/antags/antags.ftl b/Resources/Locale/ru-RU/_CP14/antags/antags.ftl deleted file mode 100644 index 11899a82b1..0000000000 --- a/Resources/Locale/ru-RU/_CP14/antags/antags.ftl +++ /dev/null @@ -1,3 +0,0 @@ -cp14-roles-antag-sociopath-name = Социопат -cp14-roles-antag-sociopath-objective = Вам непонятны принципы морали или сочувствия. Пока остальные люди скованы ими, вам не нужно заботиться о том, как именно выполнить свои задачи. -cp14-roles-antag-sociopath-briefing = С самого рождения вы не знаете что такое эмоции, мораль или сочувствие. Вы знаете только, что остальные люди скованы ими, и это мешает им действовать эффективно. У вас есть определенные задачи - и вы можете стремиться к их выполнению ЛЮБЫМИ методами. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/travelingStoreship/position_sell_special.ftl b/Resources/Locale/ru-RU/_CP14/travelingStoreship/position_sell_special.ftl index be02433461..9f79920043 100644 --- a/Resources/Locale/ru-RU/_CP14/travelingStoreship/position_sell_special.ftl +++ b/Resources/Locale/ru-RU/_CP14/travelingStoreship/position_sell_special.ftl @@ -10,9 +10,6 @@ cp14-store-sell-special-meat-desc = Нам подойдет любое мясо. cp14-store-sell-special-torch-name = 20 факелов cp14-store-sell-special-torch-desc = Поселение Гримстроук запрашивает большую партию факелов от Империи! Мы устраиваем большой поход на Великую Гробницу Лазарика! И нам нечем освещать ее. -cp14-store-sell-special-flora-name = 15 растительного волокна -cp14-store-sell-special-flora-desc = Боевой штаб 14 запрашивает поддержку! Поступил приказ 'Озеленить прилегающую к штабу территорию'. К сожалению, штаб расположен в пустыне. Запрашиваем траву, чтобы раскидать ее по всей территории. - cp14-store-sell-special-ash-name = 10 пепла cp14-store-sell-special-ash-desc = Совет русалок запрашивает партию пепла в свои океанические владения по причине, цитата 'Откуда мы должны под водой получать пепел по вашему?' diff --git a/Resources/Maps/Nonstations/meteor-arena.yml b/Resources/Maps/Nonstations/meteor-arena.yml index 92320b491f..a0d895e740 100644 --- a/Resources/Maps/Nonstations/meteor-arena.yml +++ b/Resources/Maps/Nonstations/meteor-arena.yml @@ -984,7 +984,7 @@ entities: - type: Transform pos: -0.5,-0.5 parent: 2 -- proto: SpawnPointPassenger +- proto: CP14SpawnPointAdventurer entities: - uid: 99 components: diff --git a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/sell_special.yml b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/sell_special.yml index 0ae8fa5cfa..1f073f1f8c 100644 --- a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/sell_special.yml +++ b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/sell_special.yml @@ -58,19 +58,6 @@ - CP14Torch count: 20 -- type: storePositionSell - id: BountyFloraMaterial - special: true - name: cp14-store-sell-special-flora-name - desc: cp14-store-sell-special-flora-desc - icon: - sprite: _CP14/Objects/Materials/flora.rsi - state: grass_material1 - price: 200 - service: !type:CP14SellStackService - stackId: CP14FloraMaterial - count: 15 - - type: storePositionSell id: BountySpellScroll special: true diff --git a/Resources/Prototypes/_CP14/GameRules/roundstart.yml b/Resources/Prototypes/_CP14/GameRules/roundstart.yml index d94fba9056..cfca839d82 100644 --- a/Resources/Prototypes/_CP14/GameRules/roundstart.yml +++ b/Resources/Prototypes/_CP14/GameRules/roundstart.yml @@ -30,27 +30,6 @@ - CP14PersonalCurrencyCollectObjectiveGroup CP14Innkeeper: - CP14PersonalCurrencyCollectObjectiveGroup - - -- type: entity - id: CP14SociopathsRule - parent: CP14BaseGameRule - components: - - type: GameRule - minPlayers: 2 #Increase when bigger online - - type: AntagSelection - definitions: - - prefRoles: [ CP14Sociopath ] - startingGear: CP14SociopathGear - max: 8 - playerRatio: 10 - lateJoinAdditional: true - mindRoles: - - CP14MindRoleSociopath - briefing: - text: cp14-roles-antag-sociopath-briefing - color: "#cc3010" - sound: "/Audio/_CP14/Ambience/Antag/bandit_start.ogg" # event schedulers diff --git a/Resources/Prototypes/_CP14/Maps/arenas.yml b/Resources/Prototypes/_CP14/Maps/arenas.yml index b419084759..41f5a82d6f 100644 --- a/Resources/Prototypes/_CP14/Maps/arenas.yml +++ b/Resources/Prototypes/_CP14/Maps/arenas.yml @@ -11,4 +11,4 @@ mapNameTemplate: "Meteor Arena" - type: StationJobs availableJobs: - Passenger: [ -1, -1 ] \ No newline at end of file + CP14Adventurer: [ -1, -1 ] \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Roles/Antags/Sociopath.yml b/Resources/Prototypes/_CP14/Roles/Antags/Sociopath.yml deleted file mode 100644 index c5a2f66ffe..0000000000 --- a/Resources/Prototypes/_CP14/Roles/Antags/Sociopath.yml +++ /dev/null @@ -1,18 +0,0 @@ -- type: antag - id: CP14Sociopath - name: cp14-roles-antag-sociopath-name - antagonist: true - setPreference: true - objective: cp14-roles-antag-sociopath-objective - requirements: - - !type:OverallPlaytimeRequirement - time: 7200 # 2h - #guides: TODO - -- type: startingGear - id: CP14SociopathGear - storage: - back: - - CP14BaseLockpick - - CP14BaseLockpick - - CP14BaseLockpick \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Roles/MindRoles/mind_roles.yml b/Resources/Prototypes/_CP14/Roles/MindRoles/mind_roles.yml index 69b0a06b35..4eddf2a4d3 100644 --- a/Resources/Prototypes/_CP14/Roles/MindRoles/mind_roles.yml +++ b/Resources/Prototypes/_CP14/Roles/MindRoles/mind_roles.yml @@ -6,17 +6,3 @@ - type: MindRole roleType: CP14DemiplaneAntagonist antagPrototype: CP14DemiplaneAntag - -- type: entity - parent: BaseMindRoleAntag - id: CP14MindRoleSociopath - categories: [ ForkFiltered ] - name: Sociopath Role - components: - - type: MindRole - antagPrototype: CP14Sociopath - roleType: SoloAntagonist - exclusiveAntag: true - - type: CP14SociopathRole - - type: RoleBriefing - briefing: cp14-roles-antag-sociopath-briefing diff --git a/Resources/Prototypes/_CP14/game_presets.yml b/Resources/Prototypes/_CP14/game_presets.yml index 8ce895f2fa..8bb9d76c9c 100644 --- a/Resources/Prototypes/_CP14/game_presets.yml +++ b/Resources/Prototypes/_CP14/game_presets.yml @@ -17,7 +17,6 @@ showInVote: true cP14Allowed: true rules: - - CP14SociopathsRule - CP14RoundObjectivesRule - CP14BasicStationEventScheduler