From b65c8d4e6516ec7ad02d11deab1688574cc98354 Mon Sep 17 00:00:00 2001
From: Ed <edwardxperia2000@gmail.com>
Date: Wed, 10 Apr 2024 23:05:33 +0300
Subject: [PATCH] tiefling + ui update

---
 Content.Client/Stylesheets/StyleNano.cs         |   8 ++++----
 .../_CP14/Entities/Mobs/Species/tiefling.yml    |   6 ++++--
 .../Interface/Nano/button.svg.96dpi.png         | Bin 237 -> 194 bytes
 .../Interface/Nano/button_small.svg.96dpi.png   | Bin 278 -> 214 bytes
 .../Nano/item_status_left.svg.96dpi.png         | Bin 453 -> 273 bytes
 .../Nano/item_status_middle.svg.96dpi.png       | Bin 458 -> 345 bytes
 .../Nano/item_status_right.svg.96dpi.png        | Bin 431 -> 249 bytes
 .../Interface/Nano/slider_fill.svg.96dpi.png    | Bin 267 -> 254 bytes
 .../Interface/Nano/slider_grabber.svg.96dpi.png | Bin 285 -> 327 bytes
 .../Interface/Nano/slider_outline.svg.96dpi.png | Bin 284 -> 258 bytes
 .../Interface/Nano/stripeback.svg.96dpi.png     | Bin 322 -> 621 bytes
 11 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs
index a589abb83a..0ed1d0f488 100644
--- a/Content.Client/Stylesheets/StyleNano.cs
+++ b/Content.Client/Stylesheets/StyleNano.cs
@@ -93,12 +93,12 @@ namespace Content.Client.Stylesheets
         public static readonly Color DangerousRedFore = Color.FromHex("#BB3232");
         public static readonly Color DisabledFore = Color.FromHex("#5A5A5A");
 
-        public static readonly Color ButtonColorDefault = Color.FromHex("#464966");
+        public static readonly Color ButtonColorDefault = Color.FromHex("#664e46");
         public static readonly Color ButtonColorDefaultRed = Color.FromHex("#D43B3B");
-        public static readonly Color ButtonColorHovered = Color.FromHex("#575b7f");
+        public static readonly Color ButtonColorHovered = Color.FromHex("#7f6357");
         public static readonly Color ButtonColorHoveredRed = Color.FromHex("#DF6B6B");
-        public static readonly Color ButtonColorPressed = Color.FromHex("#3e6c45");
-        public static readonly Color ButtonColorDisabled = Color.FromHex("#30313c");
+        public static readonly Color ButtonColorPressed = Color.FromHex("#6c4a3e");
+        public static readonly Color ButtonColorDisabled = Color.FromHex("#3c3330");
 
         public static readonly Color ButtonColorCautionDefault = Color.FromHex("#ab3232");
         public static readonly Color ButtonColorCautionHovered = Color.FromHex("#cf2f2f");
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml
index c6cb9a0fc1..d0515d0aaa 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseMobSpeciesOrganic
+  parent: CPBaseMobSpeciesOrganic
   id: CPBaseMobTiefling
   name: Mr. Tiefling
   abstract: true
@@ -14,7 +14,9 @@
       sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi
       state: full
     - type: Thirst
-    - type: Wagging
+    - type: Wagging  
+    - type: Inventory
+      templateId: CPHuman
 
 - type: entity
   parent: BaseSpeciesDummy
