From aa458ecca521d5589e6a34577839140020db380b Mon Sep 17 00:00:00 2001 From: Tris0r <163807362+Tris0r@users.noreply.github.com> Date: Tue, 7 Jan 2025 03:48:08 +0500 Subject: [PATCH 1/4] who's afraid of the big black --- .../Entities/Clothing/Neck/cloaks.yml | 2 +- .../Neck/Cloaks/piratecap.rsi/meta.json | 12 ++++---- .../piratecloak220.rsi/equipped-NECK.png | Bin 0 -> 1491 bytes .../Neck/Cloaks/piratecloak220.rsi/icon.png | Bin 0 -> 590 bytes .../Cloaks/piratecloak220.rsi/inhand-left.png | Bin 0 -> 953 bytes .../piratecloak220.rsi/inhand-right.png | Bin 0 -> 1068 bytes .../Neck/Cloaks/piratecloak220.rsi/meta.json | 26 ++++++++++++++++++ 7 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/equipped-NECK.png create mode 100644 Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index 2fe842c20062..def6e4788f7e 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -188,7 +188,7 @@ description: A rather fetching black pirate cloak, complete with skull motif. components: - type: Sprite - sprite: Clothing/Neck/Cloaks/piratecap.rsi + sprite: SS220/Clothing/Neck/Cloaks/piratecloak220.rsi #ss220 resprite - type: entity parent: ClothingNeckBase diff --git a/Resources/Textures/Clothing/Neck/Cloaks/piratecap.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/piratecap.rsi/meta.json index a3ef379b5468..e36cce13e931 100644 --- a/Resources/Textures/Clothing/Neck/Cloaks/piratecap.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Cloaks/piratecap.rsi/meta.json @@ -7,12 +7,12 @@ "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "equipped-NECK", - "directions": 4 + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 }, { "name": "inhand-left", diff --git a/Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/equipped-NECK.png b/Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..becca64bb595873634b8ed101f2a1327d9c24136 GIT binary patch literal 1491 zcmV;^1uXiBP)Px)jY&j7RCt{2n$K(FMij@tS_(>vWanUm<)ukXp~)#RCjZ5rO56LAbI2bP_Pq4o zmZfAvDJg;60?n`OCDhL1WEWd@Lwxt4$QTQKUo0�GP|p8mFhHN^OP_DMFiqGtW$OX5e}d^wDxZXbV#| zz{<)Rvn&g~@8i1H3r%#fw8S#D4QkKjGREHC-kpGi3?NRt=r{xIP1gmWZwMs=&;$X% zvMd0A@B6%;d`&b^5(ZdU{DvF2eo;q0m*+A`uGjHUS}bt~U0zg`1b?BU2zl7DtdIhv z1hpqk5cF|<|GBhS;@&2%d%e))gP^ZGcB}zJ?*kY)Nzot~+s0M5$I9jMqupO{=2hE1$~)08_aYlp^4|*W;gud7mH;Bn`>)Iv(=5Jbd4$ zNpiVjyJcB-22&u?0OH~XU?B8lu6sScK>5Cpt8R}WW}S(m;LI~IwDY+=l7pTtJNClD_+akw)TD;B_DY3>gL8~ zsE_;>f>T`388Q|+1ZD2e0Iz?14FDnUSI-+bIXKjwJP;EB zPXW`M2~B4Gj`O)qN z;1m~l`?&wkhRHY0nb5)JqS*u&mcj3lG92FM{81%+Tzh_`{xyK3~s z8o+H{8skJj65&sf5oqkV_rxEFC=ZtK&1Y`_t&oQUgp|foYQ-g{Q5+w9!5ZJ~iT^G%hN~GC)+J#HXfQF5{|u!vNr-{Li z;o_%D88SU%qCc$mw6X`G#%-3^}b(Rg`z8CTtZ85KT^su@_TtSIjSS`qO5 zcR%pYl#i#-_c|WfZ4i<+i6~&VfkA5#8J=neWF1w|J_yPAc*+CHlb8OfU1XRx(*xcCU`FPp;!zxFThGd9QAlD4& zpk)B^x|olDD#$ehs%Y&3g+c+wGn22vlrd(vficSaN$v!qKBNl(i2BI7JZcv(3?uYv zx7)l;OoO-E?Sa1ZN|Ir^$fPx%2uVaiR9J=WmcMS>Fc8LnDGJB~s@w_KgiMvW2*nh6quM+ac$EhC=N*PJIN?}Za)_TXTwZ@o&u2RTI(vJtF zuYk8cPR0~$|2!vg;@Z8F+nxbr?uC#30w@$DEP z1Zg_)ns*Gf<>|+R(gv{^-rarT{^9As_kHq?%gYbI%bwWgIX}KHYB{|6Ko$27Ph5Yz z25=+5m&x?hP|X62DcpM6tg58P{#Ud2=?9I+&^DoV7^1aid^>i;qni-`i{*;>bapa1 zcq~B>w043GuZAp^D@HdX7RwdGt0D90jIZB5?}+v}0gVEl*N+!AShcatr!z+k?2u=h z%!&5-C^b6RmTH66WoGTRVm<=APC=F220u3Xh}?(QciY|t_DSkS-#fuc7ZP9J*W8TG cIOCt;7h>2mtRA#8h5!Hn07*qoM6N<$f@}2>wEzGB literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..9d7b53fa676f5b882df9974aa87e3bd4f678cd63 GIT binary patch literal 953 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>U@rD_aSW-L z^LEyG@7oCy$M@$;ddvEjI+_R1%-w!*9*F`im>+qe^S2=;!y(^=<2d{`lU#dv{&o7mq7I*VSD$1 z!^q6AQ-1gU32`2e4?p7i_O0)P!LRIF8ycJnB#XYS%`cA9VhnhB`@3$7lOhnw6=gp# zVo6)Re8Npjm$c^s^Y^b~un^CWKl$s(ti<`rk)mhL>~*eE?ESd0aLroX&l7GP=v8;T zY*HBX$5}9zok1pb^SO;#%sQ)^-dwD^{O{Fs23O9cw0E*X{?!InMqLp)LBx?E@9TP&9#%4 z=y$Kqlww#Apt0kaSlWU8O%ucy{+G;b$Y5MFk*z~aL5eu$&aZ3*E4e>BTg5+n?GKCB zw;N6$`6%{GOkd1@QflY|jf2@!FRcD(!}4a6sG#YeS4Tsyb5taUFaCQ)diKMU47Nf` z*PYW-5#rRF8z*l4vuNiT-DRs8?^fwomR1*hh&-*Wkt{s<+_u!v3HEwc-TFL>=P%mW zqR+c;9#h%FPg)gmGpm4Uq4v*~mYXj%_tgC3Vz_XzuK(i9qY(~@hhL~Ogm!E1d3X|- zfRyUzv`Yo8TVwrlqQ=wy&j!CH{mTlrs}QPh`QjwyeY!h?n{7_ri!(_-AOG2^bz+@= zW6ZY(#sz67nGYOh|2}hBrtV(uwzfEvH9{w!7BMuqC>`{A$`$+KYtQoI3+C3SP0qZv zEPLmbP0l+XkKgyXx* literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..3064820e2eeaebfb2c4cee35dfbe9084dede81b5 GIT binary patch literal 1068 zcmV+{1k?M8P)Px&=1D|BRCt{2n$K(7W*o+!H;gG6QWC-nuUi^BEhx^xLW3OUUQ)!$4#gV#4@you zloHq>Q0UkphxRr~&nAanMmI_WJ&g6zQ!b^LT+GZyW0zV62eI1fh#2(UVS8Q4`eA9d zE0Vq+&_VC}>ecgo^uDibeP2Kz5C{YUfj}S-2m}IwKp^C<0vHkXSupC`%JO0LZcoS(fqa`2l47O=wVQ+o&)&LZ zabb=uF3b_Fv`X5Rg|=nk!pgbW;0?p@ovW&vAhdT-N}=mIbX|vOnvwm6(d+lId2JIn zx3_R%M-4o@1VZUm%77?8DqtPuueEg)-z0a**k8eu@z0JK7m5e8%}AZsEMBja$A){n6a&@>IbzRP&p>F~vG1bBae zh8dmq-V>Puk~ABeF`fjvt_S)L+Y2jjLBxx2jw>+|KDg$`1nzqi!jKuy;o_<0A;L9(*!tI?~ z`03{dQym44JqiBcISXIF5t0;zcr? zeIDjN6IjP;jZAB$9syRnNxbRqdc6)wlEC*5Ol$K*tyY6=+kw>kFkD;MUVt#B@6Ha?xQy>rs#^xW?mirlt8#P4$0000 Date: Tue, 7 Jan 2025 15:16:04 +0500 Subject: [PATCH 2/4] =?UTF-8?q?=D0=A1=D1=82=D0=B0=D0=BB=D0=B5=D0=BD=20?= =?UTF-8?q?=D1=81=D0=BA=D0=B0=D0=B7=D0=B0=D0=BB=20-=20=D1=8F=20=D1=81?= =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/Entities/Clothing/Neck/cloaks.yml | 2 +- .../equipped-NECK.png | Bin .../{piratecloak220.rsi => piratecap.rsi}/icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../{piratecloak220.rsi => piratecap.rsi}/meta.json | 0 6 files changed, 1 insertion(+), 1 deletion(-) rename Resources/Textures/SS220/Clothing/Neck/Cloaks/{piratecloak220.rsi => piratecap.rsi}/equipped-NECK.png (100%) rename Resources/Textures/SS220/Clothing/Neck/Cloaks/{piratecloak220.rsi => piratecap.rsi}/icon.png (100%) rename Resources/Textures/SS220/Clothing/Neck/Cloaks/{piratecloak220.rsi => piratecap.rsi}/inhand-left.png (100%) rename Resources/Textures/SS220/Clothing/Neck/Cloaks/{piratecloak220.rsi => piratecap.rsi}/inhand-right.png (100%) rename Resources/Textures/SS220/Clothing/Neck/Cloaks/{piratecloak220.rsi => piratecap.rsi}/meta.json (100%) diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index def6e4788f7e..f9acc12009b4 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -188,7 +188,7 @@ description: A rather fetching black pirate cloak, complete with skull motif. components: - type: Sprite - sprite: SS220/Clothing/Neck/Cloaks/piratecloak220.rsi #ss220 resprite + sprite: SS220/Clothing/Neck/Cloaks/piratecap.rsi #ss220 resprite - type: entity parent: ClothingNeckBase diff --git a/Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/equipped-NECK.png b/Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecap.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/equipped-NECK.png rename to Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecap.rsi/equipped-NECK.png diff --git a/Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/icon.png b/Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecap.rsi/icon.png similarity index 100% rename from Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/icon.png rename to Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecap.rsi/icon.png diff --git a/Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecap.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/inhand-left.png rename to Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecap.rsi/inhand-left.png diff --git a/Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecap.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/inhand-right.png rename to Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecap.rsi/inhand-right.png diff --git a/Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/meta.json b/Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecap.rsi/meta.json similarity index 100% rename from Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/meta.json rename to Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecap.rsi/meta.json From 595d486db7761611dccedcee57bbc22c2f0aaac4 Mon Sep 17 00:00:00 2001 From: Tris0r <163807362+Tris0r@users.noreply.github.com> Date: Tue, 7 Jan 2025 17:13:47 +0500 Subject: [PATCH 3/4] =?UTF-8?q?=D0=AF=20=D0=BF=D0=BE=D0=BC=D0=BD=D1=8E=20?= =?UTF-8?q?=D1=87=D1=83=D0=B4=D0=BD=D0=BE=D0=B5=20=D0=BC=D0=B3=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B5=D0=BD=D1=8C=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Clothing/Neck/Cloaks/piratecap.rsi/meta.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Textures/Clothing/Neck/Cloaks/piratecap.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/piratecap.rsi/meta.json index e36cce13e931..a3ef379b5468 100644 --- a/Resources/Textures/Clothing/Neck/Cloaks/piratecap.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Cloaks/piratecap.rsi/meta.json @@ -7,12 +7,12 @@ "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "equipped-NECK", - "directions": 4 + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 }, { "name": "inhand-left", From 94040d4caffe8fb151c503c84882310f14cb6de0 Mon Sep 17 00:00:00 2001 From: Tris0r <163807362+Tris0r@users.noreply.github.com> Date: Wed, 8 Jan 2025 12:51:19 +0500 Subject: [PATCH 4/4] Update meta.json --- .../SS220/Clothing/Neck/Cloaks/piratecap.rsi/meta.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecap.rsi/meta.json b/Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecap.rsi/meta.json index fd7f86ead989..835caff29343 100644 --- a/Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecap.rsi/meta.json +++ b/Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecap.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "made by brainfood1183 (github) for ss14, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875, resprite by okroshka59 (Discord) for SS220", + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "Sprited by okroshka59 (Discord) for SS220", "size": { "x": 32, "y": 32