can run

Author: Moltijoe

code/__DEFINES/bloodsuckers.dm

@@ -18,9 +18,7 @@
 #define BLOODSUCKER_DRINK_NORMAL "bloodsucker_drink_normal"
 ///Drinks blood but is snobby, refusing to drink from mindless
 #define BLOODSUCKER_DRINK_SNOBBY "bloodsucker_drink_snobby"
-///Drinks blood from disgusting creatures without Humanity consequences.
-#define BLOODSUCKER_DRINK_INHUMANELY "bloodsucker_drink_imhumanely"
-///Drinks blood only from aggressive or higher grabs, no silent feeding.
+///Drinks blood only from grabs, no silent feeding.
 #define BLOODSUCKER_DRINK_PAINFUL "bloodsucker_drink_painful"
 
 ///Controls blood, just like all Bloodsuckers do
@@ -32,8 +30,6 @@
 ///Controls the inner machinations of one's being, being able to use the vassalrack and sculpt flesh monsters
 #define BLOODSUCKER_CONTROL_FLESH 8
 
-#define BLOODSUCKER_RANK_UP_NORMAL "bloodsucker_rank_up_normal"
-
 #define DANGER_LEVEL_FIRST_WARNING 1
 #define DANGER_LEVEL_SECOND_WARNING 2
 #define DANGER_LEVEL_THIRD_WARNING 3
@@ -61,7 +57,7 @@
 /**
  * Clan defines
  */
-#define CLAN_NONE "Caitiff"
+#define CLAN_CAITIFF "Caitiff"
 #define CLAN_BRUJAH "Brujah Clan"
 #define CLAN_NOSFERATU "Nosferatu Clan"
 #define CLAN_TREMERE "Tremere Clan"
@@ -136,11 +132,12 @@
 ///Called when a new Vassal is successfully made: (datum/bloodsucker_datum)
 #define BLOODSUCKER_MADE_VASSAL "bloodsucker_made_vassal"
 
-///Called when a Bloodsucker exits Torpor.
-#define BLOODSUCKER_EXIT_TORPOR "bloodsucker_exit_torpor"
 ///Called when a Bloodsucker reaches Final Death.
 #define BLOODSUCKER_FINAL_DEATH "bloodsucker_final_death"
 
+///Called when a Bloodsucker reaches low enough blood to trigger frenzy
+#define BLOODSUCKER_TRIGGER_FRENZY "bloodsucker_trigger_frenzy"
+
 #define COMSIG_BLOODSUCKER_BROKE_MASQUERADE "comsig_bloodsucker_broke_masquerade"
 
 ///Whether the Bloodsucker should not be dusted when arriving Final Death

code/modules/antagonists/_common/antag_datum.dm

@@ -7,7 +7,6 @@ GLOBAL_LIST_EMPTY(antagonists)
 	var/prevent_roundtype_conversion = TRUE		//If false, the roundtype will still convert with this antag active
 	var/datum/mind/owner						//Mind that owns this datum
 	var/silent = FALSE							//Silent will prevent the gain/lose texts to show
-	var/can_coexist_with_others = TRUE			//Whether or not the person will be able to have more than one datum
 	var/list/typecache_datum_blacklist = list()	//List of datums this type can't coexist with
 	var/job_rank
 	var/replace_banned = TRUE //Should replace jobbanned player with ghosts if granted.

code/modules/antagonists/bloodsuckers/bloodsucker_flavour.dm

@@ -1,11 +1,15 @@
 /datum/antagonist/bloodsucker
-	///Used for assigning your name
-	var/bloodsucker_name
 	///Used for assigning your title
 	var/bloodsucker_title
 	///Used for assigning your reputation
 	var/bloodsucker_reputation
 
+///Called when you get the antag datum, called only ONCE per antagonist.
+/datum/antagonist/bloodsucker/on_gain()
+	. = ..()
+	SelectTitle(am_fledgling = TRUE)
+	SelectReputation(am_fledgling = TRUE)
+
 ////////////////////////////////////////////////////////////////////////////////////
 //--------------------------------Credits flavour---------------------------------//
 ////////////////////////////////////////////////////////////////////////////////////
@@ -80,34 +84,6 @@
  *
  *	All Bloodsuckers get a name, and gets a better one when they hit Rank 4.
  */
