Merge pull request #4997 from Citadel-Station-13/upstream-merge-34567

[MIRROR] Fixes Revs & Clockcultists being valid for mindswap

code/datums/antagonists/brother.dm

@@ -72,8 +72,8 @@
 	T.add_member(bro)
 	T.pick_meeting_area()
 	T.forge_brother_objectives()
-	new_owner.add_antag_datum(ANTAG_DATUM_BROTHER,T)
-	bro.add_antag_datum(ANTAG_DATUM_BROTHER, T)
+	new_owner.add_antag_datum(/datum/antagonist/brother,T)
+	bro.add_antag_datum(/datum/antagonist/brother, T)
 	T.update_name()
 	message_admins("[key_name_admin(admin)] made [new_owner.current] and [bro.current] into blood brothers.")
 	log_admin("[key_name(admin)] made [new_owner.current] and [bro.current] into blood brothers.")

code/datums/antagonists/cult.dm

@@ -229,13 +229,13 @@
 	sac_objective.team = src
 
 	for(var/mob/living/carbon/human/player in GLOB.player_list)
-		if(player.mind && !player.mind.has_antag_datum(ANTAG_DATUM_CULT) && !is_convertable_to_cult(player) && player.stat != DEAD)
+		if(player.mind && !player.mind.has_antag_datum(/datum/antagonist/cult) && !is_convertable_to_cult(player) && player.stat != DEAD)
 			target_candidates += player.mind
 
 	if(target_candidates.len == 0)
 		message_admins("Cult Sacrifice: Could not find unconvertable target, checking for convertable target.")
 		for(var/mob/living/carbon/human/player in GLOB.player_list)
-			if(player.mind && !player.mind.has_antag_datum(ANTAG_DATUM_CULT) && player.stat != DEAD)
+			if(player.mind && !player.mind.has_antag_datum(/datum/antagonist/cult) && player.stat != DEAD)
 				target_candidates += player.mind
 	listclearnulls(target_candidates)
 	if(LAZYLEN(target_candidates))

code/datums/antagonists/datum_traitor.dm

@@ -4,8 +4,8 @@
 	antagpanel_category = "Traitor"
 	job_rank = ROLE_TRAITOR
 	var/should_specialise = TRUE //do we split into AI and human, set to true on inital assignment only
-	var/ai_datum = ANTAG_DATUM_TRAITOR_AI
-	var/human_datum = ANTAG_DATUM_TRAITOR_HUMAN
+	var/ai_datum = /datum/antagonist/traitor/AI
+	var/human_datum = /datum/antagonist/traitor/human
 	var/special_role = "traitor"
 	var/employer = "The Syndicate"
 	var/give_objectives = TRUE

code/datums/antagonists/internal_affairs.dm

@@ -6,8 +6,8 @@
 
 /datum/antagonist/traitor/internal_affairs
 	name = "Internal Affairs Agent"
-	human_datum = ANTAG_DATUM_IAA_HUMAN
-	ai_datum = ANTAG_DATUM_IAA_AI
+	human_datum = /datum/antagonist/traitor/human/internal_affairs
+	ai_datum = /datum/antagonist/traitor/AI/internal_affairs
 	antagpanel_category = "IAA"
 
 /datum/antagonist/traitor/AI/internal_affairs

code/datums/antagonists/ninja.dm

@@ -95,12 +95,12 @@
 /proc/remove_ninja(mob/living/L)
 	if(!L || !L.mind)
 		return FALSE
-	var/datum/antagonist/datum = L.mind.has_antag_datum(ANTAG_DATUM_NINJA)
+	var/datum/antagonist/datum = L.mind.has_antag_datum(/datum/antagonist/ninja)
 	datum.on_removal()
 	return TRUE
 
 /proc/is_ninja(mob/living/M)
-	return M && M.mind && M.mind.has_antag_datum(ANTAG_DATUM_NINJA)
+	return M && M.mind && M.mind.has_antag_datum(/datum/antagonist/ninja)
 
 
 /datum/antagonist/ninja/greet()

code/datums/mind.dm

@@ -203,12 +203,12 @@
 
 /datum/mind/proc/remove_traitor()
 	if(src in SSticker.mode.traitors)
-		remove_antag_datum(ANTAG_DATUM_TRAITOR)
+		remove_antag_datum(/datum/antagonist/traitor)
 	SSticker.mode.update_traitor_icons_removed(src)
 
 /datum/mind/proc/remove_brother()
 	if(src in SSticker.mode.brothers)
-		remove_antag_datum(ANTAG_DATUM_BROTHER)
+		remove_antag_datum(/datum/antagonist/brother)
 	SSticker.mode.update_brother_icons_removed(src)
 
 /datum/mind/proc/remove_nukeop()
@@ -678,7 +678,7 @@
 	qdel(find_syndicate_uplink())
 
 /datum/mind/proc/make_Traitor()
-	if(!(has_antag_datum(ANTAG_DATUM_TRAITOR)))
+	if(!(has_antag_datum(/datum/antagonist/traitor)))
 		add_antag_datum(/datum/antagonist/traitor)
 
 /datum/mind/proc/make_Changling()