diff --git a/Resources/Textures/Interface/Nano/button.svg.96dpi.png b/Resources/Textures/Interface/Nano/button.svg.96dpi.png
index b391378bb08603dacba7306076741a968328d62d..8bcd6c739f5842c57785c42f6ade0dff6b5fd644 100644
GIT binary patch
delta 166
zcmV;X09pU-0m1>0B!2;OQb$4nuFf3k0001dNkl<ZNQvE+K?;B{5CdoZv_4^dbv%@U
z9)xXaJeX5Y8InL-03@Zxl~gooUI#8Re+L-=4@gK-smnn{L;!3Kb7<RwF#)s`wgg>v
zfVCpvbOZbq{R40~0RinkasfWuz*bZAgR7={Mb@zakhHIUc^~W$cbf9gV+NK07vF+u
Ub4x`6b^rhX07*qoM6N<$g5(@NasU7T

delta 209
zcmX@a_?B^kN<B-llV=DA5Y%v_bTBY5a29w(7BevL9RXp+soH$fKtah8*NBqf{Irtt
z#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQqs_T^vI^I`3XO$lGAR<9xB<#?GDt*WU4R
zGG@B|(XVK*Q7wE?-8aLNafWl(0SQ9}%Os|If?moWdS*0QGckm-F!`l;YlnGH7U@=L
z^jP!c!+!?r-j*e9rK0X1d_NRFv_B}{zg?SE=7hisCE0bq13&GU`+P6ZS_V&7KbLh*
G2~7ZaEKDf?

diff --git a/Resources/Textures/Interface/Nano/button_small.svg.96dpi.png b/Resources/Textures/Interface/Nano/button_small.svg.96dpi.png
index bded8df6ecb5ea1ea31f07d283baf6f19fc64676..bb1a8ee6d8fdbaabb7ee7230780082b428ac3577 100644
GIT binary patch
delta 186
zcmV;r07d_n0@eYLB!2;OQb$4nuFf3k0001xNkl<ZNQv#2F$x1Q3<O8MZ{=rkX+Q0L
z6|yN}8*|qh9El95-(@8s0U)W!A5{|9@@i(LXfkAygnufK0TK|w&=V*CCg}~>UOmgO
zC<%3{NqPatZY8To#A!Dm&Qchp-2ztgPw3Z)aw!ZF-?JeM)-wVMlTx3dbE}GlbVCn<
owBEesGX71~+sD_+<I`6FKDc6Y{<n?ij{pDw07*qoM6N<$f^AMse*gdg

delta 250
zcmV<W00sZn0hR)gB!3BTNLh0L01m?d01m?e$8V@)0000PbVXQnQ*UN;cVTj60C#tH
zE@^ISb7Ns}WiD@WXPfRk8UO$Qqe(<TR7i>K)Hx2qFc?JPFBTVNk+=j21<M^+t_r4z
zjG_oSE5R18bu&-%dzu(yR33M1@f<&d>9b^EgNqOOOBJG*x^o&i1eADki8XEpQYAN(
zSQ$u_-cVwtABwP0hY&2Gi7`IZaeAod<la=%Oyb|ruM=>dJ48+b_BhNPBp2!AI+aKb
z|4@hHTtRX%9)(unQlD0?#cApwx%f8QJB3QU0MsTM2~zBRt^fc407*qoM6N<$f-!|;
A2><{9

diff --git a/Resources/Textures/Interface/Nano/item_status_left.svg.96dpi.png b/Resources/Textures/Interface/Nano/item_status_left.svg.96dpi.png
index 5169343ea4fe9a88df5a21d069d3dec0c99b8654..ec5648081182f6421f6458cc673c2dc1ca287ce5 100644
GIT binary patch
delta 245
zcmV<R01E%b1CaudB!2;OQb$4nuFf3k0002XNkl<ZIE~HJu?~VT6a~=x03i?uV$?<5
z*j!x{2R3KElwV)~e}s*J!H}4!v<{?b00Su<yj$D!<h?d6oq~`7APj_nG>xP4&-KIc
z@}v$#Ac8JNhG`F?<aztsP(_RNZr+Dp<EYs;3hF}zC@^g-AZ}9RSy|*+`Fh*|0DcfA
zQcyb_@FzjvRVk?msN0(a6?s+yb$e0}k=ER@Xio~_obmRYk~2~QF~%z;kjQ^P?sD^a
v%<gJycfXO*sb-d=6ObCF<>-)yn!o7{5cfRzZDN7b00000NkvXXu0mjf-}7zZ

delta 427
zcmV;c0aX5x0>uN6B!3BTNLh0L01m?d01m?e$8V@)0000PbVXQnQ*UN;cVTj60C#tH
zE@^ISb7Ns}WiD@WXPfRk8UO$RQb|NXR5*>z(!EN<P#6Z__e;{G7PN|gAl>YySC9-1
zh=aH^chFmKa&>faa&mBVbm=092!(=6FF^#06>P<{^yeh!&wr&ArLDG^eBn$V=ixiN
zhg?5U00`rGw3OJdRLV~iW@9nps4w~08At%zf~>0R2fMRCl+W*UCT*0?WK)YPn>Gj?
zO?3Ehe_j1`qiF-yZ}awhBZ5{-hSIlQp?Hu80)UuxMc8^}8rsoBW!Ep35<vjKqn-?#
zb*7XefG)j4aDS8t0stN}6*ixlQbK9Mnd=9qi68(FJXRlXbtVOu0FFIBI0sI??oVxP
zS`5>q>}oEZvK^DOzGB^tQmuBu=Y{})$e`@nR@!zlCV)E|R&nO1eUH{kw_A-t%z6UA
z9*4L|1Pw8StrsSEq%`0qhDK3RYG97m{>uM@tmXCG0wm2@{|_ML7yw`m|3YGDluv|^
Vm+Xfdbrb*q002ovPDHLkV1n<my2t<k

diff --git a/Resources/Textures/Interface/Nano/item_status_middle.svg.96dpi.png b/Resources/Textures/Interface/Nano/item_status_middle.svg.96dpi.png
index dc1f84cea83c98404f6a032bcb659a2163e5069f..821a7cf1e27dabb8791dcd860d9ceefe0e8e43ce 100644
GIT binary patch
delta 318
zcmV-E0m1&t1K9$QB!2;OQb$4nuFf3k0003KNkl<ZIE~HJPi}%h9L4eP<BvqUsY$zP
zPXb+V1y1S}Txc(%ZlqBcrbGiXT>v^wBw*e2Eq{}Icr!34PBR0Do(Pu9`Rt=}Jx()Y
zs*0*SnP%pLkV6NfaWASk&CL1qZ4UXmXl73Ul3LA9U*0aPi+_I3XP3FxRn=N+u@*pw
zuMPWrUF^22V|gwp&-F9oG_$>si`ly2SW>v#u8u7Tkfhn77rKE(lEPo>kPL!4u#wve
zAQ%F*m;ftD(g^3hCTX@9)X2e_dLR+*^Gyl$_U?kN7+4DuLA$-Xp&B#SYE1^8(amP{
zho(O_a$`(g>o;Mj&HsR&-OCIR1d%s=eQ&RI@4v}S7)`E_=lk;fiT_BuAJwOd`#PaJ
QY5)KL07*qoM6N<$f-4`EOaK4?

delta 432
zcmV;h0Z;zf0?GrBB!3BTNLh0L01m?d01m?e$8V@)0000PbVXQnQ*UN;cVTj60C#tH
zE@^ISb7Ns}WiD@WXPfRk8UO$RS4l)cR5*>z(l1XOK^TDXXZDs{AcX|cqymS<VaTnx
zB?N(Eo7A9C7!<0u5`{w7^dlfjQb&sC3lI_xXxhDUdj#%gcYkKyw}O8HnjDMaNnSOX
zUnY~+w9-rf!_$sq@yiDXdneDFJt+c^5Y&}}@HoQ&%z6_aw$f~FWXStcdimM#aXQ1R
z%ipEK2Zf&tiyxDbpy#rKzU%+JC{dY;M1Lgh)s<QhKxMCe(fwr=ZK^SQt#oz076jnR
zn^5E(D<THW*MFp)ZPkJRTxF%mPpya-HSDy~Y`Yc&;9VuXKOGyq3&7_j&356-!~KyV
zfZ(0>@>A=oGAL{&?W1q=^BZF?hTwMRio9d1auC#*wdQ30JxxEodocu{D%$T}3@dx%
zfhC9EuLa#<6y0;{T`3AlZRkD;L7~PU{jawN#Q<^Kj47ty&y3ds#+uOs6g3(qYD_d<
a^P+zhq`B)>GirAL0000<MNUMnLSTZNf5tWd

diff --git a/Resources/Textures/Interface/Nano/item_status_right.svg.96dpi.png b/Resources/Textures/Interface/Nano/item_status_right.svg.96dpi.png
index 72f7e6de6b8775b85f3ef9e546634889061758c4..5c11992a30bfa7b4c71b1c143f484a9918203e08 100644
GIT binary patch
delta 221
zcmV<303!dd1Ni}vB!2;OQb$4nuFf3k00029Nkl<ZIE}58u?~VT6h%)PV$?WjqLY3J
zUHS|BGk%GigOibnz;givR49})zk70D+f>nmu~95w`esT*xrDPc`6PrKq;2VnLL1c+
z&G7Adxeql8x{^xZ5N;7by$)HLj22XA0LKFz7U9_jKpPvyzE*7jbhVaG8z@(6UbRyC
z>uouUnurwgYjCt^DjJ|DB%ehz2lI=z`{Tw(6eu_^mTU8RKJwk+w3;HRzmX9i*k9Kh
Xz@Sei80cTN00000NkvXXu0mjfT1{S`

delta 405
zcmV;G0c!sF0j~p)B!3BTNLh0L01m?d01m?e$8V@)0000PbVXQnQ*UN;cVTj60C#tH
zE@^ISb7Ns}WiD@WXPfRk8UO$RJV``BR5*>z)3Hv&Fc1dd--)Fbm@348#K6GFiUa|v
zR<~|V-++;sfrnsc;00J1U_t`krlkleiQLl4c5LTZI)F$@T7MY$Crf92zO!Y9nmH7`
z-2iw3*j`zk)j=W=?}P9NhHYz<2WWXHYWEL_(E|fE-(_OdG_y;06m{Yb3fzNeW1PJi
zqb9CuZ&+10YWHIh?ugKk*~sL2>K7dvly=hYoiWfY5pkIgjMcM+NGTMF_yUYw`NBgc
z1MQ6Z5di@HX@AWk(Ypk2?w$2A85-|wQ3nC$mo0?gIcr^maOz#|Wir&>x$keh2<mpb
zjfraB5D;6Vyi7-$3cnNr0DP>P&j3zxJ#*vqRTI^o<|_o?*jZD^<VCL}%o6}WvBD^&
z&|l>LK^y=$Zv?HaowZ*>K^U?iT(A7Vb@BnVLXOqomJaOn00000NkvXXu0mjf?cuZ>

diff --git a/Resources/Textures/Interface/Nano/slider_fill.svg.96dpi.png b/Resources/Textures/Interface/Nano/slider_fill.svg.96dpi.png
index 05a780078f98dcb1cdee34c2c165698c9e31d691..bb23c626c5b5c00caa47d9d8e344a631aa1a8bd7 100644
GIT binary patch
delta 238
zcmV<K01^L-0{#Jz7=H)`0001~N=(iG0004VQb$4nuFf3k0002ENkl<ZNQuSOy$!-J
z6a?Tqb|6s(piD-gU<VdX2B1s8&JIW8L{Jb+<oCGBg{4pT<R8E@+MgilBB`~8*2EC>
z6)XW|fhD0&7#ApO#y@0^5yz^cIh4|o901^81ONc$82e>y-De0$txOxGoB*Fjfn@Cg
zfh0Xf2f+B${S^vc(A5jNxj-a`$26Hj>+71H^?qaTe&qEYS+{yS-gVP-)+1aaslAV5
o(I3|h%x);@ENQn|V$#`p0?4OBv?jzaH2?qr07*qoM6N<$f~w|ahX4Qo

literal 267
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI23?!pd0{;Rj=3*z$5DpHG+YkL80J)q69+AZi
z417mGm~pB$pEOWVvcxr_Bsf2<q&%@Gm7%=6TrV>(yEr+qAXP8FD1G)j8<44@0X`wF
zK>9xh@Hn5#0+e7Y3GxeO(9nJM^3{6h-)TURFi#i95Q*@qCpYpoIPf?JDl3X5H2OH6
z<(aAAyXQZL$i=yDCf&EKJ+RAT(whK7U*qX%d8I36EaMZsd}ZOI>{aqszQ-3I%AFK>
g0R}Cjinsh`5VKE+y;)!^1hj#{)78&qol`;+0DJ9Y`Tzg`

diff --git a/Resources/Textures/Interface/Nano/slider_grabber.svg.96dpi.png b/Resources/Textures/Interface/Nano/slider_grabber.svg.96dpi.png
index 557d1ca819b3fe792405d8491ad150e49c84211a..99bb10f5f5be2be23c3a050d4f8d39117ca0d264 100644
GIT binary patch
delta 312
zcmV-80muHG0>=W77=H)`00023znt>`0004VQb$4nuFf3k00032Nkl<ZNQvE+JraW;
z6oeNu{uFQk4&X6z0FI;wh)1HzP3&pxuyC|Unm`DW@h8w^s|WJlH@m~A1OS8(HvkRJ
zsgqK+-yV`5hi`(25aMAL<2XWVy*Y_eimIxR=lLcmJ38E)9e;)aN~us!^Gf9tuy=R}
z7694Evvtck`3V>o(EtYGsEG~$uyPR{;Jb(p0Dxs#Y@Gx!O;cKc8&eX1t3LuzO49;T
z$pRQ-$pD>Mq=<<Cfcw!=N<|sWIS25LD47dl3fG0!+J9*smhS*?TrkGKIX~^j?Yo$w
z@B4dQ*Cl|f*)c22(%!D3C@|0SuHo*DB%wnwe`SJzNT5zi***aXd~DevH$e*k0000<
KMNUMnLSTZcQi5dw

delta 270
zcmX@kG?!_DL_G^L0|P_+#Kr?ain-XyGlYYK<Mu=U2S6@ofk$L90|Va?5N4dJ%_j{M
zlq_+LC<)F_D=AMbN@XZ7FW1Y=%Pvk%EJ)SMFG`>N&PEETNIJkL#1%+;dU|?zczAhv
z0T~7c1{M|;mX?-4Ht(XqRX}OhlAwCOV21MghK|kWlokL*l097<LnOj`FYM%PaNuzX
z%olHIX_?|6Y$mFZ%WTpxq2T5k{+xE7Z(lYuZab?`9K$wcqAGKlFW)26#=m+B_k?CK
zO=6lPWG()nUWWB@@P!{fQ%ojgDoj?Gq%i4`H&?_Teb?eWdOB$;MwxSxfz~m2vb*}Z
JtaD0e0syEmR^b2u

diff --git a/Resources/Textures/Interface/Nano/slider_outline.svg.96dpi.png b/Resources/Textures/Interface/Nano/slider_outline.svg.96dpi.png
index de74c2dee04cecabc4b0e8afaa87d93d481a07bc..8a05464b5c25065545261d3e1aa1120411203936 100644
GIT binary patch
delta 230
zcmV<C02%+B0)hgNB!2;OQb$4nuFf3k0002INkl<ZNQvE+O%}r-2!v;PvR;jxtoCAb
z6D=`nOaobTmOLIGKZ*hXR8{nvlBx<ua)8uo15anRPqLS&)XoJm3pmjku@2*sF9LTU
z4@d_l0Kg0(NoQC|o+KZh!7D8WDq$6^fLzr(WJU&5W)<1GjbB1r2YlOiTSb2i@>)TM
zAOO!u5Z0$5@-CHo^fJb<_Ayh7A!xbg8EqDzC#Xq|d<2_DFJSkebzrK$eOi(YFmm+N
g)SoXMMVWzo0C^#Q%VnSBr~m)}07*qoM6N<$f{D^v&Hw-a

delta 256
zcmZo-n!_|frJkkO$uool2x>S|Iv5xjI14-?iy0XBj({-ZRBb+KprB-lYeY$Kep*R+
zVo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt(e>T^vI^I`3XF<U4G@!|bp!pJxK!U-$hN
z?9~}|AMs$Y=H#B}ZF<{^SBUxRFP31Yj>EUSvnp5pd(V=va0AyD;jq>WAI88LT)U1=
zxuCkN&CihC<VehgwzF&N%~Xspw<sz-dYECi%D#=kX01@e_iYl|4bvC?-*?q-jkUbE
z*`8qbGAWL%H%66HZsZ<WX`tmTDj|D|eND)lkkmKaQ@+h_KmXfC1n5czPgg&ebxsLQ
E0J)N1*8l(j

diff --git a/Resources/Textures/Interface/Nano/stripeback.svg.96dpi.png b/Resources/Textures/Interface/Nano/stripeback.svg.96dpi.png
index fb35a5634e2ffb84fe95345d9dbd3fda9535737b..cb283d04f4d4a840f11f3461c4b384ee6ee63710 100644
GIT binary patch
delta 596
zcmV-a0;~PP0__BlB!2;OQb$4nuFf3k0006fNkl<ZScRolJ8r`;3}p)iwgUwA+9@aK
zEqebuWb&#afE&R>I~Y``XOfcB2L!PtiYCR!&)e7M=kG1vX&icz`2Km&IP}H;b-EA{
zQA}$g!<b{Fk7+7&$TOPGcd3kjjHx>n|1qs}i}ylKKA*cjuYXD0;+-r6BHDQ`!5%O?
zSq(9*?wNqrN}%PQtcBW{aMUAKiZ>I}N>g{r{9qslb_TRqDIpDRy&;X{g#oYJ0@3Cj
zdW?o>`-K6o#FfZqHaatPC-;Vfj1k5VV{OG*$|I^bK=kxRDzIX0dE<rAO+%u6uFDVB
z^4K$~wns!1Fn^Y4Oih7i+>*9Z+d}T54&cXHJhw<T$4KX{rzJgdiPntIS->BYy}^TL
zoNP#%oa`UFO2{6y)&^vGi{VoDt`1-t)_@_vkm5V)bbG;)9=raI3bicJ<oF$B-AX9?
zyQT2I9WsnVZ&tS@ZIuv-D&b|3Cd1%#4;U9tn<Z^)Eq_^|k(Rkpn>WIBx)kkF{?9RH
zMP6UGc%;pcxF0Omk3+vJAlC3|d8Zl44)K0C;)y0_aR9rhrZ1-TnFXz$XmVEJ(q;x+
z3vy1E3ayz>K6|~M_i7cj2mu=6d4DATS(Y<PHmPiY*41$4!)&l_0ln6$AU|ggpdyRK
za?j#}_f3unGS;%<S;Vqx|B=~Io-1ZTUi8YVSA<$-M?4pB!4pQ{{NFl56wS!%|B{%s
i@;k?vpS@8G&;0?bxf09dL^e_Y0000<MNUMnLSTZ%8X!mj

delta 295
zcmV+?0oeZS1i}K4B!2{RLP=Bz2nYy#2xN!=000SaNLh0L01m_e01m_fl`9S#0000P
zbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$Qzez+vR9J<@)=>_CAP5Fv
zW1ORh?tesAJ>lj`LFNy<Ch%ES9OrpGWfII(m}$0T8nxb~)_;3=U9GGY&_dgQX=_M?
z`QD-sOAi-;SUz355w7FC6T#jh0`R_~l1IpQ+=3wVheit$Nfx4Y%|dh?GZ3F{(TLwp
zk%(cJD8#fw1VXKzK9Hah=Bg;fQbhz}x!P`otI|${dma#g_a`KIgdDjo2tv>OT98Px
t5G^YU(Pd;HJ|L^35x*-V5yMqch!;%RzM;4o<AeYJ002ovPDHLkV1n)3bz=Yk