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)
2024-03-31 05:00:45 +02:00 · 2024-03-31 05:00:45 +02:00 · b05cb2bb2d
parent 965587840d
commit b05cb2bb2d
13 changed files with 58 additions and 26 deletions
--- 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
--- 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
--- 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
--- 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
--- a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/glasses_sechud.yml
+++ 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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