Revert "Add Corspman Access & Airlocks (Simple-Station#65)"

This reverts commit 56e7e8e.
VMSolidus · Apr 12, 2024 · 48f5d31 · 48f5d31
1 parent 5d7b409
commit 48f5d31
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 31 deletions.
diff --git 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<string> 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<string> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -32,7 +32,6 @@
   - Service
   - External
   - Detective
-  - Corpsman # DeltaV - added Corpsman access
   - Cryogenics
   special:
   - !type:AddImplantSpecial