From 532c9a6431df1ce7fef356b06aa3ba8a8b6fd242 Mon Sep 17 00:00:00 2001 From: Swept Date: Thu, 5 Aug 2021 03:18:05 -0700 Subject: [PATCH] Adds an alternate jumpsuit for botany (#4419) * Adds an alternate botanists jumpsuit * Updated license information --- .../Catalog/Fills/Lockers/service.yml | 4 +++ .../Entities/Clothing/Head/hats.yml | 13 ++++++++- .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 ++++++++ .../Hats/truckershat.rsi/equipped-HELMET.png | Bin 0 -> 448 bytes .../Head/Hats/truckershat.rsi/icon.png | Bin 0 -> 306 bytes .../Head/Hats/truckershat.rsi/inhand-left.png | Bin 0 -> 417 bytes .../Hats/truckershat.rsi/inhand-right.png | Bin 0 -> 416 bytes .../Head/Hats/truckershat.rsi/meta.json | 26 ++++++++++++++++++ .../overalls.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1307 bytes .../Uniforms/Jumpsuit/overalls.rsi/icon.png | Bin 0 -> 503 bytes .../Jumpsuit/overalls.rsi/inhand-left.png | Bin 0 -> 339 bytes .../Jumpsuit/overalls.rsi/inhand-right.png | Bin 0 -> 416 bytes .../Uniforms/Jumpsuit/overalls.rsi/meta.json | 26 ++++++++++++++++++ 13 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Clothing/Head/Hats/truckershat.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/truckershat.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/truckershat.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hats/truckershat.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hats/truckershat.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml index d2e13f35e9..8585bae168 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml @@ -84,3 +84,7 @@ prob: 0.8 - id: TomatoSeeds prob: 1 + - id: ClothingUniformOveralls + prob: 1 + - id: ClothingHeadHatTrucker + prob: 0.1 diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 783c4e9186..fb84c0f136 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -23,7 +23,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatBeretEngineering - name: engineering beret + name: engineering beret description: A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety. components: - type: Sprite @@ -360,3 +360,14 @@ sprite: Clothing/Head/Hats/xmascrown.rsi - type: Clothing sprite: Clothing/Head/Hats/xmascrown.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatTrucker + name: truckers hat + description: Formerly Chucks, this hat is yours now. + components: + - type: Sprite + sprite: Clothing/Head/Hats/truckershat.rsi + - type: Clothing + sprite: Clothing/Head/Hats/truckershat.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 77f7eb264e..f71364f361 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -571,3 +571,14 @@ sprite: Clothing/Uniforms/Jumpsuit/rainbow.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/rainbow.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformOveralls + name: overalls + description: Great for working outdoors. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/overalls.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/overalls.rsi diff --git a/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..8e0362d8dd654e1dc88129baa39f92b9fe77217b GIT binary patch literal 448 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~KnvaSW-L^Y+$8ze52cY!4P| zdL~Qo2(pW(#~*Axcy{@On`ak(mpt|08IOMBZ07Fu2Od3oq|jzzV6xHktftAvErvVU zZx#3a-)^#()Asp4k!jT&|8_Fpf2)5yxofe;?YQ#A6Tfd>Qn&iPG~eENukLPn{e5${ z!IIgl{TH2{@WOK8$;*akC$~Jhz2&389p?$WyY8O)m9zDf^9Npq2_^?;pWRzC^?mfA z*-!NwUyFrn1~SB4@$KGy?wqg3tNi$-UtRw*uK8Z2uC+t|^ylBV)PMeC;R`KKWMDG5 z(5%Ihuz)?3o8M3PRO&2qF3u{~UhoA#U)YH|^Wt~$(697yK!5aVo literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..95a2ca01f5f0bf824cfa1c35b8f07c80c6b578cc GIT binary patch literal 306 zcmV-20nPr2P)W?3I9l=Bk%OCvuMXa%;g#gH41vWOaEu+{0q*(au_iqM4W@hR- zpuzt;1A`qj8V*5Hcf&?btdM!_f;1*2eu0|o{L0M^837AXz!VgLXD07*qoM6N<$ Ef)=-Ung9R* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..7e2ef801dce07b30007fd83f9dd11364fedb6e8f GIT binary patch literal 417 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9fAzaSW-L^Y)gZAG4tV>jn8E zj4LuM|~m zWEpJPCeDZpc=@B6VRqBUr9R9OE|1<;?33?*{qY2+qrROi{}$eZIlLDheP_7GP~&U& zeb!IYdmTs4+uz$S`MhrCnPRi-1AOh)dyl?X@;+nx{=Cx0w0o9m{RgaCu8O@CTO%gU zFR`9cH~e+jnR?c$!wh@4KOBP-+kP-W-J4N)Zr{Yf-Txm%yx*|8zGchdHM-v?ZTmeZ zkLkj@;$8I$+u#11pT`t%tLge)=Bj1 z{1$NKLkw6#Mnzum4LrI3|7g zasIEy5{~DZ5B%jA-Z0j06sz2)oVzLNKDS)2{? zzt<0f*VVB`9cEa=z2O*~xK_j90s&X%9d+|~`-x%;;8;uw||?! zCT1Yxz{<@wXJl&*Z(^#L9ofOaAb(W#@7j~5PTq0_wcEcx&d$x|-o$icRoU!}b=S=b v^tBll++#dGE5FBp;Wg75LpWh7f53clW9~=KrUqwV$TN7l`njxgN@xNAq;a(e literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/meta.json new file mode 100644 index 0000000000..48deea96a8 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from baystation12 and modified by Swept at commit https://github.com/Baystation12/Baystation12/commit/80b2ded014aa871e6bceb6913b2961a23109aa23", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..42ea220dbadf69966b381a1f6f80bb6b9698de34 GIT binary patch literal 1307 zcmV+$1?2jPP)ML*f0|lmBdVfh!K=X%>Lx!dflK0^Zyr`}dfQzPPiA3d z*-K=>cvy)S1wHs5F&g|wBok-F8J%%wGh@rEo>$iN^z?L9x_id8K4^OCb$5O5eO*;u z%zL1rp`oFnp`oGinIhsA_IIcDRkUxNpEl<@4ncSJI9&hz1b=pD�MdKLpD&$Kl55 z6Rv$O1YhqS<^1PPPI8_t2Zt;8_l^C`S$^F==E@lJ>JJ9L_M1MKn`wnL8~OnDjGA-} z+o_pW!0WJk)C@ud44(Mcf7{Q3rfb+v-T254o7Q>e_ap!XKXc_V7(D~b#zYWc7z6Bj z5F$|UANj{!`O)7mJ&Mp$?*D1&s!1-sy0WRG=?0Da$=^bny4i5Lr#wo>5Hb3}XM*ymbo!z-`kF^W4)9jpkIazgx z*YSRQZlR+9pLgQN7l48w@Juhn&hKRu)SUv@nP~#p=TxF=m>(i=?&JOB^g==Ww5AmD zH(8IFp3^LFJd1W&e%C3G&%CR${hPbyc&})8dQJsS{g`Hn1#85=;x=rfU4`FOfQ>tb z99Pn4dCEsM=o zdu*$|0A&IGFVF(WJ|J#Dyx9GQ-~3XGVDW7liVrTD-B{oz}jbl#UUMmnL zs4fA0K&bd3Ex?da7XVSKR$$F9$C&NU?|%$Mh@E9VDAy&3zR8LpH3cYm7W9TbmXjCJ zbKoyuQsQo~bD$6857=Lj2S~30L`3Onu})zAmC}ro0&<9)qA&KM2`^Cgm}Os+_F949 z^8x_X^$F;UO7IA20Z{EiuE5)3k~A!coML+3sc6D?0Z?r$N)o}H=mJPXHc%PbSMTD# zMIkVFm6`;leE<>Fsuc(m|<7Z)Z@ekZ4)(Tk3$zW4smA0<<_4wD;C%LlqrG)mG4Qsl(^pOm+3 zc#lk&iNRH@9nEdz*R0f3Zv-INZ1Mc7Sj0&7nqpl-DRG&db5lAQ5Sr7SuF_^aqi5lAv_Cb2T40Uhciez3;ud3p_kL{yh>;1D5v}nU#n9_KUiW zm~x1nrCm3Ed~<}lwTJBZ3EHg=Tl4DRmaDe|yeA+lemj**0zMfZuLcT*f;(tV{`Ax+ z%M&?OZUIDQcnpe?LnIT%!saaVk)=8L$0Avg<@g2At`fO8YG#$qquGcnf-KF6nyG>E zM7rP?QF~olhY|o(^%U>{1LJ@Jz)-*A<%=TbSIl}MGt_B~=7C3`S2iC*iyPk=8FMO%A9{k$j{(hT3i zqDSCB#eVLZ=91+5%ToLT(p%5A1+d*yK^lZpxNA1tJl@U{-2VZ(U>W_AeUk_W+wQr= zDK2^ug?>c(^bYKv#YWfAm=Lm#kK&>T-+@qajajSp;QEw6zR$;t@GBSzH<_;)oI~gH t4f1dbA@h#;8b(O?6?k}fc>Hq!d;tn~syP%t9D)D<002ovPDHLkV1g5`=Y#+N literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..ef474f95ad43040a2bccaa97c076fd9b0328d360 GIT binary patch literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e{s5m4S0K$`6vg1y!(dy_U{T!4 zBC!`J!dMdI7tG-B>_!@plT#HEQR0$XoLrPyP?DLS$G}iACpfI2sPy}n;DV1|pJ;jO zYMncCK6pc@!A0W-k95xaXr5#!>gnBKVH{+9+1N{A&Z9|3CWR;jYs#-sG*n+6(b;XR zx_O1flKyVvwHk)zqDRc01ceoREoPj}!!U2NbXorMwPrwjt2|vCLp(a)PC3ZipupqW zE&QRCkwx7hreVi_zhezwFU{MNaj86O*7Rk|-BTpuj|%>@`TLbj( hYz?S?5cQ`~xbP7BWN)=^XMnC?@O1TaS?83{1ON_ffMoyx literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..79468f3b600d602e6dd8e1b50f2af05ad1de4ab7 GIT binary patch literal 416 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=g;gODB`&GO$wiq3C7Jno3=9=> zRF7M8H5dr69+*C6wsSR4C;C*`GF_wdYZt%Fo9an$Ac~Zn`-6<|KR9gBdH1?1;E=^CJ7a&C+G^ zjNu^Hyz+E$45^s&_SRnBW&?q?hu$I=FDy%B5LR-j!TLehZWl-Do1QhQ`o`}N zsC&Ke#WLXMGd`?o=stSJ;lMv< z=kA$}vX`bc0C_IA7$SgbmiXS@Z(qOv&LwkShJZJ$T!#}^R{XcO0U6}!>gTe~DWM4f D#uBir literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/meta.json new file mode 100644 index 0000000000..c35ec06fb5 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by Swept at commit https://github.com/tgstation/tgstation/commit/ac792e3226d48e5b3aaccff165ce100f7636a040", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}