From 6beebb597576ea72ed604e03c26bc540b8b9b9e1 Mon Sep 17 00:00:00 2001 From: Mloc-Argent Date: Mon, 3 Mar 2014 09:15:35 +0000 Subject: [PATCH] Dionaea can no longer steal blood from species which have the NO_BLOOD flag Fixes #4510 Signed-off-by: Mloc-Argent Conflicts: code/modules/mob/living/carbon/monkey/diona.dm --- code/modules/mob/living/carbon/monkey/diona.dm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/monkey/diona.dm b/code/modules/mob/living/carbon/monkey/diona.dm index 63796929e25..4f1233515ee 100644 --- a/code/modules/mob/living/carbon/monkey/diona.dm +++ b/code/modules/mob/living/carbon/monkey/diona.dm @@ -229,14 +229,17 @@ set desc = "Take a blood sample from a suitable donor." var/list/choices = list() - for(var/mob/living/C in view(1,src)) - if(C.real_name != real_name) - choices += C + for(var/mob/living/carbon/human/H in oview(1,src)) + choices += H - var/mob/living/M = input(src,"Who do you wish to take a sample from?") in null|choices + var/mob/living/carbon/human/M = input(src,"Who do you wish to take a sample from?") in null|choices if(!M || !src) return + if(M.species.flags & NO_BLOOD) + src << "\red That donor has no blood to take." + return + if(donors.Find(M.real_name)) src << "\red That donor offers you nothing new." return