Merge branch 'euthanasia' into euthanasia

code/__DEFINES/status_effects.dm

@@ -44,7 +44,6 @@
 
 #define STATUS_EFFECT_SLEEPING /datum/status_effect/incapacitating/sleeping //the affected is asleep
 
-#define STATUS_EFFECT_TASED /datum/status_effect/electrode //the affected has been tased, preventing fine muscle control
 #define STATUS_EFFECT_TASED /datum/status_effect/no_combat_mode/electrode/ //the affected has been tased, preventing fine muscle control
 
 #define STATUS_EFFECT_PACIFY /datum/status_effect/pacify //the affected is pacified, preventing direct hostile actions

code/__DEFINES/traits.dm

@@ -126,7 +126,6 @@
 #define TRAIT_RADRESONANCE "radioactive_resonance" //Hyperstation edit
 #define TRAIT_SWIMMING			"swimming"			//only applied by /datum/element/swimming, for checking
 #define TRAIT_CAPTAIN_METABOLISM "captain-metabolism"
-#define TRAIT_COLDBLOODED		"coldblooded"	// Your body is literal room temperature. Does not make you immune to the temp.
 #define TRAIT_NONATURALHEAL		"nonaturalheal"	// Only Admins can heal you. NOTHING else does it unless it's given the god tag.
 #define TRAIT_NORUNNING			"norunning"		// You walk!
 #define TRAIT_NOMARROW			"nomarrow"		// You don't make blood, with chemicals or nanites.

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")

code/modules/antagonists/bloodsucker/datum_bloodsucker.dm

@@ -321,8 +321,8 @@ datum/antagonist/bloodsucker/proc/SpendRank()
 		var/datum/species/S = H.dna.species
 		S.burnmod *= 0.025 			// Slightly more burn damage
 		S.stunmod *= 0.95			// Slightly less stun time.
-		S.punchdamagelow += 0.5
-		S.punchdamagehigh += 0.5    // NOTE: This affects the hitting power of Brawn.
+		S.punchdamagelow += 0.75
+		S.punchdamagehigh += 0.75    // NOTE: This affects the hitting power of Brawn.
 	// More Health
 	owner.current.setMaxHealth(owner.current.maxHealth + 5)
 	// Vamp Stats

code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm

@@ -101,7 +101,7 @@
 	var/convert_progress = 3		// Resets on each new character to be added to the chair. Some effects should lower it...
 	var/disloyalty_confirm = FALSE	// Command & Antags need to CONFIRM they are willing to lose their role (and will only do it if the Vassal'ing succeeds)
 	var/disloyalty_offered = FALSE	// Has the popup been issued? Don't spam them.
-	var/convert_cost = 100
+	var/convert_cost = 375
 
 /obj/structure/bloodsucker/vassalrack/deconstruct(disassembled = TRUE)
 	new /obj/item/stack/sheet/metal(src.loc, 4)
@@ -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...

code/modules/antagonists/bloodsucker/powers/bs_brawn.dm

@@ -66,7 +66,7 @@
 	// Target Type: Mob
 	if(isliving(target))
 		var/mob/living/carbon/user_C = user
-		var/hitStrength = user_C.dna.species.punchdamagehigh * 1.3 + 5
+		var/hitStrength = user_C.dna.species.punchdamagehigh * 2.0 + 5
 		// Knockdown!
 		var/powerlevel = min(5, 1 + level_current)
 		if(rand(5 + powerlevel) >= 5)