From d40922bdd2eb2e5556e84d8282382a2c0ec9a057 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Fri, 15 Sep 2023 13:32:28 +0200 Subject: [PATCH 1/3] Geta shoes --- Resources/Maps/shoukou.yml | 2 +- .../Entities/Clothing/Shoes/misc.yml | 10 +++++++ .../Roles/Jobs/Wildcards/martialartist.yml | 2 +- .../Shoes/Misc/geta.rsi/equipped-FEET.png | Bin 0 -> 422 bytes .../Clothing/Shoes/Misc/geta.rsi/icon.png | Bin 0 -> 304 bytes .../Shoes/Misc/geta.rsi/inhand-left.png | Bin 0 -> 421 bytes .../Shoes/Misc/geta.rsi/inhand-right.png | Bin 0 -> 414 bytes .../Clothing/Shoes/Misc/geta.rsi/meta.json | 26 ++++++++++++++++++ 8 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Clothing/Shoes/misc.yml create mode 100644 Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/icon.png create mode 100644 Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/inhand-left.png create mode 100644 Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/inhand-right.png create mode 100644 Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/meta.json diff --git a/Resources/Maps/shoukou.yml b/Resources/Maps/shoukou.yml index 6f9844b4c5..ab1fbee40c 100644 --- a/Resources/Maps/shoukou.yml +++ b/Resources/Maps/shoukou.yml @@ -27465,7 +27465,7 @@ entities: - pos: -48.775764,1.1938145 parent: 34 type: Transform -- proto: ClothingShoesWizard +- proto: ClothingShoesGeta entities: - uid: 7654 components: diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Shoes/misc.yml new file mode 100644 index 0000000000..de1ec12e36 --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Shoes/misc.yml @@ -0,0 +1,10 @@ +- type: entity + parent: ClothingShoesBaseButcherable + id: ClothingShoesGeta + name: geta shoes + description: A pair of traditional japanese sandals. + components: + - type: Sprite + sprite: Nyanotrasen/Clothing/Shoes/Misc/geta.rsi + - type: Clothing + sprite: Nyanotrasen/Clothing/Shoes/Misc/geta.rsi diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml index 7f4e57e16c..07fe8adce7 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml @@ -29,7 +29,7 @@ back: ClothingBackpackFilled id: MartialArtistPDA ears: ClothingHeadsetService - shoes: ClothingShoesWizard + shoes: ClothingShoesGeta gloves: ClothingHandsGlovesBoxingRed satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/equipped-FEET.png b/Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..58c88828307e63fd24ec52ba219a5896e35ecf85 GIT binary patch literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+7(F~)978H@y}513b;v-Z;h~F7;{(=L4{kZ$iP_V#I+)$@ zgGSSX2Txw9#@sowaCP(Eh6kdH@;idC_m@E$4c$<6O+{%hei1cCu$O_HCaXY5!*T zbDrg=GdOM^Ju;R3=c;|*+ygvM@(8fR2fRDE^*#UllchJrwf_{Ge%<|eY8BfG#ysx_ z`PaVYa!Tkj{Aa@F43Jzvf5x$@fJrK^bYF5j>{_&8zX|i72m3#&m0gK?_4cEI7rUC= zBGVIgR@{2KL!XLIV-_ybd$4Xvt#+JH{MJ}1{rUgj{;&g+S{ozVVm^t|11p%_WDQ<5FqSiL z+j+XVxv^<#Y6^VbKVybO1V`k*tE7il3UL3s+>@i>z|^U{1?>$T+pmBBzyHe{@xybRLJ9@`{(2`Fa{uqIGYmo9az!rf z2X-IcY*52ybm8JnS!Z3d)18bxKOV79VawC=Xx0w!pTYW_)2?vFQ-$Mf=4*~-vp>|R z_%KcDQA+E93`dh!4T0=ERtZ-a7xOJ(XW%ek5SSA&J?>C_2hev6p00i_>zopr0H&yR AQ~&?~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/inhand-left.png b/Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0bcdb207e75d7f6f193f67bbfbead49a96b6d835 GIT binary patch literal 421 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+7~MTx978H@y}513b;v-Z;h~F7V?z5nKE1wmdU1!YdOCjK zlXDc1nN#vbNH6cvg@djKw>q<~7pOei(AB)HGvb&13x%(&_oiPDo3*0XaMhW>KvjOA z&DelK{G2f7#aqMH_4^+?D-iS!y+N&|IdA6+HsP}yDbiNDg;=51#$V_Jr&fjwR z{Mvgitd0}r{YsLUtkP+*W=189EJk-l{$@;kwB9hYy>Rki-tup6Du>wkPW%_xauR z3s%S~xXwQQX!hUMf2a8-h{njTK3w+MqHL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/inhand-right.png b/Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..6bf36222197f71a2871e149449397ad7bff11f9c GIT binary patch literal 414 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+7#%!a978H@y}513b;v=$;iBwEmZqHzYkeKw_C=c1C3Tp1Ei=ksW9; z7H~xDSJ0Q*)!nDdq>kJUzF&Fm>B{Keml@x;`<5QK{Z-`5qFu%BdX{~9xjkt6qs&>i z7HOQRoGv;2PfF#K0EV*eg>S#HU9GF1G*iXXXWsKm90~hph5mm0Gs5FaH7#SEEIvy(?V7U0Z V^Q+7ANq!)MJzf1=);T3K0RZ(cpE>{l literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/meta.json b/Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/meta.json new file mode 100644 index 0000000000..fa455600b2 --- /dev/null +++ b/Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Mimi (justanorang) on Discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From a49d0946daa175b27d43ab2b4781f65d765123bc Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Fri, 15 Sep 2023 13:34:59 +0200 Subject: [PATCH 2/3] rename to sandals --- .../Prototypes/Nyanotrasen/Entities/Clothing/Shoes/misc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Shoes/misc.yml index de1ec12e36..279ee88250 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Shoes/misc.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Shoes/misc.yml @@ -1,7 +1,7 @@ - type: entity parent: ClothingShoesBaseButcherable id: ClothingShoesGeta - name: geta shoes + name: geta sandals description: A pair of traditional japanese sandals. components: - type: Sprite From 7efc227b72cc3bd68db21279ba3c35533641f5cd Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Fri, 15 Sep 2023 23:37:19 +0200 Subject: [PATCH 3/3] change geta equiped textures They didn't work --- .../Textures/Markers/jobs.rsi/martialartist.png | Bin 563 -> 921 bytes .../Shoes/Misc/geta.rsi/equipped-FEET.png | Bin 422 -> 389 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Markers/jobs.rsi/martialartist.png b/Resources/Textures/Markers/jobs.rsi/martialartist.png index bd5bb55a947d19623d2b8a90f17d1217db17335b..ba9c5ab1fe223c6e881359bd2a626b521374c34c 100644 GIT binary patch delta 874 zcmV-w1C{)<1ephr83+ad0047(di0SYCw~JwNkl$ zo9rKMy3>Bg&TUsJw|TG9fsgOc`Of)$=g;?@dnLvg9b}W~fLl$q1804+Y%{;f<$wMQ z{Zh5_NR=J|fWfymw`hHRof?}OIYkyD)YsJ~>3ReJX9Y&tbe5KvmKE@HDy<4mw*UaX z7F#1*=pD5=+7$43JWkn6mc)_h7C=e&|%m05)KRuNFs=pFW*Qu z8R%Hkan7Mv177hFcsw4Oo10@zZ6_$5%qRpM_Tk}S{jva)hr?lNZ*Ql%i$iq8Vp0e? z?C7sFh_V9k`~7Tmbd<~8-QCpE(n1FJbuyTYoI{5l4Sw*~EC6gR0BklJ*MA)j2bZy8 z^ZA>cLx&v=GW;=4lK{+SGoQ4$Dz1k@Aq6OvN-2KA4nOo^+@1r#R(5uFQY;puKp>#( zfB+J!FSWxD{uo!zQS7<{m@E>B(BR;pBvy*cR=RrVVh7*{e~jDna}1DRFvtP0BGD3w zglhGzt*xqY*oD#ntA37O4u4%{cGpQttR^V=BTCN~3p^NEmT6&Of%`a}PRWT^)ZT?fHWQxlUA1Vc$neCX=c@d=r!&h2_*~?vJ1~$pX}QJ1>8Aszd0cd|JYa8b-S#3@Kb;R0MT7GUwL1a-v9sr07*qoM6N<$f@L|S AaR2}S delta 513 zcmbQqzL{l$BnLAC1B1(wu45Aw)$1850(?STm#2AqdU_t2oUf&&wd?S%rAwE}%E~@? z@L)?#JR2LEj*d=7Muxw?|F(VGu06PBZEd~(#D2G?EgN@k+*_Zr^We_YS59vLg2M3a z`?s&$xbncs1IyPfU$J4u#vL2Iyu3E=-aL27-2I)I2?h*r-n=<-i7G9Qtjsr@=~zhyj;Y|;|lkJ<1rS_CvWI8-McVTB=u|oW5Bu{ zt9Cxwb!b*5pO@~6?9}BGpBo2cZJX05T);N_{3DhhF<0gZSM*+f#U&8Qmds?gC~{FY zgBHUpy<_Vxb2uK9S+Zbm_eIO)dCpwL6GQ~E)~vYCp~qD>&tdVoqcXAXkCR^NzquBf zefOHzeAlDFit!#ye>}26^y`z@PDNa*XLx@)Ts^jEjd^(Ft|tc=d5cZK3%dD7`zOgu6{1-oD!MGK0x6up*3vQ%a0w?!BM2EGBLoB+ zCvXWNU}bj1KqWCyPt*T1g*f*zDHX~$Tw=T;v-A_O(T5L|7zY{XZMEqNgL_t(|+U(mg3c@fHfZ;?uf#3z|;MzglT)c#1=q}DlS>KqMI^O2z!k+2ABpf1tW zBw1@snx=je(LPDl