-
-/// Names
-/datum/antagonist/bloodsucker/proc/SelectFirstName()
-	if(owner.current.gender == MALE)
-		bloodsucker_name = pick(
-			"Desmond","Rudolph","Dracula","Vlad","Pyotr","Gregor",
-			"Cristian","Christoff","Marcu","Andrei","Constantin",
-			"Gheorghe","Grigore","Ilie","Iacob","Luca","Mihail","Pavel",
-			"Vasile","Octavian","Sorin","Sveyn","Aurel","Alexe","Iustin",
-			"Theodor","Dimitrie","Octav","Damien","Magnus","Caine","Abel", // Romanian/Ancient
-			"Lucius","Gaius","Otho","Balbinus","Arcadius","Romanos","Alexios","Vitellius", // Latin
-			"Melanthus","Teuthras","Orchamus","Amyntor","Axion", // Greek
-			"Thoth","Thutmose","Osorkon,","Nofret","Minmotu","Khafra", // Egyptian
-			"Dio",
-		)
-	else
-		bloodsucker_name = pick(
-			"Islana","Tyrra","Greganna","Pytra","Hilda",
-			"Andra","Crina","Viorela","Viorica","Anemona",
-			"Camelia","Narcisa","Sorina","Alessia","Sophia",
-			"Gladda","Arcana","Morgan","Lasarra","Ioana","Elena",
-			"Alina","Rodica","Teodora","Denisa","Mihaela",
-			"Svetla","Stefania","Diyana","Kelssa","Lilith", // Romanian/Ancient
-			"Alexia","Athanasia","Callista","Karena","Nephele","Scylla","Ursa", // Latin
-			"Alcestis","Damaris","Elisavet","Khthonia","Teodora", // Greek
-			"Nefret","Ankhesenpep", // Egyptian
-		)
-
 /datum/antagonist/bloodsucker/proc/SelectTitle(am_fledgling = 0, forced = FALSE)
 	// Already have Title
 	if(!forced && bloodsucker_title != null)
@@ -130,9 +106,8 @@
 
 /datum/antagonist/bloodsucker/proc/return_full_name(include_rep = FALSE)
 
-	var/fullname
+	var/fullname = owner.current.name
 	// Name First
-	fullname = (bloodsucker_name ? bloodsucker_name : owner.current.name)
 	// Title
 	if(bloodsucker_title)
 		fullname = bloodsucker_title + " " + fullname

code/modules/antagonists/bloodsuckers/bloodsucker_integration.dm

@@ -10,8 +10,8 @@
 			. += ""
 			. += "Current Frenzy Enter: [FRENZY_THRESHOLD_ENTER]"
 			. += "Current Frenzy Leave: [FRENZY_THRESHOLD_EXIT]"
-			if(bloodsuckerdatum.has_task)
-				. += "Task Blood Drank: [bloodsuckerdatum.task_blood_drank]"
+			// if(bloodsuckerdatum.has_task)
+			// 	. += "Task Blood Drank: [bloodsuckerdatum.task_blood_drank]"
 
 // EXAMINING
 /mob/living/carbon/proc/return_vamp_examine(mob/living/viewer)

code/modules/antagonists/bloodsuckers/bloodsuckers.dm

@@ -3,11 +3,10 @@
 	show_in_antagpanel = TRUE
 	roundend_category = "bloodsuckers"
 	antagpanel_category = "Bloodsucker"
-	job_rank = ROLE_BLOODSUCKER
 	antag_hud_name = "bloodsucker"
+	job_rank = ROLE_BLOODSUCKER
 	show_to_ghosts = TRUE
 	show_name_in_check_antagonists = TRUE
-	can_coexist_with_others = FALSE
 	ui_name = "AntagInfoBloodsucker"
 	preview_outfit = /datum/outfit/bloodsucker_outfit
 	count_towards_antag_cap = TRUE
@@ -20,13 +19,10 @@
 
 	///If we are currently in a Frenzy
 	var/frenzied = FALSE
-	///If we have a task assigned
-	var/has_task = FALSE
+	///The current task we have assigned, if any
+	var/datum/altar_task/current_task
 	///How many times have we used a blood altar
 	var/altar_uses = 0
-	var/task_heart_required = 0
-	var/task_blood_required = 0
-	var/task_blood_drank = 0
 
 	// give TRAIT_STRONG_GRABBER during frenzy
 
@@ -42,8 +38,9 @@
 
 	var/bloodsucker_level = 1
 	var/bloodsucker_level_unspent = 1
