From 6a2ce110858f512f6be1138e7978847d0b1f3fab Mon Sep 17 00:00:00 2001 From: rosieposie Date: Fri, 23 Feb 2024 13:15:28 -0500 Subject: [PATCH 1/3] add corpsman access & mantis maint airlock --- .../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 + .../Prototypes/DeltaV/Access/security.yml | 3 +++ .../Structures/Doors/Airlocks/access.yml | 24 +++++++++++++++++++ .../DeltaV/Roles/Jobs/Security/brigmedic.yml | 1 + .../Storage/Closets/Lockers/lockers.yml | 2 +- .../Roles/Jobs/Security/head_of_security.yml | 1 + 10 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/DeltaV/Access/security.yml diff --git a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl index 239cecc6e0a..84245872f54 100644 --- a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl +++ b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl @@ -1,2 +1,3 @@ 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 ab17f6e41e5..99ad59700e0 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -44,3 +44,4 @@ - 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 4a0743d1741..cfb6e600606 100644 --- a/Resources/Prototypes/Access/security.yml +++ b/Resources/Prototypes/Access/security.yml @@ -28,6 +28,7 @@ #- 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 00f10c807e8..fcc25fcd126 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -292,6 +292,8 @@ - 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 c1260b39958..df3f60a4f88 100644 --- a/Resources/Prototypes/DeltaV/Access/misc.yml +++ b/Resources/Prototypes/DeltaV/Access/misc.yml @@ -15,6 +15,7 @@ - Command - Security - Detective + - Corpsman # - Armory - Lawyer - Engineering diff --git a/Resources/Prototypes/DeltaV/Access/security.yml b/Resources/Prototypes/DeltaV/Access/security.yml new file mode 100644 index 00000000000..6a54aea8529 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Access/security.yml @@ -0,0 +1,3 @@ +- 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 2e60a19c4a7..e68da181c6a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml @@ -13,3 +13,27 @@ components: - type: AccessReader access: [["Mantis"]] + +- type: entity + parent: AirlockMaintRnDLocked + id: AirlockMaintMantisLocked + suffix: Mantis, Locked + 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 b2fef23c648..adc6f95dfd4 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml @@ -20,6 +20,7 @@ #- Brig #Delta V: Removed brig access - Maintenance - External + - Corpsman extendedAccess: - Chemistry special: diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index dbbd9b16ae9..ba67e16560c 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: [["Medical"]] + access: [["Corpsman"]] # DeltaV - add corpsman access # 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 7ad80c7741a..5621734216b 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -32,6 +32,7 @@ - Service - External - Detective + - Corpsman # DeltaV - added Corpsman access special: - !type:AddImplantSpecial implants: [ MindShieldImplant ] From b9f9e523557637ecaa443a0fd526285244825cce Mon Sep 17 00:00:00 2001 From: rosieposie Date: Fri, 23 Feb 2024 22:47:50 -0500 Subject: [PATCH 2/3] fine --- .../DeltaV/Entities/Structures/Doors/Airlocks/access.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml index e68da181c6a..c93f0d58867 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml @@ -14,14 +14,6 @@ - type: AccessReader access: [["Mantis"]] -- type: entity - parent: AirlockMaintRnDLocked - id: AirlockMaintMantisLocked - suffix: Mantis, Locked - components: - - type: AccessReader - access: [["Mantis"]] - - type: entity parent: AirlockSecurity id: AirlockCorpsmanLocked From 252c9a2c532c70a6ce04968ada6b016d13e8ec49 Mon Sep 17 00:00:00 2001 From: rosieposie Date: Tue, 19 Mar 2024 07:50:25 -0400 Subject: [PATCH 3/3] accessible guy --- Content.Shared/Access/Components/IdCardConsoleComponent.cs | 3 ++- .../Prototypes/Entities/Objects/Tools/access_configurator.yml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs index eafc78cad15..252fc2c5f43 100644 --- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs +++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs @@ -57,6 +57,7 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List acc "ChiefEngineer", "ChiefMedicalOfficer", "Clown", // DeltaV - Add Clown access + "Corpsman", // DeltaV - Add Corpsman access "Command", "Cryogenics", "Engineering", @@ -67,7 +68,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/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml index 721a0654689..16be537891f 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml @@ -32,6 +32,7 @@ - ChiefEngineer - ChiefMedicalOfficer - Clown #Delta V: Add Clown Access + - Corpsman # DeltaV: Add Corpsman access - Command - Engineering - External