From bd5b9b0d2f090ef96c7b7115dc0bcb8f2107e1c1 Mon Sep 17 00:00:00 2001 From: Iajret <8430839+Iajret@users.noreply.github.com> Date: Wed, 15 Jan 2025 13:32:04 +0300 Subject: [PATCH] weh (#5286) --- .../icons/donator/obj/toys/plushie.dmi | Bin 3276 -> 7695 bytes .../modules/toys/code/soulmate_plushes.dm | 22 ++++++++++++++++++ tff_modular/modules/~donator/loadout.dm | 10 ++++++++ 3 files changed, 32 insertions(+) diff --git a/tff_modular/master_files/icons/donator/obj/toys/plushie.dmi b/tff_modular/master_files/icons/donator/obj/toys/plushie.dmi index c3070df9c59a13066cf52fa5a3c63b18e0b6631c..21d4765aec00ebba42075e05c7b600e2b363e0cf 100644 GIT binary patch literal 7695 zcmW+*bzGEB6F*WU1VlFy8|B##E^?(Wb-=|1?8igf28NT+mn3Bu9G!2$2X z`^VkRXLcuccXsBx`^0K#C=%g6#|MExM9NBX+CUrf@WaCe{<|g2hJYs3@BK#)IV*Py zw@)q}pPZdQAfN0nL+$wCub)M&i|ledX-T_lvSue8$ZKQ_E!-JTR|?{~*cZh+oSHcF zUq{)sHRRB0oj=tjBg09c&FUtd3-@T~KXJpgCQ=tfe5)D6717N)HET^`pwvrb*1?#3 zM&>4l(JC*H6$mGe=Ny36;R<~xb_y~x?t*ELj5*izdXcdCJqEAt$veu39zj4LI(}t2 z>GwX_hdI7J??1F01&hjBg?)V)@q!l{vn!PG3kj)%V|@Om?4D8?t<=|4X#aR2T})n} zhdWe6e1#)oGw%cFNf9G|f%l8`+ok*j+A;)NMoeq7-j;+wm7KXZ&_6Q6tc zbX-Viihp15KfDO?4_tkY^z(jI@J9*n{{AJ`9Ij8C5CvM-OXyHB-nu1chQZgz+)!`b zn;L{1gS-UmXO{$k2ytbX5_^1WewoIcCI5yTPobv2J(h6SRb;^yz{4CtJp2DxMFoYY zWLY65s|oZcfgfvxHAkrgyEw?Cd#gxwzv+4fW_iSIjd>IoPE1PPS8+=LLTwk9tbtfAe|HbSem3S+o_UNmaHIihS zh{z)$?!S}Yt|eXLM070DhSJNm77X@?>QQbx`3l(sd<>6d2ClY)eT#g(lc7#LNu(*QmWmiV2H9ajc z8;6@I+f7!F1gy5V@vkRbJs>R92yxyp{lOle@f zq$P05OsejR?@gfZrMNe48x1Jisbj&e$iLAEBqr(k6trC65w!gbh3SEq`C?Z#&91Ik zUsHCvNQ622)0n$lzt!MJWm|s%-;vc?r+vEU?kcsU6aSxgZ%tb6H1MyjCTmNx2i?if zr;snXxCp5;q(mT7LACRr=N*cFwi$`&Io5NG&K_J04?rri%YOd2%p%%v+t~suR?c#2 zXo>y@jH%X{>Z%xJSl?ee|LJg~-x6^@?`%0Y{(|=Ah>ds$ynWsE=D8}o^XpqeUpZnP zqt}y5OT*nLoh-QTkO6REqcTza!> zvfa2a3T-K`=t8^!X+J7_r{@R#)t>k`0gqLXBQw7`mOtQzy~wQoJ)!27n(yP57~$tM z2N+jtw>hVD-Wo(ojDY5UoIcSjW}YCz%peBPau!$i!ez_hP1_@^1?)02!K_7}4}Cq= z@#VaqVZ5TImsd%v+cM)Z-^mJP5w|&P?sUAau6vfTIh+tH?;(*G7aVq>%QTk=$rNxPp< zkd4F|pw^N57m_vEg6_-bTO38G^dv&ZE|=n1D7Y0vi?vaycT6&+yW5jdR^OL78cNGt z?#vPBcd>n*;bv}8pro#Dy48LoED1rM1j zoVr}zee4R2FUctSwZ9s93mKT!<+KPgV-)0wQzx)t+ubP#YjrRzAd60ou|p&ewM0Rt zQ&%v~RXWEXj<$JMd`!!&o&{q~S!i>`yemR1D%5_HJCxs3_B6EwJR1V zCpLp;$e^k>U#%STb#-+M`<>dWX9jzc2+J(FFy??6v&S>I@7(DkdG@vnxCYV1 zFV$h7cCwfOs?YNQvFYiy3C^9A=bGw8fUB$G*HnLn2zBmy|DjtAXW{jxCM5(+M}-(M z^C)jonhyVS-Z)9VYcb?(CcGP@WcN9(y8}&;nU((!^YlCZRPi+ zcBjHkz{FowcYScE7S2KZy!1bfX)34-XSGqTC{FL8h_A8Twm+OrgfH`$N)39R7RjzA zdhOu1bTf}n;9Ep9{cY{eILn6GDcm0@@A)HToFX@zC8rBHNz~V14MF|yRdFnyKK0>w zOB#}Pk8V<>kuc!b>6m-oy+o9?RC7{}bG8K>jTpsBsLvYlSU)IX2J+vWxtWa&zUD~w zMk9}sYET-tlxko)Ez3aND`pZ;SzM2V$QT!4leo4&r8Ik>6vq$~ zst?Nqq^M|#Z(v;LmY#nD8J)#qp@*YnJ8jGeBPIiPCOc$N6O1L-_xq$wd=X{7rsTIr z_PxR2w&A>t89oFm71L9gpXc*9m`|$u>`|x>kH|eSEe}uCwbW8~D?x4bhX84HVbe5tmuHlxby|N(*rrW_9*|@xTE(E<6RqM6Pu~ z`v-Q(JF~FyuvIJ2PyKuR=zG_%g%P=RnOyxaT97+=gmObFqX;SCET8St$CeM7vDg3b z7`7|%u0EQscWd_hwdbx@`bS4y`&FcatNC6;0@Q#1Ibu!3)}A)aJ-6`AVI7g|1eW)e zp08TAl|LI9Ih{ISUX)C`$-F}jpx_YX6F^HOvE;hDi0uHvjrn-q=03qP@Rm%ZxKDaZ znq4c1)WA|Isv}kjxr7_&_mrN6H^4w}@ABI_lRl)$N>yu29CYWKIs&W8X2@>)>bJhH z3W=P&A|Fy7nRCdq<23gw(7hhvSX$}*shcTlMGy0&q-*tv%hXbqaDq~C?M#*tYyGLx z)A#9Lbb5!>Y}rfJcs<3Ip{*ig%3 zMb4u+8-tCkU!#Z_0~Ww|@e?oV>z-23Ys|?LjKJu3IwhYRZ=Hy@U3J-^Bw;2mBwPMz zVt}i}4RsgAUo74&)Ozho0wG9EIO>DquJrv~zmGO@)io^ls{aES4})(;<|&paKk8#W z8TtAV>SCi~;C7xObQOT$ndxW`opfVTA2ExFmM3LcO(Gv_e<_LFojy&v zzrlgyhWlmi+9?utW@+;1bc_K;D)u}k$a6H@8p%oOHH}K1FnX?-!kGqAzN|>u-)W?U z-9VB!kTD0n5J?}{i*85F8I2%sqtW3e=uu!|sc^7{LB~H$H#HBgKfKlaLIUp$ZE!3z zv$9GnEAuN>emL+r+S+znz7aR$e||qnCOhpSFy7o;O#8g6Pq*d(+xVgFeYkmd*c6|};$N-+g3$O(Dt@R2f>fULA5d#fS)YJ4@!6GZXlJ!jc z!<1TQ@rY0?>mADf|SkV}gqT|^VJT6HzOc5h*W>+*w?s>h0sLE}!@%JE`(J%s96BT$jHn&a>}#$YzX>AcS$ci4C=!elN`ZFr#E^jn+bte=sl3l0ldM1VR8MZ^)T>CQwFh-ptKP8t zEqb*Wf9EH|!0UaglsTipcc0a1v>?yF)4DrIw1>VW{?@pry$N)&OG3H?Vr2up zI#SV2hmT0`q9hm=uInJ0flAOAFFMOwNPCq1)BKHnsJ?()xr_IYR}-QdtsMIY%`C2L zwGbTP^$nG(nZDzOgyoP_bWQ{4Ki%E(m5@*UuXRgJlwLarVidpVeoaKZb7~MQyh;kK zhg3w3(Z_H8D@n^{-mkGCCGo zmO4OVJFvRWmB;z_tTCWT(*(K1@X+bh+^8VJLlkZj+m4Ygac|~z$ZmEz@+si7hdR-K z_*#r@XlyJ^-K-!*td_O7_OPB3!!UHHZ*d~%&YBkP(-0+}aF?O4(|hCino23CQ78gi z76!}8;!I=y3}O^%BUUHU&E)VBEy@B^Hw61ce9}>e!jc6-!Ao-o*BoI=yc&0_DNC*=U5E&YRTgHjuU?rI8X4Mj;_R+^Y;r z8f+^~HCEOO-53ZX}mbl(H(=!SNK9`SnjDJB<8|jXPTf5x`1sa{~#4qy>mp{lq zHoFyB3TClu3^WW)nl~s<#y^2I)|y?Tqhr-FT3ND%IwU)rHi3?@0-!Sh zR!Tr5)4pBVp#ur@ds(@)v1?Jz;f6`eOSmGp6wFmf8Mw18HMvMwu#OhbnXd=4Xlyp` z$(gL&s<+Pi{urZtouT%A*60vnK_;B~Rc877rUUzTW_w==c5m)Hw}V#N$)0(9rN}#q zd-l|v(;xLNYLtrGGv3P0_89s@XY<TWCleE?#%|K(K*~`hHvJ$KM8*?npDvQ1+C1NaK_P21;{C zk(vBkc2z3rVPgNl8tG>y%k^Y2O#x9(tb?^rSY#X9GWqo~mJ{die$=VCAX9 z?uq{Jx(WsctxCs9+;<;F{>)7+LR(-3A3hlz8A-XpI>$KJ<{Lbjq`AXuu|J$xzy}4m zhLnNO7gN#yj<(OEB;UA%s;@nBMG=bMy#F)lmb|oNG@lg;d3`0mk6AadEBca^Rgs6C zUAl5sM_XGac<5aNINRA>VjQuNFvvRYvh}uoJ;4DY47*D$D0MuyULqw7N-zj9-9MY0 zbYxoOwdid!a)VX}5lPX72HI42O&%(gxSMbDh>I_S1K|{CjATXJVwO;q&u7@m0S5|8q{J%u?~s1WH?F5!%7RWyY`4hKw8GrLA4VET%yp2S z?`0!xkqwOF&VN^RqW23;Q4*^r$6q6&4IqO0YX1+2`CU`b?(y52i?iEy9sDun%Jqio zDgnR%lt!^4owfZa6&01_=gx03lvGqs-v(>uc_}C>$DS^)YRm%lfyeYVUQ^X`hu~-M z$tUFiJ=rNg=hMq)%*@P$)NdjR3ty?Rkg+5UR4{rWR=5!>?TeeKeJ3q+qFzcb?}6SZ zLTYoptGg&&G<_rJP?{jHgK1)NlAWFXmxJKqt^dPDiEwfbfw{YmmRqfo2IS1l@)Kbu zm3p{_p|tL{zYrH(Qnw0mQXO;!Offys#Kfm@@$o67Zo0autIahvHOUzYuCCSEHvz`S zj|K1Hzi%*%)NkZShBF0*N-!5{tl|l^K7QQu&>+}-lzGoe0|Kh}=#u>o&R>`4NYmF; zmd+pej*M<%(0t9dVG@jkjNDhjiQpJ5k6@ez%ssZ{&Of8~?qkM;v^lf+GDuRC%^RF2 zf+$jh;~QpB72(td2Pskri618~H~+FJNDgbdeY@D5*fiy;2R2&Ana6JxbApc+Vy~>#UT&mk z(fh=0dRzV?L<><(#jF-c=NZ6=h5w%QeWvaP&<9-9q;onuXt{=eN5XVd2VW+ylfAi* zjUzUiTB?|PHLHT2fkMB(#fneAZsW7DA7q9u>=(k7ATI?tj2a9^BSmP|PvH-C`y{XPItN(ssPLlltoO%XZN?cf z0R4GUuH{O=dzE1fG16;DR#lPqZPHm*NW(3)@Y~ArONb9lfVZ*s_Xv76Tk=;T0RoHo z7!aOtPJ2nfDvbE;yorUN%n9oO>;u3SL0CduVXa^(2x7Hx2weNx(okHL_lZ*cu9-63 zN%XZ71E3=_eNlA8P?^t(!PKAg2RHbchF%-aBfZ8G6sQ~}Zt`ec28Q5qQqTC6|HHy- zG`b;7o1)+{p``d+)J_F%-#YV^tM$5~a8YuFhuCvHynK!L1Ks9KGIhtQA_;2wNeDN? zQ4)|P9l$KY(9>@%-8q%Le>kff{~LolZ?mWYctXenHHk`~xnoR-8)M}2dL^)f(C0HH z!%=VT|4gTB{Z9$>#zOIp;o!T9cW0}1N~zO0D=V%S0<}f7t!;c3irV9K@d8+a?=0?e zhv&Y1jvHHZ?Ph4B|A!k7JX-Vvb%hmd%&ckBqOww75)s6N*csK^RBCB%JSBxDs8zSq z)_nh^;`l|q8UHTW*IYe-9E9j^n0{^X3Bw-O!5l@tIOFk73skVdmt6t*Wq-JHxStIG zKIAFqSdDcj%jY5-uLiuuHu=|Ai$o8|S+v`MJ=%MVZfV@&Rqq6*LXS-qdazdQc8($j z(Jz|Lz0Ib+_tByOyXrIQ=bC_ofG&q%pxw`8-Q(v&=?QPkfhz?LapzP5Yc(JR%%$_A zK_`*80*6=!V>~9km^80)vJ=^cD2iG4a6OUH;qM+Ulos z)E5M9C)bZ5e-=i)o7z0Am_Vy8aw05t@ocY8^h|&98eS)>^d^pAbo2O%jA0#%4IPet z&mXntNcv~DC8P&+AteJ>e_J`BbCz;M&=cW?)2iJ)X$5g#pft&ySozxHO7I)KeaNDJ zK6Z8{;K73%+3G{ESTJ|YSQU%?>+QL;XReMZ zw`x+$9t}WlwQg<4saX3F+up!2QgJLPQAHi!(Yu{4OXTXjVG>F7Ys=gJ1>5*FdU1As zr$t`xivu{3+s`ome5l%eyr^fwrFrDMKZ+|cQKNf@=wme|e`FE)vC>b%PzVmI)G7VqRNFTB6 z+}xvYw$l9i74%kdC5BiNxNLpT$EG-N@}U9723(JKglQkeb$d3j+Ep_&&oWQ1G~kCI zp2HeMd3qV3*-$}@h4$laf^x;if;@tdrh@v94>g$C{NZDxNMRuQlATUy@w~F{v&h~ zIvk@O+YG1R5VVG6?w*|yb6+jfW0jUfZloLJ(v~)wy!0M6k9=Lf(c^Wn!MjCzpj z+N59v4i-sWq#}37$B96v<%2gIj(+~v=y49y*=W53Q0UBVbRJzBeu&imnd~@)ggC)* z8X&p$YZHW*{6KU9MB#(>bx+DQ&A=eMU$WTP#xMr_2u7Jt7-0`y`eXYTy&FyPUP+;VxAYqQ-{b3XF2)$Gh!;7^-+Dq0`-~l1 zgJ~~NFWG3rrLa2*zK3U@jz|cApMj(!3pD#7tf&|x{w3OUD=bU}n8PG) z#LDB`JCi+@Y+E3C>Hzq57q0j4;&U^dNy6WEkF^q3Av$Rb4gkLJf|TVoV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5sVXrqzbZR3FTNnBv^XO(Rf&r;C9|j)C}qgSnO2mTn+jpWHGtK{ zXO`vXq$eU2o1iFGR&e!m0Xqi(syr-)ODad=000aFNklod?J1el{L?7|~4-(g6=lo5g0$EDju$HgMoTH(k@&sE~MJ)cBRj zEt)Np@{s9-CJrFuCnqPv>1u(Dj8;fbYY8%Z*Me?U3`wA~cvkBmv#9iXqdpUlnjcG^ zdUOjWN&Am5ep)ISKO2lO`2Bv^9S$TVCBf-*t7!}8FK2##J@VUhhTG-DYwI_&apOlS zhNT;X3YcoQqxSQoO^jjdT%gJqhMN4hU05+{Xk6q{Ua#EUPtCjVh1XO$p>!bKj5_?5g3vgTZP|f}$v@W0I2&+{CAD=8h9(E(WVhl5PF5XYvn9dpPKG^@@oreEz36y*Ph733MMXs=@>=D?@AKo;S2nSUlSfJK zh6pma7BW5=gdhVEsdigjWr}>&ytyor8B8RHgrm_IKu)0Z{Y7Kh>?zYwk!?re;6iNY zt>n<51Ni-|qj2N#%UJx$J{-%eM_z7wwFNN#C(HPv_6wtHjV+8IYU8BGpTgQD3)Qr5 zu2jZN2g-~3cY=uVU&5B; zMs2M}{mtf0TiM7_!=*Ta3bbp(tGK~ZqyFDv%>C+_2HfMXzu0g+_0gERfLI{o2IOke zMcR446aB_c)TK|z7SL_@UCM!tZ^M4E22QsdHl|?fl0V{o-x-{p(H}i0+|7Sz0a-hV zJ7~@7bu1$zt=R>O#-wg{s0S5P)Hsp0?a!+kJsYZzj+NlNNS2T*?vqa1G`)m<6_GK1 z0J;ntz^@dH7(Eh$pM4lVnD-Fu1?}+K#=r7G*@nvMOGx5_c1}(vva{2Tm#i63fkjIY z1P{(K2$n%Qh?*Y@A-f==hWV7z9Un3>G#_L60P_tF96Exwx%p_Bor|x&E`!TuM}B@D zhL0#TW%iR-IJn{B$WHY{1t0bJT=jZL&)WjeQH`X*j}}W}ffg&2hnUlg0d~lJ(~*~z z*`ULcUp3Y5&_3PyM|>G)bGekwtJh=An)P^d>$}KvXJTY(TeP#KqJ4*(Fni8p%GhzE zr5azwtExyED(_D{ywdS#1HR<_oS<<-l9Jko?lyNdD*$u2fV&;W?P; z1X}L*nK2E$2TfE9{pO$|EO2CD+53CL{*DYvi=!#4)z}~AXU+%g1Xki78o&fuRPq98fiL3)BaCYB8`1}kPD*kIk zX0xDLMl~=!BMUok>VXm4x4_|S_(*qis|+UNV~l|ECK+^1GD$Y+K)R4lM!O#(U?;KNCC9HRXIL)XPTZ<0Z>2$Bu%08dTzcioRc z8A_d!9i?O38z)@Wbwr(5n^;td=vxb(Cl?LU`TjA?nfPcTa4OfmG$9o@a zL*bGqrFvn;&z@n=KR6K&zwm04d-TEnxoq-ziluzQ>&D`@uT22FlL!eu*j)KXS96OfKXdawe?2HFPN&#-~cV z(6y`v$BdLP2B`2)tl6YqZ(m;$NFOx5STzXUr(?=eW5(74IdJdKf2+18Vf_~go`X0xv#&XQkO4&ZLn~9g z(@TP$6{}g9V+s-00bf3JyR!Gpaa=z9Ig~E#U@f{67P}3K&ku{$3d{LRsQ>UF_WWxP z<{sUSrHf10bI&efv!DE>^cfM=Jnd9)%b(^qx=%(Eh8w%=<(TD&-)i#ylk^6bm(mbqV|j5X&tD|n-KD~ zuP3xR>LKJHtfkG3`7GU?f;TpALZ>bbFQ&fu>?rHmwL4N<=HT?%Gs;uE);sy)%;9vQ zzOD{eYse^!FVyPb@l>P6Q>A`6qr>aWlFCew=iLRg05S&Ys1c;Kd=73aM5qndlM#1Vs^V- z9UgpsAACNaI%O3HIbh?)jmtHpU^c8l^GweheYoWkcqAqK*)-ZkA+0+50Hf}2gr<%kH)pIKR_nB91tqjUK<}z zV?uE3J`u}D>R`0{1GKWq=p_4=qS5OAqV;KG_`eV6?t-+$Gd^Aq*V_Joc%o|^ATvJR z2#MMsAQQvyg5n(?A1jI49}sV%IzYt7YipDmA740FJ+#IbX|f2;pJa5{Q)v)(gm3vA8!OR_6L|v z$T7go_;|gTxj(>6nmEAh_;@3ju|L3U46OrX#K#*Yk^2K=5OEMTBR<|JX6_F#gRtKN z%!-dUf|>gR%tH4xR91Yv5fZsSKo%j#05jv`WfJTD05gf$0w^?l!y{9^b3#Usz`aoM z@ze*Kf!H4)R^_Bi(X=^%``Sv=oc#f25ON`AW_-L6%-A1bHo88_%Z!hY1+(`D$VAs5 zEHgen7R=rsAQM9iG0~i_#VMV-Kj2&a60M67u7{^5nCs!`3Fd$KXl0p+6VtK)0000< KMNUMnLSTZTsY)0C diff --git a/tff_modular/modules/toys/code/soulmate_plushes.dm b/tff_modular/modules/toys/code/soulmate_plushes.dm index 8572495ae8e..06ef0811069 100644 --- a/tff_modular/modules/toys/code/soulmate_plushes.dm +++ b/tff_modular/modules/toys/code/soulmate_plushes.dm @@ -93,3 +93,25 @@ attack_verb_continuous = list("hugs", "cuddles against", "protects") attack_verb_simple = list("hug", "cuddle against", "protect") squeak_override = list('modular_nova/modules/emotes/sound/emotes/blush.ogg' = 1) + +/obj/item/toy/plush/tff/soulmates/duo + name = "Duo plushie" + gender = MALE + desc = "A cute plush toy, created be image of famous protogen, or not protogen?... however, when you look at him, you can feel responsibility and a desire for new achievements, as well as a little stupidity. Do not let him near the mechs under any circumstances!" + icon = 'tff_modular/master_files/icons/donator/obj/toys/plushie.dmi' + icon_state = "plush_duo" + happy_icon_state = "plush_duo" + depressed_icon_state = "plush_duo" + missing_one = /obj/item/toy/plush/tff/soulmates/amy + squeak_override = list('modular_nova/modules/emotes/sound/emotes/dwoop.ogg' = 1) + +/obj/item/toy/plush/tff/soulmates/amy + name = "Amy plushie" + gender = FEMALE + desc = "An adorable plushy that resembles a slimy xenobiologist. A look at it, despite her cuteness, provokes a feeling of danger." + icon = 'tff_modular/master_files/icons/donator/obj/toys/plushie.dmi' + icon_state = "plush_amy" + happy_icon_state = "plush_amy" + depressed_icon_state = "plush_amy" + missing_one = /obj/item/toy/plush/tff/soulmates/duo + squeak_override = list('modular_nova/modules/emotes/sound/voice/slime_squish.ogg' = 1) diff --git a/tff_modular/modules/~donator/loadout.dm b/tff_modular/modules/~donator/loadout.dm index f1af35a254d..ba0c566705d 100644 --- a/tff_modular/modules/~donator/loadout.dm +++ b/tff_modular/modules/~donator/loadout.dm @@ -198,3 +198,13 @@ item_path = /obj/item/clothing/under/rank/nanotrasen_consultant/trurl restricted_roles = list(JOB_NT_REP) ckeywhitelist = list("UEDHighCommand") + +/datum/loadout_item/toys/duo + name = "Duo plushie" + item_path= /obj/item/toy/plush/tff/soulmates/duo + donator_only = TRUE + +/datum/loadout_item/toys/amy + name = "Amy plushie" + item_path= /obj/item/toy/plush/tff/soulmates/amy + donator_only = TRUE