From ee21939066ef2b8d206480cb84e686c5bbccf36f Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Sun, 7 Jan 2024 21:37:56 +0100 Subject: [PATCH] Red racoon suit (#22862) * comit * :do_not_litter: :panda_face: * stupid * stupid x2 * fix tests * Update cargo_vending.yml --- .../Catalog/Cargo/cargo_vending.yml | 2 +- .../VendingMachines/Inventories/theater.yml | 2 ++ .../Entities/Clothing/Head/misc.yml | 11 ++++++++ .../OuterClothing/base_clothingouter.yml | 3 -- .../Entities/Clothing/OuterClothing/misc.yml | 13 ++++++++- .../Misc/red_racoon.rsi/equipped-HELMET.png | Bin 0 -> 1046 bytes .../Head/Misc/red_racoon.rsi/icon.png | Bin 0 -> 440 bytes .../Head/Misc/red_racoon.rsi/inhand-left.png | Bin 0 -> 847 bytes .../Head/Misc/red_racoon.rsi/inhand-right.png | Bin 0 -> 847 bytes .../Head/Misc/red_racoon.rsi/meta.json | 26 ++++++++++++++++++ .../red_racoon.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 2201 bytes .../Misc/red_racoon.rsi/icon.png | Bin 0 -> 899 bytes .../Misc/red_racoon.rsi/inhand-left.png | Bin 0 -> 820 bytes .../Misc/red_racoon.rsi/inhand-right.png | Bin 0 -> 838 bytes .../Misc/red_racoon.rsi/meta.json | 26 ++++++++++++++++++ 15 files changed, 78 insertions(+), 5 deletions(-) create mode 100644 Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/meta.json create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 52676943d0..092f3be215 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: 4650 + cost: 4670 category: Service group: market diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index d4dd657027..a2e835a28b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -27,6 +27,8 @@ ClothingHeadHatPumpkin: 2 ClothingHeadHatShrineMaidenWig: 2 ClothingOuterSuitShrineMaiden: 2 + ClothingHeadHatRedRacoon: 2 + ClothingOuterRedRacoon: 2 Gohei: 2 ClothingHeadPaperSack: 2 ClothingHeadPaperSackSmile: 2 diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 645c47f9bf..7b93e83cd9 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -213,3 +213,14 @@ sprite: Clothing/Head/Misc/squiddy.rsi - type: IngestionBlocker - type: IdentityBlocker + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatRedRacoon + name: red racoon hat + description: Fluffy hat of red racoon! + components: + - type: Sprite + sprite: Clothing/Head/Misc/red_racoon.rsi + - type: Clothing + sprite: Clothing/Head/Misc/red_racoon.rsi diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index 38c1fa1126..82df2c21e8 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -133,6 +133,3 @@ components: - type: Item size: Huge - - type: Clothing - slots: - - outerClothing diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index 1a5688b6a7..2e54fcd247 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -362,4 +362,15 @@ - state: equipped-OUTERCLOTHING-lines color: "#000000" - type: TemperatureProtection - coefficient: 0.3 \ No newline at end of file + coefficient: 0.3 + +- type: entity + parent: ClothingOuterBase + id: ClothingOuterRedRacoon + name: red racoon suit + description: Fluffy suit of red racoon! + components: + - type: Sprite + sprite: Clothing/OuterClothing/Misc/red_racoon.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Misc/red_racoon.rsi diff --git a/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..69e81b97a70fb2098857160a35a9a4095354c2ae GIT binary patch literal 1046 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z`V`V z#WAE}&f8i38Pe_|$LvGd{zs;7T;j6AV$-V`r!s|IqQoytF>x*25i(g##`jx~#pM21a^`u0EmtL|IA zH5!FwPj5}H__?ZUX{TMy)Ay#o{`G|k+|pRQe>wO6-2csS*RO7S{`BJgo!?~{6x5#2 z{!)ARIU|F!{r`hY?|(aR=a9nhntcuX>m-^UXqtYVZp5_C{>H&;bC|{JZ`D5MR%qSB zxopCzLd`&mwI^`3KRHG(KMT1>aHra6X zIfw0LWGLItKl6&&o4orQ9ka~kSdaS_#$D%MKdsl|c%A%}ziTe)rLweypT6@eSKlG! z*14v@t4Xmu3pN;aHs|m#6inz{xWS0?brQqD6eQ)iZLkkpBj;*binwV*=-NX9eMvuaW4-d|KG^e^KF<6z-(ThOnyGdSpL0D_F29+ydcGxlRYYFm1W!f%$xd-$fsdA@ zv_u64K5EO$OPpZIUUfq?-2Sq8JNvtQsc-5`CB1dR;DGyubx%JH77~jI`R~6c9RGw>W{RVdXjIwW))M(tH*o(**)0XV3nGGE%ilq?4pl%--vghh4J3!yftBGj?dd|Z^ppD hz?T}~nda-upvAzzz`+0kmx3pQ7@n?vF6*2UngA`=>u3M~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..be8beea144c7cc26165e75078b9f512bb37228de GIT binary patch literal 440 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>V2to| zaSVxQeS2x6H&dVt`-k<@-S>7dZ&ftu5m>*F?e3>#i;pf`y43T9{ElaA{~6eyAGy2r z=0a7bg|m)440tQ&7<%U?UIeJ$+Jj{Lig zxoD=*&71+m>d?_JDQcWN(|F zT2A8Z3m$8)*<8M0n)_x6=JK2Cw~B=snRp#HOk44ofy`glX=O&!1UhJ z#WAE}&f8n(y>BN-uzy&;%{5u|Mwv(Y@{HEsztxI#uKk$FJ zFuC3HX6TK~dzPhtCwkt2gMo~%FWaWhWp4=d zJn*Z8pRbSWM)bTD)yn#lw%+2t+R|{gQoO+?#yI=O%9|Iyd^3FU)B27;9rJ178*|DX zeL4QGS)HiM;v)4z$a90~3N-0d^ID=N9pxNi2Hc-46^W0FhL zzbK}F>F1d1;|ry4cNMNF-)Hh|X%9o}OB?-I{xdp0Q{SB1)oWq7I%CfMZMy@(L9BO6 tUTafIfUd%~dIkmtzSIcMG+$o^Ed~Y#4h9Ig6g(Nk@O1TaS?83{1OW4qj)njL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..4ad9c515a99d82f2707ce228d8369a1f2a8993fb GIT binary patch literal 847 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&!1UhJ z#WAE}&f8n(y>BN-uzy&;%{5u|Mwv(Y@{HEsztxI#uKk$FJ zFuC3HX6TK~dzPhtCwkt2gMo~%FWaWhWp4=d zJn*Z8pRbSWM)bTD)yn#lw%+2t+R|{gQoO+?#yI=O%9|Iyd^3FU)B27;9rJ178*|DX zeL4QGS)HiM;v)4z$a90~3N-0d^ID=N9pxNi2Hc-46^W0FhL zzbK}F>F1d1;|ry4cNMNF-)Hh|X%9o}OB?-I{xdp0Q{SB1)oWq7I%CfMZMy@(L9BO6 tUTafIfUd%~dIkmtzSIcMG+$o^Ed~Y#4h9Ig6g(Nk@O1TaS?83{1OW4qj)njL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/meta.json new file mode 100644 index 0000000000..c07c7a857a --- /dev/null +++ b/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by netwy(583844759429316618)", + "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/OuterClothing/Misc/red_racoon.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..d4d1011105c83727c5b4d4a3db081f6a642b0aa8 GIT binary patch literal 2201 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z+vg> z;uumf=k2WejOgp4$L;<1>$px+%FL2kBo-dEW(j9X{ZWC(j@#|o3L^{`FKlhiN!CnG zNtW!{n({mUaLd2TJ!UWEb+fZL-f}4G9n(v^z?yVt5|3HB%3R&Y7CNV%9EsSJ^0)5V zU3vZYPd%rp+C~;7UKa29dT;Oh+Vi&G?-ZZk{oH|Fw&a2%g!n&yLQly)qbI`FIj7zy zCu`r@EPU9Gaf0T7k0(W)-@iIdJ>DS6WNLRky7x=Hu%8%!_%dOd| z4_M>x?z@r)T)-OKin5BR<}J+fg7}U|4OX^Xj9-L-v9Q)jhlC-M$ci{ys;RRzlJZ^{QV*x4t@=@Hza5 z6kc~vW^uA+%wEew=VzU|#aQ*L=+9sM?^2TwDeUk1vABMEtiH?R8hwtJzy0`F|MF_y z3tDX$+)xsQlcC+=5KUHEEl_ziocpYa*x3%Q? z%-qGgMr(iivdw>LPO(fWxFuKk);yj);af?>m8d3D-2_YJ3DabB(t9E|{M)(s`Q;9m zGZ#Mhep)SNU_AGz?6!wnG(XSOJF(}>vm|F3Q{4x5cM4g{hA|x49kb|sa-yQt`d0$t ziwb|)l-1Q}`u2O@Tokt1_1xFlH|s4gP7z*nY<+wA_2Qno8IKmb3eV@8v9sdPIsN}3 zDXMeXr8e)IB{pHQ_mihW{9&JO=z3j`2+E1*=DujLafy+4S$8M<>dH?=opWMtT`G&{ zt^ajebnV~y^7{_|E>^w7T6uW0_RAXQYvJYMCq%D*yrui(iBS9zt~2MOOjTFZZ(Nd4 zckPt;MkdRhOTOr@la|eQ{&Q&(Gs8rGri?WE8b$XD`Onsduer6i_^;Zxc)x3N8g^|K zzV}q9th+OOzWAHF;VIjrlQfgmCsnNaYS-U7Z{M6{9sS~}MMa%E-B;?eJ5T+SWw1q{ zH{0(!dwmSENNP>hv6Z+9}H)W^y%XutQfw&?JY`Oi0BQaASry?wi}?1Om@_*4!phK@lN-!vES3=qnTR;eABkpt!=xTm8Y?1Tl87o=kFFY^I5%s68{|~{v}9C z7IYsxY!tlxl)dsVn`zs`++P%?o={g3RkvT|lWQvw$i99aPk36Vn^4}xb;62!dEDbl z3Z9%S-N{qvW}w!*(D~x2D_5@Qdf)sQl3H!O;CVnX^X#qWO`GohD%s?5Br7e{?f8`7 z836~5zli8Mc-Uy7%WqKu&l6v4B!8St)Zh4oYjLusAK&g(-~M0!e%I;Kn``T|jgQV^ zJu{Dwd+UOSPgnO#>9F+_L8>-^n139qKL9z49&zh1qq79`<(-D^+H*Ne-J zN=Z*U;GM6Rb<%D5*(U3p%c~B2$;|qj;LP}bnehd_IWlEaf6DFEIW2kc$OeCtS$g`x z4U_!B9u$`qer%b$;QkqDbMGFW9j*24N9NAdJEm^T@FF;rVUhakshhSkhqu)@eVH=< z&nlxH|Fj*(mtFU4I45oH&GOf4*PZ7zQNGLM=X3d%DhWP*5gL3oq$P~pKrpS9@5dx&7JTyVC9!!`I#>ZH9zl|rMoFigK;VEdCixfO4rq_-gC`k zbHm^1lP~S8dwMBz^M`BNVNG?$hsBF-*{+zk`M*|RWPgH5Y@AtBaD9*jnNiRU|QK;mY3XX+3NxvnxXWZ0~Jf_-{k{^{cvKAseP+3daDu)0b5*0c1rZ&!<5 zPfj_Yd*wj-?rU|Xl3(^El;~WY!V`V#_^nvMO|nKNOBuE%2u;~_@a+$_6>819o=sIc z`z$5Hi*aI$kB(-CD(m|G{QnO^_t@oKe3D`IFC*(N+h4tpQ4x>!S{^j^)3&|q_2J^F zDHXaaUjACTRi^*4Ye?ifUFr4SIZ=$iwpd)4wyPoQ!gVc%CEcg~AAgw?%$4D3An%(N zdHVDjJHM;%_qd+1^V>LWdZ$`+aQ~P1vx%j<5?8y6GB7akrABzB`T8mdKI;Vst08}G9mH+?% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..25e2613b951f9ff898c6a40df27c054989fb7c74 GIT binary patch literal 899 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>U{>~Y zaSVxQeLL-Z_U$x@xvnG7r{A^>Xk>|-{dLdtwtapd~SyL(SVS$|9!RB4QpA|Zit#^xw?mcmX z_3f&*ve3mJ9Yg1MIOMKYIn`!-S<>Na5L@ou#PsV<(d8@RPMtZzc&hF2`TK9wzqZ@x zTa+cHaPdW(-7XFO)v;&Ai^MgH#5><9*ZiM+Mtc4Hr|s`^Tp|^A3iRx9cy~jpSoTFP z>!rkL_kKjM3*WE)JXtX5g6%Zx>y6Q88>X&da`@V$*3)z*Zu$Q^jdxyuG33&Ee^)N> z+BpV;Ew*-brJdpXBbRJY*3GWI{pi?X?H@wV=l5kEd%W0g^#xvv-R5)1ZK;wB4E zN#@0g<>XYwobi^~781p5|4f2)=B9^7oc7hIJp93U)_%>AKb?Foo_TTSy1Oei=lzrZ zaKn}fN=9bB6RS7PhaO3hx78h6LJA3Cp^t(On z-M#ZR=JUi>KHbJ`=j{!518%IF&Ha~O zXG?;co7JOXps<_%2ENn?&op0O1}z2#1`Y-YxD-4Y#PD?Wb6Mw< G&;$Tu4y82! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c160a2e526d98ab63e0ddff063544030197f91e7 GIT binary patch literal 820 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z;wma z#WAE}&f8lXvxNg?*gw2qD!x}@y{}X5LiV;cvt}pb4)21ZY}XU=3m&a;{=TNkdD*Lk zcDy?9>Zf`;>Jr6BSXV?f9-QaHh!I>_D`kdGnbx&X`rI8@XC^mClOk*pF%FYe`eJk z;K8JklH}A|zHw@Pugv{Z+ZP<$y^iZf-5e3_TVGBXu6Nw!DCBTf^^Dh75 zE{RL`_RaJU4=_Hye(!`%&abn&o`&y^h|8AO-Zt-Y%XEdilQh*L*MBh(neV;gWxenB^rFfqew%4{?%;n0rAp7fwf`fK{ulaH}$Ub@2*I*p? z^OjPi^-0+W5j{69hf1@}6J-f|e?!sYxc?&&Q>_y%Yzp_Cwv{+kT|808#^_+K8zRlt zl`5HEW)-wiXYnnA1+%9uuWV~xW7d;=TyrAZ1YOgm2etP}Oq_UO(Yn0?y}2f$rd%=c?tr)3jBDd{osNx_vXKHP0LCa+h{T{?|Qjb<^Da! z5L=dgybY_`4{T=)FirmRy^d*Ok44ofy`glX=O&!1T=1 z#WAE}&f8m#{+AOZ*gw>}r+01MpesD->jsAe_TB=6xQ=*-o|ASBLht2v%!>83DRAN| zdXTh3FuBRFyWF{|K%HMM;-t?BHU-?Vj2Y+8-?y!)MHcR$(vUmh)d zk6ocfz==ZPLf?4nUcJw|wfyPpGnV!0vs3uD@hRM&R6Dy&vEgf1>(;vxpM;H8Un^xO zd$?7!HT1RBCt;)L+r5c|1?%-UkMkT~Tm0L~Z%w#PPyaD%-`Qb7D{5={FB@|Q&lFTy*ZE`7wwl>$ z6?1EL8XTL(WyEmcXTX7fyakh&nq8^T)k`ZJU_=gFr>eB_O;IvEDUE20@uF2q1j!r z{kl-uDWz4Vva=HT_BJHG%$xOD`r7);d5j`g+aA38krQ-e%cMu|zLiUF$(+Y{CiVEu zN3T4epPiMMRQQ#p_-0|vKFEaQ0W*rJ~OEVWP^tm_T!^77Hr>>j~kK2|B|9iL3eYC;mzxJEs zt0U&6vo&$ZIE1jP|Kb#BsOG