diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 73dc7969254..1ceb86dd4e8 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -120,7 +120,7 @@ components: - type: StorageFill contents: - - id: ClothingEyesGlassesSecurity + - id: ClothingEyesGlassesCorpsman # DeltaV - Corpsman Glasses - id: WeaponDisabler - id: TrackingImplanter amount: 2 @@ -160,7 +160,7 @@ components: - type: StorageFill contents: - - id: ClothingEyesHudSecurity + - id: ClothingEyesGlassesCorpsman # DeltaV - Corpsman Glasses - id: WeaponDisabler - id: TrackingImplanter amount: 2 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml index 8642867effd..4124ca5b132 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml @@ -12,3 +12,33 @@ modifiers: coefficients: Caustic: 0.85 + +- type: entity + parent: [ClothingEyesBase, ShowSecurityIcons, ShowMedicalIcons, BaseRestrictedContraband] + id: ClothingEyesGlassesCorpsman + name: corpsman glasses + description: Security glasses designed for the Corpsman for medical and security needs. Now with a cool blue hue* + components: + - type: Sprite + sprite: DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi + - type: Clothing + sprite: DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi + - type: FlashImmunity + - type: EyeProtection + protectionTime: 5 + - type: Construction + graph: GlassesCorpsHUD + node: glassesCorps + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon + - SecDogWearable + - type: GuideHelp + guides: + - Security + - Antagonists + - Medical + - type: IdentityBlocker + coverage: EYES + diff --git a/Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/clothing/glasses_corpshud.yml b/Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/clothing/glasses_corpshud.yml new file mode 100644 index 00000000000..2a29d4cf103 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/clothing/glasses_corpshud.yml @@ -0,0 +1,25 @@ +- type: constructionGraph + id: GlassesCorpsHUD + start: start + graph: + - node: start + edges: + - to: glassesCorps + steps: + - tag: Sunglasses + name: sun glasses + icon: + sprite: Clothing/Eyes/Glasses/sunglasses.rsi + state: icon + doAfter: 5 + - tag: HudMedicalSecurity + name: medsec hud + icon: + sprite: Clothing/Eyes/Hud/medsec.rsi + state: icon + doAfter: 5 + - material: Cable + amount: 5 + doAfter: 5 + - node: glassesCorps + entity: ClothingEyesGlassesCorpsman diff --git a/Resources/Prototypes/DeltaV/Recipes/Construction/clothing.yml b/Resources/Prototypes/DeltaV/Recipes/Construction/clothing.yml index 386a0211c03..5eee1b7c6e2 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Construction/clothing.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Construction/clothing.yml @@ -19,3 +19,14 @@ description: Prescription sechud, merged glasses and sechud together by sheer luck and cables with glue. icon: { sprite: DeltaV/Clothing/Eyes/Hud/prescsechud.rsi, state: icon } objectType: Item + +- type: construction + name: corpsman glasses + id: ClothingEyesGlassesCorpsman + graph: GlassesCorpsHUD + startNode: start + targetNode: glassesCorps + category: construction-category-clothing + description: A pair of sunglasses, modified to have a built-in security and medical HUD. + icon: { sprite: DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi, state: icon } + objectType: Item diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml index 275fab995d0..335749959bf 100644 --- a/Resources/Prototypes/DeltaV/tags.yml +++ b/Resources/Prototypes/DeltaV/tags.yml @@ -59,6 +59,9 @@ - type: Tag id: PaperSlip + +- type: Tag + id: HudMedicalSecurity #Craftable Corpsman Glasses - type: Tag id: BorgModuleSecurity diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index 9e881bf9c21..f79817bfab7 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -164,6 +164,9 @@ - type: Construction graph: HudMedSec node: medsecHud + - type: Tag + tags: + - HudMedicalSecurity - type: entity parent: [ClothingEyesBase, ShowSecurityIcons, ShowMedicalIcons] diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi/equipped-EYES-hamster.png b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi/equipped-EYES-hamster.png new file mode 100644 index 00000000000..ef6b81f3f47 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi/equipped-EYES-hamster.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi/equipped-EYES-secdog.png b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi/equipped-EYES-secdog.png new file mode 100644 index 00000000000..56f07db4ae1 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi/equipped-EYES-secdog.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi/equipped-EYES.png b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi/equipped-EYES.png new file mode 100644 index 00000000000..2e2d81e66de Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi/icon.png new file mode 100644 index 00000000000..e16283bad41 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi/inhand-left.png new file mode 100644 index 00000000000..934cdf25f24 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi/inhand-right.png new file mode 100644 index 00000000000..0abf0350879 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi/meta.json new file mode 100644 index 00000000000..5975b01e810 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Remodeled design of the Security Glasses done by Unkn0wn_Gh0st on github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "equipped-EYES-hamster", + "directions": 4 + }, + { + "name": "equipped-EYES-secdog", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}