From 37a4f2db3a35eaf87adaea0a7aaee9b8c24ff01d Mon Sep 17 00:00:00 2001 From: Hanz <41141796+Hanzdegloker@users.noreply.github.com> Date: Wed, 21 Feb 2024 01:22:30 -0500 Subject: [PATCH] Hud Standardization (#25208) * Standardization of the Eyepatches what it says on the tin * added the pun... yea --- .../VendingMachines/Inventories/bardrobe.yml | 2 +- .../VendingMachines/Inventories/medical.yml | 3 +++ .../VendingMachines/Inventories/medidrobe.yml | 1 - .../VendingMachines/Inventories/robotics.yml | 1 + .../VendingMachines/Inventories/sec.yml | 2 +- .../Prototypes/Entities/Clothing/Eyes/hud.yml | 17 ++++++++++++++++- .../Eyes/Hud/diagpatch.rsi/equipped-EYES.png | Bin 0 -> 644 bytes .../Clothing/Eyes/Hud/diagpatch.rsi/icon.png | Bin 0 -> 799 bytes .../Clothing/Eyes/Hud/diagpatch.rsi/meta.json | 18 ++++++++++++++++++ 9 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/equipped-EYES.png create mode 100644 Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/meta.json 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 0000000000000000000000000000000000000000..91a6b3ac3ee6e3f88e2b6fa1224a278e5c5e5ab5 GIT binary patch literal 644 zcmV-~0(EX>4Tx04R}tkv&MmP!xqvQ>7wR2Rn#5WT;LSL`57+6^me@v=v%)FnQ@8G-*gu zTpR`0f`dPcRR4rtTK|H%@ z>74h8L#!kz#OK5l1~o|h$aUG}H_ke3JS*_Gqt55#IU|w5EbDe4waV#N$Bt*!lp^OSFL}=GYF_EJ4n1_GZ@h8b8ldB9y zjs;YqLUR1zfAD*@W?_2DO$x?LIHR`qi@OqgSSBMnmf1FIZhvd49#l!1~@nb z#*37_?(y!P&bj@2r!~JH7AkUr#h4D?00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru=mHJ{A}^x((mVhF0D(zFK~#9!?b^Ey!!Qg5Kza;% z4K3(3G)H!d#!z}8O_YxuEX>4Tx04R}tkv&MmP!xqvQ>7wR2Rn#5WT;LSL`57+6^me@v=v%)FnQ@8G-*gu zTpR`0f`dPcRR4rtTK|H%@ z>74h8L#!kz#OK5l1~o|h$aUG}H_ke3JS*_Gqt55#IU|w5EbDe4waV#N$Bt*!lp^OSFL}=GYF_EJ4n1_GZ@h8b8ldB9y zjs;YqLUR1zfAD*@W?_2DO$x?LIHR`qi@OqgSSBMnmf1FIZhvd49#l!1~@nb z#*37_?(y!P&bj@2r!~JH7AkUr#h4D?00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru=mHJ{A~{wqXKerg0USw0K~z}7?UXNW!!Q(wzf2(o zlY$IFC;0+Zs8Mm?r1GfBnX&^^>KTT7f$*p}z$j8dp$E21R^--J+M)SFv6c7U@BK3* z5{blrC-YqjA*_2g#$=&?ZsD`ND`0j!8@lJFX)J)&nrWJX&X>M?$x!;rB7OY;wIXfw(Ez6Sq{sK=79;|>{-dP0jwBUqx*f+JY4^S*GYgXsapW;x)k4}Cf dkw_$5z5r^okl&|UllTAt002ovPDHLkV1jD7YFq#S literal 0 HcmV?d00001 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 + } + ] +} -- 2.51.2