From bdc4441a45400b610feda8b033a3f90cb45bbbcd Mon Sep 17 00:00:00 2001 From: Swept Date: Sun, 8 Nov 2020 19:24:17 +0000 Subject: [PATCH] Adds rainbow jumpsuit (#2149) * Initial * Fixes attribution * Fixed * Fixed * Update Resources/Textures/Clothing/Uniforms/rainbow.rsi/meta.json Co-authored-by: DrSmugleaf --- .../Entities/Clothing/Uniforms/color.yml | 13 +++ .../Clothing/Uniforms/color.rsi/meta.json | 6 +- .../rainbow.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 911 bytes .../Clothing/Uniforms/rainbow.rsi/icon.png | Bin 0 -> 382 bytes .../Uniforms/rainbow.rsi/inhand-left.png | Bin 0 -> 339 bytes .../Uniforms/rainbow.rsi/inhand-right.png | Bin 0 -> 339 bytes .../Clothing/Uniforms/rainbow.rsi/meta.json | 74 ++++++++++++++++++ 7 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Clothing/Uniforms/rainbow.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/rainbow.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/rainbow.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/rainbow.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/rainbow.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/color.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/color.yml index 152f013169..d496a33015 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/color.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/color.yml @@ -460,3 +460,16 @@ ClothingPrefix: maroon_skirt femaleMask: UniformTop HeldPrefix: maroon + +# Rainbow +- type: entity + parent: UniformColorBase + id: UniformColorRainbow + name: rainbow jumpsuit + description: A multi-colored jumpsuit! + components: + - type: Sprite + sprite: Clothing/Uniforms/rainbow.rsi + state: icon + - type: Clothing + sprite: Clothing/Uniforms/rainbow.rsi diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/color.rsi/meta.json index 0b4f3ab7f8..b8827ee3b1 100644 --- a/Resources/Textures/Clothing/Uniforms/color.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/color.rsi/meta.json @@ -2,8 +2,10 @@ "version": 1, "size": { "x": 32, - "y": 32 - }, + "y": 32, + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d836946e8e85910eaa4d132f70e21bdb9888c171", "states": [ { "name": "black-equipped-INNERCLOTHING", diff --git a/Resources/Textures/Clothing/Uniforms/rainbow.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/rainbow.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..e89ff84ba52a8c411c9524ec2929bf2a92af10a2 GIT binary patch literal 911 zcmV;A191F_P)xh6cY3F^WGO1kwF0ehycJ+0E~=`Q&Urtc>u$q1pn>;YHDh-kqhwL z0BA1^N|^v+$N)@}09mg9KR-WMSXh97fI2!lXJ=V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRL zOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DLt`LiHkEOv#1!Pg^M$-C^0t`#5UwoR&e!m z0UHVc_&ym==J=>s00068NklBh#9j!AYF9SU?;SLnM^Fpf)%T`ZDTr}icMW_ z+YVGawyh=@KsSx4VZyE=h|?|0maB?DXF@J@cQrm0hkO-y z`g=n9t^~L$pHP>Qx## zi=xO2F`vXqk_7O^h`&4;w8Q|XXTi!}1!t#-fBx;ecz&Ft9UM+TJ4n;?1YWd*c)eaH z@Z!I~*pe~)7qYx4vZBZ{%r7poEW0Q$UjQ;l;eaFlp940R<%Vp^%grZ!@MNGw0Y`jt z1saym`J+aS`g^*rj%TWCU3~?%22vd&Xuab&Izsg;q88lFoX%=`g8^=6J)>MX9ee;F z!Fi1VYR-YL0q|jnz&jYG3yuP6PMh1dy~6-^ZF}2LUZVg|w{61?19V}#?L-Rk@4KdH zw)zgX5b5p_KmG|yQ}%!X9$1=+40ij%WB`I80RyZ)64(K|IF1v>umecUSOSq9-r`PM ze<0xXggh2Ge)kGxd0sr~{372!=>Sjr9G@>FVE?QKJnyxDm)Ek_-o00S`TC*-y!E{f l(D!e8z|qSe0y@Bdsdu0ALab?XymbHo002ovPDHLkV1nFpi7WsB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/rainbow.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/rainbow.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ed407d3fcc94ca043387fc1932064a6abc646455 GIT binary patch literal 382 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyT>(BJu0Wc>b23BXL58Fw3~B!v zIy)J*ZerNJh2iceZ*Onki41YfX^Dx6Nl8g*vdkG78Ch9b+1c6o43$MP{6+s6%F4>h zb^99(<}`7rHa9nSGEDC5?CkFDo~X$%(UD=Y$+js|rc6^7nO4LwgJH>BRk5|)h6jTg zjvP61!b$cKpVqr~@BTA<|KGvz|2EVA6U>i*j$teb@(X5gcy=QV$XVp+;usMwGZ zng8gA1mpV8HTHX293PY((3-R-D?WFsI_riN(}L`lOfhBDUYx7ED0eYWMP%fq$)}8( a_sdr>zt}0jsIkCb03496elF{r5}E+fE|ZP` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/rainbow.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/rainbow.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..b587af45794e81544b99b2926c5d5ce2fa902f69 GIT binary patch literal 339 zcmV-Z0j&OsP)cky-x#Pp#2tFg5o2s67dNXijgk@Nk>PaUAF8Xs@GdZEp9tctI+4L9kEbfw(B@*!B zhCYtRG4{c5ueza}OOekMpt@lwhcX1y6A;&N9LFpE+k2qm-_^Fc;?1>XcOq>7!002ovPDHLkV1l8;k*NRx literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/rainbow.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/rainbow.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..b587af45794e81544b99b2926c5d5ce2fa902f69 GIT binary patch literal 339 zcmV-Z0j&OsP)cky-x#Pp#2tFg5o2s67dNXijgk@Nk>PaUAF8Xs@GdZEp9tctI+4L9kEbfw(B@*!B zhCYtRG4{c5ueza}OOekMpt@lwhcX1y6A;&N9LFpE+k2qm-_^Fc;?1>XcOq>7!002ovPDHLkV1l8;k*NRx literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/rainbow.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/rainbow.rsi/meta.json new file mode 100644 index 0000000000..082376bd38 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/rainbow.rsi/meta.json @@ -0,0 +1,74 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32, + }, + "license": "CC BY-NC-SA 3.0", + "copyright": "Taken from goonstation at commit https://github.com/goonstation/goonstation/commit/4059e4be90832b02b1228b1bee3db342094e4f1e", + "states": [ + { + "name": "equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +}