From e9adea5d9f6589e4b283ea128c98ea73b55c0746 Mon Sep 17 00:00:00 2001
From: CygnusB <39594514+MalricB@users.noreply.github.com>
Date: Tue, 1 Dec 2020 23:25:37 -0300
Subject: [PATCH] bsuckers get their objectives and also limits thrallling to 1
 per 10 levels

---
 code/datums/mind.dm                           | 28 ++++++++++---------
 .../bloodsucker/objects/bloodsucker_crypt.dm  |  2 +-
 2 files changed, 16 insertions(+), 14 deletions(-)

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 += "<B>Objectives:</B>"
-		var/obj_count = 1
-		for(var/datum/objective/objective in objectives)
-			output += "<br><B>Objective #[obj_count++]</B>: [objective.explanation_text]"
-			var/list/datum/mind/other_owners = objective.get_owners() - src
-			if(other_owners.len)
-				output += "<ul>"
-				for(var/datum/mind/M in other_owners)
-					output += "<li>Conspirator: [M.name]</li>"
-				output += "</ul>"
+    if(all_objectives.len)
+        output += "<B>Objectives:</B>"
+        var/obj_count = 1
+        for(var/datum/objective/objective in all_objectives)
+            output += "<br><B>Objective #[obj_count++]</B>: [objective.explanation_text]"
+            var/list/datum/mind/other_owners = objective.get_owners() - src
+            if(other_owners.len)
+            	output += "<ul>"
+                for(var/datum/mind/M in other_owners)
+                	output += "<li>Conspirator: [M.name]</li>"
+                output += "</ul>"
 
 	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, "<span class='notice'>You don't have enough blood to initiate the Dark Communion with [target].</span>")
 		return
-	if(bloodsuckerdatum.count_vassals(user)*5 > bloodsuckerdatum.vamplevel)
+	if(!bloodsuckerdatum || bloodsuckerdatum.vassals.len * 10 > bloodsuckerdatum.vamplevel)
 		to_chat(user, "<span class='notice'>Your power is yet too weak to bring more vassals under your control....</span>")
 		return
 	// Prep...