Merge pull request #3477 from Citadel-Station-13/upstream-merge-31630

[MIRROR] Datum rev & related upgrades to base datum antag

code/datums/antagonists/abductor.dm

@@ -18,9 +18,15 @@
 	landmark_type = /obj/effect/landmark/abductor/scientist
 	greet_text = "Use your stealth technology and equipment to incapacitate humans for your scientist to retrieve."
 
-/datum/antagonist/abductor/New(datum/mind/new_owner, datum/objective_team/abductor_team/T)
-	team = T
-	return ..()
+/datum/antagonist/abductor/create_team(datum/objective_team/abductor_team/new_team)
+	if(!new_team)
+		return
+	if(!istype(new_team))
+		stack_trace("Wrong team type passed to [type] initialization.")
+	team = new_team
+
+/datum/antagonist/abductor/get_team()
+	return team
 
 /datum/antagonist/abductor/on_gain()
 	SSticker.mode.abductors += owner
@@ -31,7 +37,6 @@
 
 /datum/antagonist/abductor/on_removal()
 	SSticker.mode.abductors -= owner
-	team.members -= owner
 	owner.objectives -= team.objectives
 	if(owner.current)
 		to_chat(owner.current,"<span class='userdanger'>You are no longer the [owner.special_role]!</span>")

code/datums/antagonists/antag_datum.dm

@@ -7,6 +7,8 @@ GLOBAL_LIST_EMPTY(antagonists)
 	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/delete_on_mind_deletion = TRUE
+	var/job_rank
+	var/replace_banned = TRUE //Should replace jobbaned player with ghosts if granted.
 
 /datum/antagonist/New(datum/mind/new_owner)
 	GLOB.antagonists += src
@@ -23,9 +25,10 @@ GLOBAL_LIST_EMPTY(antagonists)
 
 /datum/antagonist/proc/can_be_owned(datum/mind/new_owner)
 	. = TRUE
-	if(owner.has_antag_datum(type))
+	var/datum/mind/tested = new_owner || owner
+	if(tested.has_antag_datum(type))
 		return FALSE
-	for(var/i in owner.antag_datums)
+	for(var/i in tested.antag_datums)
 		var/datum/antagonist/A = i
 		if(is_type_in_typecache(src, A.typecache_datum_blacklist))
 			return FALSE
@@ -42,12 +45,39 @@ GLOBAL_LIST_EMPTY(antagonists)
 /datum/antagonist/proc/remove_innate_effects(mob/living/mob_override)
 	return
 
+//Assign default team and creates one for one of a kind team antagonists
+/datum/antagonist/proc/create_team(datum/objective_team/team)
+	return
+
 //Proc called when the datum is given to a mind.
 /datum/antagonist/proc/on_gain()
 	if(owner && owner.current)
 		if(!silent)
 			greet()
 		apply_innate_effects()
+		if(is_banned(owner) && replace_banned)
+			replace_banned_player()
+
+/datum/antagonist/proc/is_banned(datum/mind/M)
+	if(!M)
+		return FALSE
+	if(jobban_isbanned(M,"Syndicate"))
+		return TRUE
+	if(job_rank && jobban_isbanned(M,job_rank))
+		return TRUE
+	return FALSE
+
+/datum/antagonist/proc/replace_banned_player()
+	set waitfor = FALSE
+
+	var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as a [name]?", "[name]", null, job_rank, 50, owner.current)
+	var/mob/dead/observer/theghost = null
+	if(candidates.len)
+		theghost = pick(candidates)
+		to_chat(owner, "Your mob has been taken over by a ghost! Appeal your job ban if you want to avoid this in the future!")
+		message_admins("[key_name_admin(theghost)] has taken control of ([key_name_admin(owner.current)]) to replace a jobbaned player.")
+		owner.current.ghostize(0)
+		owner.current.key = theghost.key
 
 /datum/antagonist/proc/on_removal()
 	remove_innate_effects()
@@ -55,6 +85,9 @@ GLOBAL_LIST_EMPTY(antagonists)
 		LAZYREMOVE(owner.antag_datums, src)
 		if(!silent && owner.current)
 			farewell()
+	var/datum/objective_team/team = get_team()
+	if(team)
+		team.remove_member(owner)
 	qdel(src)
 
 /datum/antagonist/proc/greet()
