it's gone

Author: Moltijoe

code/__DEFINES/antagonists.dm

@@ -125,14 +125,6 @@
 #define TIER_3 6
 #define TIER_ASCEND 7
 
-///Whether a mob is a Bloodsucker
-#define IS_BLOODSUCKER(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/bloodsucker))
-///Whether a mob is a Vassal
-#define IS_VASSAL(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/vassal))
-///Whether a mob is a Favorite Vassal
-#define IS_FAVORITE_VASSAL(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/vassal/favorite))
-///Whether a mob is a Revenge Vassal
-#define IS_REVENGE_VASSAL(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/vassal/revenge))
 ///Whether a mob is a Monster Hunter
 #define IS_MONSTERHUNTER(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/monsterhunter))
 
@@ -205,6 +197,9 @@
 /// Checks if the given mob is a vampire
 #define IS_VAMPIRE(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/vampire))
 
+/// Checks if the given mob is a target of a monsterhunter
+#define IS_MONSTERHUNTER_TARGET(mob) (IS_HERETIC(mob) || iscultist(mob) || is_servant_of_ratvar(mob) || IS_WIZARD(mob) || is_team_darkspawn(mob) || IS_CHANGELING(mob))
+
 // Antag resource defines
 #define ANTAG_RESOURCE_DARKSPAWN "psi"
 #define ANTAG_RESOURCE_VAMPIRE "blood"

code/__DEFINES/bloodsuckers.dm

