From 56e7e8e08eb8412ce2a0122c2f2df4c9591e9e43 Mon Sep 17 00:00:00 2001 From: SimpleStation14 <130339894+SimpleStation14@users.noreply.github.com> Date: Sun, 7 Apr 2024 20:31:02 -0700 Subject: [PATCH] Add Corspman Access & Airlocks (#65) ## Mirror of PR #892: [Add Corspman Access & Airlocks](https://github.com/DeltaV-Station/Delta-v/pull/892) from DeltaV-Station [DeltaV-Station](https://github.com/DeltaV-Station)/[Delta-v](https://github.com/DeltaV-Station/Delta-v) `304fdcd35659c4bdcb17561d093d16b52b172b2e` --- PR changed 0 files with 0 additions and 0 deletions. The PR had the following labels: - Changes: YML - Status: Needs Review - Changes: C# - Changes: Localization ---

Original Body

> > > > ## About the PR > > > Content Client_AQ40yzRyFY > > > """Corpsman""" access previously was just medical access on their locker (lol!) and NO access on their suit locker (LOL) > > Tested and works. HoS was given the access too. Warden left out. > > **Changelog** > :cl: > - add: Added Corpsman-only access and airlocks. >
Co-authored-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com> --- .../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, 31 insertions(+), 2 deletions(-) create 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 eafc78cad1..252fc2c5f4 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/Locale/en-US/deltav/prototypes/access/accesses.ftl b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl index 239cecc6e0..84245872f5 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 ab17f6e41e..99ad59700e 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 4a0743d174..cfb6e60060 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 73b7021461..ac5cb47cc9 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -275,6 +275,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 c1260b3995..df3f60a4f8 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 0000000000..6a54aea852 --- /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 2e60a19c4a..c93f0d5886 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml @@ -13,3 +13,19 @@ 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 b2fef23c64..adc6f95dfd 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/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml index 721a065468..16be537891 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 diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index dbbd9b16ae..ba67e16560 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 6c9dbdd3b1..e633c7fdfa 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 - Cryogenics special: - !type:AddImplantSpecial