diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 25c3fde0bd..ae5917bc51 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -255,7 +255,6 @@ components: - type: StorageFill contents: - - id: ClothingEyesHudSecurity - id: WeaponDisabler - id: ClothingOuterCoatHoSTrench - id: ClothingMaskNeckGaiter @@ -263,7 +262,7 @@ - id: ClothingMaskGasSwat - id: ClothingBeltSecurityFilled - id: ClothingHeadsetAltSecurity - - id: ClothingEyesGlassesSunglasses + - id: ClothingEyesGlassesSecurity - id: ClothingShoesBootsJack - id: CigarGoldCase prob: 0.50 @@ -282,13 +281,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 4bb300b158..2896494978 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -9,7 +9,7 @@ - id: WeaponDisabler - id: ClothingBeltSecurityFilled - id: Flash - - id: ClothingEyesGlassesSunglasses + - id: ClothingEyesGlassesSecurity - id: ClothingHeadsetAltSecurity - id: ClothingHandsGlovesCombat - id: ClothingShoesBootsJack @@ -19,7 +19,6 @@ - id: DoorRemoteArmory - id: ClothingOuterHardsuitWarden - id: HoloprojectorSecurity - - id: ClothingEyesHudSecurity - type: entity id: LockerWardenFilled @@ -32,7 +31,7 @@ - id: WeaponDisabler - id: ClothingBeltSecurityFilled - id: Flash - - id: ClothingEyesGlassesSunglasses + - id: ClothingEyesGlassesSecurity - id: ClothingHeadsetAltSecurity - id: ClothingHandsGlovesCombat - id: ClothingShoesBootsJack @@ -41,7 +40,6 @@ - id: RubberStampWarden - id: DoorRemoteArmory - id: HoloprojectorSecurity - - id: ClothingEyesHudSecurity - type: entity id: LockerSecurityFilled @@ -60,13 +58,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 @@ -77,7 +74,7 @@ components: - type: StorageFill contents: - - id: ClothingEyesHudSecurity + - id: ClothingEyesGlassesSecurity - id: WeaponDisabler - id: TrackingImplanter amount: 2 @@ -112,7 +109,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 e8cf01cb10..24944f02dd 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -149,6 +149,11 @@ - type: FlashImmunity - type: EyeProtection protectionTime: 5 + - type: Tag + tags: + - Sunglasses + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingEyesBase @@ -163,6 +168,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 5fbe84a3fe..5a32839a47 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -683,7 +683,6 @@ - CartridgeMagnumUranium - CartridgePistolUranium - CartridgeRifleUranium - - 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 89f22cdf30..8907a47c6b 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 432594d4b5..b3100ed70b 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 b17fb0ce00..3b7284c749 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -76,7 +76,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 21458779a0..488410949a 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 5223357379..ef9a74fcb4 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -46,7 +46,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 686d140447..83b439fcab 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: ClothingOuterArmorBasic id: SecurityPDA diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 7d509651b6..dbefd46a6f 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -31,7 +31,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