From dad0b2d85670cdf537523bfebab6710569cddd0a Mon Sep 17 00:00:00 2001 From: Markolie Date: Thu, 19 Feb 2015 01:05:00 +0100 Subject: [PATCH] Fix AI tracking, karma message fix, karma say fix, robot storage sprite change --- code/game/machinery/camera/tracking.dm | 2 +- code/modules/karma/karma.dm | 4 ++-- code/modules/mob/living/carbon/human/say.dm | 2 +- icons/obj/robot_storage.dmi | Bin 5159 -> 5078 bytes 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index a605ea7c384..5f0e2a6506f 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -4,7 +4,7 @@ /mob/living/silicon/ai/proc/InvalidTurf(turf/T as turf) if(!T) return 1 - if((T.z in config.station_levels)) + if((T.z in config.admin_levels)) return 1 if(T.z > 6) return 1 diff --git a/code/modules/karma/karma.dm b/code/modules/karma/karma.dm index 0b97d51c8b3..9af7b3fa5f8 100644 --- a/code/modules/karma/karma.dm +++ b/code/modules/karma/karma.dm @@ -345,8 +345,8 @@ You've gained [totalkarma] total karma in your time here.
"} message_admins("SQL ERROR during karmaspent updating (updating existing entry). Error: \[[err]\]\n") return else - usr << "You have been charged [cost] karma." - message_admins("[key_name(usr)] has been charged [cost] karma.") + usr << "You have been [refund ? refunded : charged] [cost] karma." + message_admins("[key_name(usr)] has been [refund ? refunded : charged] [cost] karma.") return /client/proc/karmarefund(var/type,var/name,var/cost) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 48926419916..4139fcc2726 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -304,7 +304,7 @@ handled = 1 if(prob(braindam/4)) message = stutter(message) - verb = pick("stammers", "stutters") + verb = pick("gibbers") if(prob(braindam)) message = uppertext(message) verb = "yells loudly" diff --git a/icons/obj/robot_storage.dmi b/icons/obj/robot_storage.dmi index 5a996c01e7e7678414e5f90f6559d1b22c0e90e9..2382586eee7febdb948c65d6b85c47bee84fb94e 100644 GIT binary patch delta 4978 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 delta 5060 zcmV;#6FcnIC#NWok$(f?ROuEGrOuEzRk%%4R&e!mQE>6~gkov_h4_AP5$V(t@_wmO#2UOS308cYn8Y=6{d0L!oV&HuNUXzq$AQ zzWF`(ciyu+_lh-Z)-c(1{Z&`$>6LLp{YgRtgZLSbh!6}aO~Qnf>*FGkwUxBlCKc7? zT>kk_T8YZ({$%Hi$!x%^rnp$~^{dsq#;SZnx)98NrA=;gveCCTE`V4K4{lk@WoNyg z;HCB4@$ySt{(qVCI@_A+3Ts<>N*-Igxpw(YSDPYK9fVS?!b!~0laVjSU#8=yWlKM) zN`;lTcMbU7P*SN(!RSmo_}h0QLW*cj6o1<$yjNOih=*aQKUQV74Y%?9 zjB-jUOZdazcb9$b=9RPDARz6yZZ_ut7?YWA9_!5&L%X_?R942-{eS$+)QA7_&wTcu ze#^JcKZ(Vz4^p6W3SA#YC0(?u`S)L~=PhTR%EQ0=^MaMbS^1+Hux!~fy=2LfW4U*hEnB9?YeMt67qj^E z>b%$Uc;u1$I_S(65MfDPOJY$A0cZq{QBBzHCV!EzKnmWzsFt(d_qn})T-!1Qp!vd& zs;)>&_+3?JI3op_Jp98NaA5IQ_BuyZxTQ5AmMmE^ZWF2+rjRXYBcCiV`-Cb2G@wDe zc1ek*%o;+)ZCqFJKXU|`ic*TZS86LD<75i){}Lja{3XC zD1Qe3h(plIUI!N6aa4s{`L`=rS`#{|_Z&*;REo;d3OzLFa^}Y>Soq5XXidm|{oFwX z8c!P|g(B zcN6voiA;-9*7sALtp2QEWcH^f1OKRILHbjp|6Sa5G*>&a1RBFYmd0%!eV`Muul2o4`Im?tcP!VlFKs|aN4nC@&Kc9NSPcGA8GrC* z7x+lh0$k5!IPGGFG?ihKo3CGsVH&tzfYx9cf@yUzB9Rc;K(q0sG&OZ$98c0at>S&3n8wP-w(zwty^~C;fb@Kfg@V-&KB)6qi}^2j5Q_4ndp@S0eC+3uo&ET; zn&M)#Sy3_gle+_ez*l6l9uk4$23+vzC%E@JXA-3H{P;Kjps(QZp|B*jt_pc zp8GzziPKyULn=P;k<+n_({KZU<7gJlKbff~zdOHX%^JbT2hf{H{&8CguYX&&Zrs;U zN?}?hs;{qLtXtJV;3-z!aRI5JfKY9OZ+~?O(zbB}13w6`qb5d42-j0+;fD<&uw&(z z>wZuCypNGi4RPOt&+yJgi}w+9h*1nE2LHJ31)bc{!CB2;Ii{5~fc66d6=LniE}nfM zP3J(4AON&aI4m%211S`?;eQhgDJmin9{0yE<)XH?A-b)U%&cJ zW;IqFKoEy5ezEvRWq|(FYtMlr&4`vPS;CgaMwavUqd~k*j+4ifc^1#F;i{`oy?e*Pa7oeI7KgStHgoHy=|MNYes=s4NQ;q+Mc$z%U_P8bTTe-?|qlF8=(9tliW_ zwh;4uHL^C6zr6$AujQEyI}d!zs6$XO_@f%IZrwVVu?YTl z#b_@(Sbu&LmM%TI_Z&jfkmR#NShk>N&?9Oa9Bu_AfCY`^thn)2;w2V=GTr>hems%Z zpRu>QjyqTVm21Cn2`lb-oLNnAYg>DIR0E2^AJu^N_70XW?|KD`|&M@sO<51`f>?fKvYq_Qr7vN7aq zXCXqszrJ@dKYQS501j9DV)GAaz_Mk_^hoh}UGV`{t~_#imo8m8o@uC^X!u1w^P512 z<8#3 z%sHpc;^__BnAH@wx3#C;iRK?U~}sb^|NzR`ulpg?CetBFu>V?34=h48RL>Xi;YzR>6PCkIekaKR;0*!bL5L^8!sAKpNDEP~d8 z-kv0e@1hj=5eS>=h}nt$L`v9A7zu5dqnG5Q# zeAFy_d%d^#1LbUbCeK4%DbAQ3fvya-re?4p$U2Ic8IZ6P-C0G%GDsByTKgRaT*Znj z-$S~-j^XWpqwGw*u-jPBTA4ZjP-Fgt@+YeS0(5BV>R0oZ-@S>)AG{IW(L%8K9}Fjl z$$#b{D-0^b9*MBz)gGUOB?w!R(uM}YGw1Wwn^)15GP(J#b7%IHM>}hh&0{`SEhc|b z#!{*VF4Fy#k2>ai{;gr*A8+g2_2L$+?wv%kSyDlml8P9WVUPsmT}iAgpfVB=G6GV` zJcGNtaFINC`3$p7ToBYGCog}}bwG7O?SDVAtyFty-d1li?6^GFR-mr{ zbElNy1wK6~2hUg3Mh)u9!}Ja1sg9Zq5azefzrsBaJ#bXdpHE-D#B>MD&%k#3^;JgvlqDI6kLrAe9#&{@Tra4^k#fAj!(pv#G?_?nG8|O zAdx7c)bJ^fSqx`A{?R$imOb5Q!#98Vz(Yrv{Y(shvUR}!ukZ^6hmEi7^rqKU`;9ea zfngf1?*}o%5N1sX$^+#~2s|$kQh%Dh2e|;<+m-fW8+H%u+1b_O%1dL|E_jYlRicDtSA614%jX|Y zesgp4n{kWBtWgb^)f5*uf8(2K_RJ}{cuk2{y|6z2tB0Pg`_Sj!iJ|+r;eX42;y+iM zfsjqCx??R@eeTk2z1@A`EzfQbKlTAC@{(S!N=1;T%qaH|Hw)B(A4n=Z98P~~1 zG#SH*8#X-Ow;5kcrkxN+N`n^%Utv$%07Ehp3zx_IStm91zVDsm&*x7xzZe?z8F0#p z^_0g$a!ONm@|GVyHhtddQ-5e1Ow#?E6q`glky@J{-?9O;CY8(c$m+FIwybI6^OwA5 z^BeN<$21g8G`|=c)qq`HNn){R@XcEuoc{ZJzVUoMBon`Q>f!mPzkL={r&{#%r?Cp< zdUxn+<)E|``P!d*%*o> z{1Pi(=-J%QN8Vk-LL2ODgH#p@y#Le~7r&*7+8`jH*7(fFKf39e^{q91slvGO`4i1A zhDJ4@`P>iizDqxm^&@p901?A?>Jt|6kmQkjyJ=hB%NesQO3Ms#nF6kvFf2*V3RmZ@ z_~P}u&Uw#8BiGrNkAI)l6hEp}=|uC3p-~N}Zk&Qbm{KcWqLoCcy}dc^zGWNftV^ss zL}E&WTW{LV6Kgwh{g9FbN^1forBz;0iMRFdIyAUS*XQRIwza2qf90bxHLz<;g_vl5 zF*K?H=~N2CG_-;C_U8bElnfPaMN=adil2XqV>Sh3?gF--|4nqLeZp#ub32gqo7+VyQ5B7e*}p`3Xq#rWY}r(l{Uzy0q$ zXy0f3=3X*hSr7yx!5M)@ijjQ$6IqKFU+{S0IfHLq{P56;RWnT(*=m@~{9oEZrKuK#KaQ)**edE;En@)#%0s2~=~A*Iq9Ohph8 z`}6THJx68z4B{0PJo5W>Z_MXUT7EG!ssY*$FieAeUrW=zXZTM)-^q1f-GX#oW;Mh> zDZX&U7GB;lh-n&WA<#kxzRG6`UZF7VeEvl8i+`a}4RD-1f$tLR|G^0@f>g$%EMf7D z>rbM*B*dN9wW8es%aqtw;0l3OS_oxEN50I!`11J^$uEYEoR6162x(agA*IwRQDX7M zYvv&15q1wbB=edd{b(+=i7+UowFW69rWMv&yb1aI3FH?;qc6nv<>RFeTvK>KIO526 zoPRztm;Ub6udtj^Z1|J_~8w$IKvKan_CVVKJ)39$+-bSijj4aR!Rud z_4dufBdtGUZ$~G0uKFvNU3@0M{(StX2Y)3K%`b)yGGJ$+O6)9D#sD0*fakbcYhOu} zQc9>)X5`Dp-~RqwhEpypZrF|%V4D)dR;CaNEu^$8OPc1farMLx@HbWJcLzdBMrel_n*da&L!}L(psWG7`AQ2OUr=$`G0s= z`RvOqnKu<7U{+JyKFmE$G{2}iXd(8-e0;1Vfsh8O(Eawn512i@9JJ8MXjsfny zeJ7#3M=S)&SKNAiE2e4SIRd3dwtoR4Dmise-`;WO^NYQ=@Q42$zz-xd8WRlc*u$3f+d*lrz4ZrNu)xJD8Og_I#k%?v z)k|ae0lkUl7gq;$K-IuSs{cl;t>0enEpC#WSIG0}D_1j|>;nSk&#dE5Pk+BkvaOVe zA!u*w;cqYXbN)F^TzB6yy!i57gm{>z?)VfrThhO6fc%+aVZj(4*q&K(#D&j9^NX!R z2D1*#$6t2WKY0Atx026fX>HlT;9#1Ci>6UiUxgHs^l+M?!6fxlYf1-m~hkx7+Jun}?;Hld>w{Cou_KrR_Y~GDD1c4JUeOd#D5 zrgKOsXsWG31p!0p9G)LwNJ(vFoV~qCY|EmmyoBdpYT>?L|7u+M{D0%kpM)Lo`h5IZ zi>8suIV8$T$Y&f1`2v}I9uU-2B@k$`83$i!3a&@95O%akNy5qgtpEW@CpERG-e#A0DG*#cdCN%rjR1|t|( zKL2>~CtC*`F&{6bFg+oJcR)Tq9