diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 6c2eadf8916..038604d0b1f 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -26,6 +26,7 @@ - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 - id: CargoTechFabCircuitboard # Floof - port to EE if possible + - id: ClothingEyesGlassesCommand - type: entity id: LockerCaptainFilledHardsuit @@ -56,6 +57,7 @@ - id: MedalCase - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: ClothingEyesGlassesCommand - type: entity id: LockerCaptainFilled @@ -86,6 +88,7 @@ - id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: ClothingEyesGlassesCommand - type: entity id: LockerCaptainFilledNoLaser @@ -115,6 +118,7 @@ - id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: ClothingEyesGlassesCommand - type: entity id: LockerHeadOfPersonnelFilled @@ -150,6 +154,7 @@ - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 - id: ServiceTechFabCircuitboard # Floof - port to ee if possible + - id: ClothingEyesHudCommand - type: entity id: LockerChiefEngineerFilledHardsuit diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index f50b0dbca54..7a9175b3aac 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -178,6 +178,27 @@ - type: IdentityBlocker coverage: EYES +- type: entity + parent: [ClothingEyesBase] + id: ClothingEyesGlassesCommand + name: administration glasses + description: Upgraded sunglasses that provide flash immunity and show ID card status. + components: + - type: Sprite + sprite: Clothing/Eyes/Glasses/commandglasses.rsi + - type: Clothing + sprite: Clothing/Eyes/Glasses/commandglasses.rsi + - type: FlashImmunity + - type: EyeProtection + protectionTime: 5 + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon + - type: IdentityBlocker + coverage: EYES + - type: ShowJobIcons + - type: entity parent: ClothingEyesBase id: ClothingEyesGlassesMercenary @@ -276,4 +297,4 @@ sprite: Clothing/Eyes/Glasses/etherealgoogles.rsi - type: Clothing sprite: Clothing/Eyes/Glasses/etherealgoogles.rsi - - type: ShowEthereal \ No newline at end of file + - type: ShowEthereal diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index 835c405e192..2378bd4ffd8 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -57,6 +57,18 @@ tags: - HudSecurity +- type: entity + parent: [ClothingEyesBase] + id: ClothingEyesHudCommand + name: administration hud + description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status. + components: + - type: Sprite + sprite: Clothing/Eyes/Hud/command.rsi + - type: Clothing + sprite: Clothing/Eyes/Hud/command.rsi + - type: ShowJobIcons + - type: entity parent: ClothingEyesBase id: ClothingEyesHudBeer @@ -163,7 +175,7 @@ damageContainers: - Biological - type: ShowHealthIcons - damageContainers: + damageContainers: - Biological - type: entity diff --git a/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/equipped-EYES-hamster.png b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/equipped-EYES-hamster.png new file mode 100644 index 00000000000..50a6975e4ca Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/equipped-EYES-hamster.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/equipped-EYES.png new file mode 100644 index 00000000000..63da1b6fe52 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/icon.png new file mode 100644 index 00000000000..ade2bdf6b6e Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/inhand-left.png new file mode 100644 index 00000000000..da427e836c2 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/inhand-right.png new file mode 100644 index 00000000000..d7236d64292 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/meta.json new file mode 100644 index 00000000000..c84ee214073 --- /dev/null +++ b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, edited by Ghagliiarghii", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "equipped-EYES-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Eyes/Hud/command.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/equipped-EYES.png new file mode 100644 index 00000000000..851e7b216d4 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/command.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/icon.png new file mode 100644 index 00000000000..a9e76ff75a0 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/command.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/inhand-left.png new file mode 100644 index 00000000000..a9f04628f91 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/command.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/inhand-right.png new file mode 100644 index 00000000000..0190c6a518b Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/command.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/meta.json new file mode 100644 index 00000000000..149220d0e46 --- /dev/null +++ b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, edited by SlamBamActionman", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}