+
 	var/passive_blood_drain = -0.1
-	var/additional_regen
+	var/additional_regen = 0
 	var/bloodsucker_regen_rate = 0.3
 	/// How much blood we have, starting off at default blood levels.
 	var/bloodsucker_blood_volume = BLOOD_VOLUME_GENERIC
@@ -85,7 +82,8 @@
 		TRAIT_VIRUSIMMUNE,
 		TRAIT_TOXIMMUNE,
 		TRAIT_HARDLY_WOUNDED,
-		TRAIT_RESISTDAMAGESLOWDOWN
+		TRAIT_RESISTDAMAGESLOWDOWN,
+		TRAIT_UNHOLY
 	)
 
 ////////////////////////////////////////////////////////////////////////////////////
@@ -102,18 +100,10 @@
 	RegisterSignal(owner, COMSIG_MIND_CHECK_ANTAG_RESOURCE, PROC_REF(has_blood))
 	RegisterSignal(owner, COMSIG_MIND_SPEND_ANTAG_RESOURCE, PROC_REF(use_blood))
 
-	if(IS_FAVORITE_VASSAL(owner.current)) // Vassals shouldnt be getting the same benefits as Bloodsuckers.
-		bloodsucker_level_unspent = 0
-		show_in_roundend = FALSE
-	else
-		// Start Sunlight if first Bloodsucker
-		check_start_sunlight()
-		// Name and Titles
-		SelectFirstName()
-		SelectTitle(am_fledgling = TRUE)
-		SelectReputation(am_fledgling = TRUE)
-		// Objectives
-		forge_bloodsucker_objectives()
+	// Start Sunlight if first Bloodsucker
+	check_start_sunlight()
+	// Objectives
+	forge_bloodsucker_objectives()
 
 	return ..()
 
@@ -128,40 +118,23 @@
 	RegisterSignal(current_mob, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine))
 	RegisterSignal(current_mob, COMSIG_LIVING_LIFE, PROC_REF(LifeTick))
 	RegisterSignal(current_mob, COMSIG_LIVING_DEATH, PROC_REF(on_death))
+	current_mob.add_traits(bloodsucker_traits, type)
 
 	handle_clown_mutation(current_mob, mob_override ? null : "As a vampiric clown, you are no longer a danger to yourself. Your clownish nature has been subdued by your thirst for blood.")
 	add_team_hud(current_mob)
-	ADD_TRAIT(current_mob, TRAIT_UNHOLY, type)
 
 	if(current_mob.hud_used)
 		on_hud_created()
 	else
 		RegisterSignal(current_mob, COMSIG_MOB_HUD_CREATED, PROC_REF(on_hud_created))
+
 #ifdef BLOODSUCKER_TESTING
 	var/turf/user_loc = get_turf(current_mob)
 	new /obj/structure/closet/crate/coffin(user_loc)
 	new /obj/structure/bloodsucker/vassalrack(user_loc)
 #endif
 
 
-////////////////////////////////////////////////////////////////////////////////////
-//----------------------------------Hud Handling----------------------------------//
-////////////////////////////////////////////////////////////////////////////////////
-/datum/antagonist/bloodsucker/proc/on_hud_created(datum/source)
-	SIGNAL_HANDLER
-
-	var/datum/hud/bloodsucker_hud = owner.current.hud_used
-
-	blood_display = new /atom/movable/screen/bloodsucker/blood_counter(bloodsucker_hud)
-	bloodsucker_hud.infodisplay += blood_display
-
-	vamprank_display = new /atom/movable/screen/bloodsucker/rank_counter(bloodsucker_hud)
-	bloodsucker_hud.infodisplay += vamprank_display
-
-	sunlight_display = new /atom/movable/screen/bloodsucker/sunlight_counter(bloodsucker_hud)
-	bloodsucker_hud.infodisplay += sunlight_display
-
-	INVOKE_ASYNC(bloodsucker_hud, TYPE_PROC_REF(/datum/hud/, show_hud), bloodsucker_hud.hud_version)
 
 ////////////////////////////////////////////////////////////////////////////////////
 //------------------------------------Removal-------------------------------------//
@@ -184,7 +157,7 @@
 	. = ..()
 	var/mob/living/current_mob = mob_override || owner.current
 	UnregisterSignal(current_mob, list(COMSIG_LIVING_LIFE, COMSIG_ATOM_EXAMINE, COMSIG_LIVING_DEATH))
