From e791749512c7e8c138b14a7eb43e93544cfeb2e9 Mon Sep 17 00:00:00 2001 From: "elly1989@rocketmail.com" Date: Mon, 12 Mar 2012 13:04:55 +0000 Subject: [PATCH] Holy crap BYOND is retarded. ;-; \icons[object.icon] does not work correctly and may cause client crashes. This totally doesn't happen when testing locally so I guess the icon stuff must be done client-side/be lag-induced or something? I've also noticed that icon-updating is very slow (items tend to disappear briefly when being made bloody looking). With the recent forensics updates everything gets bloody, resulting in massive bulshit. I am working on a rewrite of bloodied-icons. For now, this should stop runtimes from examining humans caked in blood. Unfortunately the little icons in the chat-log will no longer be visible when items are bloody, I hope to fix this with said rewrite of bloodied-icons. Moved the paper_talisman icon into bureaucracy.dmi to make Cult mode playable. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3277 316c924e-a436-60f5-8080-3fe189b3f50e --- .../mob/living/carbon/human/examine.dm | 44 +++++++++--------- icons/obj/bureaucracy.dmi | Bin 2458 -> 2560 bytes icons/obj/paper.dmi | Bin 327 -> 0 bytes 3 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 icons/obj/paper.dmi diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 1a1d84861ee..06ac79bcfa8 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -37,7 +37,8 @@ t_has = "have" t_is = "are" else - msg += "\icon[src.icon] " + if(src.icon) + msg += "\icon[src.icon] " //fucking BYOND: this should stop dreamseeker crashing if we -somehow- examine somebody before their icon is generated switch(src.gender) if(MALE) t_He = "He" @@ -53,30 +54,30 @@ //uniform if (src.w_uniform && !skipjumpsuit) if (src.w_uniform.blood_DNA) - msg += "[t_He] [t_is] wearing \icon[src.w_uniform.icon] [src.w_uniform.gender==PLURAL?"some":"a"] blood-stained [src.w_uniform.name]!\n" + msg += "[t_He] [t_is] wearing \icon[src.w_uniform] [src.w_uniform.gender==PLURAL?"some":"a"] blood-stained [src.w_uniform.name]!\n" else msg += "[t_He] [t_is] wearing \icon[src.w_uniform] \a [src.w_uniform].\n" //head if (src.head) if (src.head.blood_DNA) - msg += "[t_He] [t_is] wearing \icon[src.head.icon] [src.head.gender==PLURAL?"some":"a"] blood-stained [src.head.name] on [t_his] head!\n" + msg += "[t_He] [t_is] wearing \icon[src.head] [src.head.gender==PLURAL?"some":"a"] blood-stained [src.head.name] on [t_his] head!\n" else msg += "[t_He] [t_is] wearing \icon[src.head] \a [src.head] on [t_his] head.\n" //suit/armour if (src.wear_suit) if (src.wear_suit.blood_DNA) - msg += "[t_He] [t_is] wearing \icon[src.wear_suit.icon] [src.wear_suit.gender==PLURAL?"some":"a"] blood-stained [src.wear_suit.name]!\n" + msg += "[t_He] [t_is] wearing \icon[src.wear_suit] [src.wear_suit.gender==PLURAL?"some":"a"] blood-stained [src.wear_suit.name]!\n" else msg += "[t_He] [t_is] wearing \icon[src.wear_suit] \a [src.wear_suit].\n" - //suit/armour storage - if(src.s_store && !skipsuitstorage) - if(src.s_store.blood_DNA) - msg += "[t_He] [t_is] carrying \icon[src.s_store.icon] [src.s_store.gender==PLURAL?"some":"a"] blood-stained [src.s_store.name] on [t_his] [src.wear_suit.name]!\n" - else - msg += "[t_He] [t_is] carrying \icon[src.s_store] \a [src.s_store] on [t_his] [src.wear_suit.name].\n" + //suit/armour storage + if(src.s_store && !skipsuitstorage) + if(src.s_store.blood_DNA) + msg += "[t_He] [t_is] carrying \icon[src.s_store] [src.s_store.gender==PLURAL?"some":"a"] blood-stained [src.s_store.name] on [t_his] [src.wear_suit.name]!\n" + else + msg += "[t_He] [t_is] carrying \icon[src.s_store] \a [src.s_store] on [t_his] [src.wear_suit.name].\n" //back if (src.back) @@ -85,7 +86,7 @@ //left hand if (src.l_hand) if (src.l_hand.blood_DNA) - msg += "[t_He] [t_is] holding \icon[src.l_hand.icon] [src.l_hand.gender==PLURAL?"some":"a"] blood-stained [src.l_hand.name] in [t_his] left hand!\n" + msg += "[t_He] [t_is] holding \icon[src.l_hand] [src.l_hand.gender==PLURAL?"some":"a"] blood-stained [src.l_hand.name] in [t_his] left hand!\n" else msg += "[t_He] [t_is] holding \icon[src.l_hand] \a [src.l_hand] in [t_his] left hand.\n" @@ -99,7 +100,7 @@ //gloves if (src.gloves && !skipgloves) if (src.gloves.blood_DNA) - msg += "[t_He] [t_has] \icon[src.gloves.icon] [src.gloves.gender==PLURAL?"some":"a"] blood-stained [src.gloves.name] on [t_his] hands!\n" + msg += "[t_He] [t_has] \icon[src.gloves] [src.gloves.gender==PLURAL?"some":"a"] blood-stained [src.gloves.name] on [t_his] hands!\n" else msg += "[t_He] [t_has] \icon[src.gloves] \a [src.gloves] on [t_his] hands.\n" else if (src.blood_DNA) @@ -112,21 +113,21 @@ //belt if (src.belt) if (src.belt.blood_DNA) - msg += "[t_He] [t_has] \icon[src.belt.icon] [src.belt.gender==PLURAL?"some":"a"] blood-stained [src.belt.name] about [t_his] waist!\n" + msg += "[t_He] [t_has] \icon[src.belt] [src.belt.gender==PLURAL?"some":"a"] blood-stained [src.belt.name] about [t_his] waist!\n" else msg += "[t_He] [t_has] \icon[src.belt] \a [src.belt] about [t_his] waist.\n" //shoes if (src.shoes && !skipshoes) if(src.shoes.blood_DNA) - msg += "[t_He] [t_is] wearing \icon[src.shoes.icon] [src.shoes.gender==PLURAL?"some":"a"] blood-stained [src.shoes.name] on [t_his] feet!\n" + msg += "[t_He] [t_is] wearing \icon[src.shoes] [src.shoes.gender==PLURAL?"some":"a"] blood-stained [src.shoes.name] on [t_his] feet!\n" else msg += "[t_He] [t_is] wearing \icon[src.shoes] \a [src.shoes] on [t_his] feet.\n" //mask if (src.wear_mask && !skipmask) if (src.wear_mask.blood_DNA) - msg += "[t_He] [t_has] \icon[src.wear_mask.icon] [src.wear_mask.gender==PLURAL?"some":"a"] blood-stained [src.wear_mask.name] on [t_his] face!\n" + msg += "[t_He] [t_has] \icon[src.wear_mask] [src.wear_mask.gender==PLURAL?"some":"a"] blood-stained [src.wear_mask.name] on [t_his] face!\n" else msg += "[t_He] [t_has] \icon[src.wear_mask] \a [src.wear_mask] on [t_his] face.\n" @@ -156,13 +157,12 @@ //Jitters if (src.is_jittery) - switch(src.jitteriness) - if(300 to INFINITY) - msg += "[t_He] [t_is] convulsing violently!\n" - if(200 to 300) - msg += "[t_He] [t_is] extremely jittery.\n" - if(100 to 200) - msg += "[t_He] [t_is] twitching ever so slightly.\n" + if(src.jitteriness >= 300) + msg += "[t_He] [t_is] convulsing violently!\n" + else if(src.jitteriness >= 200) + msg += "[t_He] [t_is] extremely jittery.\n" + else if(src.jitteriness >= 100) + msg += "[t_He] [t_is] twitching ever so slightly.\n" if (src.suiciding == 1) msg += "[t_He] [t_has] bitten off [t_his] own tongue and suffered major bloodloss!\n" diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index e78895058acfaf637e87b6dbab544cda29e71b80..0bd0782923fb05a1845143c0b06493ea4dca32b3 100644 GIT binary patch delta 2199 zcmV;I2x#}36Mz(uBmsA^B|ia^X8|XFnVFfJ007R;&NF5J06+i$GXMaW08(U3!~g&Q z0d!JMQvg8b*k%9#0Y7?FSad{Xb7OL8aCB*JZU6vyoRyW&Zi6rk#?SB+s6B6Lw_SIc zT1`E)uMh=dilzKpNQ?IN%Sg*qq{-%%pr4Ju_=~fyKK7r7Q?)xD$}5B(ovq$~tGDM( zSq!LRmo~32WzhkiyO=k9lo8T$)jF*phyZF;779b3K5omR4bnhf&(T_6fXjY^)^6a^ zLx+)_+Di|Cgte?eL)dV^EeSRneeGnR&ub!uyE01s!#!A%9_5P~EiG+AX>q(m%?Sq= zRL^A7)_8`+9%#`>zc8Y6OCuV8+HmtDQVpqWO(P6k>!~i%kav*PDZ<1)M(G?wx$sS zk)B77JaZ_CC^hy*{;P3a?N7V$3H$*~Q5rsi!lje|00!(yL_t(|ob8=|i&qm@5QhVb z7DPy(U@H%8DLky_=bgRqhHc8%pa?YitU6P+U?{cO?lArB#2`rcfFhMj=ydW5)GnsT#7Z4-| zL2G@s!Xe2)&|078;E?1XXsyrla7c0xwAN?mS<0|m{_U=G=JQP2L~20fLa-aa1VxSs ziX0OZd0;_Ne@`Zz>Alc<;fpVip0{1R*k*FEtyQ)}+xz<3P5Rn@&&if(M}L2ZNq@(A z*%BQX92_ti9OxXt^r{5AEJXc|K(F6`$~{3FrJ#*c&_*d}b40DTR1i9e3PLAQ!9l|B5Ke1`%afV5tqnn3`Grpf~T5HPRXA@sF}a}85xeG zz%hq_KVOTWjp7+bA~LfX8@C8*Sc71^jE#4jjC~u-uzm!Ut8`)_H8DA<`uVyM?Cu^9 z)WQ=I%=$Q5P76W#!=T(w_L^e=zynz=r!^O^)Flnsnr&{VViax;?tP5aNk z>fF6m6L)Jt3W!+HKi{PN`y`k6c{keu@3*5C%y|QUPICT{`7sdf>s_%d;R8N_fTVsZ zPdr(({9I04{$=%3dE#*fytu|l@6m`n@dUrgW*CNH7=~dOhG7_#f;b9=xXXx+f_*eB zqI)$6&JuYsWIjsdrNGZ$+Y+7q4mT`*j~f){@O<vyE)s%x z|7uvG$`zVA7DF`GN~O|uU>2>A@FOoWYQN(!B+k>&gc}nAsIY=n7&eceN~Lm-$nO(> zIkgEKGnIP=p5Ol&&r6McGsZ9s!!QiPFbu;mL0Dc6mp^!b=PN6CUVez@)F0KaV!t#4 zewkZF|7?D39nT*V`@R_}RgZEkLT8Bk4vwe@v0r}pQbZftC<0IEq*E|;5|U%YszniS8rwzdku zbH#;pb@kVmFBcYGy?Q0j8HQmPhG7_nVIpFuViPb=IKMemcBFr7M&(JzaM;;@-IWPY zdEzm4Z48AVktZJG_3JmlTcse8Cm!RqXwSR1@0Egho_LHmyT5<A`*PJ;g7xemz2}1Ke!l4CwW2j>Q+h6m|Ihml_UsO=jK7wCtg6RGlKIgptQXSM{ z>>#?o26OID^_=tiiwi;n!7(nu{k^@tzX0i^z~`LTU;H8i*HJiPI|ng;@Hyx87oUUH zm`JD~HV3`_)-veFwWzBN06qu3{;CH(Ts^h%aq&q@rXV^8T~v2EDPiakajk)Hu9M1J zH6l+u4f1+W4L%3yJn@8oJ(zI9zaC6D#^3)~has<@$`g;V^sjXo^7^Sf`M8rVV9rFt Zf4IIDRSJCUk^lez07*p#PDHLkV1hiOAV&ZI delta 2097 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