From 767093f0a24636cfa19a9a3c765454d2744c104a Mon Sep 17 00:00:00 2001 From: Chinsky Date: Wed, 16 Oct 2013 10:42:10 +0400 Subject: [PATCH 1/3] Fixes #3779 Mask for lying state was named wrong - "chest2" instead of "torso2" --- icons/mob/dam_mask.dmi | Bin 1482 -> 1481 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/dam_mask.dmi b/icons/mob/dam_mask.dmi index 286d742f4b970da8aa48e52977d8c1cc6b29f63b..a50d135818789d0ca144f88de1ca67aa180e15b2 100644 GIT binary patch delta 243 zcmVfFDZ*Bkpc$|&Yu?~VT6a~<^{fY)=jiRfI zffxq)1ya)oZ7kG0s{XzRlY{Bq`jV5|m)=0G&ef%ERC%rCi+FNjR3~-Z?xc7-6YV@4 z3MnkP-o|y9qK-5lvq5{xq%e-BdE86Uu^wnW|DcUYvW}p%m1hBY+;$K)>99J zA*$!##-xgYrvU7wc>wl86t`B7>4)_gv!v0I3b3WLTWUh$AZDC?5U1Tz6|&si0fFDZ*Bkpc$|&Yu?~VT6a~4&u#)1=UnO0cE0TWUh$Al4c6AWplRCJ!w)w}31M uvDg+8hq-TGX?3+~x~D&R_Y4|Sf3GZL)tr{U(g%Y`OJcf|N@KIj0saGAqIdZK From ac7aae7358de25d22ac05c7472141d0ac05cdecf Mon Sep 17 00:00:00 2001 From: Chinsky Date: Wed, 16 Oct 2013 10:57:19 +0400 Subject: [PATCH 2/3] Fixed #3776 Missed update_body calls --- code/modules/virus2/effect.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/virus2/effect.dm b/code/modules/virus2/effect.dm index 0945f60b72c..a55adeb4f9e 100644 --- a/code/modules/virus2/effect.dm +++ b/code/modules/virus2/effect.dm @@ -138,6 +138,7 @@ if (!(E.status & ORGAN_DEAD)) E.status |= ORGAN_DEAD H << "You can't feel your [E.display_name] anymore..." + H.update_body(1) mob.adjustToxLoss(15*multiplier) deactivate(var/mob/living/carbon/mob,var/multiplier) @@ -145,6 +146,7 @@ var/mob/living/carbon/human/H = mob for (var/datum/organ/external/E in H.organs) E.status &= ~ORGAN_DEAD + H.update_body(1) /datum/disease2/effect/immortal name = "Longevity Syndrome" From a7be4d93533968cbb1f6797f9ce64d0da3ae2112 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Wed, 16 Oct 2013 11:06:43 +0400 Subject: [PATCH 3/3] Fixes #3781 Magical thingies now go zzap instead of click click when empty. --- code/modules/projectiles/guns/energy/special.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index ca2d1cd0538..a708562e7ab 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -63,6 +63,15 @@ obj/item/weapon/gun/energy/staff update_icon() return + + + click_empty(mob/user = null) + if (user) + user.visible_message("*fizzle*", "\red *fizzle*") + else + src.visible_message("*fizzle*") + playsound(src.loc, 'sound/effects/sparks1.ogg', 100, 1) + /obj/item/weapon/gun/energy/staff/animate name = "staff of animation" desc = "An artefact that spits bolts of life-force which causes objects which are hit by it to animate and come to life! This magic doesn't affect machines."