From d7c4bc0a5ca1464b7d32e6000682eaeffb15ede5 Mon Sep 17 00:00:00 2001 From: creamybag Date: Tue, 18 Mar 2025 17:26:39 +0300 Subject: [PATCH] A set of "jagermeister" clothes. (#1039) * jagermeister * fix --- .../_CP14/Entities/Clothing/Gloves/gloves.yml | 11 ++++++++ .../Entities/Clothing/Head/Roles/general.yml | 13 ++++++++- .../Clothing/OuterClothing/Roles/general.yml | 13 +++++++++ .../Entities/Clothing/Pants/Roles/general.yml | 12 ++++++++- .../_CP14/Loadouts/Jobs/general.yml | 25 ++++++++++++++++++ .../jagermeister_gloves.rsi/equipped-HAND.png | Bin 0 -> 543 bytes .../Gloves/jagermeister_gloves.rsi/icon.png | Bin 0 -> 632 bytes .../Gloves/jagermeister_gloves.rsi/meta.json | 18 +++++++++++++ .../jagermeister_hat.rsi/equipped-HELMET.png | Bin 0 -> 887 bytes .../General/jagermeister_hat.rsi/icon.png | Bin 0 -> 439 bytes .../General/jagermeister_hat.rsi/meta.json | 18 +++++++++++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 629 bytes .../jagermeister_waistcoat.rsi/icon.png | Bin 0 -> 262 bytes .../jagermeister_waistcoat.rsi/meta.json | 18 +++++++++++++ .../equipped-PANTS.png | Bin 0 -> 983 bytes .../Pants/jagermeister_trousers.rsi/icon.png | Bin 0 -> 389 bytes .../Pants/jagermeister_trousers.rsi/meta.json | 18 +++++++++++++ 17 files changed, 144 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/_CP14/Clothing/Gloves/jagermeister_gloves.rsi/equipped-HAND.png create mode 100644 Resources/Textures/_CP14/Clothing/Gloves/jagermeister_gloves.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Gloves/jagermeister_gloves.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/jagermeister_waistcoat.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/jagermeister_waistcoat.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/jagermeister_waistcoat.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/Pants/jagermeister_trousers.rsi/equipped-PANTS.png create mode 100644 Resources/Textures/_CP14/Clothing/Pants/jagermeister_trousers.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Pants/jagermeister_trousers.rsi/meta.json diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Gloves/gloves.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Gloves/gloves.yml index 445f37c510..c1dc81927e 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Gloves/gloves.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Gloves/gloves.yml @@ -31,3 +31,14 @@ Blunt: 0.99 Slash: 0.98 Piercing: 0.99 + +- type: entity + parent: CP14ClothingGlovesBase + id: CP14ClothingGlovesJagermeister + name: jagermeister's gloves + description: Leather gloves, a deep favourite of the local jagermeister's. + components: + - type: Sprite + sprite: _CP14/Clothing/Gloves/jagermeister_gloves.rsi + - type: Clothing + sprite: _CP14/Clothing/Gloves/jagermeister_gloves.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml index 92ea2f6dd1..c9e4726d5a 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml @@ -73,4 +73,15 @@ - type: Sprite sprite: _CP14/Clothing/Head/Roles/General/jesters_cap.rsi - type: Clothing - sprite: _CP14/Clothing/Head/Roles/General/jesters_cap.rsi \ No newline at end of file + sprite: _CP14/Clothing/Head/Roles/General/jesters_cap.rsi + +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadJagermeisterHat + name: jagermeister's hat + description: The mark of a professional in his field. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/general.yml index 650f73f59d..ab71e6e7fd 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/general.yml @@ -63,3 +63,16 @@ - type: Clothing sprite: _CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi +- type: entity + parent: + - ClothingSlotBase + - CP14ClothingOuterClothingBase + id: CP14ClothingOuterClothingJagermeisterWaistcoat + name: jagermeister's waistcoat + description: Doesn't interfere with movement, looks restrained. Time to go hunting. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/Roles/General/jagermeister_waistcoat.rsi + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/Roles/General/jagermeister_waistcoat.rsi + diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/general.yml index 4d67c338c5..4e37e6136a 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/general.yml @@ -67,4 +67,14 @@ - type: Sprite sprite: _CP14/Clothing/Pants/Trousers/jesters_pantaloons.rsi - type: Clothing - sprite: _CP14/Clothing/Pants/Trousers/jesters_pantaloons.rsi \ No newline at end of file + sprite: _CP14/Clothing/Pants/Trousers/jesters_pantaloons.rsi + +- type: entity + parent: CP14ClothingPantsBase + id: CP14ClothingPantsJagermeisterTrousers + name: jagermeister's trousers + components: + - type: Sprite + sprite: _CP14/Clothing/Pants/jagermeister_trousers.rsi + - type: Clothing + sprite: _CP14/Clothing/Pants/jagermeister_trousers.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index f0303fe7bf..e168123e35 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -70,6 +70,7 @@ - CP14ClothingOuterClothingBrownVest1 - CP14ClothingOuterClothingBrownVest2 - CP14ClothingOuterClothingBrownVest3 + - CP14ClothingOuterClothingJagermeisterWaistcoat - CP14ClothingOuterClothingRedVest - type: loadout @@ -92,6 +93,12 @@ equipment: outerClothing: CP14ClothingOuterClothingRedVest +- type: loadout + id: CP14ClothingOuterClothingJagermeisterWaistcoat + equipment: + outerClothing: CP14ClothingOuterClothingJagermeisterWaistcoat + + # Eyes - type: loadoutGroup @@ -120,12 +127,18 @@ minLimit: 0 loadouts: - CP14Girdles + - CP14ClothingGlovesJagermeister - type: loadout id: CP14Girdles equipment: gloves: CP14ClothingGlovesGirdles +- type: loadout + id: CP14ClothingGlovesJagermeister + equipment: + gloves: CP14ClothingGlovesJagermeister + # Mask - type: loadoutGroup @@ -164,6 +177,7 @@ - CP14ClothingHeadTriangularHatGolden - CP14ClothingHeadJestersCap - CP14ClothingHeadHuntersHat + - CP14ClothingHeadJagermeisterHat - type: loadout id: CP14ClothingHeadMetalHeadband @@ -190,6 +204,11 @@ equipment: head: CP14ClothingHeadHuntersHat +- type: loadout + id: CP14ClothingHeadJagermeisterHat + equipment: + head: CP14ClothingHeadJagermeisterHat + # Pants - type: loadoutGroup @@ -200,6 +219,7 @@ - CP14ClothingPantsTrouserDarkBlue - CP14ClothingPantsJestersPantaloons - CP14ClothingPantsAristocratic + - CP14ClothingPantsJagermeisterTrousers - CP14ClothingPantsGreen - CP14ClothingPantsBrown @@ -233,6 +253,11 @@ equipment: pants: CP14ClothingPantsBrown +- type: loadout + id: CP14ClothingPantsJagermeisterTrousers + equipment: + pants: CP14ClothingPantsJagermeisterTrousers + # Shirt - type: loadoutGroup diff --git a/Resources/Textures/_CP14/Clothing/Gloves/jagermeister_gloves.rsi/equipped-HAND.png b/Resources/Textures/_CP14/Clothing/Gloves/jagermeister_gloves.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..97d45664ef96907d8366726b148b80323fe739d8 GIT binary patch literal 543 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zZ+f~ohE&XX zd&{tUv4aTvhyBMx`4p!%^$X;%bx*1L-#_6~SHfnUMFuN<%5u`Xoo`w%nrSF*UhqF& zb;Wzzdp&0P3`$_IXkv%OTJG;2JZrhtmAaGGO#T1-O0SLmg7?-Lu@>3uGiIrM^3_rD zTgf}+mXhZ;Aa}{T(9iy64{GY%C%s`l{V&%;?s)W^^Y1}g>$k0r68BrF%Wz=Et!z=3 zBTHZMF(l-+ud=FKf2aJ(f5YtQ_sr1 zTn5YJg!$j=Z*}{3vYvq<PH#H#JbhYf;IJ0 zmw(?}`pj@&w7Sg9!a}b9!mffS@po~?HSIIJ?{vpbdm6Dk-)B7=&!m+8(@zg~o=8!C z^kZY^hdC>6q((Zq+?RZhxf?sC4p&Afm9p1ps$v=ol4y`l8z*0xfh z=%hCnzb6W3zGsW5{#$fc@jSoz{OV^eWm;wP}{W4FK;PM*1MfAbx?!Y^C@Gkn!65y{~GX#13};(`;8y5FDoGW0db eJBz}%TdPx%GD$>1R9J=Wm9cKyFc5}+rQK*LlLj$G;Ds>iECK`p*)sXT`dobh1A#^>D6%L< zKn>wX2#gbt)Q&Ihk0D`>#(wZ?EQp!70GThB_W%H;BpCDU^YgF2f*1v`-@n-~yggYzu2}#Gf|-|P*~Kxh#sCq?cG;RC%`11s!w+lGuwtefil#)jN0Oh7hqc zCWx~opi~*7k)|ux<6(FUrKC$MrP~;dD2hBP4FE_fJsMa_Nu=q@#qCoEfDWhWssqv( zY>)k~JKd0FnVXP|`ACxF1cK(pMP0x-w{)P%f^_CmN{@4H=kq%#wM7uj-1)LB?Z@dy zlQW8E{QEWO!bc=TFCrz64&+9h@u8^9m S_>86i0000U^eu0aSW-L z^Y)Iv_w583_7C}6f=?t%PuUvnUFgVRTM@BP;nME*gM9lM_BJ1UXZ>E`&DA#sANKL8 zF&~tzD!3H1+T=o4bo6|`-CkuL!dvU_sQBl!ynn9p(D0{iWu5;e?|lq{KyY#I6X3-7F!oT`5NUX1(39fmo-Nm;C!*0@+LXKjCo7B@q4p7h;k zmkn0_Tl&-e-;B%M_6x7dS1<~7vaY?GXSpknM~yLt$>F`YmOb0~6YBmGo35w6TO!=q zy3)R`;pA8I_G7J~`zK8n;bOh9?Jb9(yU|XY!kEpG%~NETTz=`Xr@{8}n)pibsIYSr zHyIbjbXf55eN(>pb$jKDufm{k#{~j^OsTK1(R;(eq5nZc=esGts`}_|)XSMz^Ihn<^$-a!9zM%@H; z#g>OGxmrsLO}AZRw|XA&Ds+Q|dH0n~w>9I+F8p4*{a;?^EvK0KN7vuq^QpLx!QA*o z`g@_Ljyb)Yr4voL#18Oo`>^ZSwO<>mYnSLJX-q$N*RlDH0z;itXV<&Hr@!>3ZEEqK zU;bx~a{t<|`8FGt<|M|fI3BCHlX0d`n#!xCQM$c7#%Dtr!tV-CjZKKObmv)gqTzNn z`?{p;S6_d9xzEV($7#tM3#TKBErp8{`o9;2UA0}sbKPiV+4?+D^LxTx>{aJ47w$Q^ vYEBE+OrK+n5B?vLRM)be)`1-?da8fHYc^xh`)8fNoW$Vi>gTe~DWM4f9Ltyw literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..96d3e6bc052de3bd92269a259fab8eaa69f2c615 GIT binary patch literal 439 zcmV;o0Z9IdP)Px$aY;l$RA_S0LBdPybVU9ekxBXhahO9 zbqN65E?TWtE9>$UvKENrVNx#F7>)WEGeAFfV6C3Yt3KWFmK2z12c;aMsGE?(24-$R zYX_L_Fg&olw8*-8rm(q>=hX><4&%!cdO&E6@s#uBxvVlbV9fNmDCOX~RnB@3RNAi) zpVPhXaTnaeeMD%DaosAwY+C7K_7|BOu%e7zgqNs~811gnDE*~(=;T~u-))Qj}skqi9Zf>sTa_#bC9kwv!?(6002ovPDHLkV1nvd!;Sy| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi/meta.json new file mode 100644 index 0000000000..8f89a72be6 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by creamy", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/jagermeister_waistcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/jagermeister_waistcoat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..689f749a510f8b9c7c3629892ba9d94efe621038 GIT binary patch literal 629 zcmV-*0*d{KP)Px%FG)l}RCt{2nlWqRKoEtWkE^tIQDuP^6VjLzX#@fn>F-xxpW?uf=8BLe7-7Mx zQk-?GE6nKDv66UXOLu|yfx+If^=4PIYvVTnA%qY@2>F=#{JJ?Mp67Yzm^_Zr&$30Q zMwTs_kMz5kXx==ZUpL0YxWE5(@VP8oG~U;Ee0)${Q^W1;k7m2A0RZ0D?YJ>903eED z+}-_D>3`L{*_aqn6hrQU_w}Cm7>Lff^uF{>LMHEhJ=)~u?)Qy%p;~~j?55L8I9Fgg zz3hw+f%i44YIQKt?RGcbM_*k5B3@N1B*_d_wb~mW8rgC(Y0;H&Evf|w#f^#KTmfU^ zlatWu3*K+ujUR*R5R?*=y`Lnry|Z9wLVW;8lG#B_i*f-rFy?zZY3GV|5hOk&p?>%} zjB8PUXIpEVP&5=@uh)b91_<@vijAR92qARX(Z(u+}zdnoayvlUM& z*{~D=;OXi2;QpMowz;~x0f4h?yMK literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/jagermeister_waistcoat.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/jagermeister_waistcoat.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5dbe961f8700ce43a3daf058492422b3d186901e GIT binary patch literal 262 zcmV+h0r~!kP)Px#z)3_wR9J=Wk+BNHAP|QCmQG4>(jkOwp=+kT|FeXUK_?04nhrtRfTfrsrEuS* zck1_Z0t~}2|3u&4)^GYb&ZQTI;hvSetAFBBa#%_QAykqPc}S@M079rE{_+V#S(Fp` z!}8()L_V#x?qKZ%t-EZ$N&o-|VUsvF!k8A$jk|i)0P(*=*v4<|1SwUL$9}Z{L_Up~ z$itX+x3B&ML`#yrPT(10DGqQdz0fqxD&;jBZl34j_ZWs@80P0Z06lG0k+XYaMgRZ+ M07*qoM6N<$f^Vj7c>n+a literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/jagermeister_waistcoat.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/jagermeister_waistcoat.rsi/meta.json new file mode 100644 index 0000000000..52df3fe795 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/jagermeister_waistcoat.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by creamy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Pants/jagermeister_trousers.rsi/equipped-PANTS.png b/Resources/Textures/_CP14/Clothing/Pants/jagermeister_trousers.rsi/equipped-PANTS.png new file mode 100644 index 0000000000000000000000000000000000000000..d0826fb5fb13f0d444d37db6439405d6d1fa381b GIT binary patch literal 983 zcmV;|11S87P)Px&kx4{BRCt{2noVfaU>L{$ap?vLWm#K<2C;P?-BB;6;Y_x5o2kg(Ka(n#ct*G(4{n8_wlw(o#pvmn&eI2|MULy zFJe#vo$=R3~9cda~{&R@PSO_0$zq$Lp!utnTorI-CA!au5cJnnp>~7(+ zqyPX4k=vL{FLMWR5$4j%C`4{IW7uT^EF}s67`rhGONm03!)JBT5iSE{c^tQ-GE!9= zyG%ePv*SxQwY-COYb)GAT!eRPD^SZj0Dx+B9{`Za>RDc-cA89u%@1Zi(Tfe&BOJ zt5`Sfz2dsgsTyas^%YfBnX0Pnylum(PY}d#5y&;>(w8a79u8d=(;Ip+YV>>Qi9(?ubee$roeixTx~@Z2 zRVK^fW-I`>GoY*McI&tJPJ<8fH0WePYb=2Y69h4o`~`%jr2u1S`@H}F002ovPDHLk FV1lC*!@U3i literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Pants/jagermeister_trousers.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Pants/jagermeister_trousers.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..57ae0ffb534ce423d880bc4bf77fadee75cf3a21 GIT binary patch literal 389 zcmV;00eb$4P)Px$KS@MER9J=Wl)p*?K@f+(nA75pkTVGuTbK~#ECmY-v9+`IEqnrNpTM`U7Az!U zAr@&8vGRy=oZ*U#Bo~goA|#wmBA$OBD+ZhWs@a*@-wea-f<~j!Xf*#!PW6HiBK;{A z1c9=i(uE_(NnO)M${_%jRm|8<5^?UjN}5W^2eplKbtTW*dI4kmkXo&d=RGsNzaaEu z2BQf8SKiayx`s*v-m(FsF@sJ-p%en(zl0dm;#-?Gp&zSAvZRy^NKvO}moeH6ZW@<7 zw61YY8-Sp+%ii(H;u^55B0FXuCy8jKIoj=JX4InJ`yMQ$f!o(S-Aa`t8D{*mbI&d-Eg&c^;q1vtIYi2MYR6yVDkx3hW3k`F{{$gK j`uR8f&Zp66H1qNXDbRX!MB@0G00000NkvXXu0mjf