From 80b0a24ee8ee27dbaf32e882a63bc15d1b255a09 Mon Sep 17 00:00:00 2001 From: Alekshhh <44923899+Alekshhh@users.noreply.github.com> Date: Mon, 22 Jan 2024 16:59:32 +0200 Subject: [PATCH] Hud Eyepatches (#24132) * dsdt * op * text reduce * ey * we fix --- .../VendingMachines/Inventories/bardrobe.yml | 1 + .../VendingMachines/Inventories/medidrobe.yml | 1 + .../VendingMachines/Inventories/sec.yml | 1 + .../Prototypes/Entities/Clothing/Eyes/hud.yml | 57 ++++++++++++++---- .../Eyes/Hud/beerpatch.rsi/equipped-EYES.png | Bin 0 -> 390 bytes .../Clothing/Eyes/Hud/beerpatch.rsi/icon.png | Bin 0 -> 375 bytes .../Clothing/Eyes/Hud/beerpatch.rsi/meta.json | 18 ++++++ .../Eyes/Hud/medpatch.rsi/equipped-EYES.png | Bin 0 -> 384 bytes .../Clothing/Eyes/Hud/medpatch.rsi/icon.png | Bin 0 -> 372 bytes .../Clothing/Eyes/Hud/medpatch.rsi/meta.json | 18 ++++++ .../Eyes/Hud/secpatch.rsi/equipped-EYES.png | Bin 0 -> 390 bytes .../Clothing/Eyes/Hud/secpatch.rsi/icon.png | Bin 0 -> 378 bytes .../Clothing/Eyes/Hud/secpatch.rsi/meta.json | 18 ++++++ .../Eyes/Misc/eyepatch.rsi/equipped-EYES.png | Bin 313 -> 381 bytes 14 files changed, 102 insertions(+), 12 deletions(-) create mode 100644 Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/equipped-EYES.png create mode 100644 Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/equipped-EYES.png create mode 100644 Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/equipped-EYES.png create mode 100644 Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml index bd43b174ee..cbc71f85af 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml @@ -4,6 +4,7 @@ ClothingHeadHatBowlerHat: 2 ClothingHeadHatTophat: 2 ClothingEyesHudBeer: 2 + ClothingEyesEyepatchHudBeer: 1 ClothingHeadsetService: 2 ClothingOuterApronBar: 2 ClothingOuterWinterBar: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml index 841f05a630..6dc1996479 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml @@ -6,6 +6,7 @@ ClothingBackpackSatchelMedical: 4 ClothingUniformJumpsuitMedicalDoctor: 4 ClothingUniformJumpskirtMedicalDoctor: 4 + ClothingEyesEyepatchHudMedical: 1 ClothingHeadNurseHat: 4 ClothingOuterCoatLab: 4 ClothingShoesColorWhite: 4 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index 227d8767e8..695f7e98af 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -11,6 +11,7 @@ FlashlightSeclite: 5 ClothingEyesGlassesSunglasses: 2 ClothingEyesHudSecurity: 2 + ClothingEyesEyepatchHudSecurity: 1 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 5771d9f024..89010ca30e 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -9,7 +9,7 @@ - type: Clothing sprite: Clothing/Eyes/Hud/diag.rsi - type: ShowHealthBars - damageContainers: + damageContainers: - Inorganic - Silicon @@ -24,10 +24,10 @@ - type: Clothing sprite: Clothing/Eyes/Hud/med.rsi - type: ShowHealthBars - damageContainers: + damageContainers: - Biological - type: ShowHealthIcons - damageContainers: + damageContainers: - Biological - type: Tag tags: @@ -111,10 +111,10 @@ - type: Clothing sprite: Clothing/Eyes/Hud/medonion.rsi - type: ShowHealthBars - damageContainers: + damageContainers: - Biological - type: ShowHealthIcons - damageContainers: + damageContainers: - Biological - type: ShowHungerIcons @@ -129,10 +129,10 @@ - type: Clothing sprite: Clothing/Eyes/Hud/medonionbeer.rsi - type: ShowHealthBars - damageContainers: + damageContainers: - Biological - type: ShowHealthIcons - damageContainers: + damageContainers: - Biological - type: ShowHungerIcons - type: ShowThirstIcons @@ -152,7 +152,7 @@ node: medsecHud - type: ShowSecurityIcons - type: ShowHealthBars - damageContainers: + damageContainers: - Biological - type: entity @@ -167,11 +167,11 @@ sprite: Clothing/Eyes/Hud/medsecengi.rsi - type: ShowSecurityIcons - type: ShowHealthBars - damageContainers: + damageContainers: - Biological - Inorganic - type: ShowHealthIcons - damageContainers: + damageContainers: - Biological - type: ShowSyndicateIcons @@ -187,11 +187,11 @@ sprite: Clothing/Eyes/Hud/omni.rsi - type: ShowSecurityIcons - type: ShowHealthBars - damageContainers: + damageContainers: - Biological - Inorganic - type: ShowHealthIcons - damageContainers: + damageContainers: - Biological - type: ShowHungerIcons - type: ShowThirstIcons @@ -216,3 +216,36 @@ suffix: Syndicate components: - type: ShowSecurityIcons + +- type: entity + parent: ClothingEyesHudMedical + id: ClothingEyesEyepatchHudMedical + name: medical hud eyepatch + description: A heads-up display that scans the humanoids in view and provides accurate data about their health status. For true patriots. + components: + - type: Sprite + sprite: Clothing/Eyes/Hud/medpatch.rsi + - type: Clothing + sprite: Clothing/Eyes/Hud/medpatch.rsi + +- type: entity + parent: ClothingEyesHudSecurity + id: ClothingEyesEyepatchHudSecurity + name: security hud eyepatch + description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records. For true patriots. + components: + - type: Sprite + sprite: Clothing/Eyes/Hud/secpatch.rsi + - type: Clothing + sprite: Clothing/Eyes/Hud/secpatch.rsi + +- type: entity + parent: ClothingEyesHudBeer + id: ClothingEyesEyepatchHudBeer + name: beer hud eyepatch + description: A pair of sunHud outfitted with apparatus to scan reagents, as well as providing an innate understanding of liquid viscosity while in motion. For true patriots. + components: + - type: Sprite + sprite: Clothing/Eyes/Hud/beerpatch.rsi + - type: Clothing + sprite: Clothing/Eyes/Hud/beerpatch.rsi diff --git a/Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/equipped-EYES.png new file mode 100644 index 0000000000000000000000000000000000000000..5ea6a09494b79b4456d74fb8ec46e4ef62cd1a29 GIT binary patch literal 390 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVD$BLaSW-5dpqkO?;!&L7X4I} z+!p9@sr^ZoJWrllF&CzRzb;U@jAqI9|BY z{mkb%Nx|=J%3nr3u<{M-y7~93=k6a>%h?`%|9yfZkHPdqp|-c-=F^{LfBpA+`R`v` zqKjTUe^Km$?RB<}F1vR!e9<{mG>u_{PU9;@=71-WMX3y@g;vNJF}TiC4QC@y`1=z# z`IfxYUA#A{^!lsf7aX@{%43-N=vSr9?cYptyPX)MTEs+ZEe{5NS#iIOQ6^O5cMRhR zwR6+dnQw@le5cI3sdMwwlMLHjH~l`*kn<>~(x@SK;u||7h1nL-^LP@XRd)CDpevty buR(v?Y&*w!wP&^i!%p@+rX=2zi6x3;clK8&ZVy!7jytZHiO@dzFo>9Oosu!=TMw z6NKHFx!JjOhCiR#pZVbgI0u{q&H=3hK@dFT1=TdoN1a;Jx6pLGa&0d#H!>0ZPLiY( zRul!=w#68@+}kHmD?kN~qUaIFG3J*`hjU*pI}t(%qYTMzsn~-8h?oeOe4k~wrW+hf zdl7^~LW~4ZF%`-;CvraLbc3=4gy*5EDy#pqQ30%!zP|6jZ@*mui+u(n=W`Ms@;o;h zgK-A9kmtrC*7Mi=>8t?kgonDWjdNfnKus@=A`C+uqFaYE6**z`+NTDFMNrceH)lr% z1#lQ;`*caRN}*Cb7$Dsu`KbW;MaaU(HlU3oUp*lkBCA(01+XcGbHF*^9B>Xi0Wb2L VA`5dZ)H07*qoM6N<$f&kmnnIixI literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/meta.json new file mode 100644 index 0000000000..2f7d9c2de7 --- /dev/null +++ b/Resources/Textures/Clothing/Eyes/Hud/beerpatch.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", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/equipped-EYES.png new file mode 100644 index 0000000000000000000000000000000000000000..5bb3dde71f131963774154bbe6e653667c5f1814 GIT binary patch literal 384 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV086#aSW-5dpqkOZ?l1j^I-{@ z8;vV1Hpn@r@~l!&T-bH`Kg(^QcN?=de*Tk}q9OmEN8Y~PkU{#xgaa0R)zvO*MU#Tx z?X!>2`TF||MKq xx=rtrnJ*l<`YEU3meLD5Ga`lU@(=L;KW^h_ZM-8I7_JPSu6{1-oD!NC7y#bxrtbg% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..fcb3dbb4121bb2242035f8706ab15696d0233cd1 GIT binary patch literal 372 zcmV-)0gL{LP)q_^??Th{%C)`1+{i}so+OC? z%d!kj(_lo#b{C5JgcK&5)dysyzrm#$?Fm^=^k{+XBbq zWC+qB5F-F8rb2n=WX@}Oxd7KI;`14Ko=^IpjRG(!Jzdv*?jGAM>cs-W{ITNw9%-5y z9fR=%FLTOH$Oeeu+4ST?-S_C?>*)H c!Sr*zjbqLx^NGOFW$<+Mb6Mw<(8Rz10BO&pqW}N^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8a1fc5bc5557ac3bc60eae5d9fdd53ed13232384 GIT binary patch literal 378 zcmV-=0fqjFP)1pw6n*XKLpuz=eEnEaJU*x?yYqyyOyX+gj(qNr0YSI*KGo@KdG(&RXPzHEN$87#2ZI zYwVmInH0cbRP8e**(rru@nnEZgXFFP)EhB3nwPrpuPd~abn-1&1Jnh>JK!Dg4tNKy YF5{dbsu2?D00000NkvXXu0mjf0PdZgga7~l literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/meta.json new file mode 100644 index 0000000000..2f7d9c2de7 --- /dev/null +++ b/Resources/Textures/Clothing/Eyes/Hud/secpatch.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", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Eyes/Misc/eyepatch.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Misc/eyepatch.rsi/equipped-EYES.png index 7534d4eb56b66178c27f66855eef7cb480b05098..f3ecc702de31ed3ad7630f0404580a043227db96 100644 GIT binary patch literal 381 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV089$aSW-5dpqkOZ?l1jb0Py< zLgO2Ier^K?whU2~C0#{7=O;vWRj;{qqq5F?#`1&qpC5dm&vSsyMrFgg*UM!$zPCQI z>|W)=OKT5o(qZ2grTym7^|^im`|qc_aWH2zE}fG6HTQPV|9XwP_wP&hoOycNaUu7Y zYwOiJa<&UJ%xeujXT&g7HNrNBp?iV7mi&0l+$oa w>4lvcgKv!PdA1e0P4AMKi4)GRVBWXD*v_%=ZrWL3s4{rE`njxgN@!vL0C-ZU$^ZZW delta 298 zcmey%w3BIqL_G^L0|P^Zd(K-RB@y5g;(Fk~0W~!>CnqO4IXOv5NuaQip`ne9O~}Dk zHz0?xB*-tA!Qt7BG$1FpDkP%BCAB!YD6^m>Ge3`kp<+&OSV2+g_bgE*^OZvNw*J>D=iykq15)@YOwU}`>55w&F(uuqH!_0s-hk3dR?j8QZ-;VHJlr!>-PZ8de@_R>Qf5Ty6(7Bnl3AXk>FONY6j!QtFtpkEu%W u@Ua6z9eK*!QvCsi3LXx1B0WusEDRHqm{ygtOjr-Jg2B_(&t;ucLK6UNv}m0G -- 2.51.2