From b05cb2bb2d7ebcfdb2507fea9a85125b71cbfff0 Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+flareguy@users.noreply.github.com> Date: Sun, 31 Mar 2024 05:00:45 +0200 Subject: [PATCH] Makes secglasses roundstart (#26487) * makes secglasses roundstart * fix epic fail * fix tests questionmark? * Update Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> (cherry picked from commit a98d0cfe2e120f90c269e810f1365dad404d645a) --- .../Catalog/Fills/Lockers/heads.yml | 6 ++--- .../Catalog/Fills/Lockers/security.yml | 13 ++++------ .../Entities/Clothing/Eyes/glasses.yml | 8 ++++++ .../Entities/Structures/Machines/lathe.yml | 1 - .../Graphs/clothing/glasses_sechud.yml | 25 +++++++++++++++++++ .../Recipes/Construction/clothing.yml | 11 ++++++++ .../Prototypes/Recipes/Lathes/security.yml | 8 ------ Resources/Prototypes/Research/arsenal.yml | 1 - .../Roles/Jobs/Security/detective.yml | 2 +- .../Roles/Jobs/Security/head_of_security.yml | 2 +- .../Roles/Jobs/Security/security_officer.yml | 2 +- .../Prototypes/Roles/Jobs/Security/warden.yml | 2 +- Resources/Prototypes/tags.yml | 3 +++ 13 files changed, 58 insertions(+), 26 deletions(-) create mode 100644 Resources/Prototypes/Recipes/Construction/Graphs/clothing/glasses_sechud.yml diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 5c9aca23e4..d513645e05 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -326,7 +326,6 @@ components: - type: StorageFill contents: - - id: ClothingEyesHudSecurity - id: WeaponDisabler - id: ClothingOuterCoatHoSTrench - id: ClothingMaskNeckGaiter @@ -334,7 +333,7 @@ - id: ClothingMaskGasSwat - id: ClothingBeltSecurityFilled - id: ClothingHeadsetAltSecurity - - id: ClothingEyesGlassesSunglasses + - id: ClothingEyesGlassesSecurity - id: ClothingShoesBootsJack - id: CigarGoldCase prob: 0.50 @@ -359,13 +358,12 @@ components: - type: StorageFill contents: - - id: ClothingEyesHudSecurity - id: WeaponDisabler - id: ClothingOuterCoatHoSTrench - id: ClothingMaskNeckGaiter - id: ClothingBeltSecurityFilled - id: ClothingHeadsetAltSecurity - - id: ClothingEyesGlassesSunglasses + - id: ClothingEyesGlassesSecurity - id: ClothingShoesBootsJack - id: CigarGoldCase prob: 0.50 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index e2d7ad1483..582b039c3b 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -10,7 +10,7 @@ prob: 0.3 - id: ClothingBeltSecurityFilled - id: Flash - - id: ClothingEyesGlassesSunglasses + - id: ClothingEyesGlassesSecurity - id: ClothingHeadsetAltSecurity - id: ClothingHandsGlovesCombat - id: ClothingShoesBootsJack @@ -20,7 +20,6 @@ - id: DoorRemoteArmory - id: ClothingOuterHardsuitCombatWarden # DeltaV - ClothingOuterHardsuitWarden replaced in favour of warden's riot combat hardsuit. - id: HoloprojectorSecurity - - id: ClothingEyesHudSecurity - id: BoxPDAPrisoner # Delta-V - id: ClothingShoesBootsWinterWarden #Delta V: Add departmental winter boots - id: BoxEncryptionKeyPrisoner #Delta-V @@ -39,7 +38,7 @@ prob: 0.3 - id: ClothingBeltSecurityFilled - id: Flash - - id: ClothingEyesGlassesSunglasses + - id: ClothingEyesGlassesSecurity - id: ClothingHeadsetAltSecurity - id: ClothingHandsGlovesCombat - id: ClothingShoesBootsJack @@ -48,7 +47,6 @@ - id: RubberStampWarden - id: DoorRemoteArmory - id: HoloprojectorSecurity - - id: ClothingEyesHudSecurity - id: BoxPDAPrisoner # Delta-V - id: ClothingShoesBootsWinterWarden #Delta V: Add departmental winter boots - id: BoxEncryptionKeyPrisoner #Delta-V @@ -88,13 +86,12 @@ - id: ClothingBeltSecurityFilled - id: Flash prob: 0.5 - - id: ClothingEyesGlassesSunglasses + - id: ClothingEyesGlassesSecurity - id: ClothingHeadsetSecurity - id: ClothingHandsGlovesColorBlack - id: ClothingShoesBootsJack - id: WeaponMeleeNeedle prob: 0.1 - - id: ClothingEyesHudSecurity - id: HoloprojectorSecurity prob: 0.6 - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes! @@ -107,7 +104,7 @@ components: - type: StorageFill contents: - - id: ClothingEyesHudSecurity + - id: ClothingEyesGlassesSecurity - id: WeaponDisabler - id: TrackingImplanter amount: 2 @@ -180,7 +177,7 @@ components: - type: StorageFill contents: - - id: ClothingEyesHudSecurity + - id: ClothingEyesGlassesSecurity prob: 0.3 - id: ClothingHeadHatFedoraBrown - id: ClothingNeckTieDet diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 9af8edb002..7a43d96a24 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -154,6 +154,11 @@ - type: FlashImmunity - type: EyeProtection protectionTime: 5 + - type: Tag + tags: + - Sunglasses + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingEyesBase @@ -168,6 +173,9 @@ - type: FlashImmunity - type: EyeProtection protectionTime: 5 + - type: Construction + graph: GlassesSecHUD + node: glassesSec - type: Tag tags: - HamsterWearable diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 00829df73f..96fe70f3db 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -743,7 +743,6 @@ - CartridgeMagnumRubber - CartridgePistolRubber - CartridgeRifleRubber - - ClothingEyesGlassesSecurity - ExplosivePayload - FlashPayload - HoloprojectorSecurity diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/glasses_sechud.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/glasses_sechud.yml new file mode 100644 index 0000000000..de264dbd58 --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/glasses_sechud.yml @@ -0,0 +1,25 @@ +- type: constructionGraph + id: GlassesSecHUD + start: start + graph: + - node: start + edges: + - to: glassesSec + steps: + - tag: Sunglasses + name: sun glasses + icon: + sprite: Clothing/Eyes/Glasses/sunglasses.rsi + state: icon + doAfter: 5 + - tag: HudSecurity + name: security hud + icon: + sprite: Clothing/Eyes/Hud/sec.rsi + state: icon + doAfter: 5 + - material: Cable + amount: 5 + doAfter: 5 + - node: glassesSec + entity: ClothingEyesGlassesSecurity diff --git a/Resources/Prototypes/Recipes/Construction/clothing.yml b/Resources/Prototypes/Recipes/Construction/clothing.yml index f1eb270af7..cc343f9a4d 100644 --- a/Resources/Prototypes/Recipes/Construction/clothing.yml +++ b/Resources/Prototypes/Recipes/Construction/clothing.yml @@ -96,3 +96,14 @@ description: Comfy, yet haunted by the ghosts of ducks you fed bread to as a child. icon: { sprite: Clothing/Shoes/Misc/duck-slippers.rsi, state: icon } objectType: Item + +- type: construction + name: security glasses + id: ClothingEyesGlassesSecurity + graph: GlassesSecHUD + startNode: start + targetNode: glassesSec + category: construction-category-clothing + description: A pair of sunglasses, modified to have a built-in security HUD. + icon: { sprite: Clothing/Eyes/Glasses/secglasses.rsi, state: icon } + objectType: Item \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index ffa74d460f..77944d540c 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -87,14 +87,6 @@ materials: Plastic: 100 -- type: latheRecipe - id: ClothingEyesGlassesSecurity - result: ClothingEyesGlassesSecurity - completetime: 2 - materials: - Steel: 300 - Glass: 200 - - type: latheRecipe id: ClothingEyesHudSecurity result: ClothingEyesHudSecurity diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 7432d4225f..9371bce781 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -108,7 +108,6 @@ tier: 1 cost: 8000 recipeUnlocks: - - ClothingEyesGlassesSecurity - Truncheon - TelescopicShield - HoloprojectorSecurity diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index 0b9bb5cfba..9236e6ea73 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -27,7 +27,7 @@ jumpsuit: ClothingUniformJumpsuitDetective back: ClothingBackpackSecurityFilledDetective shoes: ClothingShoesBootsCombatFilled - eyes: ClothingEyesGlassesSunglasses + eyes: ClothingEyesGlassesSecurity head: ClothingHeadHatFedoraBrown outerClothing: ClothingOuterVestDetective id: DetectivePDA diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index e633c7fdfa..84d530fdf8 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -52,7 +52,7 @@ back: ClothingBackpackHOSFilled shoes: ClothingShoesBootsCombatFilled outerClothing: ClothingOuterCoatHoSTrench - eyes: ClothingEyesGlassesSunglasses + eyes: ClothingEyesGlassesSecurity head: ClothingHeadHatBeretHoS id: HoSPDA gloves: ClothingHandsGlovesCombat diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index 695464e030..62d15df51c 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -28,7 +28,7 @@ jumpsuit: ClothingUniformJumpsuitSec back: ClothingBackpackSecurityFilled shoes: ClothingShoesBootsCombatFilled - eyes: ClothingEyesGlassesSunglasses + eyes: ClothingEyesGlassesSecurity head: ClothingHeadHelmetBasic outerClothing: ClothingOuterArmorPlateCarrier # DeltaV - ClothingOuterArmorBasic replaced in favour of plate carrier id: SecurityPDA diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 3b7697cb68..d1c5986220 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -35,7 +35,7 @@ jumpsuit: ClothingUniformJumpsuitWarden back: ClothingBackpackSecurityFilled shoes: ClothingShoesBootsCombatFilled - eyes: ClothingEyesGlassesSunglasses + eyes: ClothingEyesGlassesSecurity outerClothing: ClothingOuterCoatWarden id: WardenPDA ears: ClothingHeadsetSecurity diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index ae1f8c0d19..fe8c5a3cc1 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1180,6 +1180,9 @@ - type: Tag id: SuitEVA + +- type: Tag + id: Sunglasses - type: Tag id: SurgeryTool