diff --git a/code/datums/mind.dm b/code/datums/mind.dm index f8550697..db2b099e 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -364,20 +364,22 @@ output += memory - for(var/datum/antagonist/A in antag_datums) - output += A.antag_memory + var/list/all_objectives = list() + for(var/datum/antagonist/A in antag_datums) + output += A.antag_memory + all_objectives |= A.objectives - if(objectives.len) - output += "Objectives:" - var/obj_count = 1 - for(var/datum/objective/objective in objectives) - output += "
Objective #[obj_count++]: [objective.explanation_text]" - var/list/datum/mind/other_owners = objective.get_owners() - src - if(other_owners.len) - output += "" + if(all_objectives.len) + output += "Objectives:" + var/obj_count = 1 + for(var/datum/objective/objective in all_objectives) + output += "
Objective #[obj_count++]: [objective.explanation_text]" + var/list/datum/mind/other_owners = objective.get_owners() - src + if(other_owners.len) + output += "" if(window) recipient << browse(output,"window=memory") diff --git a/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm b/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm index 48e5df0a..84c09295 100644 --- a/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm +++ b/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm @@ -255,7 +255,7 @@ if(user.blood_volume < convert_cost + 5) to_chat(user, "You don't have enough blood to initiate the Dark Communion with [target].") return - if(bloodsuckerdatum.count_vassals(user)*5 > bloodsuckerdatum.vamplevel) + if(!bloodsuckerdatum || bloodsuckerdatum.vassals.len * 10 > bloodsuckerdatum.vamplevel) to_chat(user, "Your power is yet too weak to bring more vassals under your control....") return // Prep...