From 13c91c405c7c9db0e28b08e4890f20685e3c4074 Mon Sep 17 00:00:00 2001 From: Jackal298 <129199891+Jackal298@users.noreply.github.com> Date: Fri, 12 Jan 2024 02:19:58 +0300 Subject: [PATCH] (Add) black cap and some contraband (#23933) * Add black cap and some contraband * Bot fix * bot fix 2 * Price increases --- .../Catalog/Cargo/cargo_vending.yml | 2 +- .../Inventories/clothesmate.yml | 2 ++ .../Entities/Clothing/Head/soft.yml | 22 +++++++++++++++ .../Soft/blacksoft.rsi/equipped-HELMET.png | Bin 0 -> 422 bytes .../Clothing/Head/Soft/blacksoft.rsi/icon.png | Bin 0 -> 221 bytes .../Head/Soft/blacksoft.rsi/inhand-left.png | Bin 0 -> 362 bytes .../Head/Soft/blacksoft.rsi/inhand-right.png | Bin 0 -> 375 bytes .../Head/Soft/blacksoft.rsi/meta.json | 26 ++++++++++++++++++ .../blacksoft_flipped.rsi/equipped-HELMET.png | Bin 0 -> 423 bytes .../Head/Soft/blacksoft_flipped.rsi/icon.png | Bin 0 -> 221 bytes .../blacksoft_flipped.rsi/inhand-left.png | Bin 0 -> 389 bytes .../blacksoft_flipped.rsi/inhand-right.png | Bin 0 -> 367 bytes .../Head/Soft/blacksoft_flipped.rsi/meta.json | 26 ++++++++++++++++++ 13 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 56db79484d..2e8d7dc46f 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -33,7 +33,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockClothesFilled - cost: 4670 + cost: 4750 category: Service group: market diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 05177a4e4c..2b64a9d0a9 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -64,6 +64,7 @@ ClothingHeadHatGreensoft: 2 ClothingHeadHatOrangesoft: 2 ClothingHeadHatRedsoft: 2 + ClothingHeadHatBlacksoft: 2 ClothingHeadHatPurplesoft: 2 ClothingHeadHatCorpsoft: 2 ClothingHeadFishCap: 2 @@ -81,5 +82,6 @@ ClothingHandsGlovesColorOrange: 2 ClothingHandsGlovesColorPurple: 2 contrabandInventory: + ClothingMaskNeckGaiter: 2 ClothingUniformJumpsuitTacticool: 1 ClothingUniformJumpskirtTacticool: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/Entities/Clothing/Head/soft.yml index b8594c841f..50be724c41 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml @@ -113,6 +113,28 @@ - type: Clothing sprite: Clothing/Head/Soft/greensoft_flipped.rsi +- type: entity + parent: ClothingHeadBaseButcherable + id: ClothingHeadHatBlacksoft + name: black cap + description: "It's a baseball hat in a tasteless black colour." + components: + - type: Sprite + sprite: Clothing/Head/Soft/blacksoft.rsi + - type: Clothing + sprite: Clothing/Head/Soft/blacksoft.rsi + +- type: entity + parent: ClothingHeadBaseButcherable + id: ClothingHeadHatBlacksoftFlipped + name: black cap flipped + description: "It's a baseball hat in a tasteless black colour. Flipped." + components: + - type: Sprite + sprite: Clothing/Head/Soft/blacksoft_flipped.rsi + - type: Clothing + sprite: Clothing/Head/Soft/blacksoft_flipped.rsi + - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatGreysoft diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..76a49f5e700e11701a51df6e3f1d088eeb8b3997 GIT binary patch literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|R4( zr;B4q#hkaZHg+{TNVGivAh3o-`=jofn*WzhZJ%(1qbWgk=kHb)L$4eEZTRz^HE&2! zo%!Z?p3X7<3CfJ~_(MZW@1MI``nR!LYo?`kEP7#Se*UvjeJe|J z&AjLOKh54xd|<~UmSunF*!~0=cNNd3%vsYec6%RqTjo4#+4=8>4HWv4V_fflKb_GX z-!Iq1dc#b=>(Rcrg6pLjx4%vL&+tCd{?JzDoQ?PO|FD-xvsel-6sa&g@nASHkpbuw z1$QQgK9&X9*G| zb=kj?KjWHMBSiPL+bSnqm%IJ>&D;+^?k)aPe!Y)F?87>#|7&m6=zclFbC(sHE$G(2 cV69=?yQ7);clL_Ez<_7)boFyt=akR{0OYK#BLDyZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..598173190ededcbcfed07b0b65bde45cf49f145e GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv=>VS)*8>L*=;-L^>gpOB8ygrH zC@Lzds;U|q8p_MdvorLv0hKY91o;IsI6S+N2ILfYx;TbtOiWIYsA~ue2;iKluaT3J zBh;Xh&%>g(ii1%!U07V)U8T`QT-?!7QKeC3!9*{wr5;QU>n2rcI4#)g;kk0p7RGbW zGj!RTI9i&nUFhiR3us|#bNhNBAjQtvy>h3#IkS$R{ao`sE_0UNHF4LC)qiW=uig1|!K50Awo{*NHov#%Ta_EVmECbt|DueI z`_^SYWqO$9mszRc>3#X{@`u0o)vuX)FLn1$4n2Qu4kqDUudSZ`-Zyi<^oiR_xe{&5 z{~2zq+4zt1#Lq_-^Cqbny6c_}3JralqQ9AwnMJ^Xfe{aJL&zdz@4Kt@%#-fur+z-n z@Zvw)Gyh<%6G65A#148^*3@~-E{-+YF8cXB`QK~z-;aG3{&*FutM>U~@mt%@F3EiLZKM8^?5Tw^ z#}C)sujqduKA|G^`u1g+F|RE8(q^fdURT|S#W^UhYn;JaclG_{Umt?jTx;tSeVEIj z8E17OavJMa+t)|gI|XG{y!|-;&gpFn-dam_^d7a?|CiN+d#{f7)@7-YJ-xM;-Y*b4 mtjNTn(7*s94#UT@WW?#sVS)*8>L*=<4d~=;$aaDjFCV z7#ka_s;U|q8p_Md&yG{M3RK2e666=m;PC858jw@q>EaloF)=woBF`bf)01)L`8QHh zQcGG?5?%;#v3O+hgvP|gILl0AX_+!5CgzF&)3c@~hvcIIOvhRs1RYfv`92ppI)3C* z$)0t(@xUTR&(1=3_sttwnKyN8EL_O8DS3A9snga0doEwRnAmW2{uf3D%M6k56@qIw Q0PSY*boFyt=akR{0B1`^H~;_u literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..31ebadff94fb3871f57b9fc035b41286527d9750 GIT binary patch literal 389 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVD#~HaSW+oe0ytmR*Qp3!^6oE zEZPU%1Zz07@9*F8Ns;BEn*fXU%_l5r3E{$N$#pkx^r%M*kTS&Miv1F22|of zJ?9=-!Mw<6({ESKURD^ldey44KX$E~d;I>oztMMpFOjO5mMX;37+W42{_=NRjDX1x z6;HFr#|x(@3*39FXDj}!Qj9m|v-_mJt0|w{pA|@cet7BSJ-c69Omt5dO|1`?(fhUS zNMTO3-({6ViCeqQH+}a%aQxXPoBblLiOaKYhwWNdeRA(D-yn2np}TS`t6%B8ZQt)V ze%d9o`~MdSKjsAoUw0OYxXzA<`EPrJ=TDZ!lZu*r#rWK3C+?ov&Ytvc=ac1?%wJB} w_+Gv{qb*UO`2EcDiRDF7f^eJutvH~buql-1$zXEW*tJZ4Z*TQepy`DYN7LjjF^UVXYW!`uwBY`qIq*uNH~TSLtMNOvs-3Jo45yQF(zaKP>vf ze}1pk*K1k4w#ZQOc;J?TUOT?CvF)AFrgLJXS1nDRwQP4qY{iF#<=G;xW|tEsRCt_s z@0+_uuJN{S{PWCN^ET^jetErA*Z1si?{!~L|J+&n?uI=) z3HOu@>{Aw%P1!2_n!9PUZC+QU$}F*8%IW(*p1I8MY}@-?d7J0$-FsGlVmdKI;Vst01eBK^#A|> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/meta.json new file mode 100644 index 0000000000..a470e00944 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} -- 2.51.2