-	REMOVE_TRAIT(current_mob, TRAIT_UNHOLY, type)
+	current_mob.remove_traits(bloodsucker_traits, type)
 
 	if(current_mob.hud_used)
 		var/datum/hud/hud_used = current_mob.hud_used
@@ -205,14 +178,31 @@
 	var/fullname = return_full_name(TRUE)
 	to_chat(owner, span_userdanger("You are [fullname], a strain of vampire known as a Bloodsucker!"))
 	owner.announce_objectives()
-	if(bloodsucker_level_unspent >= 2)
-		to_chat(owner, span_announce("As a latejoiner, you have [bloodsucker_level_unspent] bonus Ranks, entering your claimed coffin allows you to spend a Rank."))
 	owner.current.playsound_local(null, 'sound/ambience/antag/bloodsuckeralert.ogg', 100, FALSE, pressure_affected = FALSE)
 	antag_memory += "Although you were born a mortal, in undeath you earned the name <b>[fullname]</b>.<br>"
 
 /datum/antagonist/bloodsucker/farewell()
 	to_chat(owner.current, span_userdanger("<FONT size = 3>With a snap, your curse has ended. You are no longer a Bloodsucker. You live once more!</FONT>"))
 
+////////////////////////////////////////////////////////////////////////////////////
+//----------------------------------Hud Handling----------------------------------//
+////////////////////////////////////////////////////////////////////////////////////
+/datum/antagonist/bloodsucker/proc/on_hud_created(datum/source)
+	SIGNAL_HANDLER
+
+	var/datum/hud/bloodsucker_hud = owner.current.hud_used
+
+	blood_display = new /atom/movable/screen/bloodsucker/blood_counter(bloodsucker_hud)
+	bloodsucker_hud.infodisplay += blood_display
+
+	vamprank_display = new /atom/movable/screen/bloodsucker/rank_counter(bloodsucker_hud)
+	bloodsucker_hud.infodisplay += vamprank_display
+
+	sunlight_display = new /atom/movable/screen/bloodsucker/sunlight_counter(bloodsucker_hud)
+	bloodsucker_hud.infodisplay += sunlight_display
+
+	INVOKE_ASYNC(bloodsucker_hud, TYPE_PROC_REF(/datum/hud/, show_hud), bloodsucker_hud.hud_version)
+
 ////////////////////////////////////////////////////////////////////////////////////
 //-----------------------------------Ability use----------------------------------//
 ////////////////////////////////////////////////////////////////////////////////////
@@ -360,7 +350,7 @@
 	var/list/report = list()
 
 	// Vamp name
-	report += "<br>[span_header("<b>\[[return_full_name(TRUE)]\]</b>")]</span>"
+	report += "<br>[span_header("<b>\[name\]</b>")]</span>"
 	report += printplayer(owner)
 	if(my_clan)
 		report += "They were part of the <b>[my_clan.name]</b>!"
@@ -441,27 +431,6 @@
 	// 	to_chat(owner, span_boldnotice("Your Altar uses have been reset!"))
 	// 	altar_uses = 0
 
-/// Buying powers
-// /datum/antagonist/bloodsucker/proc/BuyPower(datum/action/cooldown/bloodsucker/power)
-// 	for(var/datum/action/cooldown/bloodsucker/current_powers as anything in powers)
-// 		if(current_powers.type == power.type)
-// 			return FALSE
-// 	powers += power
-// 	power.Grant(owner.current)
-// 	return TRUE
-
-// /datum/antagonist/bloodsucker/proc/RemovePower(datum/action/cooldown/bloodsucker/power)
-// 	if(power.active)
-// 		power.DeactivatePower()
-// 	powers -= power
-// 	power.Remove(owner.current)
-
-// /datum/antagonist/bloodsucker/proc/give_starting_powers()
-// 	for(var/datum/action/cooldown/bloodsucker/all_powers as anything in all_bloodsucker_powers)
-// 		if(!(initial(all_powers.purchase_flags) & BLOODSUCKER_DEFAULT_POWER))
-// 			continue
-// 		BuyPower(new all_powers)
-
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -482,7 +451,7 @@
 
 /// Name shown on antag list
 /datum/antagonist/bloodsucker/antag_listing_name()
-	return ..() + "([return_full_name(TRUE)])"
+	return ..() + "(name)"
 
 /// Whatever interesting things happened to the antag admins should know about
 /// Include additional information about antag in this part