From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Thu, 29 Aug 2024 01:58:16 +0000 (+0200) Subject: Add Command Glasses (#30447) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=ff5acf787757cd03fd7102c214f68e6535eab8f8;p=space-station-14.git Add Command Glasses (#30447) * Initial commit * Removed wanted and mindshield status display * Updated glasses visuals & contraband status * Added Command Hud * Changed name to administration glasses/hud --- diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 45935be0ac..f718eea1cc 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -49,6 +49,7 @@ - id: RubberStampCaptain - id: SpaceCash1000 - id: WeaponDisabler + - id: ClothingEyesGlassesCommand # No laser table + Laser table - type: entityTable @@ -131,6 +132,7 @@ - id: RubberStampDenied - id: RubberStampHop - id: WeaponDisabler + - id: ClothingEyesHudCommand - type: entity id: LockerHeadOfPersonnelFilled diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 44df034ee9..368cefe9cb 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -158,7 +158,7 @@ - WhitelistChameleon - type: entity - parent: [ClothingEyesBase, ShowSecurityIcons, BaseSecurityCommandContraband] + parent: [ClothingEyesBase, ShowSecurityIcons, BaseRestrictedContraband] id: ClothingEyesGlassesSecurity name: security glasses description: Upgraded sunglasses that provide flash immunity and a security HUD. @@ -184,6 +184,27 @@ - type: IdentityBlocker coverage: EYES +- type: entity + parent: [ClothingEyesBase, BaseCommandContraband] + 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 diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index e627cffc74..9e881bf9c2 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -49,7 +49,7 @@ - HudMedical - type: entity - parent: [ClothingEyesBase, ShowSecurityIcons, BaseSecurityCommandContraband] + parent: [ClothingEyesBase, ShowSecurityIcons, BaseRestrictedContraband] id: ClothingEyesHudSecurity name: security hud description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records. @@ -62,6 +62,18 @@ tags: - HudSecurity +- type: entity + parent: [ClothingEyesBase, BaseCommandContraband] + 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 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 0000000000..50a6975e4c 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 0000000000..63da1b6fe5 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 0000000000..ade2bdf6b6 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 0000000000..da427e836c 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 0000000000..d7236d6429 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 0000000000..c84ee21407 --- /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 0000000000..851e7b216d 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 0000000000..a9e76ff75a 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 0000000000..a9f04628f9 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 0000000000..0190c6a518 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 0000000000..149220d0e4 --- /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 + } + ] +}