Merge remote-tracking branch 'origin/just-in-case'

# Conflicts:
#	code/game/objects/items/weapons/weaponry.dm

Conflict clearance for vampire.

code/datums/mind.dm

@@ -53,6 +53,8 @@
 	var/datum/faction/faction 			//associated faction
 	var/datum/changeling/changeling		//changeling holder
 
+	var/datum/vampire/vampire //vampire holder
+
 	var/rev_cooldown = 0
 
 	// the world.time since the mob has been brigged, or -1 if not at all
@@ -72,6 +74,8 @@
 		if(changeling)
 			current.remove_changeling_powers()
 			current.verbs -= /datum/changeling/proc/EvolutionMenu
+		if(vampire)
+			current.remove_vampire_powers()
 		current.mind = null
 
 		nanomanager.user_transferred(current, new_character) // transfer active NanoUI instances to new user
@@ -83,7 +87,8 @@
 
 	if(changeling)
 		new_character.make_changeling()
-
+	if(vampire)
+		new_character.make_vampire()
 	if(active)
 		new_character.key = key		//now transfer the key to link the client to our new body
 
@@ -143,7 +148,7 @@
 
 	if(href_list["add_antagonist"])
 		var/datum/antagonist/antag = all_antag_types[href_list["add_antagonist"]]
-		if(antag) 
+		if(antag)
 			if(antag.add_antagonist(src, 1, 1, 0, 1, 1)) // Ignore equipment and role type for this.
 				log_admin("[key_name_admin(usr)] made [key_name(src)] into a [antag.role_text].")
 			else
@@ -439,6 +444,7 @@
 	assigned_job =    null
 	//faction =       null //Uncommenting this causes a compile error due to 'undefined type', fucked if I know.
 	changeling =      null
+	vampire =         null
 	initial_account = null
 	objectives =      list()
 	special_verbs =   list()