From 1220b8c4c7841daaefba50a22d5374ecf1c19b21 Mon Sep 17 00:00:00 2001 From: UBlueberry <161545003+UBlueberry@users.noreply.github.com> Date: Sun, 20 Apr 2025 17:15:34 -0400 Subject: [PATCH] Adds beanies to the WinterDrobe! (#32946) * sprites * messing with the ymls * new sprites * that's a lotta yaml * make the sprites gooder * color adjustment * to the winterdrobe with you * layering fix --- .../Inventories/winterdrobe.yml | 1 + .../Entities/Clothing/Head/hats.yml | 37 ++++++++++++ .../Hats/beanie.rsi/body-equipped-HELMET.png | Bin 0 -> 673 bytes .../Head/Hats/beanie.rsi/body-icon.png | Bin 0 -> 626 bytes .../Head/Hats/beanie.rsi/body-inhand-left.png | Bin 0 -> 661 bytes .../Hats/beanie.rsi/body-inhand-right.png | Bin 0 -> 667 bytes .../beanie.rsi/cuffcrown-equipped-HELMET.png | Bin 0 -> 859 bytes .../Head/Hats/beanie.rsi/cuffcrown-icon.png | Bin 0 -> 697 bytes .../Hats/beanie.rsi/cuffcrown-inhand-left.png | Bin 0 -> 761 bytes .../beanie.rsi/cuffcrown-inhand-right.png | Bin 0 -> 743 bytes .../Clothing/Head/Hats/beanie.rsi/meta.json | 56 ++++++++++++++++++ .../beanie.rsi/pompom-equipped-HELMET.png | Bin 0 -> 625 bytes .../Head/Hats/beanie.rsi/pompom-icon.png | Bin 0 -> 553 bytes .../Hats/beanie.rsi/pompom-inhand-left.png | Bin 0 -> 612 bytes .../Hats/beanie.rsi/pompom-inhand-right.png | Bin 0 -> 615 bytes 15 files changed, 94 insertions(+) create mode 100644 Resources/Textures/Clothing/Head/Hats/beanie.rsi/body-equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beanie.rsi/body-icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beanie.rsi/body-inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beanie.rsi/body-inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beanie.rsi/cuffcrown-equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beanie.rsi/cuffcrown-icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beanie.rsi/cuffcrown-inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beanie.rsi/cuffcrown-inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beanie.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Head/Hats/beanie.rsi/pompom-equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beanie.rsi/pompom-icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beanie.rsi/pompom-inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beanie.rsi/pompom-inhand-right.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml index 8909fb163f..510257c045 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml @@ -16,6 +16,7 @@ ClothingOuterFlannelBlue: 2 ClothingOuterFlannelGreen: 2 ClothingOuterCoatBomber: 3 + ClothingHeadHatCanadaBeanie: 4 ClothingHeadHatSantahat: 2 ClothingHeadHatXmasCrown: 2 ClothingUniformTurtleneckColorWhite: 2 diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 64d55a2dd9..2477e1e996 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -523,6 +523,43 @@ map: ["foldedLayer"] visible: false +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatCanadaBeanie + name: beanie + description: Red, white and snug. It radiates a homely feeling, if your home happens to be chilly and filled with coffeehouses. + components: + - type: Sprite + sprite: Clothing/Head/Hats/beanie.rsi + layers: + - state: body-icon + - state: cuffcrown-icon + color: "#a60b0b" + - state: pompom-icon + color: "#a60b0b" + - type: Item + inhandVisuals: + left: + - state: body-inhand-left + - state: cuffcrown-inhand-left + color: "#a60b0b" + - state: pompom-inhand-left + color: "#a60b0b" + right: + - state: body-inhand-right + - state: cuffcrown-inhand-right + color: "#a60b0b" + - state: pompom-inhand-right + color: "#a60b0b" + - type: Clothing + sprite: Clothing/Head/Hats/beanie.rsi + clothingVisuals: + head: + - state: body-equipped-HELMET + - state: cuffcrown-equipped-HELMET + color: "#a60b0b" + - state: pompom-equipped-HELMET + color: "#a60b0b" - type: entity parent: ClothingHeadHatWizardBase diff --git a/Resources/Textures/Clothing/Head/Hats/beanie.rsi/body-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/body-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..06452941bb256d4f511bc5afa52b5d431bc4cc87 GIT binary patch literal 673 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d{Sb`Ho)PG(@xm{>Z|(wjL@ zq}5(n^^p^oxQkBEiU<`2t}IQ#EuCV9P0_|PeS{QG8%$O>7`9;}M?{BNUh98{=!0R7 z0wRt_F5OxyDEZ!-iF4APhiCsZ!= zdkPJHx}BSxFz3{*dDg>vpdT4LUHx3vIVCg!0JH=e&Hw-a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/beanie.rsi/body-icon.png b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/body-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..eaee6101490a2343cf45a7fcfb7a7fcb41ddedf3 GIT binary patch literal 626 zcmV-&0*(ENP)&Q zt_U9p57;uG@TJl)uM*$#1Dnw%;`2-rc z57M!`KWuJ|(B!v>OkHM@JdggALLkQYwfZ|(wjL@ zq}5(n^^p^oxQkBEiU<`2t}IQ#EuCV9P0_|PeS{QG8%$O>7`9;}M?{BNUh98{=!0R7 z0wRt_F5OxyDEZ!-iF4APhiCslIfQoJqw`i1kC!tMX9+437jGrDm-$`_us zMD|uawKwK++d1P^+PV|(TQ96l7dbWSvHa9O-|O6M^Y+UL9R4e~eYFNm^ADvDZ0?+< VvCFn^YX6iWaA literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/beanie.rsi/body-inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/body-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..db0a12d8c93c69367113c55ca7aed5b292c7cb99 GIT binary patch literal 667 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d{Sb`Ho)PG(@xm{>Z|(wjL@ zq}5(n^^p^oxQkBEiU<`2t}IQ#EuCV9P0_|PeS{QG8%$O>7`9;}M?{BNUh98{=!0R7 z0wRt_F5OxyDEZ!-iF4APhiCscmBy$?pJun-q&v_RR8FD?|W;_rGNMn;(N-W eE;Z|(wjL@ zq}5(n^^p^oxQkBEiU<`2t}IQ#EuCV9P0_|PeS{QG8%$O>7`9;}M?{BNUh98{=!0R7 z0wRt_F5OxyDEZ!-iF4APhiCsMYXUlr(WGN-Y4)wx3I+VkA~+zAKq4| z|I^xJU6nxe?~C8W?kXHwy(;SMZxgw%^P}{WPH)ngma18E+vKd)`YHRXvl{1%e^k1r zzJc}V`@gMkU8Aj!*Uy;IA>WoLx;ppvBOQ+EvJEl&_q{j2KfC9BWw-VsY36JD9R#AI zVzZu?zFGcO{iBqM>H612(I4|!qwS663ETf+$+@8YODSmH?En0e(r=c=M)+487F|?( zX6@v2g75z(IWsT`G%&CzFfejBU|}}a`zow9QgQW&o@TdN>y5wDtHy0E(>~WWe4n{x zt5S7^s@cqw)d%OzaWZ$%-u&&zSCM6zRjDN&Q zt_U9p57;uG@TJl)uM*$#1Dnw%;`2|xJzYCV3ChFG3-iIFF-{#;Hh4hLHx1dKR z=cXg%cjTG_Zky0kd8z8#{;lOM0d;ZhG!!LAOPKo-$~Ud$bcmxSbQp&Ncv7tZ&bd0r zdaIc0M+6%|wyx_3-?A(hCY`xJBXQjUaNu+;u5H^|aDp(a|Jdjj(5!NRnlP-le%Tsl f;Nd_xa4!emeK?z|fIvW100000NkvXXu0mjfhc-VN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/beanie.rsi/cuffcrown-inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/cuffcrown-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..048c6b4493978761ecb9bfaa25b47d84f233a220 GIT binary patch literal 761 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Y-ueVd8 zNW1)2gEInJ8ix)ZT;!<8waAdCXd|2HiL8sS!yg=f8mGF%G$T_$YSFZPZU361ny)n} zXf$;kd$w=dgxfo{G!{Ppbno+r>htdl-tA1_eL7{&J!Af#PM+NC%=50^n05SLU$daj z4#^(vUAsggdoG#Q$t?|fbTI$htGMfizb0$OGJ4Pdux3$~YU0ec3t^t7mHrhGCyz}& zq<+ZGmrZ1!=~tKL`#$GPewa8D zWJHVK|Np*ndHOQxyK@;|)SC93FWm6nd2N=&{^f0f*37rLW5lEWEqasrF8WKB_h-50 zY<9i;sHjH_>&gFOk8yD%xowFakIWJR*x382Ao@Fyrz36)C{zF!XeB45?szd-E-4vw=WEV)U*C z;T=sD&CM^=@*Z)ld&K4UfMc5=pNWU<!_LZr&ou$J6M~p?0Wj^r*O@^qJlOz21XVEhX?Z|(wjL@ zq}5(n^^p^oxQkBEiU<`2t}IQ#EuCV9P0_|PeS{QG8%$O>7`9;}M?{BNUh98{=!0R7 z0wRt_F5OxyDEZ!-iF4APhiCsl8-aSW+oe0%F6?;!<&hKH}% zd=7BQE^6MOxVog(?*PYDejSzznyI()Xo0TZf~|GC)$iQ@z4=OXaPqd9w^H`b_MIDE zop?P&Xup`(vCi5v8UD}jsN~0SC^RrI;UwI-zevpbWjrnQWZ$R0cWX7`*H4@|C%NaR z-huVK$Gh`3sCncm?)!Kp%JI%D|Xla z(3s$dduM+?I=}V7Xa4_t{&S@LKW|XOEYbnC{6GYgxs!1*yYam}`oQ30@O1TaS?83{ F1OTsIL)riU literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/beanie.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/meta.json new file mode 100644 index 0000000000..40fbf11d37 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by UBlueberry for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "body-icon" + }, + { + "name": "cuffcrown-icon" + }, + { + "name": "pompom-icon" + }, + { + "name": "body-equipped-HELMET", + "directions": 4 + }, + { + "name": "cuffcrown-equipped-HELMET", + "directions": 4 + }, + { + "name": "pompom-equipped-HELMET", + "directions": 4 + }, + { + "name": "body-inhand-left", + "directions": 4 + }, + { + "name": "cuffcrown-inhand-left", + "directions": 4 + }, + { + "name": "pompom-inhand-left", + "directions": 4 + }, + { + "name": "body-inhand-right", + "directions": 4 + }, + { + "name": "cuffcrown-inhand-right", + "directions": 4 + }, + { + "name": "pompom-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Hats/beanie.rsi/pompom-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/pompom-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..4f9a4dcd9483bf5e1172424ba8b3e8b3b8977cba GIT binary patch literal 625 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d{Sb`Ho)PG(@xm{>Z|(wjL@ zq}5(n^^p^oxQkBEiU<`2t}IQ#EuCV9P0_|PeS{QG8%$O>7`9;}M?{BNUh98{=!0R7 z0wRt_F5OxyDEZ!-iF4APhiCsbP0l+XkKO#}aO literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/beanie.rsi/pompom-icon.png b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/pompom-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5d46efe582b825cb2d0aecbe5f95d7885e979b93 GIT binary patch literal 553 zcmV+^0@nSBP)&Q zt_U9p57;uG@TJl)uM*$#1Dnw%;`2Z|(wjL@ zq}5(n^^p^oxQkBEiU<`2t}IQ#EuCV9P0_|PeS{QG8%$O>7`9;}M?{BNUh98{=!0R7 z0wRt_F5OxyDEZ!-iF4APhiCsSi}rW|2_jIzMhiY>cl%D>xNzrCsdak3GklD&XY`3W_!RrcaL7Z|(wjL@ zq}5(n^^p^oxQkBEiU<`2t}IQ#EuCV9P0_|PeS{QG8%$O>7`9;}M?{BNUh98{=!0R7 z0wRt_F5OxyDEZ!-iF4APhiCswYhmZCxvgp%__vosz)h8~3VT{jmA;c#g8?