From aba8d2ce2bafb0e4e11b74a405ca8be526d305b3 Mon Sep 17 00:00:00 2001 From: Jay Date: Fri, 5 Feb 2021 09:57:19 -0600 Subject: [PATCH 01/28] NT Choker donator item --- icons/mob/clothing/custom_w.dmi | Bin 48009 -> 48062 bytes icons/obj/custom.dmi | Bin 29246 -> 29263 bytes .../code/modules/client/loadout/__donator.dm | 5 +++++ .../modules/custom_loadout/custom_items.dm | 9 +++++++++ 4 files changed, 14 insertions(+) diff --git a/icons/mob/clothing/custom_w.dmi b/icons/mob/clothing/custom_w.dmi index 10f7c5080af862dbbfadeef73fb14788f24179b6..440e5aefe658eda99ca303da8215509a527ef210 100644 GIT binary patch delta 9135 zcmXwebzD^6^Y>lCMUavZ1Sx}(ln_a!6cogdfJk?@bX*XWZV7`%K{^+Zlv-&NkXT^p zUSL^RYGI%2_xF1Ck8|(YGiT1+nYlCXnHzOP(t1RacnhTTfBEW-inXVuhrQbydsi0# z@cojSHtd2Dz0xz>`yT~H@Q>*m~|9kdneNnrpv{&c34|{2n3(?$@Y36QUIj9LL zDFlTee9I|zA9wtXrUHq1n;ez0IfhHGKn+Gcbua!;I{_7^TwQL&=@I(2_&*;8=0WZd zxn&-Sg;~(s@^Ljp>V1z=WuW-Kvo^R#=)BG*`)yQ+&UG)dy=Pnzz+v*Wc;&xbmZ@W0 z9bYl$3|}8G+F+D~t<;NM|F{QN9wv)Yd}@_=tLxNdWcS^tK1YQz^#1tQ_jxzoU;G#n zP$09pX{XT{U#?6It93Q`NvDK)mnP-){-4cZ z_*Y=|f;hZGiql9ZLqVrz!NNcKOT&(He3g5Fum867&_}LA28yw`pS?7&+WOFRFMi^l zs^~{g#TS}6gZFbJ-pF67E|(~{aCIxE`uY8K{>>9VF72pKBR#iO_dS&y`KP2NVdIMP zNrV|YQobb5Z28%_<UiL|TE+^rtR{;Clt z!KQbiNoX2PT%9mflZnLNalO^umyhZlLkGY$bDme9ZZ3xL9DTnAtV~Xv!7({Le z<>c29a^+_#&m2qFDZ_b8A97S_wOgk%-Gp7eN^y%TQAsKCE*X>j8FJZZXJ)|4COKd@ z^XXj0T5rnokd;Dqz@=5s;l{PBfECI+&pzFn1A~r?pRF?QI7;|aJea(7SN7?lZ>@$e z)hyDbUX&TV5K0{I5Z5Dbh6Cc9vieIuTAks|;vRfJPX9Ca$d<;KVISah$vcUmY%{fkFn7`lA+0u3AZEUi@c~dk~(ciU}d{)c8{zNM+Bl4K-gM7|&3Lx?j5#G(Z_}er=L*_ya((rd*IFQhBg)*CG7tcs8xi`I=QOb-EGw>4w1gr z)Jq%Oer7IWJEND~^(vgO7tuKp1rvJd|S$SI=qF^W|I6> z)>3TklULafXJzJx-zpAz^soWH7PQ-CaScTcD#Y1x+5KM=som&FT#14YGX`|aEW-}^ z{W|Um(zovoah#CpH}aLfRgFp$GOTn(D*z!V%wNC^-5R73kfYTD9?kmH9UOpfmRDCT zHvW8ltgWr?@BahisKmAcNhH4W=c}febsu9vVWBdOYD8x>w;iv|rOz^cH!3N6IMUhi zlI2gFjB@*EdT^!t)x3Vs_Ew1JY6jdNFkDpGsU_O)G@Xrnm&p`#|H5(=e{FO~>hY@|FYe(_m-lRS+@lm&e}O}umHX_K><&^{ zVVBAe<8{A~reU~fNlH!j#Tms{`!-7u_3}wp>~GUv(!k)+6+hrkGp4CGf#fRcPu08T zO!EO-Hr(j{d^pCATdH@kYPMI^XhNjR2_)rZt=2w)mh7H10(j0M#U;Ht7L#|eD3^UU zbd>qLOqKHi>DAQkVKB;@m!!EQ^d#kr7J8sgm#}l1y9nt zuAGfp79;aB-yiuK;(T;pGEP4p%srhku=+yPIw*WmUgzb&Ts>pU>z}p%jiGot^Rbpc zB|_-+5}Rt@>v>&W-DiEOIA6KH*2*d>D%|#n2^a%Cy`=5kb`?-Xg~o2|%GIOykAi-} zhP$j*)__>7A*W!6I#GN)2}dVR3;j8GT(g-Wuy~a|sjfq~eTVuTiI1tF$3T!-gwlqI zHF-Nbu_^op%Q><>e3Qp%ptEJ+c4*V6J94NHb_>Nx*m)y=2gvb<&#>VsQ&oMZ!{Mq% zNPJOoW9-B}IHzwy$c$Gc_NoWzwY(;*d1-jMJ!l=p?7j&sM4>m1t>P-*=LAKY9@1<- zC^Xj>yp||BR;cfA%`@=jE&v1`5rdv*v^sAH!0x(yrh%9}VXNzDqNH*8sEjOrM3l+%OB= zw>XU>#pF36z2e8{&Ip?56%pY&`2=WWilDv0cr#dhyb1)ZG81hdZmAaf!*}@n`gc9k z6fImu-prl0tKxA>bGzP0;afMzSY~wg(=g8SbI1(%rQy(4&Dy{RI7?Hs54rpq+Q}tn;%E@v$=u6D#?iK!f%(` zQFE@%4NBdJ&{v_Oq6MC;W(?B?$D)OF6ic;FU3vU|MYqKHpK z-DyiO<8-*qs{jtx;?e1Or%m4LH#ifdbR*p6V;l_Cx&LiHh&e%+xc-ON=yyON8jjjb z2kH^^0m^T=R)310P)}Z z2}UsbUI6V9)x^z1e0?sGhm}fHvhSbw#SojdQqY-0NdBI=#A5G6d9C(F6IwJ_k#=xF zd;P_ozP`S_XBg6Wrgn3AOVyv)O@A>G=laeZZtKOx&6c$71Gz6t0Kj_hiOR#5f>fgP z^yFTh-z4)y8<~Urhs*VST_$VQzQ`EIff*aDh-(imt9VyPz5b04>^{G0*iKrsE`fQMBXXi5`K%)3nshRZV$}V6qLn`$Midz4#n5U` zoJuV2-Y0veqOuIoJWMgq*G%!trv}fUz^YSImDl_{qkb?>`|l^qKxQ)@p6JKblg_~& zQgR##2xzS!{>=n9C!CPMmR;I7>ms%@Tyj_FmtY^2Y6CWOBwGBRzEs&Qs{$k!?7JFg zEsX8C)w*V5XLZ*O)|ke}c)SYOcEYW6Quidht6wYC&}V{R%LGFO=yj4YF@h>L7uwZB|{B8NP_{%r7Pa~ZS@ z&HZA8b2zVLc#?&TCGF(MRKg)m(|?E7vY9Yyy@Cn$Zf!gO7h=EJyLMl$xXFuoTz8Gm z(9c9ubAy)|2J-o>hza?mtBcIVVJ@@L0vm++2nq7$FMmYV z4o7=aUEx?5)uaiR|ED9Cp2Z`B-!A7y4!Rwq3aUcTA+vN`;io**Jk4Vh91?uX!_~;MG2KJq(D#quIE*F7?bkJ z7o~1}%DUtCdA&6`5r?r%M1$AS@z#pKNX2)NiJa7FYK!=WbsyWc$e7p43F=hfySeW{ z@dZYak%W(s7nSi%3%#f102eUipKa9Gc#X*gTlE~@(7wX^Q^o5$ijCf@b#>sh6XR?a zPSGc#>EZlF$Kgo6!r4dW3$XBeTPL$$6V+H0_MfDVqJ$~BKeF$^*&ZV%K6wE zYGY(5G_vQDPqml(=S5)E@$R#Jfh+r@ZMod@?>Q2rJiAn#3GpOAEBJ15r(v~2Hdq}N z(4wLeH&VpC{=fKea0Qb$J{4}ZB;P3-tR6c2yyh;Yw-_UF#rZpL?!C}JxG;Yc;-*-;et`LoYE4BSMUfwA;Y z2b=>N#{#BJ{MSddR6_5&3;*Rezcx=W;dTF2BYVssbSEZ`kjzO4MWBA_R+5I)A78KU zN3Sdid^}PV#OR_dtiQHU>N*SEr~r02MCnlz-y#?t&!*pim>n2{do$02MQKS+rtLY~ zJUb>l-J9&Wn!1=4=U=zTdT0s%MAk6P&bv)mydk!B$giOg`{KomS^^=kEn#JC&5@s< zU*J!XIwHo2p=t3$tAc93M!@)A7Mlo-u?ypZZvDd_dXdXBk+B2P+7#BaHnI|^clWL6 zpBr4^$&3aO&u8b}1<+bTvJBo>eCk=>e;ZNpY=ZKL10fN7AGEX%#BB+Gx<|j1ecZBA zG5Zp_$}EPt>TBhHC^` znPjG(bYHyax6pSTL*G_kn7N-@b$vS9#!I&2IVfCHg=@CD)g|55D#ojOuaYg={?LLi zOZtu-h3Gctp6fnNvRUkBb(F>q5*NNk9Uctq`DS6>iGBI9UEl!npR(HWqk7TNue7L@ zrAs&}+f?~p3X{=a#-2N)A^-f!&~8L7OJ}#*nCd(-w(wN*qSYexh>PpWzXOV1S@(l( zPL`h4DVb-QLSc<-GJ$&(n*RCE{Nld#q)UeZfv!DffwMNcA-834J}Z5x@psA0n+eE` zcYLdnG1Gmif=S8Ac@hz+g8GO^^842Vo|R-ybf_(QA(Ao}BxybDCN~#Mm$sy87gO8J z?U-a>gH9CFcF+sNeVd%WBWgwIpabMx#}I=tn$3tAOcV)VdmlS+L3(r;OxGlDXt!Z>+nA152-&r_Y3|E^Y|R?Jla|d zz-9JqH*M2jYSMSL%oygEu5FKK(=FK^vhNm7uuD@OQ5oB>-BF-NJAU_V$^$9Ow)AEk zW`lU<%8NRVUKh6x4jq%D+g%B7UCjalEjfBJoQ>M_u1*xiZA}ED^1qk1a(B)gTR|Zk z-q`S<>b9y400b7~vL0Hrb)Q(*y3!61Zg8f7Ueol4FOgvl9EzRcP`XD_?U zWcT&>X$FJXId+00&iZaEs3)w>I^_7u;LTu*1GuFPg<+i<_ad_U22;~MhW3s|r^VJ? zKH}fda)erSOBN~-v)wY7t~j$fa5yCLKVqGRBhjHO`L&v|f_1*3ta5vLY-a36LK~hU z0{f+C`>+qAx3VtLLP46?VlLBF<|oIYo^q3iQcbwnqYmQ?wy)&djp83TnSL&h`*@n% zaEg&uI#aO2VJ-vD+Ad_TE`9dYxiM-=qjZk9+urKM<^O)^doH%i8_=%8_`Bz6&=Vu) z0K<{B-nCe0cV#u#201OzD!)m5lAf?wyl|pHna6)8=i4!<(g>d7zuIdiz0KKB5ygnL z(xwGQ@DD&Va@qvW!dZW_mEWc)VX8YSBZ*P*wHw8!$jD!?xJ}sS3R@3{+6|OVjWz77l4z_cz0YC}f`;qs?<$~KYm&SzZtU-Nj z3LFNZ3~nfSBOF|LxpBUmrf_bixl}a>3T#toFY}!&?7XCn#b(B7|K=?qacWJs*nBLl zcHTOGHL-Eh|@+qP@jd|k~(z_28_=>h=GO7;es|{Xw;J_KQ5)^51hB+8AJWe z1frF0b^m{z{E;zR0{tc+RAK2m`y(w(wkHRIEj#`C>?aZWvt>0v-~{arm)D#9QO%K& zk#8?QpqidJOYNQrI*I-VGg6MU-e@?j_zj|A?R!6O66P+VA|v^(h6l1HZ(BbYM;-Da z_5-_?A3>loUQMXW{BB3m3$oet3cH67-GX9fcTNj^-s^d3ndOvxd{w`g#lL5?7f6Msz`F|qH4Bd&7RSz%vrjIY8D+l^r zsIow<3{T$`ZIPvmD$7(R;uvoh9SY&nJxV;#4Ej8nwR~)Z`T3zhT@@|ryBjQ~5=gLQnJ$j=leja%(@&nM;dLvWFoZ;w50bgX6cn9)J4s@!`5izBERgfPkjnO;bj?3p)#M;E{jhwb=9d!1=6=QiPZ0VZ_7WNn&yHFWV-9@wkjxA-MS2Rwi4aNTYh#}=Ke26)KWkDW^}2|z!Su~zSPQCjPOytaDTyW@1pm|x(^kCa@X#YYo3vkj16NlO&%0-K z_LbWA7Y%ud@=AsuHiUlIYFk8>Fm(-FzAs%Z*_CI&vgkm5aDx^)-!4YHr8_;6FET{l z%wPbDs+QW@O+9bw5ln1`#Tr=@`ct?)my~+TQ zo+tWgFjZyM@eowh@&rB6u%t%_szVV$4|B$zMMbisb^U!7Q3C|eTQXf4J)PHakUL} zx4R_K5f46&x(UE>7ugD)ul?BQ=ygWJjsHgks&fW~4~)-!&b2Kc>VhT(rNHv?awOF0 zueC?15j8Y4UR?jTyIU z$^MEzz1~V%dHwtnAz{n8KH!#8yh29M7owQUhJTE)c~s=DOHk*!wpOC-*sKbTjHYEq zDbW970q2_iPScBz|7_eV45G~1B&G8lF#It`f~%B(`VolAh@9O`)Ax&E-H+LmBMt7^ z=4zuA_!M5nHl3#Pv%cLyRaAf%XY0T753|qkTP0Q$4}^rC;q>>eM%=PESpSXSAS?L# z)jnT6L2WTnB^$FJ5^^s$D)Li8;@`Jv@5)@;THTIjqnCJ(EPFgBIEGCq4z?A@vTjqaylZFS1n}p>cZ`ZKrHXU>t8&Q~3+6z3QuR$>yX7t~FRwab@j@B&4Kf6?F~yWQ zCrZkzc>))Csxc}Si*;ckq;MLu-+8Ki(I8YpWrn3<8?Q1ac|HpCyKe6o2sX0w%f4+rKRvBg-!a8~2m}f*oZconXI)Hs?Xj~` zwa=YPX+C|*2&Z8m0hfK4#BS?GwURZ0Q1hYy6N1kD5LlXz~=h} zm@CW-d-!7Zl9ML{9czL9yqX=%T_6O1J^_RT!Q;)qV`GNO-H@YBMcx3`9hS5ZFIQWG z*AxTTufNdx>#tWNCRUXyp8)t$sl^S=+CW;)W5HdOk6t6=( zJw2-+&g}PJy^B)hxYUl?V$1r&DKphCD)&{c4b1bVA`$`%i(=09mTW#>TW; zcCoY|fYdT30kS#V_7j6oy-SuNl1HH@Lev<^cy*YX8pexg z=`KoB>G4H5-#R*iZsz~R3SzFy@p6i`Q{2a@b+nFwZq!+DU`$pRyB}0Rtllgjk=xAD zaci0-0p>s=>N?QgaQR-P?Zlnf&!Wm`{Ji$JPKA`<(NQZfC0Q3DFM+Cx2e`Px`V;RBkRV!jR@SIzKBCr-orb zNt#ecv2_dpT)yE^SzJn41FoD0jmhVW+6;g!LCG&(zkZ#cau4Y`Ud)u7e02{JU?O1W z3^WXrbo@I%*w$)q5Lh!dHs&uA_j%8=MM&XfnPJ%#ZD#*8pMYTl0QLUnlr|fp1HG^j zeil78_R`RT0s8Lr79YYHw9R_n8MGFk$#T>#da!Y=P_dOT=sHqp$}Y8LZHa@=fl&r) zCA3TbEDWP6??1ezn7A=oXvm@XN-J~Pbl;wKA|ndXCDDqAt(OsDll5VoZ2k9;Ejfbb zy}7oK;h}Eq??z8`s{!JTw7bC%L9HGF+B~=?(5TTv70e=h{&t7Ofp9yact83jcT5RT6YJRKTbjL^k6*c@X z?!1nEkxahlfnl;6p=0orcW`WbAEI=Y;q4Er6*Qo{T@ANC_iG0LeL^k0_Ta&hf1iS(9-~8PlD2LP0F@k@hU{}QP6iN zJ+cUFq};N(lC3BIrvRCsRCR488L}Oe9gRY8^{(y7-6A;%yklF!#NXgJNQomNsa2l> zXWuWfW!u)rUfEr|>AmBrynJRp@GcU{3zh!u0HmCtSE#bpf2o*95aNS=b=K-_IiP!f z)SGhWED#>TW?8-%SGS82r~kEa463bWXhFRQ2&cnaCBY}1q85xV||3*bI-|eXtv=xw>JbX*8bKAzGC!Ms42YyBut$w&WhKtf& z4a451B;>v#NXo-==$-q;v_G3@5^yL!Y0a&1}p|`TFmyPFZckkD3t`LZSc4}&uD_Z#W z`;h^in>!M$X${{sP&5zUv&J4B`#Y9}cUkS7&m?oFpz?H96<1?NAz>IlV@rcbf= z`T6+6UFlO^JS@?W1x{P$vioU@rE!N%bC2(D{lIb3Klmc;BWX1j$+&!v{?o0!27p;9 zNv}A!F-!ZdrGCx~UMhjKO7*K3jSJyZkBRI~$*@SqO)jB_w~fMM^j?NP<8?XKq}iez znF%xPkJH5zs-1RCs(ribaQ5q_el?ZXr=t0}H+LdFzARHCQ-LpEwfy9jbASGHH03?3 z*#{Cnks zq*B6J8?o^NYoXVjdd0K8S0Rn~hSpot+X}&zQW6Xtg)msgRvL}?qv})0PPH8H-PZ2g zBX(2m3_0!EzgB@H4?njw>fDUwd^c_*Sx0BHpmLM|BWwQ%VL;Tx+ed;A6OfGMMGk07VqJU~@jtHuvb?t` z=i3`cT$T4xgcT<4U9)!!6bxhY?*!q_LbX0LE*?L= z`1xxS=qcQK&mjc8-^NW;XG#&(N+BP7>uag}Y%0N-0WZ?_Bvu$HMSG!@JyGnA-nP$gLT^KYs?U zLd8hWv(9sacALF#C3CC)!T=%1X6nmy8$setq|y_2`58Y4wj0BO-|gx&nn==PsJie& zz8v~e!Nd>__K&q5X6Ob&b2f?FkkOU*kGtomd-ixBOFl;33Va??lncxeTxotyM}c3l zJyNzFbwSkD$j*@1_2+?SbFKk|LMy0}&7dE%L<9*iYK2?dEPHf#?4 z-tx4i`{X0F=dh}c;-L2`)#(wBS-rg5Fc-=ArL0D zUDA@13nH7qxt^4VItgiMH^yjLZ=qZAau^t$SC)M`c{5B*^U+f>Jk4@m@wo_h`-)Y2@JcNRspj#vmK|4)dEFf0P^Ds@6nZ=G&w!FNU)u`34m!i3vPB zHYqw)hI#?EU}ar|QmnVW1nVnUe!;oXgAW&k30#DW7j{8+#$_sA{~mY{Tw@Ieh2wL-;>rut2~XI0je#B{yvN`V0r3R|k@7v?CpHwJOx}!lv>Hi` z^{`|#eUXBH6+~=z!`~M1NqCiNdINMcbd2F)uX4iy+BJlVLG3AvxO=@%*&<8TG{xfG z&fSMX-|tyhl(le#V5o1c3OXp-(z{okl$dm`?&$p?yqj^XXwx8@PY`Ud^I#e7G!mW( z=ue>L7hZ7mL-%`VDHb-jO=_01mJGeLsxKAhs2Uf0_jwC3!AhMc8s3B>kuEkY319d_ zHMac#j!sF^44=vJ3bR)0jLuWoslm+KTH^gM!({iBi0(W=KpcIOpq4Q4t8*E)P8ZL6uN z(QbAyube_TM?^$C;8#DAw&dW*{~QC$h=}M1pkz#ni{?nT7mpWmG72wP5K^IAoUoG< z%x7s&wkOMf!O4$+0jrLRDF;W5K{sr=UCyG9)u5QgYY$UV;2&Q@U>S=K`Q{sQI%v|e z$>IF-d;66Nt6$;YNmfnhvn2M5IB`yHNS-5ncI$YZH+sMB*71f1E4rZOjKh5JQ~?OU z`bl41^sygh;T*A;N#5bEjT4PMpm+)1j?anHJc{^2I#YR~=hF96jLEmb6MF0Wg>g}h z;ZlJk9I|i@oO1PE*v8hphLjUSpE1}ibD+_ZLr0gMs+kx$EgT~Rg};zjZ-GJf#|uq1 zgBk1Io`eVbeK`FjO3bt5Hq)dC$Qybpu)CvoAP8vVTwFL8@u51iV}(Kk&?z&wIXQLFH($ z0EMhE`Q}4T@WNFfQ0+|4y>evA?Kdd_s=T>_WH4gDkdF^oKMwdVZL&!o)nl{zndIvYDM{#IetroY!T zkD|&*TO8q9ZK{EZz^%`yCY!68r~gSFmIp$8i668fE(j?VvbV@)hs*O}7YhaB!j=mV zXVVVo$*P)ZdlYuu7YcGa*_=klVClKApR`)8`{%Px+kGX1@~N`E92GyhO_G zVJORBb&jVNRcEONMLW?S$B`2@CKe=TfxnM;3VVrzWg$v|-HXpnft2*rdkr|Q7nc~o zy%1Kn3dpDBZ=U!nVZM_iMi_XHah*FQ8aDw1$9nO(yOt-?3X+fg#l zoo0B?F9t%X>Jdi4A;!L*uht6>uwi z+Isr$=dsww2LFm|1oHL-&7SOC5js&2p#W8IMFJb<_1MuVQtzf|n9ZdMu~Wu6<2$J7X(n=;iq)Gmi6K0yf1_lS$ss8_KC2`6%r8W zS;-7yfH=bE#2(C*3laB`t9h2AXVQs(OrSBC%vVYYJWXcQ{OEX0tl{`7$0d= zYPT`Z+S+rxhq*9VTjHF!$&7$5+Nd*&?l>5&_yGo56 z5b-apq;+OwbYb(REjgJf?-H;a+Z=`)7xlc*oD!UxMO&l%%>>hTJ(~|JWQjKx{q(BW z*4HGommkeau`utl#DOPk`9aqd!Lw*`z`+rvTV?clo6`A}XBE|yFX`mv+ya5=OVgN2 zI^b7R8OL4J{?-;j#U5_eE-uuZxkDD9KmhmBSf`Br``kusO4B30K$#}~cbi;ESu?ns z-y^GO_ciwzOzzs$Z~mw^&bXdiDd~8_D%X>cZ;?wzyR;BFG}0=)taw*9)^ZQrF}dr znPAZ8QgOr!&McM&TELaPT$Sx6vv}T$xz*lQ_vIkhCeoz~cL0j5ExycSPJ_s;(V61I ztgFww8V8HqOp-sZ>`6H|T|B$${dqEZY$k5c(JOz%gT}O0U$^|3)Mf%+`3_UBNQLWf zJ7J8;K&lV$s=lnO(q=QkkR6j!muQL;3el2y!;y*;-{t$sQ9DIxD*8_1qg<+qvyVT0 z+C=Aa`@n&3?t-<60p_AiizXOMc5(^TG_I#ENR(!enOdA^x{YM)lfl-Er~d1n$Fy)dI^lh;SNbEwW6}pg~FiZtd!{n zMA%^7mxwvQbxqE}+3&LeV1fGKM@b32-XNtCNczQ!9?gE0)Z9KHYG{(nc_Y5ANMa`A z*ugp2L+oZJ-tPA5vCB)CAtfgOCR`i+%9N{vKz43~H7LI(&7NG~JEX2wd9M7R6M?EK zRlZIQ5O5YZw`Y!((jLFt@_uLcN}|IpM9dtv`CdPfdbGPGZ+I2dpZh$VMt;`Plt97$ zh8GPzNMQ(sYS5k_Tqch09Ai68c3s@cg`Vc0ZpC$o|*HpLLJhuM`U z<%~z=n79Aut4OUqINoxue34hQ0POsGURROhQR;IX>EGIRN8aIKujohYfgq>lMcW`4 zWn_PlvSXgwOX-$yS~@f9yc{$1#UxmPjw-EvJbF84KB3krvcjPnmD3|>==aE^Q+eW5 z*<4m^)FMfTEp3nV6_eZZH-kxTEall2b_^zyr7u+PIEVml# zDGz8jS54;RAW?Zy;#maj40rZ?cNjlnat38SHs>rqbftAr;atw)U`_-Q+i?YFS~Bs{ zW);&SSD3pT8$G68Q_a%(OV-_z19~8BU1m5=%NdG z$kt0ce)gOspNl*1^9i9s|0UI@RdavXmTwJs#|dfyS%?CFcDk@|3L>)%HG3MYHso%R z+!L8GM$^%3`TwB;(*!|-`N*>FahOzm+OKzt%F4q^-P9ft`HdUcKhGFfjIbI;45Q>bY6x0+nL`B(3$LSsM2}9f@ihX79R=K;#ww97T3AAIFOQ=aa93^ck^ogvsHPW=8g6Da;vN!9T4nJ0%3m;q}&iF?z~5UPUpv1lvo z0YjqhcIuovV5C6m4H359??*HO9H0-pVP*0DzVSzmdSAlG^2f{)pvR?B$ycQI$cT2Y zqftEWQOktO-MZHCaKNSQQ?1@qZusGdpL3T>LEqnru_wc4rp5~pEG!iZUFc8bY>B9p zZm^uAK<-VyF>eo4>FH46V0_6I^kQ$0hYg|?+H_m>$B$7yIkr{XKLEb94o|px64oDw zVet@LzeyGo-?Ih}?hwM8Po;lMLrRxCLisdDo#da8$Hc=RKu3s3W&P)6d8ALrdCd1U zc*8pXw~6djc0odj^IQ!~MMY)0#g=rJQBttm;t#XD78PBz_y54H?O>@9nGanG7wpA(!fwT_|s}DO`!LRJ|JQzUi?EKX_e2Rm@2IWSJWuz z-)Da7XD|`}D2Yi!Zca~vi4TgdDbv+~Y9yOb8&JC&MFA;TVJ_2~$;Rzc?==d6=|`7o zunHU5?``8wuchQV(8`rg5uzX8F%JH-wz_&o%Y-%c6}gGK;*Hj>3K^ZXp_VH5L;5!f zni4_4FK3UQsTbR%)$+QO*zM`P;R-PKppt;Gyrum_XshSmY}(TNd&RTaTd!Qx>lmmN z7M7b#tT6O4t)|fRR?0eVEa|dW)@Y?K*QQy-t+KH1vv1Q12;h5fD>zNU3{6{|>9yU< zdNlMzg!?4vt%{=(`#DGD5?SfpcRR!TA5tJI$XlF|N?6z*?4F9#?RM1CZy0Vl|4p?} zMMsxm!(LXur!~DdQFr>K+aSqB8W6o!@)HWD#Yq1+y_P(d@yvAo)t&l=Cfm4f-?i;= z?cF2UA;oOK#W?bsbKp2U#|GMdrx{R_nLKd zSN?V%wRjzEFi25X5IfSRwBlUnS{Qq#aS%kJSQp0&<-aA3q=BFhX|M*0rye+{N6yWS zd}RE1_D$Y?;g7wY)nBAo%;aiV4R1!ez1^!#&5^*Fqx?PZ3oYdf9aU1L%GqaNQ7wPA zd@CAaNeAhi)BkV`Co`*HjEI_9lNMiJ61QYYIG6K2Jo0??=#S$j#zOK+J%sFT>(Sci zjI9#kWn$s~E6DF4K=QuFEzLR$(zbklOcO4z%qd+=O!U(D5#Fh5uWH9zqStpL0w1`G zxtvVZLky2#jE>_x$bEk(=@j(OKV44>`tnb zN*;%FhKLi-=Ta}oWfC5;QfwQO?d==&dLFd!e^b^)=9!HGs}-{j-2Y6q(<%qIL+LCw z_sW8ZA^R31mvHH}WsxX^pnr%vN8sb1N+8OzOS z^I)eH6oo^yXt2uhp~r2X`Zsc31V3XO$wJ2X!4bh(+=p`q@;Vhp)S{X)&682Ost0y| z;31W&PJF=Q(Xcl$GCfk5>Vn?xJGL~qbUL>S+{E(}Dl zbP|BofMvuDKSg_6TShU0qR*ds*|}KNu{r%RtYQ@Ohw`Mp476XbdoJ8&T)s(T`cXurNlF4kBSoH7d?)T33T!fbht-Uns*2>)MF4-$Ea}hGi~|WJyvuX|VLQ z1stUGP;lG$+&J1pSMtwag`8g=$%3XxmTdD)u7sC<`-p88AnC@ICS(!!Rem>aWiXvt z#V|FiW&W+Emwb7xsjnttJ*4VP{8(pp0>^D+6&dmDO$3R%qhpD_f1dDy(>r34A_^kW zKBS~uE>?@y;&H%cp+%QY2*f%zKxZn;awmaBRZGd1NeXE(&Kbd0(@P2jN zE&E6Bg%0*Wp{h@)sU%pfhG7CECYaEWzq_q4)%d;dG4_?HU89?a+j2DXN=xov4ik3X zb+WKSj;=al9~+GS@o(1|GP-}YtO)7+^h*h{Y@U`3fFR3zXx=i%%wXJ_O9&ifM=6`d z@5|YLz4Ut@kDJ$hAQL{{!J@#@JO0l6^|BB+H6-tHUjSmcccsMOaZa>7w|D+;{V}NW&yhS^>M+Sm8BWKj1=vJeBQ@L@`yPW&&*mIThbv?a;Kj_S?vaFRyPJ zA!=)Dt3je|d9BDud3N&7sZHj@S$3mbTL!QZ>(%?)A4%GDzBXQsSKyjN}j0*5Rh6kG3^d8GlmI)s=lbosT(o!c~+CG3LM zmN&nJ9Qz03VsL{zy;A*`i&>HSpZot?$1RaJ`S=rfHkPN$QK{}W;I2o3mrdc-rjti^ zs1jwUFk}NDhY#$b3Pxyo4lEC?!|xJW@_WFXzxq4++^lFe`Q7(T8aey%Q)x@3)U+p; zZ)l%eXGQK@f*nw=?(YWVG0UBAi+vRtr@tiT<>hlf9&r=(q?DxqZH@O^J%lPoipjOn zgcw0F9|VKAoL*1$!(mPDvc7zNIeGkzp7l*e4(0SZEPl zBp!U-8^hRypa0uibI$YS;oDX}SMgBHp%t61vk+(+OXmr)b8=$A=ZV=Jw!m*rK@fU_ zbXLD>R3M1Ai#*u$IaI)+nYYs82@JWWkl+4VTh2=8rHLl&=M6<`y8$Oel3+)E` zKlmyahJm)%Cc&jCDJjx`)SUd^sb18{cI`+)t4n*i$S?>ZF@!}BM|PEYiB@^+HwFah zynI>M4VvVjcg|4xi~jN6^z*nKxI4c6`&h9>HumhFq)>ro$7AOoSj+Jbs4ye@Qu4*W zs=2+P%oT%VH1Zi6 zcx}ES00RH&)jQ%25s}Sw5)zmvAL5Qgc47z~@EJ9t%Pr8m#&z+p*BURZhq)k~jp?XV zCiW)jI{}lk_KDTjpRnT+zWKkJ^LBoOf%RXIqo&H~`o#I+&m1_@h|hYHq1P?x3UiOX-G& zT>lx&;rQg6U?+$ec78J~bg&_`>GvKfzWq00Q4S&5A!_oZYcl!2IvG8$*qn$MTA4L9 zRXw6jUp*VgH+8N#cvyf3L|q~P-^8c{hl5gg4GjRYhGQ>(N5 zF=vZeQ^^9dbCRbKLoOBZCo)4|(xg33rA^8Jv9_*=b!eW;j?+|De)XY>bf4KtZnPr4 z*;)oE^STD332BmBC7Cxo2ulf5(CCw_?e%`1cL`?7>PpkF$9#Nh6cW?@AW(H#RF7FZ zP#GFz-#j@4!3XCoBgnqC|C&LbOrK??%I9(2(!TVHRKPelhNYi9(c2;X8Q7l^2Ff<;PJ(gG(%gD3`*}e9ky9%Bx2bNjWO3tc$b%Fnq0DDoiRWqf3ZsV&(#1zW*2BYcabog37evl z-z*s>sV9ZCfk{J%*^d)jR7QszZ5}+V(LN;%*r6?C%u+z_lTKc}RPf@}UnCDDK9Cc$ zkCCL52;PcA0x>mjA2}#vSQ``{?<6T57_>VWKeh6#b1%;G-Ym{^0(STWimXKops-@& zVx*2*dr>g&7wf3+^z{%6m!3N%a~ddU-x4+y&IElFX^@y!t3?+}jjar1Iq>Lri7B*Y z!`)Q`~8={B8&#?L=&o{+pnGvWFHb6)kptw#1j$ZTMt0 zWU8%xH>f^|5*3X%x%1T5f4Cwxa1G*Cyw>Zi5i3<7{zgQG^VcUu_J<_Krdo?=O*JuZ z$9ZC6{$8m3DkUW3v2|BurBBF;dD}6#nN1#_C2vRY@xq>)t15*XJ?2x)ggkZKezqd@ zd5fjAHi-;{p0pNNYgZAx|5Plj;60)4s^4z;^rNEsSk!x8{QH-d2md@z4Sf+#!_?xJ zP9eH8$OviUPEo<9^kdQ}?tpRM+7XRDY`H$bvSCA$Gm_M z--aBgT&HtA-wg=5!Grq7PPcpq4u(NV7b$$PHBja{Vz3` zDX9>M*c@~ff?H#-q}cS{)L+u%J?)S4cv1{#a;V5%7JG380I1yI zMEbZZm%d##l!VJ%E#+bI;o*T%N{ZHcAfdm(aYk)_YiEa%i3z$y!)*y<9eJTcnuSFt zjZ4Y@O8ARgQOyt51cv1ym-6&1>4m?(@{2$ESVV$1ENy`GvO zc9bv zKPn*bN1TQs74p@0qw>$k^CNzQ+!q!W4)OHTSglaeKJxV*y0Z6~7GnFg0dLIPGCE$K zALg8sLw{6OA~)u=c2-tm6)PqB%)^Qq82*jyc6L;K8?xyw-F55Jh_;Q|3HxFCIZ5#D z@~Dm7Ay|U(8AVP41&a(JG?Sf)$lcwYyMD@gr1X6kn{7bUG8h?XyAH~O#GuN)VYGcG${)a3haP!{&-zdh+>v#?z@J^5AR4saO4mltT(#~ zOYK`CfC#R0&1VQIt|S?*nH(SW;>yZ#N7F(_#VHu!@4?mJ&=61Sn2tz(dO8Vx>!yLr zw4oe18SudpxKwX+S2qa{LyD9oCky>%BDz>!4O@;TElwT6BT$tej4sptE_?S!DC4FB zpT4kXo`R4Br2r{-6QkajduC~m{p90;dZSyFP8`3tCZG`{rAy5Yx z|053}2i0xuuz%zN6%xZs>IvBWb% zt2O0sklrOY{+(+z+3*2)f?!xL7NW?!Q~t>*^Nw@;JZ>6tizLDI6T4tx?LZEx9={+c zbhPlaqRliLc26-cdR+9aj3)BhV0Fp9Xh(C>1Sik zWbFCbFj_|xYjZt#L|{wX`k>xF+$aq%89=&5$_@_>;{IK?Y7K5SEiA|W6Qtz`D#dPb z6g3@uA!k%lV5mvVpPBV#PDW*-?`CxVlGS2r9*Y#A8g#qj%Omv@{Y{ncIJoI!Y{k~# zeCtf#q?S z@m7;gVLz$DGufI6N~|ZkpCr*z*!4BZr_{7HH)Fsf?yZ*AyV#}&RuQlBR=9&C$#SEk zW0oB0=mIsja|-oNf8{sx$CS30IqF!w=8u=A4yrp;8?h)NO@v(OoNqY4YXAkM7kq!TCdXlQ=_~nYqOGqFv4)xJ>tnM}FUI!9Q1Wci4j0@_Q_^JLCMVTIXFKQ*_l-2_3@>hMeSHD8D!n2LeeCOsXzDID z$6lW)`9JTMjhLLqW{%4T{am&&5X%Q@&e?5OephEW1A_sRXuZ`ov&>y@jK%TOR25R9 z-fR(E%k{w-jhYXjMgiS#*y_%F2wsq5)Gq&0tj86lK{L|f0>M2xABy4rENImmb(7Hs zOB;&6^KxGPFtu%_*wwvM|CQIZX9E!4X(b4hj`eVBx zRPQx0H4P2UIh~btnQ2c*)4FwnPCJ!$El-AkFHR35gIZp(m9Kw6?&J`qbBDGa4PzC{^%{T+~+HNSU}?s6g++^lX@_I zJ5LbzvymHUV<1t<-(O_#y4Ah-G!jN)Y}})X!pI<}#YV(UhBfZcfQE}}*NFbEiiF}7 zRzvm`7e|Trxn;%GFSdno8j6_GSu!Gv*HBmW7=^Pn2*Khv&(}n8xR`}6b<}Ws?|IdH==6K>F)Td0Z9wW38M#2o(SjwYVLZhUAmjkKZ0m`ybXmm6hhiOyNa-(KjNwI99WqxmOZ{f59J~j1{ zI+O`=Xl?)3^c@eF46Z0VV#<%Z8Q{9BSd2KM2@(BsKDgP6CHM*IoP-rk%oDzA3)6+^IC%m#5~Es4M-qgIh2>{8F@{LU{T~0bI0pc!Xu*z<#rYG= zBmIF{Fp+v$j(t?7FRB%8;e?_hhA+`tIywZwXO}Mpx9{{DPedL1xC0iaP~BI%5UTIa zF3=OBy9hD2t(Epyw1djVopRyY7O%CG#5sN;z&d5ce+!v;7`zH59O`it++gc$uED;6Sx(%*5BxAQTl| zP1Fq#!bnws3fi~z`RyqXlswC#$&H?xoIHlvi;wpe#I$p{fzGfnsn-(RD~GEdQC@_X z^k2fg-|FcC=@|0R8&;ztE;)rJvH7{^1075f?ZvG%h1ZM zeV1Rv9SC%_a!~&uK4^3ZnZHw;Aty#lj1GmhQN^P$qC{XRN=wuIu1?LG!qyq&c08t% zACUiF{92YR{r?4RWwa=su!QQ&k%k1{7iiCn9|`{ri5>}!-^-t!8i2s#?J{Eghhy-{ zw3O|caB>m~01uDGe536%1{+<1EI;uS){`Di?y=3V58t**I!fCk_t-LKjR_0 ze^U6_2;lL4^p{tMggZbabI&7=I=jaaWPngsk`cRMmw(gi*GDY!pLnlCDXD)YR0~!l-YE+{Cm1nPg7$ zn~&v1<4mT6h`fCo9+DC*ihj3VvE#-LREPNVKxHW& zM+_byD9=Y)ZcIQQ@&I!aSbJ4|tw;?IBc9hm>WQ6pI*r$gxhl!?DYgD&A;v%U1o3IR z^ioHry&;iXaK>ndc#G_C2N!upYd#FaMVeiU{`9F&Q!4kEMG_-|>g}$ryrQDj)7F7e zM^LjRthx6PBLZ<^V!}W{xpM6m2K#ZNCLhHvx%gz2bgn=W>~sI)hubiQU75S!w3x0@ z!m41dG0$3@R+4O_z^iIm6Z6qXJx3jLg(O*9h)0eH{_76C=v6`LQKIyPDXyO0>_!t} z+HiOx+F$##aOAL(d&wqkdSWM%&M5Sy8O!h3#&YKP_{!5WQ?!*;j+-lb*lX0$ktS(e z{>fWRUq>fg3Kvsa8~;M{+cdAQ1@i(kGjsS>NRxS@Y$5lVbY)DE)-v8%2(UVuD+YFk zI7du?p{C2hgL7d1qJ{=y-(#=kTwO~pwyijhEHu>wO+=3%f)T??v4mF&fdHVp8|Sk? zZ`BiAztjRdUaU0-9aX= zGrEGDfTrkGe@AbIh(5r<{4J)j&v|nBas1(=6Bi&8^88@iO{t;j4pMj;jkc>A zA~=UKzTu8~13`E87pWZM-A|BUG`aqif!^=)I`qk`O?Cx#AY>a%CfT@?oqyWPWs+Ej z+MFN~1}}ClWac16=%y&~5($SBFYK19dc5FK+j!`)-1k^b$R9pC$*ZWK=Y`zc-(QSL z`3}NVzZO-YDQ&3cd0o+4dH2dl4=|yA9s=H35>?jwB`PLCpTzcs>j&F?8SCotb z3vpGy-FXLAwvVG4htP`5Uggzp{xQlr~viTSoHkAWWai|LB7Z%=g zlg)}JnQ}&TTjF^?;|}csmhw^Ju@~H5!MHXnp4X&1G6vn7AqnjcE41&`tub8$1sGjy z&>SdCkRf|w?2_t#a2o8#2LG8oSr;XQyUV?iG(AIbx(PibC>YFXHK4Wf2)|J4Vw%R$5!F|ih{hSJi(@}|qZNmO`Y_VV(oFJP74*NtQI^b9a^Cm=iC5(4P> zOI;gl%1a~Bo4xK^qj8Q@-(+LX+#dNeqVFUii6gvzJ~e*5-{0;fdNE(<<4i(ltNi3o z`Pz2EY9~|~F{{;VHGJ*1wA1B#%Xd~tL@dS(Q z*6972|BUf>H6wYB+O@xFpN`|2KGQFG$jEyEt8uO&mJb(Ghf2ooSOz{%Di^(6cI}m( zY2JE?q)Zh=u1|(Ok63Lz>~R6^TxO4Jb$WIk1BE_E=b5tD zDuSi*COoc4rwgSPWn)de>Zk=8-;CwCVK1sOeW$!16qVQ@_v}|j8;Ose<5S(n$}LQfAyw_$874o=fIQ}? ztJq26R7LK@;ur>{Zy~M^Yo0(NqLCoWIEGLT^yp?$7?mBa1>{KpupG@1QP$A-wf!f% z_I)o3m8cim#rB`x91%~qqj>?lKYqwePCuDM(^vmlWbuC?;eA|Bh~CnivL-sDWcExq z++9fhD$j2Lb)p7&f(6<{G@}phqVdB&J0g)IsBK1AcCJG$DbND(d1D})xBdmYyWroZ znT~CJWKrRFUr(gJG~h%Fs(Tw6U6WyA)xE?D12S9L zBV#X-k^vRrvA-qF{6k103^b!OC+g8+g!5QGGQi+}oQthQa_h@IbEjoOpF-xsi{(y3 zNljDp;xNoS!*0Q=PmmZe`qBqcUGRz?i+fGYzh5;~K1n%cHvyQyyso}DcR2wqi4 zfr@V;y<-CL?fT^iXb=1z&3Kx2WA!cvP;G9_lJUDI%=~HIZowzZym&+OBq&t=q^H6| z8vfmmnb^UV0riKa?f7P+)C%^9x%4v7cPkLk;YLOOStI=ik%o6}3%@V+m?!m?4z|F% z4fuqw;NzRr^B8q9or)hwrv%(r3jnxfD)KUVXxrU*wZ^>a5m}{MT4j2d$@Z_s@f-r) z{Edqb;K=+I4zDbZMd{W<{AtEqDzZJ3Nyvk8YXPF9lvhr7{fZJA(~CVwg-G~1OVSc} zqIg5vjB1d5w*@zS2s0Cv44kJOt74jFQq4l}jHi<_F&xb7t~s@waz0;D-xJd?g!5~1 zu_6G(`ba2!*al0Bv#LOu#K~1c#qoaJqy(N3WsjA`yi0JGF+0eWE2k_?+D9>nb|`8g zLAG$3sw>Q7k|oHCWs;`BlB#^ir(y>)SN2ANfB;sUCj@|xAsvpO)q;Q?UGsnK^d`d- zG*|njP9md;d~_%$J_7?wOp@;emrK_4Nx8)$|NOszJO>LnWWT8nIX5x6#77ng{$>7;@@x323qz?8=@*RnUywTsuy4?}fHvai1dtArjhu`nRp ziB_X0JCy8I<($7mb&X^dl!vk;28N!6i?Y6HX|?#b`n-E2QJ5q0Z|PbkIBhiF7e-j>DL6a2g z>0$45>)Y7aA;crhk)9BP#&fU*U!RZnv3t}9*GkZJU~6862i%`wx+Bg())7>$&Fngr zaM|1^0xw^Pm;rz$#vHJzf;lYu-Xi93%#Tsk?MmE(|2ZVyhXo>8#U!#$>f&^pk5CU& zXYv>hEM4CP<4tyag)O~b+2;=WnvPFv60r#f-~YS|DxI2Ne(zdT(}wey6z3;JaBXex zXSl0P_10&}c_q&pS`Xp+#gkC~K>$@xXEQ@vDe=O_ia}P($Q-p}Hpy9&27SZYKJRly ztzesDS)KsL)9w+vjHz>eKBR^8(1f_)v29p5t07B=nQ0uh9m;Q9u>A7uQT=v=pwPeS zkwM4CjJDr#i?mk2%2eq6zH=##X@S65MMk{aXhUPe$daM{&R8$9&eM$~1DoFQltK8Ro&!OxOecTDA&Xj5x+lP<@3EcaR^K_2S?HfrPZ z^?yrkZ!keH=H`6Jr)=zWZ-vog;+78t%(VjEiMF3D@wc4~=+EA|P#hc)rO$+!*e2$-ZBQSyAAPcP;P?3bgj6?^%A{4+#kv2W@plNGp zF606td`FE%fwS0_VDjRNje_i5&@mAeOp{@a{JR6$#XM?G{B!QWVo(YIG5D^qZHt1#eh*{V2 zXTj#79jHIhP&fIoM??ju7w~~#+ny&MbUcforVp|KGNGP?RGkm0 zXHZ*-9w*ijqyq%}wYy`c3-N=-zf1Pi{RV{|OnpCn-{i0#2BrbboB@e073TwXkS&w5 zg(!<(6P43?>qR%anlBfUc`<(2=kNarYGzy#arjGxy73h?&j22(VI);2*}5}&3YJ1f~yG& zk{MP58b<0XjUu;MguIpMZW~vdAv6ENRTi`Ta)GTKvtNI*8`XZta+-Jlp^SIg|Lp0u z^9=7rQd^rH2?&Zd1Vrd~%WBOe5y8!f7R|KTNDi*8n3vR`6__Ki>g`Wgz^=)Np4it8 zH8f3?gl7}4)*xg?NeStFzYVOz|LdAc5ZPjIn2_&6=an?ONhm zn-=yoURbt#G4FBwf59BH9Ayaoe_Pv5s1gcKUyG45o1wQhHa0aeJ)4_0Uj`2IY*wg) z;rDSd%VCDwp}f4jyR#WaJ`Xx;%wO_=Jj)lwBkV`swJ$DvNH0$>8BdInSTqdqz3h^o z8Cv@1&oZ=PK3Mh;u}J{17n^iDoUL_v8MK*oKFan^B7w4T03Sbw=7z()*)6P(Zlemte764~gRDXFT)4j-B@INMQRa1u3*n0H4Y zri_`(_Gq`MhN4v%{MdIlanjMzNy^HKRp^am6c9**5Yrp-*qq`$W;|IpdelnDtOuXd z(`P`T?S61CVP)0*g29!!v=d8(HWQ+%it*r<7Tgm*PszgCRsqUz^&DKKUyb@eKmc3S zM@)swBt>N$`!?bWo{%ICoLo=oM6p}hDFICahqnrvV8962CvbZt^YCE8TCtT0`K^Y= zH^@ltsr$wTx97H+wgR_^NM@FZC(HV;fy`7wnbhQQg6nnSV$01w8VOr|z2Z)ptt(8U zGsT&ZD@8h|TR-q`+v3W4wNt_{M_OPsUlJ|1L#kEEXf708Hy;2})6x;}e2qjI89#=& z8=y-*a{et@Oe?lrbpA_fIJZ)7Pe@HV17Qvafk3nM_9?@CW0QxiEx5AtHxvl#d5?e_ zi{|k0OMi(Qz>SYUuZiM$eG%8<5+=$cs;2j_eXnEiE)p(Bb`VWwK8@QDuG^4n3iv#; zI%E_#>*pNM7rYX*zP`R29*!6*-rDo+I{_)F5>hC;Bx<3vzdjnwy;sq|k0l;LIV1^e zZ;olX5-&Z^dG-qj{va#t?mpZ&Y_`f7nzY)8j4ztsi3$a3URHJh?)<2V$hGEtkuy<* znTSHb6H$4+cXfYES~-x0OM0_p;ilRP0H!A}0AUNQ$RS+TwIGCx4LI`t)LXX02g8;E zR>T#_LdEaaw2L9=&MQ=XkcYKv`}1BEtIPwG+O)#u-yIeVvhdrPd`{CVV>IW14G*2*uk6BOJP9`%Kva9BWm48NYV=W zd_abuG~qzv`{4+f>)ZU%Ja&?$hmGXI<=DENSZ(d;Pic;VF_7mF<^V35H`3(f@V}=V1SkWYQKUDN6;`9h9^j(!A98j=h zJa&asz55sGJNMnzpwelxn<&!X9U{L~hr5ml_Yy1US9)WK*=KJKaJZCvTF=1nh9_dI z9ZEQ$DP0WNYoYv@n1~zV2Vwfwr-T6f|6&5)m};>mZ?#Q-b{blV5?tSE8mc*D-x`~s-=Xux-QHx3Z|8UNucDY*qWT0^R)Of5D ze9rhnqF8suD|N4Y+N4)yP+VM$v~@ni^B&?L5EK-o73qB_X?WTwG-I_{Q;3F*^Xofp z$-0BSz;oOC?6*#y^d~oCl(02;LK(>tB4X9dBbwfBQGcPG7MS+CoROQA#2eF+kO_q|;Q2SB4GUQ_E-%aF7d)qA}i>8I2&j}7>V+k-~8sroil*den& zn>9HbIi40jfHp2Et&&fCT~1V9Yt(vwh?4FKBD%B0A5JqcjuZ_EhJ zr4|O7=A!#tJGv|9>T*x0GlEd>-1CJ)5EG?H61A;m=bp;)7yCx-5(YU-}p9pjZ zvs@PUFu6S+{>Yh$$qRWV+AtDsy8fi>*u&)1Pme%xx{gtYn0mBA3MAdm(TrqCn4B{4@?$#B;tm zT#-WSG~qW)eGj(ktkwx5Y46@d0D{vnw2ugrQ&P&Z?tOr+@&?z8)HwSuE2!sLmxbRt z%m`@FTk*XhG)YP5U`g~C%+u*nvXq}E9Z#d1s4wvM2@ksM`K^UUJx#Ufoizsn0#Z8X z?9_|TZa7iNb2Ag_@wPh%G4%3w4ta>D>1j_ppvHrt%6AVaqdToT5}p$9Dz0=I zJM0dqp-q+CeDIV6Ho`^%oJg=k|Dc0jFPypm!-sUsA;5dJRlc8^|$>Ya0?C=VXf$)29u;9xx zB;-~4bBKN7l`?gqLg=hiP=+zmRWGho#v$uM6fP}Me~6~rO5Ln30I=LxAKcK>zsIg_ z7J5W|xdrlrpEHdO^HU}6cZ-W65Eo%mw*#n4_t&=@n$gRsoMYloSfe}n11;VMiv-VZ how%D`{vRLm^QHg* delta 10445 zcmW+*1ymh96MeXQky6~DxPN$&;!@n*-5nNpZL#8BDDLj=?#?Uj#r=Q%_nh6cn@ut^ z_fC>YX6g@A=O3s9DuCNtRnt}6%*Djn%F)%z!5#$i%uG)1v0r0F4V$`BK|JFkPT>yM zbN;A|`d|I84K(e1>aX>tO0~g%jy#5|3;P60c|JXeC%%;C#2-JO#P_wWb`ht4r2d9# z{j1TSle-M(=jpschXBv#a8td`w?fp93krh6N!VWwKYj-+)x!X)(yUd^GJV7DlY3HL zGx0$RZsWzokALXR@@jm^%naj||Ja(&>01(kX{WivfVnkuvxJ>;ck8;%a-Nema4N5> zbnwkUG~LaTahX({l6@U~V%mvjc0Ei>!ddCM1^(O*rZLI9UHwB?d3i=#H!l#~GV-gB z+|PaIERIo;@p_=}#ZQ(f=+CD{Jt@pu_u(_ObmRFr6V4zSjR@y6)1h2Hwpgd*=Q=F8 zQi8<*Pc&%CLuYjOe%kPa4ccj1m|YxK<&Rxa0x!OP{NIM@)G@_2D5X9oo-o>mU=4iH z5@qA--8C%N9k+_nI-B1&>v-HIjw#uw>BU5y?59O;EH?+H47pS_=@nOV;z`Y|0@vr{ zpmZXMQ!W(I`^a>XehydEseZ$@?N>X&F zghb5>sT-E&w=P*DV&80cY59l<=fg$V3DY?S&V7WAi-f)^F#ymqsPwgC!>BT;*f*iP<#FnQAzese2t?ks6#2(&WtUH-3_cy}OCF)=pNVN6sK0fMWmtKrd6QF(c^-(_Xr z)YPbD*3m#o@Msyp<_ExAi-{ZJ;Ti_=D1v`fuvc6#s5fwNNe|q{lgz6LFC)@r$>Nw&)KO%)z`e6T4J3&P~W;6_bI@fV3pr^#f z+?b+MhWgIe2^8CubuF@Pw}tE3j$n#HA>#|d5{T{X6}=ve zSiy&X-rv93sSL`$Q-(7wCfACPmgOyk^UU3P;cu#?#2-&oq|^9BnDG4HS2WP7ox_5_ z73n$v5TV}6yE+0ukDF7IpT^D%v?(WHVpf*jRa%3q(8R=qvHD2GdU;t0A1mm%8$|HQ zVJE#45e5M@6jBh&gVwC2VbzAo^0h*Vj4CNYiN9Dr1OAq0%W%`@3=s);X)&#u6-0bk zpqf_^>~*eSU`DFz&>m^C=Ur&k1gL-#8o`3cd$=q!#3m+ejGknw$OaD&blV4I;yN~; zpkZD+W;@F+Eup@flce6~zdi)FJw3BFHi3iTkO|h-^3>@Z>*rwjF2Cp3JuWb(GYK2O z`O<@k?V9H{1O5H|(uy(Vzf^E{l|KJYBS-oWuo#CV%*c>&Dv95bzbjcRFrPm?#ihL}!fn%Z{PPng=z>8Pv$|HN0$kfy=w+jFO&Mhk_#`V$8&Q43KHkf45NPaseORL+SUIcBUX7ldQ^&D1b zRVwJ`2d`K^4GJF-c6NbTcgxbTqJibqszHSJ&fv$ySWEksSok@+Bt0gH{qqg;>_yr( zp*)#e>f91^*t>7W?wV+KS-Dqk(jZHj!0v6(m+YTyXKmP80j8z^V?v{tY;sESuFOvo zgAWfTAr44%la$+!O0Ed2tLbdY--3dvp?GyPL)v$Z`#1Sl@-ntI?({;}VSgmnh_0eD z!GWT4w8THtD2kpx>YAQT)_aQmI$M|Scsnk0z0Ngi_9`H>;`iY71GlYpey%=(I`Y4w z5xgZGb7VCVq`BAvLZYG=q8}L;ezSVL(-6sN#+SZp!f&u_-Yj>g#>8L>ZDvVljsNGs zk<*!vY~gZUy>qdPF6!3gN00RfN-afS^7gY1n-@R`=|D-h@@rQV!;P%0*d(~hXgFm- zc|qmtV1;kHPwGU*lgZ~zX@_bS+`p}c?Ck9JVsQ{=5DkH|Ym|yGJnk2l_$4p0^RIUh zOilw3rO>3tN~E zh`_|ki2{0pot*y4mvq|T+bJZBZ;Y%S;LnPCG9OjxeE8Vi3Q9CtXYa?(qemN;!M6ye z`6gK8g`&@fogSgMuQP6Y00yc14-n}*;?`k+emXSt-Jrm^M^sZq)8@}uTGp=oV5TIZ z5aM!!hv>>mH%-bz*hX@)hDR7_T!20Bl^S)_5V-Txu}oD|2#HK$WA^oo@3HauIh!E6 z^hfur{G=J|>6WyP>@|&men9i?_0n@-A{SQ#Z1ow^{zD@zfug0UJldN#aDhu6`&BGF zJUrM|+_t=E3^Dw(PzoJ40~QxEeBJ)!7f|~$)OyJs0L2V%RMSg_e2?txLq8Rc723CsSrWe zR9g@d4oz--{Rh+ctmSW>Dh9#ha#sk!Sc&8%stjpzG>5m|A>rY5&#)c(7+LG6xa0po zg*U67@HLsQutbR!|EG-pXt;w~BA|A)gS~F;_?sRNA5Zk%;_NdBbX)tOkqA5)%Lx)_ zHbR+9Uh-bJIG+IrxLb18!w2LS!%KiZ7>dIihJ=gEGJuj?y`_xn9Ct+d$jPDT#)bl* z$PrOc#56St*hk0M3_*1?BI4q(c+9#|7b}!{)8C4eYpQm3cBW5mBjV!D0UA;EUd?pg zRCP4Mu*(QU@!04uu5$GQzHpCl<%gM!Pe{SguQL$FwA?cbSeOQ8`&(|FpV5&zg?4*I z4_)>elDxHKnoPuFAZpe=hNN6D6Je9Z()`F~FS5zHtg}cJ`=vv*5^hf_Ku}WJgQ>7O zS`~1SZK!|EmtoS^jfew`u+ShOA)Wdp%S4g_0-?g_DBT7O_FsyWMLiTzmGtA#Ov3M# zqFgYqcFrLT7v$!4Q&S|RrAZkG+;-8mtIwP@#SyZ_kO-gopRP4c*)aPH?Ov+U`N<3QXXo+T~*)u*f9?>+u1fW&~66k^_T*S%~saBwIqTf_ILcDnUUjcl)~ zIX;I2rui^O^8tpygoDLx2eBAb-vnEDW*=n5`P040U;w*7HtPx%+cX<$5CuA|$Xgmm zuCHNY1SMjQtLq;N?CjXGhcu>2Z_WN4Hlmd>MIj^eQ3xby@bX$huJ`@h!-G zteuEZh8cj#%*+fO9bH1TdNfH6oa1x(tGd5g$XJ26*p%P;r`B`dNep=Uvc ztn)jI;4uOHkW*w)oOp}TB;sYL{bXBB^K6B`vf4Ij_d(LJOjl3=|2S(%9neae!sg40 zn?1S36C|pnr7C)WjD-G)2#dML3pEB@Uq8RZv^2WMi<}n;nu?VSS#VxzV7NZKC<$QR zSTZtwI#KkatNNV~l^7Ei^p8C5v#)k&_8ZpX{d6u>1wHd|ec_#7A(nvBA~8S&u@lX6 zvq8DrZ`)#{w0Ea@GzaWYr_2}iYL*;TO>l*F$e3L%4K6ZEHFYWh^cI0;7HzYUtdZoR zU{}5<{@q93RucZnGq}2brwD$4)#+^SgpPrs7Y0KP#*kSE#Olji#~579xK-Xl178@O z)$i+#O_ygUU-V%Of#CjgjW1rRMS> z4|{8U3lFrV>Brh1{@@#{J{*%&S$uCQZe3)QIvZKuKz*?Dk}7Heny~c_%;s}kv&GsJ&nf@>rF6y%FG*FOTKXRrw`IW!y5=;5&gmd zr%v02>}N&4R;Zoz0x$%rBG+9rMk?(T`NB34I`VbRS9)WStXB^dKVZ&}DVHGd*kY-6 z@*jN*Xx^N1W*l0n8#n2mQh;(lJF6Mad^Y>Fxwt7LcI5tHVYi~7TM@b%zKd+ithpm7#yf=u$rZ66H;VO#v^8wDMz%&N ztNZ?Q_MQs(51DTm5JPPlBY5`xO0>w5<{@6qJ;CC@3(sF4fL^(NYQu<_2!}{bb*r{jqo{2xewd+FX$e z|1)P|m2aoE|0xOts z%F85X^TgzWI-=g={l+M`-TL@d(@n5?CXH=7Q+MqTNL`O+7ha-DglV55Aj@6r4ws?0 zl-2ZfMb9q03CjBoGTJEV-rl%chuxZc-O}H`&L1G8l>W-j7k+!%*5%FVX&OUMkz| zgYygQvnQ}cZf&)z%f}gkl~+*;T%?3&;H_H=DX%Ks;4~I%+pAwqm04ScB{+$!XIFsw zq+5SwS2*EB9qsNKqdwkoL!-W*vjJ5Fwt3K&mBWzdAq#1oN&J+sdmQ{Jem)7@u(HQf zQe8JX%2b-ZXd z%(kt_-8MbTE(-x1QogH7!;5g%uNzVAWetdE$7986T$~waIzgXhUS8DDCL)MG27N*g z8J3#D1JN|Ei)}(Ix>?af4<`01GJLCXDZji79VHCf4>Ei5i{Qe4%C&4YXtJ9K6&k*I zp6>a5AH(G^xEf(m(?JRXJUg19O~Md%%~$^8J|o!lwBlJ$ofg zRSXk=MO=%!Z)n}aOxFn}Vi^z2kBNLG@>5$THBuAfu;=6^cQ-`@eiNokl=6QTij_xC zrZ2QOiM#qH?bFjN&m^RK1$BBK0E?t#dPkg*kwkRRj(rs=u5l{aBm702F6vR}bwMTs z?FgYE9xE~L!@SVfe;+^twi6rWNCJw(XUoT9NDGSPUR@tJUcG`G{0{bJbZ&F>DV9Vt%Y2qpCURC8hZ2a zItU5WsH(tR^{8E?aG-B2r^N<&4&QvQu!3?+2_)w1ST6WZ`6YiFkrGO6jn@uZ{IRjL(Xz$kveUJ|@h}6#8t= zME-_@gX113Qp^#8EX=tD1qBivP|7*F;#!1reNjJ#9Z9>OKzU#M+PKP)f2Yx;_IM)9 zX+w3vVt1CWJ1!=k*6csjDYE|gl_Q84F<-ZF_la#)p`h){thHl|#@ zc=*oeGyzH*eLr@4@kt?}Vz+x00sbzQ(-1lqmUCFfmIT=y56vIH!rG@+aEuB~IYsia z;}P=Ldx_KG1p68?3O>-~0MAz4t(Ws1WjQZ=S=(FT;{=OEM>!-cQ;o-<`kZS2rlG#x z=NX!cciU^Z6d*CA=j*jyQMCHn1+b9H3^E^^&=05XCTBy;*y6a_=Y)Lbr`x}aE!fY?YJVx|p_ z8X7*`2V+xK_G~tdnEr0%__PFlc8fz>>z`hE;=Y}}yy(~QS#_Te$A|J(E_G*iqNZx= zfPkC7b3Wv|-K0%@xa2m_#`N)m2S__7RbB9)@t+(B($dn))kZLj6*}QC2M|QTV!&&MVGwKtVssHb-nxl0N zn%JSLsGb3(+&tmcU)>JaYgj}ZxCb>U%#@Vi70+bQ$nfwDb2|e(6(!|d+vTBKk11na z3un_BYXle8W({g|3@W}>fB+Fd!Htk(fR?2oX~#TKlq$F6I+a>cup};*&q;{(x-8r@ ziVRn<2?Al{NQ-|_4Wa_$4$HG*ghfnzKO$6>U<&_QkOyhB-KlhKk*IIWYCPhK25G2= z+dw2+Y{Td+&CZ@3#wbF9yfoLcY-l>i!cE{*drWhVLL8AW>V4cf4FpO>5gMh0>x7jZ zf2IT@)`Glv@ju1z`dm>Vy9I;kvy8O;hG4WMe@;!jaU?{B3#?Aj-Qi;?9>DP8n4v+k! zq68ipM%Y%lw%`h2$YvmACI|-_!gxUk%~87F?MmM@Gm5fjM?usMHA&{koYu4 zU_$9ph>JtoU*sE{x@L5#buAy&cRUI#bV6!I73H!UGP5_%c6cK2tl3OKtS5$ z#qYc_N-qIrOSv_{nTV-xFy)58QO}-QGwEbVPi- zMb{tTWmbC;2ATj0I-tCqG2FrSZJE>`by%x;&%*RXz`36DeoM6+aI*Jmv={YQJ6MvC zdlq#H^;>~)#++UMP2VN%6e>OVUpZG`=9dVBZTsi-7mr}S43dN}7nh^c2M_%8tqcMp z?zp%}#G1ps{-L3{{?E?!zNLa>ooI?TLEf#v!$5Q3=~aN~b7kFD0YXysq23dKvI_;m zkYE9^8#G$2dptmA(k+i=)5Ot=yHapHcgri$pGca(qB zT0yACwY7ASHCgXs~{ z^ZT}01GFSjk=y&J`eJhqAQ1S~GKtf*;sgBSKyIx|4m_MUH{3XUEqVa=bpq_}un4bE zB}oKrir;yxH_vh^0tK)-a#w$5F5C@s^7cv6o|DW-3De*A#KGK)7%O+8sO1JC<&;um z;24Q=@B4kw*rJW)?yV^?h;#2b7ezLt*q4;mTgcJ*ldDtNva7v5n|Q>wEowebmV=`2 zfX?X{G*!Tv)!Na9!Ra7}qR`wKfwYIJZ;IR!8Kn+Fz)wzwFaV^*fRD-h7LK#kle^O$ zd(!-9P{u}90^^1zbb8W#>Yn>Yc6-oGGX@7KJsW#g`EpwdKRd_eS0W(#qodLmgW8a$e#Rf0RDJy z5C27}AMC98V*`dp5YA>3gKRUx@|+_elj-xlPV9o=pF&Bq9VhBIZWh6j&L#P;8!kdH z$)U;SR>`59cbQWl620wW?Z{wNm!AI2S@P(ZgKg#=thvr5B&BaqjvdNI+3F=CDg_w~ zQ~>r1wdZ+biy^xQtv;P z#o@Uc=_NrE8rx+zCMF_w6&?Yd1>0-hXrOjxbXeB`E7P6CmW<1&@L5_$?^Ju0IK%#5 z2vQ^tM1dVN#@N)+7{P6%m;3h59yt1QumI&I8c5{G!e8zP!7+Z!lWS67v5{xFE8{Yq zCQa@_ykMre4Vm4(|8x4kQ`-)le`nUF>tRd%0S|@0e$@r`78X*aHmyKV;6H{;f9xGF zRW|{%b8|;dY+w=Yw+Tm{<*Lfku(spw_m>5(1?G2jQ*Q)_p+`qYH!}s2i9jP08YBb3 zgeDnJ;Metf zc)7-oK!kFP#P4p%$;^xyk2-;DTHSy8*%aEzifx7pq^^v$C0N{Tj1BWfX&_-5EsUxO zp3BNRJF_dRsMJ_4I~Eof1GN-?7{X9Vf=Fxq4^x;MXrn`aDic->P5OD8Cp z<)=kj zREf|VrWjCZ$}JNmE8d0GdK#0GUve+OE5jSWbU{5-&1B$zFaTdz0hoqTwqfv?ZiYZ^oOm*>AcmVK2yDIlAn zfZAGJcW|+bAQe5C{xU*1C7buSCFjCkUMVw1EATF>+@|aL{)TUJAF3rWojmUT6M+sA zc@aWZ*4vXsuxlI%h}G*w${i*ka*jl@)&0kxyQ$32K>tsdP((Cz^Cpf1WG6n!ct~AY z>zplE*np0AK7@crA>9SEsn^NKC8Xxcj|_7@kjy9r&qlUl6AY*%4iD7**p4md#fo)s zofa*u*M_75&aXb0JImih^nDIt2oBt6zQtbaq=sPAT{V}4fK$Z2gl7C%uPySmT|C6p zGz8ebf=)_I3>3_n;@ z>({WuJE+|9d?e7gK&~{-VD*vlTGKBDi%DFW^H(S7CHr28QFLXNy`u{bQg2>n-Yg_c z|2*E+R*vo|JO-{CQBg|*r(TI%!a3A^Y?;>Fg5%-6@ zo}Pz4ud2EgCHVAA)g@Jv#r8a2r`?c3Zk5f4_mcA8{ghoqy^DdK z+3f71PEr9hu<$h(_o&FCya#D-GV~xaU)2zfTXvJdK91ZOR+L@hCu>^Jc1=Gn?~e}B zc?5j&u$f@C(O@sE!UIiB@pbR$|?^*^h+S1NaFV_qlB8fGbBawBD z#mpSpoaz*QIQtKhav8l*5ceZVfJo|`lz7g)+03AjT?9n z*{CqFPIOuI6PGyvQ6(WEp&Q=n$M^5zbr%ruBXJ5??<37N{*pknb3b2?j2C{?U z%}8hJoI)l7ty_xpLXy0Trz?|7=yL7By6Z#n#6u?WgGTddN_U>eLmsTwa&+kDbGzG3 za)zy)ckFmV&lG>f2~tf)I=NDqbZA=rbO1Nx^EJ~uzkXV&CO$^`jAj02#c1%*r1byY z7F~Wo^Y6NgI!so0*CRX#lbD!k^ccGEsA%qp4w7=ZzaR}sYN#>+hc>(AyXcttK_F z{*<#7a*iuIby&aTK0f&*-ZT{onIw-( zmk(dAoNpM~)dQ@=`ATd`zc13{!wm->l9=595$C3ui#!@hi-EB)Eu6Oqjy ze5wl#BXv7wu$0HVWNa|gzPmVh+hula=2qcdg0}8GKm*g)T7n3m$ocWEV($m`u2*yV zLkOJI8sm_!X=Yy@*-hvm{GFexN$`M^h%(~L(QjI)c02Hc*UXtWd)Z=p zrB=}qKJftdNjDt#u#bYui=A;vNgq;IQ;q~ZUsO?rAozYc>X_(^k#p#^fjul3 z7gNn`jokpAN`Fo0Ly;+MgvGOCNMj>Ha>2~L8RxyT_vDn6uvJ*OH#e@U>eXCAMuDb3 z*f#9CXfw`{Mceu+ag+h5Gl=kK=w2lvcVQh{az z>}SEA*KuVGNWNnS@$QX;oxSlgyZ1^@-{%QIaIFoW7gs`4wp2s<4k2 zylejBw*B`;MG@?K?p0V=*j)73_bT{jKQ*S{g>-PO@~46t4<-n5NlPe*SBe@2{SU@o BJpBLw diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index d58dda7f7d..ec4ec38015 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -537,4 +537,9 @@ path = /obj/item/clothing/suit/custom/exo ckeywhitelist = list("jesterz7") +/datum/gear/donator/choker + name = "NT Choker" + slot = SLOT_NECK + path = /obj/item/clothing/neck/petcollar/choker + ckeywhitelist = list("trigillass") diff --git a/modular_citadel/code/modules/custom_loadout/custom_items.dm b/modular_citadel/code/modules/custom_loadout/custom_items.dm index 4ef5a91a92..3c208608c0 100644 --- a/modular_citadel/code/modules/custom_loadout/custom_items.dm +++ b/modular_citadel/code/modules/custom_loadout/custom_items.dm @@ -585,3 +585,12 @@ icon = 'icons/obj/custom.dmi' mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi' mutantrace_variation = NONE + +/obj/item/clothing/neck/petcollar/choker + name = "NT Choker" + desc = "NT property since January 21st, 2562." + icon = 'icons/obj/custom.dmi' + icon_state = "choker" + mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi' + item_state = "choker" + tagname = null From 601305426f6feefed72663361f7f1f138353a9ff Mon Sep 17 00:00:00 2001 From: dzahlus Date: Sun, 7 Feb 2021 17:08:06 +0100 Subject: [PATCH 02/28] wounds now work --- .../projectiles/guns/ballistic/rifles.dm | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm b/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm index ca76a5370b..a9b9491bf9 100644 --- a/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm +++ b/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm @@ -85,16 +85,19 @@ ///projectiles/// -/obj/item/projectile/bullet/cflechetteap //shreds armor +/obj/item/projectile/bullet/cflechetteap //shreds armor but no wounds name = "flechette (armor piercing)" - damage = 8 - armour_penetration = 80 + damage = 15 + armour_penetration = 100 + wound_bonus = -100 -/obj/item/projectile/bullet/cflechettes //shreds flesh and forces bleeding +/obj/item/projectile/bullet/cflechettes //causes wounds fast but is heavily countered by armor name = "flechette (serrated)" damage = 15 dismemberment = 10 - armour_penetration = -80 + wound_bonus = 15 + sharpness = SHARP_EDGED + wound_falloff_tile = 0 /obj/item/projectile/bullet/cflechettes/on_hit(atom/target, blocked = FALSE) if((blocked != 100) && iscarbon(target)) @@ -168,15 +171,19 @@ ///unique variant/// -/obj/item/projectile/bullet/cflechetteshredder +/obj/item/projectile/bullet/cflechetteshredder //you only get this with a 30TC bundle,5 magazines, as such this should be the superior ammotype name = "flechette (shredder)" - damage = 5 - dismemberment = 40 + damage = 10 + dismemberment = 50 + wound_bonus = 50 + armour_penetration = 100 + sharpness = SHARP_EDGED + wound_falloff_tile = 0 /obj/item/ammo_casing/caseless/flechetteshredder name = "flechette (shredder)" desc = "A serrated flechette made of a special alloy that forms a monofilament edge." - projectile_type = /obj/item/projectile/bullet/cflechettes + projectile_type = /obj/item/projectile/bullet/cflechetteshredder /obj/item/ammo_box/magazine/flechette/shredder name = "flechette magazine (shredder)" @@ -185,7 +192,7 @@ /obj/item/gun/ballistic/automatic/flechette/shredder name = "\improper CX Shredder" - desc = "A flechette launching machine pistol made of ultra-light CFRP optimized for firing serrated monofillament flechettes." + desc = "A flechette launching machine pistol made of ultra-light CFRP optimized for firing serrated monofilament flechettes." w_class = WEIGHT_CLASS_SMALL spread = 15 recoil = 0.1 From 7da856ebefe5ce6d350bd66b6596118e2e3026c5 Mon Sep 17 00:00:00 2001 From: dzahlus Date: Sun, 7 Feb 2021 17:09:35 +0100 Subject: [PATCH 03/28] remove bleed haha forgot this for a second --- .../code/modules/projectiles/guns/ballistic/rifles.dm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm b/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm index a9b9491bf9..5a3f149dbb 100644 --- a/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm +++ b/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm @@ -98,13 +98,7 @@ wound_bonus = 15 sharpness = SHARP_EDGED wound_falloff_tile = 0 - -/obj/item/projectile/bullet/cflechettes/on_hit(atom/target, blocked = FALSE) - if((blocked != 100) && iscarbon(target)) - var/mob/living/carbon/C = target - C.bleed(10) - return ..() - + ///ammo casings (CASELESS AMMO CASINGS WOOOOOOOO)/// /obj/item/ammo_casing/caseless/flechetteap From d482d387eec70ada4a01d4024520a72053b10fa2 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Sun, 7 Feb 2021 18:24:18 +0100 Subject: [PATCH 04/28] whoops --- code/modules/vending/wardrobes.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index e88cfe33a3..eebb07938b 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -207,6 +207,7 @@ product_ads = "You turn me TRUE, use defines!;0110001101101100011011110111010001101000011001010111001101101000011001010111001001100101" vend_reply = "Thank you for using the RoboDrobe!" products = list(/obj/item/clothing/glasses/hud/diagnostic = 3, + /obj/item/stack/medical/nanogel = 5, /obj/item/clothing/head/beret/robo = 3, /obj/item/clothing/under/rank/rnd/roboticist = 3, /obj/item/clothing/under/rank/rnd/roboticist/sleek = 3, From 0c0ff44c2313c8b8782bd2c01a4a28c86db5a3a5 Mon Sep 17 00:00:00 2001 From: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com> Date: Sun, 7 Feb 2021 22:01:57 -0500 Subject: [PATCH 05/28] pog pog --- code/modules/clothing/masks/miscellaneous.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index fc4185f207..fe08cbd63e 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -36,7 +36,7 @@ /obj/item/clothing/mask/surgical/aesthetic name = "aesthetic sterile mask" desc = "A sterile mask designed to help prevent the spread of diseases. This one doesn't seem like it does a whole lot, somehow." - flags_inv = HIDEFACE + flags_inv = null flags_cover = null visor_flags_inv = null visor_flags_cover = null From 952d2e1e60384382ff7c284f9c052bd3e13a2dfd Mon Sep 17 00:00:00 2001 From: keronshb Date: Sun, 7 Feb 2021 23:41:27 -0500 Subject: [PATCH 06/28] Removes the power sink objective Alternative to the other PR --- code/game/gamemodes/objective_sabotage.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/gamemodes/objective_sabotage.dm b/code/game/gamemodes/objective_sabotage.dm index c8f1ef4713..1fbebfdac4 100644 --- a/code/game/gamemodes/objective_sabotage.dm +++ b/code/game/gamemodes/objective_sabotage.dm @@ -33,6 +33,7 @@ /datum/sabotage_objective/processing/check_conditions() return won +/* /datum/sabotage_objective/processing/power_sink name = "Drain at least 100 megajoules of power using a power sink." sabotage_type = "powersink" @@ -44,6 +45,7 @@ for(var/s in GLOB.power_sinks) var/obj/item/powersink/sink = s won = max(won,sink.power_drained/1e8) +*/ /obj/item/paper/guides/antag/supermatter_sabotage info = "Ways to sabotage a supermatter:
\ From 38827122e9c88810013d7756ee089c7bd24137cc Mon Sep 17 00:00:00 2001 From: keronshb Date: Sun, 7 Feb 2021 23:50:42 -0500 Subject: [PATCH 07/28] Adjusts warp implant to 30 second delay who thought this was a good idea --- code/game/objects/items/implants/implant_misc.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm index 83e9b21e0b..0a86abdec9 100644 --- a/code/game/objects/items/implants/implant_misc.dm +++ b/code/game/objects/items/implants/implant_misc.dm @@ -44,7 +44,7 @@ icon_state = "warp" uses = -1 var/total_delay = 10 SECONDS - var/cooldown = 10 SECONDS + var/cooldown = 30 SECONDS var/last_use = 0 var/list/positions = list() var/next_prune = 0 From cae5a8463e8cd3b2d6e31128fc7bb2b3e7a97716 Mon Sep 17 00:00:00 2001 From: dzahlus Date: Mon, 8 Feb 2021 14:37:10 +0100 Subject: [PATCH 08/28] sound fixes fucking grenade launcher sound used everywhere, now fixed. Also mech weapons use the proper sounds too. --- code/game/mecha/equipment/weapons/weapons.dm | 10 ++++++---- code/game/objects/items/weaponry.dm | 2 +- .../projectiles/guns/ballistic/launchers.dm | 2 +- sound/weapons/woodbonk.ogg | Bin 0 -> 12407 bytes 4 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 sound/weapons/woodbonk.ogg diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index f2bced4aa8..ff4d4a4c65 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -97,7 +97,7 @@ icon_state = "mecha_ion" energy_drain = 120 projectile = /obj/item/projectile/ion - fire_sound = 'sound/weapons/laser.ogg' + fire_sound = 'sound/weapons/IonRifle.ogg' /obj/item/mecha_parts/mecha_equipment/weapon/energy/tesla equip_cooldown = 35 @@ -195,7 +195,7 @@ //Base ballistic weapon type /obj/item/mecha_parts/mecha_equipment/weapon/ballistic name = "general ballistic weapon" - fire_sound = 'sound/weapons/gunshot.ogg' + fire_sound = 'sound/weapons/lmgshot.ogg' var/projectiles var/projectiles_cache //ammo to be loaded in, if possible. var/projectiles_cache_max @@ -285,6 +285,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot name = "\improper LBX AC 10 \"Scattershot\"" desc = "A weapon for combat exosuits. Shoots a spread of pellets." + fire_sound = 'sound/weapons/gunshotshotgunshot.ogg' icon_state = "mecha_scatter" equip_cooldown = 20 projectile = /obj/item/projectile/bullet/scattershot @@ -299,6 +300,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/seedscatter name = "\improper Melon Seed \"Scattershot\"" desc = "A weapon for combat exosuits. Shoots a spread of pellets, shaped as seed." + fire_sound 'sound/weapons/gunshotshotgunshot.ogg' icon_state = "mecha_scatter" equip_cooldown = 20 projectile = /obj/item/projectile/bullet/seed @@ -331,7 +333,7 @@ desc = "A weapon for combat exosuits. Launches light explosive missiles." icon_state = "mecha_missilerack" projectile = /obj/item/projectile/bullet/a84mm_he - fire_sound = 'sound/weapons/grenadelaunch.ogg' + fire_sound = 'sound/weapons/rocketlaunch.ogg' projectiles = 8 projectiles_cache = 0 projectiles_cache_max = 0 @@ -345,7 +347,7 @@ desc = "A weapon for combat exosuits. Launches low-explosive breaching missiles designed to explode only when striking a sturdy target." icon_state = "mecha_missilerack_six" projectile = /obj/item/projectile/bullet/a84mm_br - fire_sound = 'sound/weapons/grenadelaunch.ogg' + fire_sound = 'sound/weapons/rocketlaunch.ogg' projectiles = 6 projectiles_cache = 0 projectiles_cache_max = 0 diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 07900d6bbf..fa1fd9093f 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -302,7 +302,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 damtype = STAMINA attack_verb = list("whacked", "smacked", "struck") total_mass = TOTAL_MASS_MEDIEVAL_WEAPON - hitsound = 'sound/weapons/grenadelaunch.ogg' // no good wood thunk sounds + hitsound = 'sound/weapons/woodbonk.ogg' var/harm = FALSE // TRUE = brute, FALSE = stam var/reinforced = FALSE var/burnt = FALSE diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm index 9e03207888..c53366c4f5 100644 --- a/code/modules/projectiles/guns/ballistic/launchers.dm +++ b/code/modules/projectiles/guns/ballistic/launchers.dm @@ -35,7 +35,7 @@ name = "gyrojet pistol" desc = "A prototype pistol designed to fire self propelled rockets." icon_state = "gyropistol" - fire_sound = 'sound/weapons/grenadelaunch.ogg' + fire_sound = 'sound/weapons/rocketlaunch.ogg' mag_type = /obj/item/ammo_box/magazine/m75 burst_size = 1 fire_delay = 0 diff --git a/sound/weapons/woodbonk.ogg b/sound/weapons/woodbonk.ogg new file mode 100644 index 0000000000000000000000000000000000000000..5fbadb104d6f88acfb2b870749ecf50fdba46661 GIT binary patch literal 12407 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 w960gT?aQmNeO^Zzztxs++dK Date: Mon, 8 Feb 2021 14:37:34 +0100 Subject: [PATCH 09/28] Revert "sound fixes" This reverts commit cae5a8463e8cd3b2d6e31128fc7bb2b3e7a97716. --- code/game/mecha/equipment/weapons/weapons.dm | 10 ++++------ code/game/objects/items/weaponry.dm | 2 +- .../projectiles/guns/ballistic/launchers.dm | 2 +- sound/weapons/woodbonk.ogg | Bin 12407 -> 0 bytes 4 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 sound/weapons/woodbonk.ogg diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index ff4d4a4c65..f2bced4aa8 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -97,7 +97,7 @@ icon_state = "mecha_ion" energy_drain = 120 projectile = /obj/item/projectile/ion - fire_sound = 'sound/weapons/IonRifle.ogg' + fire_sound = 'sound/weapons/laser.ogg' /obj/item/mecha_parts/mecha_equipment/weapon/energy/tesla equip_cooldown = 35 @@ -195,7 +195,7 @@ //Base ballistic weapon type /obj/item/mecha_parts/mecha_equipment/weapon/ballistic name = "general ballistic weapon" - fire_sound = 'sound/weapons/lmgshot.ogg' + fire_sound = 'sound/weapons/gunshot.ogg' var/projectiles var/projectiles_cache //ammo to be loaded in, if possible. var/projectiles_cache_max @@ -285,7 +285,6 @@ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot name = "\improper LBX AC 10 \"Scattershot\"" desc = "A weapon for combat exosuits. Shoots a spread of pellets." - fire_sound = 'sound/weapons/gunshotshotgunshot.ogg' icon_state = "mecha_scatter" equip_cooldown = 20 projectile = /obj/item/projectile/bullet/scattershot @@ -300,7 +299,6 @@ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/seedscatter name = "\improper Melon Seed \"Scattershot\"" desc = "A weapon for combat exosuits. Shoots a spread of pellets, shaped as seed." - fire_sound 'sound/weapons/gunshotshotgunshot.ogg' icon_state = "mecha_scatter" equip_cooldown = 20 projectile = /obj/item/projectile/bullet/seed @@ -333,7 +331,7 @@ desc = "A weapon for combat exosuits. Launches light explosive missiles." icon_state = "mecha_missilerack" projectile = /obj/item/projectile/bullet/a84mm_he - fire_sound = 'sound/weapons/rocketlaunch.ogg' + fire_sound = 'sound/weapons/grenadelaunch.ogg' projectiles = 8 projectiles_cache = 0 projectiles_cache_max = 0 @@ -347,7 +345,7 @@ desc = "A weapon for combat exosuits. Launches low-explosive breaching missiles designed to explode only when striking a sturdy target." icon_state = "mecha_missilerack_six" projectile = /obj/item/projectile/bullet/a84mm_br - fire_sound = 'sound/weapons/rocketlaunch.ogg' + fire_sound = 'sound/weapons/grenadelaunch.ogg' projectiles = 6 projectiles_cache = 0 projectiles_cache_max = 0 diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index fa1fd9093f..07900d6bbf 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -302,7 +302,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 damtype = STAMINA attack_verb = list("whacked", "smacked", "struck") total_mass = TOTAL_MASS_MEDIEVAL_WEAPON - hitsound = 'sound/weapons/woodbonk.ogg' + hitsound = 'sound/weapons/grenadelaunch.ogg' // no good wood thunk sounds var/harm = FALSE // TRUE = brute, FALSE = stam var/reinforced = FALSE var/burnt = FALSE diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm index c53366c4f5..9e03207888 100644 --- a/code/modules/projectiles/guns/ballistic/launchers.dm +++ b/code/modules/projectiles/guns/ballistic/launchers.dm @@ -35,7 +35,7 @@ name = "gyrojet pistol" desc = "A prototype pistol designed to fire self propelled rockets." icon_state = "gyropistol" - fire_sound = 'sound/weapons/rocketlaunch.ogg' + fire_sound = 'sound/weapons/grenadelaunch.ogg' mag_type = /obj/item/ammo_box/magazine/m75 burst_size = 1 fire_delay = 0 diff --git a/sound/weapons/woodbonk.ogg b/sound/weapons/woodbonk.ogg deleted file mode 100644 index 5fbadb104d6f88acfb2b870749ecf50fdba46661..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12407 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 w960gT?aQmNeO^Zzztxs++dK Date: Mon, 8 Feb 2021 14:43:33 +0100 Subject: [PATCH 10/28] fixes oversights fixes grenadelauncher.ogg being used where it shouldnt FOR GOOD NOW I SWEAR. Bokken sound fixed, mech weapons now use proper sound too --- code/game/mecha/equipment/weapons/weapons.dm | 10 ++++++---- code/game/objects/items/weaponry.dm | 2 +- .../projectiles/guns/ballistic/launchers.dm | 2 +- sound/weapons/woodbonk.ogg | Bin 0 -> 12407 bytes 4 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 sound/weapons/woodbonk.ogg diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index f2bced4aa8..6956f2ce6c 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -97,7 +97,7 @@ icon_state = "mecha_ion" energy_drain = 120 projectile = /obj/item/projectile/ion - fire_sound = 'sound/weapons/laser.ogg' + fire_sound = 'sound/weapons/IonRifle.ogg' /obj/item/mecha_parts/mecha_equipment/weapon/energy/tesla equip_cooldown = 35 @@ -195,7 +195,7 @@ //Base ballistic weapon type /obj/item/mecha_parts/mecha_equipment/weapon/ballistic name = "general ballistic weapon" - fire_sound = 'sound/weapons/gunshot.ogg' + fire_sound = 'sound/weaponslmgshot.ogg' var/projectiles var/projectiles_cache //ammo to be loaded in, if possible. var/projectiles_cache_max @@ -285,6 +285,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot name = "\improper LBX AC 10 \"Scattershot\"" desc = "A weapon for combat exosuits. Shoots a spread of pellets." + fire_sound = 'sound/weapons/gunshotshotgunshot.ogg' icon_state = "mecha_scatter" equip_cooldown = 20 projectile = /obj/item/projectile/bullet/scattershot @@ -299,6 +300,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/seedscatter name = "\improper Melon Seed \"Scattershot\"" desc = "A weapon for combat exosuits. Shoots a spread of pellets, shaped as seed." + fire_sound = 'sound/weapons/gunshotshotgunshot.ogg' icon_state = "mecha_scatter" equip_cooldown = 20 projectile = /obj/item/projectile/bullet/seed @@ -331,7 +333,7 @@ desc = "A weapon for combat exosuits. Launches light explosive missiles." icon_state = "mecha_missilerack" projectile = /obj/item/projectile/bullet/a84mm_he - fire_sound = 'sound/weapons/grenadelaunch.ogg' + fire_sound = 'sound/weapons/rocketlaunch.ogg' projectiles = 8 projectiles_cache = 0 projectiles_cache_max = 0 @@ -345,7 +347,7 @@ desc = "A weapon for combat exosuits. Launches low-explosive breaching missiles designed to explode only when striking a sturdy target." icon_state = "mecha_missilerack_six" projectile = /obj/item/projectile/bullet/a84mm_br - fire_sound = 'sound/weapons/grenadelaunch.ogg' + fire_sound = 'sound/weapons/rocketlaunch.ogg' projectiles = 6 projectiles_cache = 0 projectiles_cache_max = 0 diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 07900d6bbf..554ea81974 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -302,7 +302,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 damtype = STAMINA attack_verb = list("whacked", "smacked", "struck") total_mass = TOTAL_MASS_MEDIEVAL_WEAPON - hitsound = 'sound/weapons/grenadelaunch.ogg' // no good wood thunk sounds + hitsound = 'sound/weapons/woodbonk.ogg' var/harm = FALSE // TRUE = brute, FALSE = stam var/reinforced = FALSE var/burnt = FALSE diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm index 9e03207888..c53366c4f5 100644 --- a/code/modules/projectiles/guns/ballistic/launchers.dm +++ b/code/modules/projectiles/guns/ballistic/launchers.dm @@ -35,7 +35,7 @@ name = "gyrojet pistol" desc = "A prototype pistol designed to fire self propelled rockets." icon_state = "gyropistol" - fire_sound = 'sound/weapons/grenadelaunch.ogg' + fire_sound = 'sound/weapons/rocketlaunch.ogg' mag_type = /obj/item/ammo_box/magazine/m75 burst_size = 1 fire_delay = 0 diff --git a/sound/weapons/woodbonk.ogg b/sound/weapons/woodbonk.ogg new file mode 100644 index 0000000000000000000000000000000000000000..5fbadb104d6f88acfb2b870749ecf50fdba46661 GIT binary patch literal 12407 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 w960gT?aQmNeO^Zzztxs++dK Date: Mon, 8 Feb 2021 14:48:53 +0100 Subject: [PATCH 11/28] fug --- code/game/mecha/equipment/weapons/weapons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 6956f2ce6c..30bf06b475 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -195,7 +195,7 @@ //Base ballistic weapon type /obj/item/mecha_parts/mecha_equipment/weapon/ballistic name = "general ballistic weapon" - fire_sound = 'sound/weaponslmgshot.ogg' + fire_sound = 'sound/weapons/lmgshot.ogg' var/projectiles var/projectiles_cache //ammo to be loaded in, if possible. var/projectiles_cache_max From b7e91692579bf80805b9682e5d057970db3b3639 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Mon, 8 Feb 2021 16:44:02 +0000 Subject: [PATCH 12/28] Update human.dm --- code/modules/mob/living/carbon/human/human.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index f653c96cbc..a624367197 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -281,11 +281,13 @@ dropItemToGround(pocket_item) if(!usr.can_hold_items() || !usr.put_in_hands(pocket_item)) pocket_item.forceMove(drop_location()) + log_combat(usr, src, "pickpocketed of item: [pocket_item]") else if(place_item) if(place_item.mob_can_equip(src, usr, pocket_id, FALSE, TRUE)) usr.temporarilyRemoveItemFromInventory(place_item, TRUE) equip_to_slot(place_item, pocket_id, TRUE) + log_combat(usr, src, "placed item [pocket_item] onto") //do nothing otherwise // Update strip window @@ -293,8 +295,9 @@ show_inv(usr) else // Display a warning if the user mocks up - if (!strip_silence) + if(!strip_silence) to_chat(src, "You feel your [pocket_side] pocket being fumbled with!") + log_combat(usr, src, "failed to [pocket_item ? "pickpocket item [pocket_item] from" : "place item [pocket_item] onto "]") if(usr.canUseTopic(src, BE_CLOSE, NO_DEXTERY, null, FALSE)) // separate from first canusetopic From 3d97c1fb895e4ff2e8b193a60c3103942cf7c75a Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Mon, 8 Feb 2021 17:00:26 +0000 Subject: [PATCH 13/28] log fix --- code/modules/mob/living/carbon/human/human.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index a624367197..8660e115a6 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -287,7 +287,7 @@ if(place_item.mob_can_equip(src, usr, pocket_id, FALSE, TRUE)) usr.temporarilyRemoveItemFromInventory(place_item, TRUE) equip_to_slot(place_item, pocket_id, TRUE) - log_combat(usr, src, "placed item [pocket_item] onto") + log_combat(usr, src, "placed item [place_item] onto") //do nothing otherwise // Update strip window @@ -297,7 +297,7 @@ // Display a warning if the user mocks up if(!strip_silence) to_chat(src, "You feel your [pocket_side] pocket being fumbled with!") - log_combat(usr, src, "failed to [pocket_item ? "pickpocket item [pocket_item] from" : "place item [pocket_item] onto "]") + log_combat(usr, src, "failed to [pocket_item ? "pickpocket item [pocket_item] from" : "place item [place_item] onto "]") if(usr.canUseTopic(src, BE_CLOSE, NO_DEXTERY, null, FALSE)) // separate from first canusetopic From e433c0b172496347dce2ad67ce55c391f4663073 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Mon, 8 Feb 2021 17:04:55 +0000 Subject: [PATCH 14/28] Update living.dm --- code/modules/mob/living/living.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index fcc1d734a3..6aaa2cca87 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -866,7 +866,7 @@ if(istype(G)) strip_mod = G.strip_mod strip_silence = G.strip_silence - if (!strip_silence) + if(!strip_silence) who.visible_message("[src] tries to remove [who]'s [what.name].", \ "[src] tries to remove your [what.name].", target = src, target_message = "You try to remove [who]'s [what.name].") From 69e4f7ff841ea400974545d8fc392edde5d1c07e Mon Sep 17 00:00:00 2001 From: Changelogs Date: Tue, 9 Feb 2021 00:13:10 +0000 Subject: [PATCH 15/28] Automatic changelog compile [ci skip] --- html/changelog.html | 20 +++++++++++++++++++- html/changelogs/.all_changelog.yml | 11 +++++++++++ html/changelogs/AutoChangeLog-pr-14194.yml | 5 ----- html/changelogs/AutoChangeLog-pr-14196.yml | 4 ---- html/changelogs/AutoChangeLog-pr-14199.yml | 4 ---- html/changelogs/AutoChangeLog-pr-14200.yml | 4 ---- 6 files changed, 30 insertions(+), 18 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-14194.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14196.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14199.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14200.yml diff --git a/html/changelog.html b/html/changelog.html index 0bc2a4d838..b08f77d3f8 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -24,7 +24,7 @@
Traditional Games Space Station 13
- +

@@ -50,6 +50,24 @@ -->
+

09 February 2021

+

Chiirno updated:

+
    +
  • Adds clown waddle to clown shoes. Enhanced Clown Waddle Dampeners can be engaged in-hand with ctrl+click, _but why would you?_
    • +
+

MrJWhit updated:

+
    +
  • Re-adds theater disposal outlet, and makes dorms disposal able to have things sent to it on boxstation.
    • +
+

TyrianTyrell updated:

+
    +
  • made default tongue able to speak signed language.
    • +
+

timothyteakettle updated:

+
    +
  • sentient viruses can now infect synths and ipcs
    • +
+

07 February 2021

Thalpy updated: