From 05851aa0e474a858b3d88ee85b0b3f909eec422f Mon Sep 17 00:00:00 2001 From: Albert Iordache Date: Thu, 12 Jul 2012 15:57:53 +0300 Subject: [PATCH] Quick fix to avoid artifact runtime error spam --- .../xenoarchaeology/artifact_effect.dm | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/modules/research/xenoarchaeology/artifact_effect.dm b/code/modules/research/xenoarchaeology/artifact_effect.dm index 9bfbb35981..68b4d509f4 100644 --- a/code/modules/research/xenoarchaeology/artifact_effect.dm +++ b/code/modules/research/xenoarchaeology/artifact_effect.dm @@ -202,7 +202,7 @@ switch(src.effecttype) if("healing") for (var/mob/living/carbon/M in range(src.aurarange,originator)) - if(istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) + if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) continue if(prob(10)) M << "\blue You feel a soothing energy radiating from something nearby." M.adjustBruteLoss(-1) @@ -214,7 +214,7 @@ return 1 if("injure") for (var/mob/living/carbon/M in range(src.aurarange,originator)) - if(istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) + if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) continue if(prob(10)) M << "\red You feel a painful force radiating from something nearby." M.adjustBruteLoss(1) @@ -226,7 +226,7 @@ return 1 /*if("stun") for (var/mob/living/carbon/M in range(src.aurarange,originator)) - if(istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) + if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) continue if(prob(10)) M << "\red Energy radiating from the [originator] is making you feel numb." if(prob(20)) @@ -290,7 +290,7 @@ switch(src.effecttype) if("healing") for (var/mob/living/carbon/M in range(src.aurarange,originator)) - if(istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) + if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) continue M << "\blue A wave of energy invigorates you." M.adjustBruteLoss(-5) @@ -302,7 +302,7 @@ return 1 if("injure") for (var/mob/living/carbon/M in range(src.aurarange,originator)) - if(istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) + if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) continue M << "\red A wave of energy causes you great pain!" M.adjustBruteLoss(5) @@ -316,7 +316,7 @@ return 1 /*if("stun") for (var/mob/living/carbon/M in range(src.aurarange,originator)) - if(istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) + if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) continue M << "\red A wave of energy overwhelms your senses!" M.paralysis += 3 @@ -373,7 +373,7 @@ return 1 if("teleport") for (var/mob/living/M in range(src.aurarange,originator)) - if(istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) + if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) continue var/list/randomturfs = new/list() for(var/turf/T in orange(M, 30)) @@ -393,7 +393,7 @@ switch(src.effecttype) if("healing") for (var/mob/living/carbon/M in world) - if(istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) + if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) continue M << "\blue Waves of soothing energy wash over you." M.adjustBruteLoss(-3) @@ -415,7 +415,7 @@ return 1 /*if("stun") for (var/mob/living/carbon/M in world) - if(istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) + if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) continue M << "\red A powerful force causes you to black out momentarily." M.paralysis += 5 @@ -459,7 +459,7 @@ return 1 if("teleport") for (var/mob/living/M in world) - if(istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) + if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) continue var/list/randomturfs = new/list() for(var/turf/T in orange(M, 15))