From 93aacc5569fcd1cd00351dbc4634b5a20adce578 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Wed, 1 Jul 2015 01:58:20 -0400 Subject: [PATCH] Last commit of the night. Weee! paranoia works! --- .../mob/living/simple_animal/slaughter/bloodnode.dm | 11 +++++++---- .../mob/living/simple_animal/slaughter/slaughter.dm | 3 ++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/simple_animal/slaughter/bloodnode.dm b/code/modules/mob/living/simple_animal/slaughter/bloodnode.dm index 7bb7c68aa6f..cf1a041c1ef 100644 --- a/code/modules/mob/living/simple_animal/slaughter/bloodnode.dm +++ b/code/modules/mob/living/simple_animal/slaughter/bloodnode.dm @@ -74,23 +74,26 @@ if(istype(W, /obj/item/weapon/weldingtool)) playsound(get_turf(src), 'sound/items/Welder.ogg', 100, 1) if("brute") - paranoia.DoEffectTouch(user) + if(prob(25)) + paranoia.DoEffectTouch(user) damage = (W.force) health -= damage - //update_icon() + update_icon() return attack_hand(var/mob/user) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) - paranoia.DoEffectTouch(user) + if(prob(25)) + paranoia.DoEffectTouch(user) playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1) var/damage = rand(1,10) if(!damage) // Avoid divide by zero errors return damage = max(damage) health -= damage + update_icon() return @@ -104,5 +107,5 @@ return damage = max(damage) health -= damage - //update_icon() + update_icon() return diff --git a/code/modules/mob/living/simple_animal/slaughter/slaughter.dm b/code/modules/mob/living/simple_animal/slaughter/slaughter.dm index abcecc693d1..3187d921598 100644 --- a/code/modules/mob/living/simple_animal/slaughter/slaughter.dm +++ b/code/modules/mob/living/simple_animal/slaughter/slaughter.dm @@ -297,7 +297,8 @@ var/datum/artifact_effect/paranoia = new /datum/artifact_effect/badfeeling for (var/mob/living/carbon/human/portal in nearby_mortals) - paranoia.DoEffectPulse() + if(prob(25)) + paranoia.DoEffectPulse() var/targetPart = pick("chest","groin","head","l_arm","r_arm","r_leg","l_leg","l_hand","r_hand","l_foot","r_foot") portal.apply_damage(rand(5, 10), BRUTE, targetPart) portal << "\red The skin on your [parse_zone(targetPart)] feels like it's ripping apart, and a stream of blood flies out."