@@ -62,3 +95,14 @@ GLOBAL_LIST_EMPTY(antagonists)
 
 /datum/antagonist/proc/farewell()
 	return
+
+//Returns the team antagonist belongs to if any.
+/datum/antagonist/proc/get_team()
+	return
+
+//Should probably be on ticker or job ss ?
+/proc/get_antagonists(antag_type,specific = FALSE)
+	. = list()
+	for(var/datum/antagonist/A in GLOB.antagonists)
+		if(!specific && istype(A,antag_type) || specific && A.type == antag_type)
+			. += A.owner

code/datums/antagonists/brother.dm

@@ -3,20 +3,27 @@
 	var/special_role = "blood brother"
 	var/datum/objective_team/brother_team/team
 
-/datum/antagonist/brother/New(datum/mind/new_owner, datum/objective_team/brother_team/T)
-	team = T
+/datum/antagonist/brother/New(datum/mind/new_owner)
 	return ..()
 
+/datum/antagonist/brother/create_team(datum/objective_team/brother_team/new_team)
+	if(!new_team)
+		return
+	if(!istype(new_team))
+		stack_trace("Wrong team type passed to [type] initialization.")
+	team = new_team
+
+/datum/antagonist/brother/get_team()
+	return team
+
 /datum/antagonist/brother/on_gain()
 	SSticker.mode.brothers += owner
-	owner.special_role = special_role
 	owner.objectives += team.objectives
 	finalize_brother()
 	return ..()
 
 /datum/antagonist/brother/on_removal()
 	SSticker.mode.brothers -= owner
-	team.members -= owner
 	owner.objectives -= team.objectives
 	if(owner.current)
 		to_chat(owner.current,"<span class='userdanger'>You are no longer the [special_role]!</span>")

code/datums/antagonists/clockcult.dm

@@ -1,6 +1,8 @@
 //CLOCKCULT PROOF OF CONCEPT
 /datum/antagonist/clockcult
+	name = "Clock Cultist"
 	var/datum/action/innate/hierophant/hierophant_network = new()
+	job_rank = ROLE_SERVANT_OF_RATVAR
 
 /datum/antagonist/clockcult/silent
 	silent = TRUE
@@ -47,8 +49,6 @@
 	var/mob/living/current = owner.current
 	SSticker.mode.servants_of_ratvar += owner
 	SSticker.mode.update_servant_icons_added(owner)
-	if(jobban_isbanned(current, ROLE_SERVANT_OF_RATVAR))
-		addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, current, ROLE_SERVANT_OF_RATVAR, ROLE_SERVANT_OF_RATVAR), 0)
 	owner.special_role = "Servant of Ratvar"
 	owner.current.log_message("<font color=#BE8700>Has been converted to the cult of Ratvar!</font>", INDIVIDUAL_ATTACK_LOG)
 	if(issilicon(current))

code/datums/antagonists/cult.dm

@@ -1,8 +1,10 @@
 #define SUMMON_POSSIBILITIES 3
 
 /datum/antagonist/cult
+	name = "Cultist"
 	var/datum/action/innate/cult/comm/communion = new
 	var/datum/action/innate/cult/mastervote/vote = new
+	job_rank = ROLE_CULTIST
 
 /datum/antagonist/cult/Destroy()
 	QDEL_NULL(communion)
@@ -73,8 +75,6 @@
 		add_objectives()
 	SSticker.mode.cult += owner // Only add after they've been given objectives
 	cult_memorization(owner)
-	if(jobban_isbanned(current, ROLE_CULTIST))
-		addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, current, ROLE_CULTIST, ROLE_CULTIST), 0)
 	SSticker.mode.update_cult_icons_added(owner)
 	current.log_message("<font color=#960000>Has been converted to the cult of Nar'Sie!</font>", INDIVIDUAL_ATTACK_LOG)
 	if(GLOB.blood_target && GLOB.blood_target_image && current.client)

code/datums/antagonists/revolution.dm

