From 48f5d3171ef89a72da2c54313bef6344bf58bb17 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Fri, 12 Apr 2024 15:19:20 -0400 Subject: [PATCH] Revert "Add Corspman Access & Airlocks (#65)" This reverts commit 56e7e8e08eb8412ce2a0122c2f2df4c9591e9e43. --- .../Access/Components/IdCardConsoleComponent.cs | 3 +-- .../en-US/deltav/prototypes/access/accesses.ftl | 1 - Resources/Prototypes/Access/misc.yml | 1 - Resources/Prototypes/Access/security.yml | 1 - .../Catalog/Fills/Lockers/suit_storage.yml | 2 -- Resources/Prototypes/DeltaV/Access/misc.yml | 1 - Resources/Prototypes/DeltaV/Access/security.yml | 3 --- .../Structures/Doors/Airlocks/access.yml | 16 ---------------- .../DeltaV/Roles/Jobs/Security/brigmedic.yml | 1 - .../Objects/Tools/access_configurator.yml | 1 - .../Storage/Closets/Lockers/lockers.yml | 2 +- .../Roles/Jobs/Security/head_of_security.yml | 1 - 12 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 Resources/Prototypes/DeltaV/Access/security.yml diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs index 252fc2c5f43..eafc78cad15 100644 --- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs +++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs @@ -57,7 +57,6 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List acc "ChiefEngineer", "ChiefMedicalOfficer", "Clown", // DeltaV - Add Clown access - "Corpsman", // DeltaV - Add Corpsman access "Command", "Cryogenics", "Engineering", @@ -68,7 +67,7 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List acc "Janitor", "Kitchen", "Lawyer", - "Library", // DeltaV - Add Library access + "Library", // DeltaV - Add Library access "Maintenance", "Medical", "Mime", // DeltaV - Add Mime access diff --git a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl index 84245872f54..239cecc6e0a 100644 --- a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl +++ b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl @@ -1,3 +1,2 @@ id-card-access-level-orders = Orders id-card-access-level-mantis = Psionic Mantis -id-card-access-level-corpsman = Corpsman diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index 99ad59700e0..ab17f6e41e5 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -44,4 +44,3 @@ - Musician # DeltaV - Add Musician access - Reporter # DeltaV - Add Reporter access - Zookeeper # DeltaV - Add Zookeeper access - - Corpsman # DeltaV - Add Corpsman access diff --git a/Resources/Prototypes/Access/security.yml b/Resources/Prototypes/Access/security.yml index cfb6e600606..4a0743d1741 100644 --- a/Resources/Prototypes/Access/security.yml +++ b/Resources/Prototypes/Access/security.yml @@ -28,7 +28,6 @@ #- Brig #Delta V removed - Detective - Cryogenics - - Corpsman # DeltaV - add Corpsman access - type: accessGroup id: Armory diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index ac5cb47cc97..73b7021461d 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -275,8 +275,6 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitCombatCorpsman - id: ClothingMaskBreath - - type: AccessReader - access: [ [ "Corpsman" ] ] # DeltaV - End Changes diff --git a/Resources/Prototypes/DeltaV/Access/misc.yml b/Resources/Prototypes/DeltaV/Access/misc.yml index df3f60a4f88..c1260b39958 100644 --- a/Resources/Prototypes/DeltaV/Access/misc.yml +++ b/Resources/Prototypes/DeltaV/Access/misc.yml @@ -15,7 +15,6 @@ - Command - Security - Detective - - Corpsman # - Armory - Lawyer - Engineering diff --git a/Resources/Prototypes/DeltaV/Access/security.yml b/Resources/Prototypes/DeltaV/Access/security.yml deleted file mode 100644 index 6a54aea8529..00000000000 --- a/Resources/Prototypes/DeltaV/Access/security.yml +++ /dev/null @@ -1,3 +0,0 @@ -- type: accessLevel - id: Corpsman - name: id-card-access-level-corpsman diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml index c93f0d58867..2e60a19c4a7 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml @@ -13,19 +13,3 @@ components: - type: AccessReader access: [["Mantis"]] - -- type: entity - parent: AirlockSecurity - id: AirlockCorpsmanLocked - suffix: Corpsman, Locked - components: - - type: AccessReader - access: [["Corpsman"]] - -- type: entity - parent: AirlockSecurityGlass - id: AirlockCorpsmanGlassLocked - suffix: Corpsman, Locked - components: - - type: AccessReader - access: [["Corpsman"]] diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml index adc6f95dfd4..b2fef23c648 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml @@ -20,7 +20,6 @@ #- Brig #Delta V: Removed brig access - Maintenance - External - - Corpsman extendedAccess: - Chemistry special: diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml index 16be537891f..721a0654689 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml @@ -32,7 +32,6 @@ - ChiefEngineer - ChiefMedicalOfficer - Clown #Delta V: Add Clown Access - - Corpsman # DeltaV: Add Corpsman access - Command - Engineering - External diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index ba67e16560c..dbbd9b16ae9 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -321,7 +321,7 @@ stateDoorOpen: armory_open stateDoorClosed: brigmedic_door - type: AccessReader - access: [["Corpsman"]] # DeltaV - add corpsman access + access: [["Medical"]] # Security Officer - type: entity diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index e633c7fdfa1..6c9dbdd3b19 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -32,7 +32,6 @@ - Service - External - Detective - - Corpsman # DeltaV - added Corpsman access - Cryogenics special: - !type:AddImplantSpecial