first expunge

Author: Moltijoe

code/__DEFINES/antagonists.dm

@@ -202,10 +202,6 @@
 /// Checks if the given mob is a changeling
 #define IS_CHANGELING(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/changeling))
 
-/// Checks if the given mob is a vampire
-#define IS_VAMPIRE(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/vampire))
-
 // Antag resource defines
 #define ANTAG_RESOURCE_DARKSPAWN "psi"
-#define ANTAG_RESOURCE_VAMPIRE "blood"
-#define ANTAG_RESOURCE_BLOODSUCKER "blood" //these having the same name means that if someone gets both antags, they'll consume both resource types, which isn't ideal, but they're both blood so idk
+#define ANTAG_RESOURCE_BLOODSUCKER "blood"

code/__DEFINES/bloodsuckers.dm

@@ -72,6 +72,7 @@
 #define CLAN_LASOMBRA "Lasombra Clan"
 #define CLAN_TZIMISCE "Tzimisce Clan"
 #define CLAN_HECATA "Hecata Clan"
+#define CLAN_TEPES "Tepes Clan"
 
 #define TREMERE_VASSAL "tremere_vassal"
 #define FAVORITE_VASSAL "favorite_vassal"

code/__DEFINES/status_effects.dm

@@ -194,8 +194,6 @@
 
 #define STATUS_EFFECT_PROGENITORCURSE /datum/status_effect/progenitor_curse
 
-#define STATUS_EFFECT_MASQUERADE /datum/status_effect/masquerade
-
 #define STATUS_EFFECT_EXPLOSION_PRIME /datum/status_effect/explosion_prime
 
 /////////////

code/__DEFINES/traits/declarations.dm

@@ -41,7 +41,6 @@
 #define TRAIT_BLOODY_MESS_LITE	"bloody_mess_lite" //weak heparin, otherwise the same
 #define TRAIT_NO_BLOOD_REGEN	"no_blood_regen" //prevents regenerating blood
 #define TRAIT_NOPULSE           "nopulse" // Your heart doesn't beat
-#define TRAIT_MASQUERADE        "masquerade" // Falsifies Health analyzer blood levels
 #define TRAIT_NOCLONE			"noclone" // No cloning
 #define TRAIT_NODEFIB			"nodefib" // No defibbing
 #define TRAIT_COLDBLOODED       "coldblooded" // Your body is literal room temperature. Does not make you immune to the temp

code/__DEFINES/{yogs_defines}/antagonists.dm

@@ -1,4 +1,3 @@
-#define ANTAG_DATUM_VAMPIRE			/datum/antagonist/vampire
 #define ANTAG_DATUM_DARKSPAWN		/datum/antagonist/darkspawn
 #define ANTAG_DATUM_THRALL			/datum/antagonist/thrall
 #define ANTAG_DATUM_INFILTRATOR		/datum/antagonist/infiltrator

code/datums/components/mood.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/game/machinery/mindmachine.dm

@@ -496,8 +496,7 @@
 			/datum/antagonist/rev,
 			// Additional
 			/datum/antagonist/clockcult, // Same as bloodcult.
-			/datum/antagonist/bloodsucker,
-			/datum/antagonist/vampire
+			/datum/antagonist/bloodsucker
 		)
 		for(var/antag_datum in blacklisted_antag_datums)
 			if(firstOccupant.mind?.has_antag_datum(antag_datum) || secondOccupant.mind?.has_antag_datum(antag_datum))

code/game/objects/items/devices/scanners.dm

@@ -431,9 +431,7 @@ GENE SCANNER
 					blood_type = R.name
 				else
 					blood_type = blood_id
-			if(HAS_TRAIT(M, TRAIT_MASQUERADE)) //bloodsuckers
-				combined_msg += span_info("Blood level 100%, 560 cl, type: [blood_type]")
-			else if(C.blood_volume <= BLOOD_VOLUME_SAFE(C) && C.blood_volume > BLOOD_VOLUME_OKAY(C))
+			if(C.blood_volume <= BLOOD_VOLUME_SAFE(C) && C.blood_volume > BLOOD_VOLUME_OKAY(C))
 				combined_msg += "[span_danger("LOW blood level [blood_percent] %, [C.blood_volume] cl,")] [span_info("type: [blood_type]")]"
 			else if(C.blood_volume <= BLOOD_VOLUME_OKAY(C))
 				combined_msg += "[span_danger("CRITICAL blood level [blood_percent] %, [C.blood_volume] cl,")] [span_info("type: [blood_type]")]"