@@ -394,9 +394,6 @@ GLOBAL_LIST_INIT(donor_pdas, list(PDA_COLOR_NORMAL, PDA_COLOR_TRANSPARENT, PDA_C
 #define ALIGNMENT_NEUT "neutral"
 #define ALIGNMENT_EVIL "evil"
 
-/// Whether we have succesfully hidden out blood level
-#define BLOODSUCKER_HIDE_BLOOD "hide_blood_volume"
-#define BLOODSUCKER_SHOW_BLOOD "show_blood_volume"
 /// 1 tile down
 #define ui_blood_display "WEST:6,CENTER-1:0"
 /// 2 tiles down

code/__DEFINES/misc.dm

@@ -43,7 +43,6 @@
 #define ROLE_HORROR				"Eldritch Horror" // Yogs
 #define ROLE_INFILTRATOR		"Infiltrator" // Yogs
 #define ROLE_ZOMBIE				"Zombie"
-#define ROLE_BLOODSUCKER		"Bloodsucker"
 #define ROLE_MONSTERHUNTER		"Monster Hunter"
 #define ROLE_SPACE_DRAGON		"Space Dragon"
 #define ROLE_GOLEM				"Golem"
@@ -84,7 +83,6 @@ GLOBAL_LIST_INIT(special_roles, list(
 
 	//Roundstart or Midround
 	ROLE_VAMPIRE = /datum/antagonist/vampire, // Yogs
-	ROLE_BLOODSUCKER = /datum/antagonist/bloodsucker,
 	ROLE_TRAITOR = /datum/antagonist/traitor,
 	ROLE_CHANGELING	= /datum/antagonist/changeling,
 	ROLE_HERETIC = /datum/antagonist/heretic,

code/__DEFINES/role_preferences.dm

@@ -261,8 +261,6 @@
 #define GUARDIAN_TRAIT "guardian_trait"
 #define STARGAZER_TRAIT "stargazer"
 #define MADE_UNCLONEABLE "made-uncloneable"
-/// Source trait for Bloodsuckers-related traits
-#define BLOODSUCKER_TRAIT "bloodsucker_trait"
 /// Source trait for Monster Hunter-related traits
 #define HUNTER_TRAIT "monsterhunter_trait"
 /// Source trait during a Frenzy

code/__DEFINES/traits/declarations.dm

@@ -874,7 +874,6 @@ GLOBAL_LIST_INIT(maintenance_loot_moderate,list(
 	/obj/item/stack/medical/suture/medicated = W_RARE,
 	/obj/item/stack/ore/diamond = W_RARE,
 	/obj/item/stack/ore/dilithium_crystal = W_RARE,
-	/obj/item/stake = W_UNCOMMON,
 	/obj/item/stamp/chameleon/broken = W_RARE,
 	/obj/item/storage/backpack/chameleon/broken = W_RARE,
 	/obj/item/storage/backpack/duffelbag/syndie = W_RARE,
@@ -949,7 +948,6 @@ GLOBAL_LIST_INIT(maintenance_loot_major,list(
 	/obj/item/stack/ore/bluespace_crystal = W_RARE,
 	/obj/item/stack/sheet/capitalisium = W_MYTHICAL,
 	/obj/item/stack/sheet/stalinium = W_MYTHICAL,
-	/obj/item/stake/ducky = W_MYTHICAL,
 	/obj/item/stamp/chameleon = W_RARE,
 	/obj/item/storage/backpack/chameleon = W_RARE,
 	/obj/item/storage/backpack/duffelbag/clown/cream_pie = W_RARE,

code/_globalvars/lists/maintenance_loot.dm

@@ -136,14 +136,9 @@
 				highest_absolute_mood = absmood
 
 	if(!conflicting_moodies.len && owner.mind) //no special icons- go to the normal icon states
-		var/datum/antagonist/bloodsucker/bloodsuckerdatum = owner.mind.has_antag_datum(/datum/antagonist/bloodsucker) //bloodsucker edit
 		if(sanity < 25)
 			screen_obj.icon_state = "mood_insane"
-			if(IS_BLOODSUCKER(owner) && bloodsuckerdatum.my_clan?.get_clan() == CLAN_TOREADOR)
-				screen_obj.add_overlay("teeth_insane")
 		else
-			if(IS_BLOODSUCKER(owner) && bloodsuckerdatum.my_clan?.get_clan() == CLAN_TOREADOR)
-				screen_obj.add_overlay("teeth[mood_level]")
 			screen_obj.icon_state = "mood[mood_level]"
 		screen_obj_sanity.icon_state = "sanity[sanity_level]"
 		return

code/datums/components/mood.dm

@@ -79,11 +79,6 @@
 		to_chat(D, span_danger("Their arm tears through your demonic form!"))
 		D.apply_damage(stake_damagehigh, BRUTE, BODY_ZONE_CHEST)
 		return TRUE
-	if(D.mind.has_antag_datum(/datum/antagonist/bloodsucker))
-		to_chat(D, span_cultlarge("Their arm stakes straight into your undead flesh!"))
-		D.apply_damage(A.get_punchdamagehigh() + 10, BURN)				//20 damage
-		D.apply_damage(A.get_punchdamagehigh(), BRUTE, BODY_ZONE_CHEST)	//10 damage
-		return TRUE
 	else
 		D.apply_damage(A.get_punchdamagehigh() + 5, BRUTE, BODY_ZONE_CHEST)	//15 damage
 	return TRUE
@@ -111,9 +106,6 @@
 			D.apply_damage(A.get_punchdamagehigh() + 5, BRUTE, BODY_ZONE_HEAD)	//15 damage
 			D.SetSleeping(40)
 			return TRUE
-		if(D.mind.has_antag_datum(/datum/antagonist/bloodsucker))
-			to_chat(D, span_warning("Your undead form protects you from being put to sleep!"))
-			return TRUE
 		if(D.mind.has_antag_datum(/datum/antagonist/sinfuldemon))
 			to_chat(D, span_warning("Your demonic form protects you from being put to sleep!"))
 			return TRUE
@@ -142,9 +134,6 @@
 		D.apply_damage(holykick_staminadamage, STAMINA)
 		D.Paralyze(20)
 		return TRUE
-	if(D.mind.has_antag_datum(/datum/antagonist/bloodsucker))
-		to_chat(D, span_warning("This just seems like regular water..."))
-		return TRUE
 	if(D.mind.has_antag_datum(/datum/antagonist/cult))
 		for(var/datum/action/innate/cult/blood_magic/BD in D.actions)
 			to_chat(D, span_cultlarge("Your blood rites falter as the holy water drips onto your body!"))