From f152373d4befd0c55ebbda8a84e8a70f192e5a8e Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Thu, 5 Oct 2023 22:55:12 +0200 Subject: [PATCH] Psionic Mantis access (#104) * Mantis access * Not really forensic * cleanup --------- Signed-off-by: Fluffiest Floofers --- .../Components/IdCardConsoleComponent.cs | 1 + .../deltav/prototypes/access/accesses.ftl | 1 + Resources/Prototypes/Access/misc.yml | 1 + Resources/Prototypes/Access/research.yml | 1 + Resources/Prototypes/DeltaV/Access/cargo.yml | 4 ++++ .../Catalog/Fills/Lockers/epistemics.yml | 19 ++++++++++--------- .../Entities/Clothing/Belt/belts.yml | 2 +- .../Storage/Closets/Lockers/lockers.yml | 2 ++ .../Roles/Jobs/Epistemics/forensicmantis.yml | 1 + .../Roles/Jobs/Science/research_director.yml | 1 + 10 files changed, 23 insertions(+), 10 deletions(-) diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs index 7f8823d5742..ddab9b4cccd 100644 --- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs +++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs @@ -75,6 +75,7 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List acc "Theatre", "Orders", // DeltaV - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml "Mail", // Nyanotrasen - Mail, see Resources/Prototypes/Nyanotrasen/Access/cargo.yml + "Mantis", // DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml }; [Serializable, NetSerializable] diff --git a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl index 93e757d77a9..239cecc6e0a 100644 --- a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl +++ b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl @@ -1 +1,2 @@ id-card-access-level-orders = Orders +id-card-access-level-mantis = Psionic Mantis diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index 39384f6f3b8..496c09860de 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -32,4 +32,5 @@ - Atmospherics - Mail # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml - Orders # DeltaV - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml + - Mantis # DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml - Paramedic # DeltaV - Add Paramedic access diff --git a/Resources/Prototypes/Access/research.yml b/Resources/Prototypes/Access/research.yml index 04a6a8c402b..f0de2c93db4 100644 --- a/Resources/Prototypes/Access/research.yml +++ b/Resources/Prototypes/Access/research.yml @@ -11,3 +11,4 @@ tags: - ResearchDirector - Research + - Mantis # DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml diff --git a/Resources/Prototypes/DeltaV/Access/cargo.yml b/Resources/Prototypes/DeltaV/Access/cargo.yml index 72ba1da7850..a70f3afe4de 100644 --- a/Resources/Prototypes/DeltaV/Access/cargo.yml +++ b/Resources/Prototypes/DeltaV/Access/cargo.yml @@ -1,3 +1,7 @@ - type: accessLevel id: Orders name: id-card-access-level-orders # Custom access level that allows the approval of orders + +- type: accessLevel + id: Mantis + name: id-card-access-level-mantis # Custom access level for the Mantis so they can have their own locker and maybe doors diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Lockers/epistemics.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Lockers/epistemics.yml index f9044290d21..6fa1145175b 100644 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Lockers/epistemics.yml +++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Lockers/epistemics.yml @@ -10,19 +10,20 @@ # - id: ForensicScanner # - id: BoxForensicPad - id: AntiPsychicKnife + - id: FlashlightLantern # DeltaV - To replace their lost flashlight + - id: BoxZiptie # DeltaV - Give the mantis some zipties - id: WeaponPistolPsiBreaker # DeltaV - Mantis mindbreaker pistol, see Resources/Prototypes/DeltaV/Entities?Objects/Weapons/Guns/Pistols/pistols.yml # Spare change of clothes - - id: ClothingUniformJumpsuitMantis - - id: ClothingUniformSkirtMantis - - id: ClothingBeltMantis - - id: ClothingShoesBootsMantis - - id: ClothingHandsGlovesForensic + # - id: ClothingUniformJumpsuitMantis + # - id: ClothingUniformSkirtMantis + # - id: ClothingBeltMantis + # - id: ClothingShoesBootsMantis + # - id: ClothingHandsGlovesForensic # Deltav - Detective is in charge of investigating crimes. - id: ClothingHeadHatFezMantis - - id: ClothingOuterCoatMantis + # - id: ClothingOuterCoatMantis - id: ClothingOuterWinterCoatMantis - - id: ClothingEyesGlassesSunglasses + # - id: ClothingEyesGlassesSunglasses # Insulative headgear - id: ClothingHeadTinfoil - id: ClothingHeadCage - - id: ClothingHeadCage - - id: BoxZiptie + amount: 2 diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml index 49bfcc247c5..0176575593d 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml @@ -2,7 +2,7 @@ parent: ClothingBeltStorageBase id: ClothingBeltMantis name: psionic mantis' belt # DeltaV - Rename Forensic Mantis to Psionic Mantis - description: Perfect for storing all of your forensic equipment. + description: Perfect for storing all of your equipment. components: - type: Sprite sprite: Nyanotrasen/Clothing/Belt/mantis_belt.rsi diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 508ea269271..74ffdf511e9 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -10,6 +10,8 @@ - type: Damageable damageContainer: Inorganic damageModifierSet: StrongMetallic + - type: AccessReader + access: [["Mantis"]] - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml index 077632458b4..89173e3b248 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml @@ -18,6 +18,7 @@ access: - Research - Maintenance + - Mantis # DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml # special: # - !type:AddComponentSpecial # components: diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 1fad4afc26e..8aaf50671ef 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -21,6 +21,7 @@ - Command - Maintenance - ResearchDirector + - Mantis # DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml special: # Nyanotrasen - Mystagogue can use the Bible - !type:AddComponentSpecial components: