From: Hanz <41141796+Hanzdegloker@users.noreply.github.com> Date: Wed, 21 Feb 2024 06:22:30 +0000 (-0500) Subject: Hud Standardization (#25208) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=37a4f2db3a35eaf87adaea0a7aaee9b8c24ff01d;p=space-station-14.git Hud Standardization (#25208) * Standardization of the Eyepatches what it says on the tin * added the pun... yea --- diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml index cbc71f85af..5e4b056176 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml @@ -4,7 +4,7 @@ ClothingHeadHatBowlerHat: 2 ClothingHeadHatTophat: 2 ClothingEyesHudBeer: 2 - ClothingEyesEyepatchHudBeer: 1 + ClothingEyesEyepatchHudBeer: 2 ClothingHeadsetService: 2 ClothingOuterApronBar: 2 ClothingOuterWinterBar: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml index 43e7cf7c94..466749120b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml @@ -7,3 +7,6 @@ Bloodpack: 5 EpinephrineChemistryBottle: 3 Syringe: 5 + ClothingEyesHudMedical: 2 + ClothingEyesEyepatchHudMedical: 2 + diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml index a511b08d65..54e8d3d9fb 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml @@ -6,7 +6,6 @@ ClothingBackpackSatchelMedical: 4 ClothingUniformJumpsuitMedicalDoctor: 4 ClothingUniformJumpskirtMedicalDoctor: 4 - ClothingEyesEyepatchHudMedical: 1 ClothingHeadHatBeretMedic: 4 ClothingHeadNurseHat: 4 ClothingOuterCoatLab: 4 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml index 077aa2dca4..c53efb3e72 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml @@ -5,6 +5,7 @@ SciFlash: 4 ProximitySensor: 3 ClothingEyesHudDiagnostic: 2 + ClothingEyesEyepatchHudDiag: 2 RemoteSignaller: 3 Igniter: 3 # its more ordnance but yeah HandheldHealthAnalyzer: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index b1152f42ab..0aa814196a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -12,7 +12,7 @@ FlashlightSeclite: 5 ClothingEyesGlassesSunglasses: 2 ClothingEyesHudSecurity: 2 - ClothingEyesEyepatchHudSecurity: 1 + ClothingEyesEyepatchHudSecurity: 2 ClothingBeltSecurityWebbing: 5 Zipties: 12 RiotShield: 2 diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index aa1aea4df7..fabb7bc642 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -17,7 +17,7 @@ parent: ClothingEyesBase id: ClothingEyesHudMedical name: medical hud - description: A heads-up display that scans the humanoids in view and provides accurate data about their health status. + description: A heads-up display that scans the humanoids in view and provides accurate data about their health status. components: - type: Sprite sprite: Clothing/Eyes/Hud/med.rsi @@ -249,3 +249,18 @@ sprite: Clothing/Eyes/Hud/beerpatch.rsi - type: Clothing sprite: Clothing/Eyes/Hud/beerpatch.rsi + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesEyepatchHudDiag + name: diagnostic hud eyepatch + description: A heads-up display capable of analyzing the integrity and status of robotics and exosuits. Made out of see-borg-ium. + components: + - type: Sprite + sprite: Clothing/Eyes/Hud/diagpatch.rsi + - type: Clothing + sprite: Clothing/Eyes/Hud/diagpatch.rsi + - type: ShowHealthBars + damageContainers: + - Inorganic + - Silicon diff --git a/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/equipped-EYES.png new file mode 100644 index 0000000000..91a6b3ac3e Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/icon.png new file mode 100644 index 0000000000..ca0aac22e7 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/meta.json new file mode 100644 index 0000000000..bb228e7d5c --- /dev/null +++ b/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da , edited by Alekshhh and Hanzdegloker", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + } + ] +}