@@ -0,0 +1,229 @@
+//How often to check for promotion possibility
+#define HEAD_UPDATE_PERIOD 300
+
+/datum/antagonist/rev
+	name = "Revolutionary"
+	job_rank = ROLE_REV
+	var/hud_type = "rev"
+	var/datum/objective_team/revolution/rev_team
+
+/datum/antagonist/rev/can_be_owned(datum/mind/new_owner)
+	. = ..()
+	if(new_owner.assigned_role in GLOB.command_positions)
+		return FALSE
+	if(new_owner.unconvertable)
+		return FALSE
+
+/datum/antagonist/rev/apply_innate_effects(mob/living/mob_override)
+	var/mob/living/M = mob_override || owner.current
+	update_rev_icons_added(M)
+
+/datum/antagonist/rev/remove_innate_effects(mob/living/mob_override)
+	var/mob/living/M = mob_override || owner.current
+	update_rev_icons_removed(M)
+
+/datum/antagonist/rev/proc/equip_rev()
+	return
+
+/datum/antagonist/rev/New()
+	. = ..()
+
+/datum/antagonist/rev/on_gain()
+	. = ..()
+	create_objectives()
+	equip_rev()
+	owner.current.log_message("<font color='red'>Has been converted to the revolution!</font>", INDIVIDUAL_ATTACK_LOG)
+
+/datum/antagonist/rev/on_removal()
+	remove_objectives()
+	. = ..()
+
+/datum/antagonist/rev/greet()
+	to_chat(owner, "<span class='danger'><FONT size = 3> You are now a revolutionary! Help your cause. Do not harm your fellow freedom fighters. You can identify your comrades by the red \"R\" icons, and your leaders by the blue \"R\" icons. Help them kill the heads to win the revolution!</FONT></span>")
+	owner.announce_objectives()
+
+/datum/antagonist/rev/create_team(datum/objective_team/revolution/new_team)
+	if(!new_team)
+		//For now only one revolution at a time
+		for(var/datum/antagonist/rev/head/H in GLOB.antagonists)
+			if(H.rev_team)
+				rev_team = H.rev_team
+				return
+		rev_team = new /datum/objective_team/revolution
+		rev_team.update_objectives()
+		rev_team.update_heads()
+		return
+	if(!istype(new_team))
+		stack_trace("Wrong team type passed to [type] initialization.")
+	rev_team = new_team
+
+/datum/antagonist/rev/get_team()
+	return rev_team
+
+/datum/antagonist/rev/proc/create_objectives()
+	owner.objectives |= rev_team.objectives
+
+/datum/antagonist/rev/proc/remove_objectives()
+	owner.objectives -= rev_team.objectives
+
+//Bump up to head_rev
+/datum/antagonist/rev/proc/promote()
+	var/old_team = rev_team
+	var/datum/mind/old_owner = owner
+	silent = TRUE
+	owner.remove_antag_datum(/datum/antagonist/rev)
+	var/datum/antagonist/rev/head/new_revhead = new(old_owner)
+	new_revhead.silent = TRUE
+	old_owner.add_antag_datum(new_revhead,old_team)
+	new_revhead.silent = FALSE
+	to_chat(old_owner, "<span class='userdanger'>You have proved your devotion to revolution! You are a head revolutionary now!</span>")
+				
+
+/datum/antagonist/rev/head
+	name = "Head Revolutionary"
+	hud_type = "rev_head"
+	var/remove_clumsy = FALSE
+	var/give_flash = FALSE
+	var/give_hud = FALSE
+
+/datum/antagonist/rev/proc/update_rev_icons_added(mob/living/M)
+	var/datum/atom_hud/antag/revhud = GLOB.huds[ANTAG_HUD_REV]
+	revhud.join_hud(M)
+	set_antag_hud(M,hud_type)
+
+/datum/antagonist/rev/proc/update_rev_icons_removed(mob/living/M)
+	var/datum/atom_hud/antag/revhud = GLOB.huds[ANTAG_HUD_REV]
+	revhud.leave_hud(M)
+	set_antag_hud(M, null)
+
+/datum/antagonist/rev/proc/can_be_converted(mob/living/candidate)
+	if(!candidate.mind)
+		return FALSE
+	if(!can_be_owned(candidate.mind))
+		return FALSE
+	var/mob/living/carbon/C = candidate //Check to see if the potential rev is implanted
+	if(!istype(C)) //Can't convert simple animals
+		return FALSE
+	if(C.isloyal())
+		return FALSE
+	return TRUE
+
+/datum/antagonist/rev/proc/add_revolutionary(datum/mind/rev_mind,stun = TRUE)
+	if(!can_be_converted(rev_mind.current))
+		return FALSE
+	if(stun)
+		if(iscarbon(rev_mind.current))
+			var/mob/living/carbon/carbon_mob = rev_mind.current
+			carbon_mob.silent = max(carbon_mob.silent, 5)
+			carbon_mob.flash_act(1, 1)
+		rev_mind.current.Stun(100)
+	rev_mind.add_antag_datum(/datum/antagonist/rev,rev_team)
+	rev_mind.special_role = "Revolutionary"
+	return TRUE
+
+/datum/antagonist/rev/head/proc/demote()
+	var/datum/mind/old_owner = owner
+	var/old_team = rev_team
+	silent = TRUE
+	owner.remove_antag_datum(/datum/antagonist/rev/head)
+	var/datum/antagonist/rev/new_rev = new /datum/antagonist/rev(old_owner)
+	new_rev.silent = TRUE
+	old_owner.add_antag_datum(new_rev,old_team)
+	new_rev.silent = FALSE
+	to_chat(old_owner, "<span class='userdanger'>Revolution has been disappointed of your leader traits! You are a regular revolutionary now!</span>")
+				
+/datum/antagonist/rev/farewell()
+	if(ishuman(owner.current))
+		owner.current.visible_message("[owner.current] looks like they just remembered their real allegiance!", \
+				"<span class='userdanger'><FONT size = 3>You are no longer a brainwashed revolutionary! Your memory is hazy from the time you were a rebel...the only thing you remember is the name of the one who brainwashed you...</FONT></span>")
+	else if(issilicon(owner.current))
+		owner.current.visible_message("The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it.", \
+				"<span class='userdanger'><FONT size = 3>The frame's firmware detects and deletes your neural reprogramming! You remember nothing but the name of the one who flashed you.</FONT></span>")
+
+/datum/antagonist/rev/proc/remove_revolutionary(borged, deconverter)
+	log_attack("[owner.current] (Key: [key_name(owner.current)]) has been deconverted from the revolution by [deconverter] (Key: [key_name(deconverter)])!")
+	if(borged)
+		message_admins("[ADMIN_LOOKUPFLW(owner.current)] has been borged while being a [name]")
+	owner.special_role = null
+	if(iscarbon(owner.current))
+		var/mob/living/carbon/C = owner.current
+		C.Unconscious(100)
+	owner.remove_antag_datum(type)
+
+/datum/antagonist/rev/head/remove_revolutionary(borged,deconverter)
+	if(!borged)
+		return
+	. = ..()
+
+/datum/antagonist/rev/head/equip_rev()
+	var/mob/living/carbon/human/H = owner.current
+	if(!istype(H))
+		return
+
+	if(remove_clumsy && owner.assigned_role == "Clown")
+		to_chat(owner, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.")
+		H.dna.remove_mutation(CLOWNMUT)
+	
+	if(give_flash)
+		var/obj/item/device/assembly/flash/T = new(H)
+		var/list/slots = list (
+			"backpack" = slot_in_backpack,
+			"left pocket" = slot_l_store,
+			"right pocket" = slot_r_store
+		)
+		var/where = H.equip_in_one_of_slots(T, slots)
+		if (!where)
+			to_chat(H, "The Syndicate were unfortunately unable to get you a flash.")
+		else
+			to_chat(H, "The flash in your [where] will help you to persuade the crew to join your cause.")
+	
+	if(give_hud)
+		var/obj/item/organ/cyberimp/eyes/hud/security/syndicate/S = new(H)
+		S.Insert(H, special = FALSE, drop_if_replaced = FALSE)
+		to_chat(H, "Your eyes have been implanted with a cybernetic security HUD which will help you keep track of who is mindshield-implanted, and therefore unable to be recruited.")
+
+/datum/objective_team/revolution
+	name = "Revolution"
+	var/list/objectives = list()
+	var/max_headrevs = 3
+
+/datum/objective_team/revolution/proc/update_objectives(initial = FALSE)
+	var/untracked_heads = SSjob.get_all_heads()
+	for(var/datum/objective/mutiny/O in objectives)
+		untracked_heads -= O.target
+	for(var/datum/mind/M in untracked_heads)
+		var/datum/objective/mutiny/new_target = new()
+		new_target.team = src
+		new_target.target = M
+		new_target.update_explanation_text()
+		objectives += new_target
+	for(var/datum/mind/M in members)
+		M.objectives |= objectives
+	
+	addtimer(CALLBACK(src,.proc/update_objectives),HEAD_UPDATE_PERIOD,TIMER_UNIQUE)
+
+/datum/objective_team/revolution/proc/head_revolutionaries()
+	. = list()
+	for(var/datum/mind/M in members)
+		if(M.has_antag_datum(/datum/antagonist/rev/head))
+			. += M
+
+/datum/objective_team/revolution/proc/update_heads()
+	if(SSticker.HasRoundStarted())
+		var/list/datum/mind/head_revolutionaries = head_revolutionaries()
+		var/list/datum/mind/heads = SSjob.get_all_heads()
+		var/list/sec = SSjob.get_all_sec()
+
+		if(head_revolutionaries.len < max_headrevs && head_revolutionaries.len < round(heads.len - ((8 - sec.len) / 3)))
+			var/list/datum/mind/non_heads = members - head_revolutionaries
+			var/list/datum/mind/promotable = list()
+			for(var/datum/mind/khrushchev in non_heads)
+				if(khrushchev.current && !khrushchev.current.incapacitated() && !khrushchev.current.restrained() && khrushchev.current.client && khrushchev.current.stat != DEAD)
+					if(ROLE_REV in khrushchev.current.client.prefs.be_special)
+						promotable += khrushchev
+			if(promotable.len)
+				var/datum/mind/new_leader = pick(promotable)
+				var/datum/antagonist/rev/rev = new_leader.has_antag_datum(/datum/antagonist/rev)
+				rev.promote()
+
+	addtimer(CALLBACK(src,.proc/update_heads),HEAD_UPDATE_PERIOD,TIMER_UNIQUE)

code/datums/antagonists/wizard.dm

@@ -5,6 +5,7 @@
 
 /datum/antagonist/wizard
 	name = "Space Wizard"
+	job_rank = ROLE_WIZARD
 	var/give_objectives = TRUE
 	var/strip = TRUE //strip before equipping
 	var/allow_rename = TRUE
@@ -32,6 +33,16 @@
 /datum/antagonist/wizard/proc/unregister()
 	SSticker.mode.wizards -= src
 
+/datum/antagonist/wizard/create_team(datum/objective_team/wizard/new_team)
+	if(!new_team)
+		return
+	if(!istype(new_team))
+		stack_trace("Wrong team type passed to [type] initialization.")
+	wiz_team = new_team
+
+/datum/antagonist/wizard/get_team()
+	return wiz_team
+
 /datum/objective_team/wizard
 	name = "wizard team"
 
@@ -99,6 +110,8 @@
 
 /datum/antagonist/wizard/on_removal()
 	unregister()
+	for(var/objective in objectives)
+		owner.objectives -= objective
 	owner.RemoveAllSpells() // TODO keep track which spells are wizard spells which innate stuff
 	return ..()
 

code/datums/mind.dm

@@ -147,6 +147,10 @@
 		qdel(A)
 		return
 	LAZYADD(antag_datums, A)
+	A.create_team(team)
+	var/datum/objective_team/antag_team = A.get_team()
+	if(antag_team)
+		antag_team.add_member(src)
 	A.on_gain()
 	return A
 
@@ -227,15 +231,9 @@
 	remove_antag_equip()
 
 /datum/mind/proc/remove_rev()
-	if(src in SSticker.mode.revolutionaries)
-		SSticker.mode.revolutionaries -= src
-		SSticker.mode.update_rev_icons_removed(src)
-	if(src in SSticker.mode.head_revolutionaries)
-		SSticker.mode.head_revolutionaries -= src
-		SSticker.mode.update_rev_icons_removed(src)
+	var/datum/antagonist/rev/rev = has_antag_datum(/datum/antagonist/rev)
+	remove_antag_datum(rev.type)
 	special_role = null
-	remove_objectives()
-	remove_antag_equip()
 
 /datum/mind/proc/remove_antag_equip()
 	var/list/Mob_Contents = current.get_contents()
@@ -258,7 +256,6 @@
 	SSticker.mode.update_changeling_icons_removed(src)
 	SSticker.mode.update_traitor_icons_removed(src)
 	SSticker.mode.update_cult_icons_removed(src)
-	SSticker.mode.update_rev_icons_removed(src)
 
 /datum/mind/proc/equip_traitor(var/employer = "The Syndicate", var/silent = FALSE)
 	if(!current)
@@ -333,8 +330,9 @@
 	if(iscultist(creator))
 		SSticker.mode.add_cultist(src)
 
-	else if(is_revolutionary_in_general(creator))
-		SSticker.mode.add_revolutionary(src)
+	else if(is_revolutionary(creator))
+		var/datum/antagonist/rev/converter = creator.mind.has_antag_datum(/datum/antagonist/rev)
+		converter.add_revolutionary(src,FALSE)
 
 	else if(is_servant_of_ratvar(creator))
 		add_servant_of_ratvar(current)
@@ -549,9 +547,10 @@
 		text = "<i><b>[text]</b></i>: "
 		if (assigned_role in GLOB.command_positions)
 			text += "<b>HEAD</b> | not mindshielded | employee | headrev | rev"
-		else if (src in SSticker.mode.head_revolutionaries)
+		else if (has_antag_datum(/datum/antagonist/rev/head))
+			var/datum/antagonist/rev/head = has_antag_datum(/datum/antagonist/rev/head)
 			var/last_healthy_headrev = TRUE
-			for(var/datum/mind/I in SSticker.mode.head_revolutionaries)
+			for(var/datum/mind/I in head.rev_team.head_revolutionaries())
 				if(I == src)
 					continue
 				var/mob/M = I.current
@@ -576,7 +575,7 @@
 				text += "<br>Objectives are empty! <a href='?src=\ref[src];revolution=autoobjectives'>Set to kill all heads</a>."
 		else if(current.isloyal())
 			text += "head | <b>MINDSHIELDED</b> | employee | <a href='?src=\ref[src];revolution=headrev'>headrev</a> | rev"
-		else if (src in SSticker.mode.revolutionaries)
+		else if (has_antag_datum(/datum/antagonist/rev))
 			text += "head | not mindshielded | <a href='?src=\ref[src];revolution=clear'>employee</a> | <a href='?src=\ref[src];revolution=headrev'>headrev</a> | <b>REV</b>"
 		else
 			text += "head | not mindshielded | <b>EMPLOYEE</b> | <a href='?src=\ref[src];revolution=headrev'>headrev</a> | <a href='?src=\ref[src];revolution=rev'>rev</a>"
@@ -721,8 +720,7 @@
 			out += sections[i]+"<br>"
 
 
-	if(((src in SSticker.mode.head_revolutionaries) || (src in SSticker.mode.traitors) || (src in SSticker.mode.syndicates)) && ishuman(current))
-
+	if(((src in SSticker.mode.traitors) || (src in SSticker.mode.syndicates)) && ishuman(current))
 		text = "Uplink: <a href='?src=\ref[src];common=uplink'>give</a>"
 		var/obj/item/device/uplink/U = find_syndicate_uplink()
 		if(U)
@@ -938,57 +936,41 @@
 		switch(href_list["revolution"])
 			if("clear")
 				remove_rev()
-				to_chat(current, "<span class='userdanger'>You have been brainwashed! You are no longer a revolutionary!</span>")
 				message_admins("[key_name_admin(usr)] has de-rev'ed [current].")
 				log_admin("[key_name(usr)] has de-rev'ed [current].")
 			if("rev")
-				if(src in SSticker.mode.head_revolutionaries)
-					SSticker.mode.head_revolutionaries -= src
-					SSticker.mode.update_rev_icons_removed(src)
-					to_chat(current, "<span class='userdanger'>Revolution has been disappointed of your leader traits! You are a regular revolutionary now!</span>")
-				else if(!(src in SSticker.mode.revolutionaries))
-					to_chat(current, "<span class='danger'><FONT size = 3> You are now a revolutionary! Help your cause. Do not harm your fellow freedom fighters. You can identify your comrades by the red \"R\" icons, and your leaders by the blue \"R\" icons. Help them kill the heads to win the revolution!</FONT></span>")
+				if(has_antag_datum(/datum/antagonist/rev/head))
+					var/datum/antagonist/rev/head/head = has_antag_datum(/datum/antagonist/rev/head)
+					head.demote()
+				else if(!has_antag_datum(/datum/antagonist/rev))
+					add_antag_datum(/datum/antagonist/rev)
+					special_role = "Revolutionary"
+					message_admins("[key_name_admin(usr)] has rev'ed [current].")
+					log_admin("[key_name(usr)] has rev'ed [current].")
 				else
 					return
-				SSticker.mode.revolutionaries += src
-				SSticker.mode.update_rev_icons_added(src)
-				special_role = "Revolutionary"
-				message_admins("[key_name_admin(usr)] has rev'ed [current].")
-				log_admin("[key_name(usr)] has rev'ed [current].")
-
+				
 			if("headrev")
-				if(src in SSticker.mode.revolutionaries)
-					SSticker.mode.revolutionaries -= src
-					SSticker.mode.update_rev_icons_removed(src)
-					to_chat(current, "<span class='userdanger'>You have proved your devotion to revoltion! Yea are a head revolutionary now!</span>")
-				else if(!(src in SSticker.mode.head_revolutionaries))
+				if(has_antag_datum(/datum/antagonist/rev))
+					var/datum/antagonist/rev/rev = has_antag_datum(/datum/antagonist/rev)
+					rev.promote()
+				else if(!has_antag_datum(/datum/antagonist/rev/head))
+					//what about the team here.
+					var/datum/antagonist/rev/head/new_head = new /datum/antagonist/rev/head(src)
+					new_head.give_flash = TRUE
+					new_head.give_hud = TRUE
+					new_head.remove_clumsy = TRUE
+					add_antag_datum(new_head)
 					to_chat(current, "<span class='userdanger'>You are a member of the revolutionaries' leadership now!</span>")
 				else
 					return
-				if (SSticker.mode.head_revolutionaries.len>0)
-					// copy targets
-					var/datum/mind/valid_head = locate() in SSticker.mode.head_revolutionaries
-					if (valid_head)
-						for (var/datum/objective/mutiny/O in valid_head.objectives)
-							var/datum/objective/mutiny/rev_obj = new
-							rev_obj.owner = src
-							rev_obj.target = O.target
-							rev_obj.explanation_text = "Assassinate [O.target.name], the [O.target.assigned_role]."
-							objectives += rev_obj
-						SSticker.mode.greet_revolutionary(src,0)
-				SSticker.mode.head_revolutionaries += src
-				SSticker.mode.update_rev_icons_added(src)
 				special_role = "Head Revolutionary"
 				message_admins("[key_name_admin(usr)] has head-rev'ed [current].")
 				log_admin("[key_name(usr)] has head-rev'ed [current].")
 
-			if("autoobjectives")
-				SSticker.mode.forge_revolutionary_objectives(src)
-				SSticker.mode.greet_revolutionary(src,0)
-				to_chat(usr, "<span class='notice'>The objectives for revolution have been generated and shown to [key]</span>")
-
 			if("flash")
-				if (!SSticker.mode.equip_revolutionary(current))
+				var/datum/antagonist/rev/head/head = has_antag_datum(/datum/antagonist/rev/head)
+				if(!head.equip_rev())
 					to_chat(usr, "<span class='danger'>Spawning flash failed!</span>")
 
 			if("takeflash")
@@ -1447,31 +1429,12 @@
 		to_chat(H, "Spawning an amulet from your Master failed.")
 
 /datum/mind/proc/make_Rev()
-	if (SSticker.mode.head_revolutionaries.len>0)
-		// copy targets
-		var/datum/mind/valid_head = locate() in SSticker.mode.head_revolutionaries
-		if (valid_head)
-			for (var/datum/objective/mutiny/O in valid_head.objectives)
-				var/datum/objective/mutiny/rev_obj = new
-				rev_obj.owner = src
-				rev_obj.target = O.target
-				rev_obj.explanation_text = "Assassinate [O.target.current.real_name], the [O.target.assigned_role]."
-				objectives += rev_obj
-			SSticker.mode.greet_revolutionary(src,0)
-	SSticker.mode.head_revolutionaries += src
-	SSticker.mode.update_rev_icons_added(src)
+	var/datum/antagonist/rev/head/head = new(src)
+	head.give_flash = TRUE
+	head.give_hud = TRUE
+	add_antag_datum(head)
 	special_role = "Head Revolutionary"
 
-	SSticker.mode.forge_revolutionary_objectives(src)
-	SSticker.mode.greet_revolutionary(src,0)
-
-	var/list/L = current.get_contents()
-	var/obj/item/device/assembly/flash/flash = locate() in L
-	qdel(flash)
-	take_uplink()
-	var/fail = 0
-	fail |= !SSticker.mode.equip_revolutionary(current)
-		
 /datum/mind/proc/AddSpell(obj/effect/proc_holder/spell/S)
 	spell_list += S
 	S.action.Grant(current)