From dd2343b57390e2371f82393d958b8b6cf16fb79d Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Mon, 18 Dec 2023 14:11:18 +1100 Subject: [PATCH] Rubber gloves for janitors (#22668) * add * fix * formatting.. --- Resources/Locale/en-US/forensics/fibers.ftl | 1 + .../VendingMachines/Inventories/janidrobe.yml | 1 + .../Entities/Clothing/Hands/gloves.yml | 16 +++++++++++ .../Roles/Jobs/Civilian/janitor.yml | 2 ++ .../Gloves/janitor.rsi/equipped-HAND.png | Bin 0 -> 1367 bytes .../Hands/Gloves/janitor.rsi/icon.png | Bin 0 -> 1547 bytes .../Hands/Gloves/janitor.rsi/inhand-left.png | Bin 0 -> 1287 bytes .../Hands/Gloves/janitor.rsi/inhand-right.png | Bin 0 -> 1283 bytes .../Hands/Gloves/janitor.rsi/meta.json | 26 ++++++++++++++++++ 9 files changed, 46 insertions(+) create mode 100644 Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/meta.json diff --git a/Resources/Locale/en-US/forensics/fibers.ftl b/Resources/Locale/en-US/forensics/fibers.ftl index c12bcf5b13..c95b292c96 100644 --- a/Resources/Locale/en-US/forensics/fibers.ftl +++ b/Resources/Locale/en-US/forensics/fibers.ftl @@ -9,6 +9,7 @@ fibers-latex = latex fibers-nitrile = nitrile fibers-nanomachines = insulative nanomachine fibers-chameleon = holographic chameleon +fibers-rubber = rubber fibers-purple = purple fibers-red = red diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml index 4c7415aa0a..b585d34051 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml @@ -3,6 +3,7 @@ startingInventory: ClothingUniformJumpsuitJanitor: 2 ClothingUniformJumpskirtJanitor: 2 + ClothingHandsGlovesJanitor: 2 ClothingShoesColorBlack: 2 ClothingHeadHatPurplesoft: 2 ClothingBeltJanitor: 2 diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index 31debf872c..dc1c4fcf48 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -391,3 +391,19 @@ - type: GuideHelp guides: - DNA + +# TODO Make lubed items not slip in hands +- type: entity + parent: ClothingHandsBase + id: ClothingHandsGlovesJanitor + name: rubber gloves + description: High-quality rubber gloves, squeaky to do some cleaning! + components: + - type: Sprite + sprite: Clothing/Hands/Gloves/janitor.rsi + - type: Clothing + sprite: Clothing/Hands/Gloves/janitor.rsi + - type: Fiber + fiberMaterial: fibers-rubber + fiberColor: fibers-yellow + - type: FingerprintMask diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml index 2b778ee6c2..bf11532ddb 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml @@ -23,6 +23,7 @@ shoes: ClothingShoesGaloshes head: ClothingHeadHatPurplesoft id: JanitorPDA + gloves: ClothingHandsGlovesJanitor ears: ClothingHeadsetService belt: ClothingBeltJanitorFilled innerClothingSkirt: ClothingUniformJumpskirtJanitor @@ -35,6 +36,7 @@ jumpsuit: ClothingUniformJumpskirtJanimaid back: ClothingBackpackFilled id: JanitorPDA + gloves: ClothingHandsGlovesJanitor head: ClothingHeadHatCatEars ears: ClothingHeadsetService belt: ClothingBeltJanitorFilled diff --git a/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..914ead60ecc4168175f24975d2c9b88bcf64cba2 GIT binary patch literal 1367 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`&f984^(v;p=0SoS&h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fx%@^cciN^SHZYEbn;L{W{j(Z^!D4am<{kwK}& z`8lPaP`5KOGqC}O1d1pk{2@9bu3q+g>poTyK6e)E=l0G=_fob24 z%SIobkLGi;8hi(^Oy6ZMvy<-By% zTjfZU*gW^K z0k!-1S5H2Daedcyo3s6F^Er1M`^BGrZGHaPW=$f zzuv9!^<%!-+8=ks6DGgD_S(GkLnn$`(43}FP|jqvDylyIp790sDZd0mCO@^%dwXPa z=-)RduNhzPdi?8h)MQSFsjtuM^WO7%)^)$#MX#g$?3*|jSZznTPbd0U|>$m42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#Ug$@zIU`VbYUIw7K{2HNOjvD*gZW2?xZ)Z+Y{ zQc#%N8JU^bfWrYr6cPFm9T8Y{Ad8~w2*}7U$p@yUqReE^ypq(Sf+Aqbg4hVP54Q?* zvk;bt=4F=H89@y|6Gqa76f;(iMJ46=McEYr&_z_KXS776qk5h@1XK- ziu;rqKh%XLT&aF{=IxeLfr4b8Wt`u>?K}4}(^}}Ma`=OO(T=+A`#UwIuf)apFFs!8 znzQD-p1SncI~tM<41GIZ?XgrgYO7i=YPHr+U{d4PWhz_Bp7InJYe^Y*oT&*jzOhqM zq^B~ue*Vh`$2Tr-mtB2g)v}|ZoKox+t1XxQjGL;V6|nxV-`eD`g>lzK7Cj6IS;$+W zyX5L=UB>hcKMw}-)E$4|bBx)2=cLH$|1R0u3eRi*E9yL+Yc3|q&vxbQ^qc>;N<=@3 zjMlMbI>dWr?k-<<g_J-zvsJb zopto(y}qNzinsb5KT)ET*SMZItlm-ZQkV zSS+sZt@@;3KVPq}N76&lHN1Kk4$fD7aAdl$z2Zcfm0?vZIu$_+JonGr$}c?Gd#2+d zp@M^|lDjXmMe)-W9dNI+REj?HJ n?-)G0_PlJJ0}vkAANWA}s=Mp6uS>aBg9>6#S3j3^P6h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fx%@^cciN^SHZYEbn;L{W{j(Z^!D4am<{kwK}& z`8lPaP`5KOGqC}O1d1pk{2@9bu3q+g>poTyK6e)E=l0G=_fob24 z%SIobkLGpvlKi(^OyP`8^+8Q`3%Cg>2+r`TY6P z)tgVB+kVdb?a^X1TQIo?{8a7u(i&yke(cM!z4rA}D{uOD-V56nE_%O< zH*|Xb$+-RVkN3Uz<++y-f5684+yD39_+Hf1@U=hrDWM(pY0piO3!f4f++F;n;-nh` gBa46okT}BmdKI;Vst0ML1*4*&oF literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..98bf0b33b5bd5b32fa2c701a3ed1c23d4829e735 GIT binary patch literal 1283 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`&f984^(v;p=0SoS&h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fx%@^cciN^SHZYEbn;L{W{j(Z^!D4am<{kwK}& z`8lPaP`5KOGqC}O1d1pk{2@9bu3q+g>poTyK6e)E=l0G=_fob24 z%SIobkLGpvNCi(^OydnP2eSB=b=aI%yc19Kf2L@CkK}*43_5JbKWs9HxOZ|N7&g|e@N}qOibZD|2 z)ZKSJ+jza>g}|k|`uu+0=FDTi5xXJiGmn7Y=NaW^`Bo$?Jgjup*Y)}FSF*MHx9oAR z4v)2=eGOU zz31OvyKY}&-kaYSS-)tWSy?VoI9IFo`*FUdHJx9=4@^Jt-Syb@wXfIhR(cZ6=;8ZWAWv66mvv4FO#q7-p4|Wd literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/meta.json new file mode 100644 index 0000000000..14008ae27b --- /dev/null +++ b/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Drawn by Ubaser.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file -- 2.51.2