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!ia0y~yU~m9o4mJh`hE;$|NUP6 z`xlq!q8HC!6uV%1ovowG?wt%@bj}n_W7we6_)3vE;7MdrD#K}^6>>%luJcsG*~k2~F(h}h? z5!PGVj!Nvfb6Y(?+kv%j(F?)jhR>#Zw-?9jSqnOGEao|xxAI0aQ^yRBnKkoMcPx{Z z@vatZadzrq2{05rWv*Ui_q?Qe6HCkUg{!ny|KA+QxMs?}eed_@?~i5du4PktUMwW{ z$;Mo&xsYwggy+YUu6@4#=j9rPH!bbE*7X)As5|Kz1;$p7b&x34#3kp3{?fJI+*waZ%3 zq~P~^3SNdSSeLE&Ip$buqwJsh<-$k4{yxKz$l(59+go0Tnal3{myarES1$hXZO#S8 zs@K;iJ8z5Ta5#TR>%0-eRMiOE9ER>aUh8-RBAc!rX4`OL^^;rV3ICaV=S}y8-Dfs1 zZh!yO^E+$R9YGG}43U0sq3hC$N#9wO%9b+B5jeNt&C?c-i`(mFvwa9t{8G%z;2WcR zo^6G0)4OEm3rDVg%4xWz^uo@JNMXDD1N{Gw+c;Vq?}%n#U|{fc^>bP0l+eV$007?Z Brtbg% 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 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANNfR-P`7ArbCxryBA#IS9Dg z?`1U;F)6z;r=ft^KOxESW$2#9*3Rb!ibt3u0x#SQxZvQ}KeKo7?9xWpUX$ItiZg%y ze|tZ%(BN}X+P8Mr4V*Vva+q$h*qnd;gnQMhRokt$E_?5E`Rl2zdk@_?;r3;oN+-kV zO+3Dr6MSOcy=A__wBnGXKuMs;!wpfKbDxw63%CYKoSiUd+A3QPhhr%xo_)=0Prc1_ z{Ba7$B}D;c2CZdImCsYoWmoQGxUT)^vt;Ew|6lWanG7^-W3Sh~le?|^>L}BpKN}zY zmCKwZCENUwr$BN3ZQ-Q7b(t-SkIu5CMoOJOsKQWM^-`nezI&Aw=iK<2lf&|BUL7!C zG5wqLe9j342L8n|^YbRD`z{Q!v2fVc{bW7ECvn3v)B0J5!slODzN~0I)Q_9h3)q*i Y&sJ2n7EWehU|{fc^>bP0l+eTg0Ga@vQ2+n{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/meta.json new file mode 100644 index 0000000000..2f7d9c2de7 --- /dev/null +++ b/Resources/Textures/Clothing/Eyes/Hud/medpatch.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/secpatch.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/equipped-EYES.png new file mode 100644 index 0000000000000000000000000000000000000000..ed5af49e30e73148e2e5f69a881598f285c17bf8 GIT binary patch literal 390 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEd+7zX+zaieIX)>1as9k=b7!pPY2n6lTkHKP8@ubLb>F|w;=sluq_K3( z-;QfhUA~(?-&tDSn7%u5Yu5Kqe!G9vE$2P*{`*A1I}BA1j>~16Zax~f@ISxT_wV2N zl#71WO?b_;`Ri;>rCVoN6Vei=ZDwgm-Y1IIq$hE-f%JAP{?t-I9=Gr_580~i35?Xo6d_i z(H%j~#it#(1ff!*)&mr1FTWk)j)Sav;kY?*RN%Xw9_)wd-KN@`AO^|tZ? zZq+pl%fuWlRE~Hthz2j*Rjl;LsVr+SJBV;3DI5EYi`}BtTUgn{Gk2k2jA!O9AL9i*|6^Qa@mdV zt&c3bSNZVL+5?+(*tbP#zj<_huAjjE`{`~R%o&YKrzC&Py&d$wUgPfl`_esUp5As` z$o=Kodi9Q+?E($+T0_qnF-%pBu+3rU-s827Hz2a<>S4AGCsseXMV|1V$#>o~U)X(S z17rF5r;+cuzf`y@@GJ=2W7i*E9j}lS&UJwEA4%kZG~>ryJTkKg!3zy_bo8Cb1b}@c9wyGfx*+&&t;ucLK6c3cv7g! delta 298 zcmey%w3BIqL_G^L0|P^Zd(K-11_p@$pAgpr2M(yIsW~}0$;rt{N=h;?Fc=vc+Su5H z9Bg%CU|?V@3GxeOaCmkjje&t7w<;u}#3i*jxhS)sBr`vcfuUkfa9BZ6>GvSI(O!L@P<%>i^dNg>74h`Jjqbh)4RjMILP?2v6sS}`bU$FObSs5*4%2eRbiuw zrE_PuvFhd(5=;8Kjn`@znu{JWdlD2@@U@t6HV?z>`O=BI_`}Q?7#PAlT^vI^I+GJ5 zTp9uyW~w_l%xe^kjgyS+UZAjw!<%7OXGRSxk2R~|TthCmgBlVA2Rt;gxfZ17A9E>n zOxed&rFi(*0iljOWp1hdfI