Antag Panel / Check antagonists Refactor

code/datums/antagonists/abductor.dm

@@ -1,24 +1,33 @@
+#define ABDUCTOR_MAX_TEAMS 4
+
 /datum/antagonist/abductor
 	name = "Abductor"
 	roundend_category = "abductors"
+	antagpanel_category = "Abductor"
 	job_rank = ROLE_ABDUCTOR
+	show_in_antagpanel = FALSE //should only show subtypes
 	var/datum/team/abductor_team/team
 	var/sub_role
 	var/outfit
 	var/landmark_type
 	var/greet_text
+	
 
 /datum/antagonist/abductor/agent
+	name = "Abductor Agent"
 	sub_role = "Agent"
 	outfit = /datum/outfit/abductor/agent
 	landmark_type = /obj/effect/landmark/abductor/agent
 	greet_text = "Use your stealth technology and equipment to incapacitate humans for your scientist to retrieve."
+	show_in_antagpanel = TRUE
 
 /datum/antagonist/abductor/scientist
+	name = "Abductor Scientist"
 	sub_role = "Scientist"
 	outfit = /datum/outfit/abductor/scientist
 	landmark_type = /obj/effect/landmark/abductor/scientist
 	greet_text = "Use your stealth technology and equipment to incapacitate humans for your scientist to retrieve."
+	show_in_antagpanel = TRUE
 
 /datum/antagonist/abductor/create_team(datum/team/abductor_team/new_team)
 	if(!new_team)
@@ -33,6 +42,7 @@
 /datum/antagonist/abductor/on_gain()
 	SSticker.mode.abductors += owner
 	owner.special_role = "[name] [sub_role]"
+	owner.assigned_role = "[name] [sub_role]"
 	owner.objectives += team.objectives
 	finalize_abductor()
 	return ..()
@@ -72,11 +82,48 @@
 	var/datum/species/abductor/A = H.dna.species
 	A.scientist = TRUE
 
+/datum/antagonist/abductor/admin_add(datum/mind/new_owner,mob/admin)
+	var/list/current_teams = list()
+	for(var/datum/team/abductor_team/T in get_all_teams(/datum/team/abductor_team))
+		current_teams[T.name] = T
+	var/choice = input(admin,"Add to which team ?") as null|anything in (current_teams + "new team")
+	if (choice == "new team")
+		team = new
+	else if(choice in current_teams)
+		team = current_teams[choice]
+	else
+		return
+	new_owner.add_antag_datum(src)
+	log_admin("[key_name(usr)] made [key_name(new_owner.current)] [name] on [choice]!")
+	message_admins("[key_name_admin(usr)] made [key_name_admin(new_owner.current)] [name] on [choice] !")
+
+/datum/antagonist/abductor/get_admin_commands()
+	. = ..()
+	.["Equip"] = CALLBACK(src,.proc/admin_equip)
+
+/datum/antagonist/abductor/proc/admin_equip(mob/admin)
+	if(!ishuman(owner.current))
+		to_chat(admin, "<span class='warning'>This only works on humans!</span>")
+		return
+	var/mob/living/carbon/human/H = owner.current
+	var/gear = alert(admin,"Agent or Scientist Gear","Gear","Agent","Scientist")
+	if(gear)
+		if(gear=="Agent")
+			H.equipOutfit(/datum/outfit/abductor/agent)
+		else
+			H.equipOutfit(/datum/outfit/abductor/scientist)
 
 /datum/team/abductor_team
 	member_name = "abductor"
 	var/team_number
 	var/list/datum/mind/abductees = list()
+	var/static/team_count = 1
+
+/datum/team/abductor_team/New()
+	..()
+	team_number = team_count++
+	name = "Mothership [pick(GLOB.possible_changeling_IDs)]" //TODO Ensure unique and actual alieny names
+	add_objective(new/datum/objective/experiment)
 
 /datum/team/abductor_team/is_solo()
 	return FALSE
@@ -105,10 +152,10 @@
 
 	return result.Join("<br>")
 
-
 /datum/antagonist/abductee
 	name = "Abductee"
 	roundend_category = "abductees"
+	antagpanel_category = "Abductee"
 
 /datum/antagonist/abductee/on_gain()
 	give_objective()

code/datums/antagonists/antag_datum.dm

@@ -12,12 +12,15 @@ GLOBAL_LIST_EMPTY(antagonists)
 	var/job_rank
 	var/replace_banned = TRUE //Should replace jobbaned player with ghosts if granted.
 	var/list/objectives = list()
+	var/antag_memory = ""//These will be removed with antag datum
+	
+	//Antag panel properties
+	var/show_in_antagpanel = TRUE	//This will hide adding this antag type in antag panel, use only for internal subtypes that shouldn't be added directly but still show if possessed by mind
+	var/antagpanel_category = "Uncategorized"	//Antagpanel will display these together, REQUIRED
 
-/datum/antagonist/New(datum/mind/new_owner)
+/datum/antagonist/New()
 	GLOB.antagonists += src
 	typecache_datum_blacklist = typecacheof(typecache_datum_blacklist)
-	if(new_owner)
-		owner = new_owner
 
 /datum/antagonist/Destroy()
 	GLOB.antagonists -= src
@@ -36,6 +39,11 @@ GLOBAL_LIST_EMPTY(antagonists)
 		if(is_type_in_typecache(src, A.typecache_datum_blacklist))
 			return FALSE
 
+//This will be called in add_antag_datum before owner assignment.
+//Should return antag datum without owner.
+/datum/antagonist/proc/specialization(datum/mind/new_owner)
+	return src
+
 /datum/antagonist/proc/on_body_transfer(mob/living/old_body, mob/living/new_body)
 	remove_innate_effects(old_body)
 	apply_innate_effects(new_body)
@@ -131,18 +139,82 @@ GLOBAL_LIST_EMPTY(antagonists)
 /datum/antagonist/proc/roundend_report_footer()
 	return
 
+
+//ADMIN TOOLS
+
+//Called when using admin tools to give antag status
+/datum/antagonist/proc/admin_add(datum/mind/new_owner,mob/admin)
+	message_admins("[key_name_admin(admin)] made [new_owner.current] into [name].")
+	log_admin("[key_name(admin)] made [new_owner.current] into [name].")
+	new_owner.add_antag_datum(src)
+
+//Called when removing antagonist using admin tools
+/datum/antagonist/proc/admin_remove(mob/user)
+	if(!user)
+		return
+	message_admins("[key_name_admin(user)] has removed [name] antagonist status from [owner.current].")
+	log_admin("[key_name(user)] has removed [name] antagonist status from [owner.current].")
+	on_removal()
+
+//gamemode/proc/is_mode_antag(antagonist/A) => TRUE/FALSE
+
+//Additional data to display in antagonist panel section
+//nuke disk code, genome count, etc
+/datum/antagonist/proc/antag_panel_data()
+	return ""
+
+/datum/antagonist/proc/enabled_in_preferences(datum/mind/M)
+	if(job_rank)
+		if(M.current && M.current.client && (job_rank in M.current.client.prefs.be_special))
+			return TRUE
+		else
+			return FALSE
+	return TRUE
+
+// List if ["Command"] = CALLBACK(), user will be appeneded to callback arguments on execution
+/datum/antagonist/proc/get_admin_commands()
+	. = list()
+
+/datum/antagonist/Topic(href,href_list)
+	if(!check_rights(R_ADMIN))
+		return
+	//Antag memory edit
+	if (href_list["memory_edit"])
+		edit_memory(usr)
+		owner.traitor_panel()
+		return
+	
+	//Some commands might delete/modify this datum clearing or changing owner
+	var/datum/mind/persistent_owner = owner
+
+	var/commands = get_admin_commands()
+	for(var/admin_command in commands)
+		if(href_list["command"] == admin_command)
+			var/datum/callback/C = commands[admin_command]
+			C.Invoke(usr)
+			persistent_owner.traitor_panel()
+			return
+
+/datum/antagonist/proc/edit_memory(mob/user)
+	var/new_memo = copytext(trim(input(user,"Write new memory", "Memory", antag_memory) as null|message),1,MAX_MESSAGE_LEN)
+	if (isnull(new_memo))
+		return
+	antag_memory = new_memo
+
 //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)
+		if(!A.owner)
+			continue
+		if(!antag_type || !specific && istype(A,antag_type) || specific && A.type == antag_type)
 			. += A.owner
 
-
-
 //This datum will autofill the name with special_role
 //Used as placeholder for minor antagonists, please create proper datums for these
 /datum/antagonist/auto_custom
+	show_in_antagpanel = FALSE
+	antagpanel_category = "Other"
 
 /datum/antagonist/auto_custom/on_gain()
 	..()
@@ -156,5 +228,20 @@ GLOBAL_LIST_EMPTY(antagonists)
 			already_registered_objectives |= A.objectives
 	objectives = owner.objectives - already_registered_objectives
 
+/datum/antagonist/auto_custom/antag_listing_name()
+	return ..() + "([name])"
+
 //This one is created by admin tools for custom objectives
-/datum/antagonist/custom
+/datum/antagonist/custom
+	antagpanel_category = "Custom"
+
+/datum/antagonist/custom/admin_add(datum/mind/new_owner,mob/admin)
+	var/custom_name = stripped_input(admin, "Custom antagonist name:", "Custom antag", "Antagonist")
+	if(custom_name)
+		name = custom_name
+	else
+		return
+	..()
+
+/datum/antagonist/custom/antag_listing_name()
+	return ..() + "([name])"

code/datums/antagonists/blob.dm

@@ -1,6 +1,7 @@
 /datum/antagonist/blob
 	name = "Blob"
 	roundend_category = "blobs"
+	antagpanel_category = "Blob"
 	job_rank = ROLE_BLOB
 
 	var/datum/action/innate/blobpop/pop_action
@@ -56,4 +57,11 @@
 	var/mob/camera/blob/B = new /mob/camera/blob(get_turf(old_body), blobtag.starting_points_human_blob)
 	owner.mind.transfer_to(B)
 	old_body.gib()
-	B.place_blob_core(blobtag.point_rate_human_blob, pop_override = TRUE)
+	B.place_blob_core(blobtag.point_rate_human_blob, pop_override = TRUE)
+
+/datum/antagonist/blob/antag_listing_status()
+	. = ..()
+	if(owner && owner.current)
+		var/mob/camera/blob/B = owner.current
+		if(istype(B))
+			. += "(Progress: [B.blobs_legit.len]/[B.blobwincount])"

code/datums/antagonists/brother.dm

@@ -1,12 +1,10 @@
 /datum/antagonist/brother
 	name = "Brother"
+	antagpanel_category = "Brother"
 	job_rank = ROLE_BROTHER
 	var/special_role = "blood brother"
 	var/datum/team/brother_team/team
 
-/datum/antagonist/brother/New(datum/mind/new_owner)
-	return ..()
-
 /datum/antagonist/brother/create_team(datum/team/brother_team/new_team)
 	if(!new_team)
 		return
@@ -36,7 +34,7 @@
 	if(!owner.current || !team || !team.meeting_area)
 		return
 	to_chat(owner.current, "<B>Your designated meeting area:</B> [team.meeting_area]")
-	owner.store_memory("<b>Meeting Area</b>: [team.meeting_area]")
+	antag_memory += "<b>Meeting Area</b>: [team.meeting_area]<br>"
 
 /datum/antagonist/brother/greet()
 	var/brother_text = ""
@@ -56,15 +54,42 @@
 /datum/antagonist/brother/proc/finalize_brother()
 	SSticker.mode.update_brother_icons_added(owner)
 
+/datum/antagonist/brother/admin_add(datum/mind/new_owner,mob/admin)
+	//show list of possible brothers
+	var/list/candidates = list()
+	for(var/mob/living/L in GLOB.alive_mob_list)
+		if(!L.mind || L.mind == new_owner || !can_be_owned(L.mind))
+			continue
+		candidates[L.mind.name] = L.mind
+
+	var/choice = input(admin,"Choose the blood brother.", "Brother") as null|anything in candidates
+	if(!choice)
+		return
+	var/datum/mind/bro = candidates[choice]
+	var/datum/team/brother_team/T = new
+	T.add_member(new_owner)
+	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)
+	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.")
 
 /datum/team/brother_team
 	name = "brotherhood"
 	member_name = "blood brother"
 	var/meeting_area
+	var/static/meeting_areas = list("The Bar", "Dorms", "Escape Dock", "Arrivals", "Holodeck", "Primary Tool Storage", "Recreation Area", "Chapel", "Library")
 
 /datum/team/brother_team/is_solo()
 	return FALSE
 
+/datum/team/brother_team/proc/pick_meeting_area()
+	meeting_area = pick(meeting_areas)
+	meeting_areas -= meeting_area
+
 /datum/team/brother_team/proc/update_name()
 	var/list/last_names = list()
 	for(var/datum/mind/M in members)
@@ -122,4 +147,7 @@
 		else
 			add_objective(new/datum/objective/assassinate, TRUE)
 	else
-		add_objective(new/datum/objective/steal, TRUE)
+		add_objective(new/datum/objective/steal, TRUE)
+
+/datum/team/brother_team/antag_listing_name()
+	return "[name] blood brothers"

code/datums/antagonists/changeling.dm

@@ -5,6 +5,7 @@
 /datum/antagonist/changeling
 	name = "Changeling"
 	roundend_category  = "changelings"
+	antagpanel_category = "Changeling"
 	job_rank = ROLE_CHANGELING
 
 	var/you_are_greet = TRUE
@@ -40,11 +41,6 @@
 	var/static/list/all_powers = typecacheof(/obj/effect/proc_holder/changeling,TRUE)
 
 
-/datum/antagonist/changeling/New()
-	. = ..()
-	generate_name()
-	create_actions()
-
 /datum/antagonist/changeling/Destroy()
 	QDEL_NULL(cellular_emporium)
 	QDEL_NULL(emporium_action)
@@ -68,6 +64,8 @@
 	emporium_action = new(cellular_emporium)
 
 /datum/antagonist/changeling/on_gain()
+	generate_name()
+	create_actions()
 	reset_powers()
 	create_initial_profile()
 	if(give_objectives)
@@ -340,6 +338,9 @@
 
 	owner.announce_objectives()
 
+/datum/antagonist/changeling/farewell()
+	to_chat(owner.current, "<span class='userdanger'>You grow weak and lose your powers! You are no longer a changeling and are stuck in your current form!</span>")
+
 /datum/antagonist/changeling/proc/forge_team_objectives()
 	if(GLOB.changeling_team_objective_type)
 		var/datum/objective/changeling_team_objective/team_objective = new GLOB.changeling_team_objective_type
@@ -436,6 +437,25 @@
 	hud.leave_hud(owner.current)
 	set_antag_hud(owner.current, null)
 
+/datum/antagonist/changeling/admin_add(datum/mind/new_owner,mob/admin)
+	. = ..()
+	to_chat(new_owner.current, "<span class='boldannounce'>Our powers have awoken. A flash of memory returns to us...we are [changelingID], a changeling!</span>")
+
+/datum/antagonist/changeling/get_admin_commands()
+	. = ..()
+	if(stored_profiles.len && (owner.current.real_name != first_prof.name))
+		.["Transform to initial appearance."] = CALLBACK(src,.proc/admin_restore_appearance)
+
+/datum/antagonist/changeling/proc/admin_restore_appearance(mob/admin)
+	if(!stored_profiles.len || !iscarbon(owner.current))
+		to_chat(admin, "<span class='danger'>Resetting DNA failed!</span>")
+	else
+		var/mob/living/carbon/C = owner.current
+		first_prof.dna.transfer_identity(C, transfer_SE=1)
+		C.real_name = first_prof.name
+		C.updateappearance(mutcolor_update=1)
+		C.domutcheck()
+
 // Profile
 
 /datum/changelingprofile
@@ -509,4 +529,10 @@
 	else
 		parts += "<span class='redtext'>The changeling has failed.</span>"
 
-	return parts.Join("<br>")
+	return parts.Join("<br>")
+
+/datum/antagonist/changeling/antag_listing_name()
+	return ..() + "([changelingID])"
+
+/datum/antagonist/changeling/xenobio/antag_listing_name()
+	return ..() + "(Xenobio)"

code/datums/antagonists/clockcult.dm

@@ -2,6 +2,7 @@
 /datum/antagonist/clockcult
 	name = "Clock Cultist"
 	roundend_category = "clock cultists"
+	antagpanel_category = "Clockcult"
 	job_rank = ROLE_SERVANT_OF_RATVAR
 	var/datum/action/innate/hierophant/hierophant_network = new()
 	var/datum/team/clockcult/clock_team
@@ -9,6 +10,7 @@
 
 /datum/antagonist/clockcult/silent
 	silent = TRUE
+	show_in_antagpanel = FALSE //internal
 
 /datum/antagonist/clockcult/Destroy()
 	qdel(hierophant_network)
@@ -21,6 +23,8 @@
 	if(!new_team && make_team)
 		//TODO blah blah same as the others, allow multiple
 		for(var/datum/antagonist/clockcult/H in GLOB.antagonists)
+			if(!H.owner)
+				continue
 			if(H.clock_team)
 				clock_team = H.clock_team
 				return
@@ -33,28 +37,7 @@
 /datum/antagonist/clockcult/can_be_owned(datum/mind/new_owner)
 	. = ..()
 	if(.)
-		if(iscyborg(new_owner.current))
-			var/mob/living/silicon/robot/R = new_owner.current
-			if(R.deployed)
-				var/mob/living/silicon/ai/AI = R.mainframe
-				R.undeploy()
-				to_chat(AI, "<span class='userdanger'>Anomaly Detected. Returned to core!</span>") //The AI needs to be in its core to properly be converted
 		. = is_eligible_servant(new_owner.current)
-		if(!silent && new_owner.current)
-			if(.)
-				to_chat(new_owner.current, "<span class='heavy_brass'>The world before you suddenly glows a brilliant yellow. [issilicon(new_owner.current) ? "You cannot compute this truth!" : \
-				"Your mind is racing!"] You hear the whooshing steam and cl[pick("ank", "ink", "unk", "ang")]ing cogs of a billion billion machines, and all at once it comes to you.<br>\
-				Ratvar, the Clockwork Justiciar, [GLOB.ratvar_awakens ? "has been freed from his eternal prison" : "lies in exile, derelict and forgotten in an unseen realm"].</span>")
-				flash_color(new_owner.current, flash_color = list("#BE8700", "#BE8700", "#BE8700", rgb(0,0,0)), flash_time = 50)
-			else
-				new_owner.current.visible_message("<span class='boldwarning'>[new_owner.current] seems to resist an unseen force!</span>", null, null, 7, new_owner.current)
-				to_chat(new_owner.current, "<span class='heavy_brass'>The world before you suddenly glows a brilliant yellow. [issilicon(new_owner.current) ? "You cannot compute this truth!" : \
-				"Your mind is racing!"] You hear the whooshing steam and cl[pick("ank", "ink", "unk", "ang")]ing cogs of a billion billion machines, and the sound</span> <span class='boldwarning'>\
-				is a meaningless cacophony.</span><br>\
-				<span class='userdanger'>You see an abomination of rusting parts[GLOB.ratvar_awakens ? ", and it is here.<br>It is too late" : \
-				" in an endless grey void.<br>It cannot be allowed to escape"].</span>")
-				owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/clockcultalr.ogg', 40, TRUE, frequency = 100000, pressure_affected = FALSE)
-				flash_color(new_owner.current, flash_color = list("#BE8700", "#BE8700", "#BE8700", rgb(0,0,0)), flash_time = 5)
 
 /datum/antagonist/clockcult/greet()
 	if(!owner.current || silent)
@@ -85,7 +68,7 @@
 		to_chat(current, "<span class='nezbere'>You can communicate with other servants by using the Hierophant Network action button in the upper left.</span>")
 	..()
 	to_chat(current, "<b>This is Ratvar's will:</b> [CLOCKCULT_OBJECTIVE]")
-	owner.memory += "<b>Ratvar's will:</b> [CLOCKCULT_OBJECTIVE]<br>" //Memorize the objectives
+	antag_memory += "<b>Ratvar's will:</b> [CLOCKCULT_OBJECTIVE]<br>" //Memorize the objectives
 
 /datum/antagonist/clockcult/apply_innate_effects(mob/living/mob_override)
 	. = ..()
@@ -178,13 +161,32 @@
 		owner.current.visible_message("<span class='deconversion_message'>[owner] seems to have remembered their true allegiance!</span>", ignored_mob = owner.current)
 		to_chat(owner, "<span class='userdanger'>A cold, cold darkness flows through your mind, extinguishing the Justiciar's light and all of your memories as his servant.</span>")
 	owner.current.log_message("<font color=#BE8700>Has renounced the cult of Ratvar!</font>", INDIVIDUAL_ATTACK_LOG)
-	owner.wipe_memory()
 	owner.special_role = null
 	if(iscyborg(owner.current))
 		to_chat(owner.current, "<span class='warning'>Despite your freedom from Ratvar's influence, you are still irreparably damaged and no longer possess certain functions such as AI linking.</span>")
 	. = ..()
 
 
+/datum/antagonist/clockcult/admin_add(datum/mind/new_owner,mob/admin)
+	add_servant_of_ratvar(new_owner.current, TRUE)
+	message_admins("[key_name_admin(admin)] has made [new_owner.current] into a servant of Ratvar.")
+	log_admin("[key_name(admin)] has made [new_owner.current] into a servant of Ratvar.")
+
+/datum/antagonist/clockcult/admin_remove(mob/user)
+	remove_servant_of_ratvar(owner.current, TRUE)
+	message_admins("[key_name_admin(user)] has removed clockwork servant status from [owner.current].")
+	log_admin("[key_name(user)] has removed clockwork servant status from [owner.current].")
+
+/datum/antagonist/clockcult/get_admin_commands()
+	. = ..()
+	.["Give slab"] = CALLBACK(src,.proc/admin_give_slab)
+
+/datum/antagonist/clockcult/proc/admin_give_slab(mob/admin)
+	if(!SSticker.mode.equip_servant(owner.current))
+		to_chat(admin, "<span class='warning'>Failed to outfit [owner.current]!</span>")
+	else
+		to_chat(admin, "<span class='notice'>Successfully gave [owner.current] servant equipment!</span>")
+
 /datum/team/clockcult
 	name = "Clockcult"
 	var/list/objective

code/datums/antagonists/cult.dm

@@ -3,6 +3,7 @@
 /datum/antagonist/cult
 	name = "Cultist"
 	roundend_category = "cultists"
+	antagpanel_category = "Cult"
 	var/datum/action/innate/cult/comm/communion = new
 	var/datum/action/innate/cult/mastervote/vote = new
 	job_rank = ROLE_CULTIST
@@ -18,6 +19,8 @@
 	if(!new_team)
 		//todo remove this and allow admin buttons to create more than one cult
 		for(var/datum/antagonist/cult/H in GLOB.antagonists)
+			if(!H.owner)
+				continue
 			if(H.cult_team)
 				cult_team = H.cult_team
 				return
@@ -127,7 +130,6 @@
 
 /datum/antagonist/cult/on_removal()
 	remove_objectives()
-	owner.wipe_memory()
 	SSticker.mode.cult -= owner
 	SSticker.mode.update_cult_icons_removed(owner)
 	if(!silent)
@@ -138,11 +140,36 @@
 		owner.current.client.images -= cult_team.blood_target_image
 	. = ..()
 
+/datum/antagonist/cult/admin_add(datum/mind/new_owner,mob/admin)
+	give_equipment = FALSE
+	new_owner.add_antag_datum(src)
+	message_admins("[key_name_admin(admin)] has cult'ed [new_owner.current].")
+	log_admin("[key_name(admin)] has cult'ed [new_owner.current].")
+
+/datum/antagonist/cult/admin_remove(mob/user)
+	message_admins("[key_name_admin(user)] has decult'ed [owner.current].")
+	log_admin("[key_name(user)] has decult'ed [owner.current].")
+	SSticker.mode.remove_cultist(owner,silent=TRUE) //disgusting
+
+/datum/antagonist/cult/get_admin_commands()
+	. = ..()
+	.["Tome"] = CALLBACK(src,.proc/admin_give_tome)
+	.["Amulet"] = CALLBACK(src,.proc/admin_give_amulet)
+
+/datum/antagonist/cult/proc/admin_give_tome(mob/admin)
+	if(equip_cultist(owner.current,1))
+		to_chat(admin, "<span class='danger'>Spawning tome failed!</span>")
+
+/datum/antagonist/cult/proc/admin_give_amulet(mob/admin)
+	if (equip_cultist(owner.current))
+		to_chat(admin, "<span class='danger'>Spawning amulet failed!</span>")
+
 /datum/antagonist/cult/master
+	ignore_implant = TRUE
+	show_in_antagpanel = FALSE //Feel free to add this later
 	var/datum/action/innate/cult/master/finalreck/reckoning = new
 	var/datum/action/innate/cult/master/cultmark/bloodmark = new
 	var/datum/action/innate/cult/master/pulse/throwing = new
-	ignore_implant = TRUE
 
 /datum/antagonist/cult/master/Destroy()
 	QDEL_NULL(reckoning)
@@ -296,4 +323,7 @@
 		parts += "<span class='header'>The cultists were:</span>"
 		parts += printplayerlist(members)
 
-	return "<div class='panel redborder'>[parts.Join("<br>")]</div>"
+	return "<div class='panel redborder'>[parts.Join("<br>")]</div>"
+
+/datum/team/cult/is_gamemode_hero()
+	return SSticker.mode.name == "cult"

code/datums/antagonists/datum_traitor.dm

@@ -1,8 +1,9 @@
 /datum/antagonist/traitor
 	name = "Traitor"
 	roundend_category = "traitors"
+	antagpanel_category = "Traitor"
 	job_rank = ROLE_TRAITOR
-	var/should_specialise = FALSE //do we split into AI and human, set to true on inital assignment only
+	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/special_role = "traitor"
@@ -10,23 +11,28 @@
 	var/give_objectives = TRUE
 	var/should_give_codewords = TRUE
 
+	
+
 /datum/antagonist/traitor/human
+	show_in_antagpanel = FALSE
+	should_specialise = FALSE
 	var/should_equip = TRUE
 
-/datum/antagonist/traitor/AI
 
-/datum/antagonist/traitor/proc/specialise()
-	silent = TRUE
-	if(owner.current && isAI(owner.current))
-		owner.add_antag_datum(ai_datum)
-	else 
-		owner.add_antag_datum(human_datum)
-	on_removal()
+/datum/antagonist/traitor/AI
+	show_in_antagpanel = FALSE
+	should_specialise = FALSE
+
+/datum/antagonist/traitor/specialization(datum/mind/new_owner)
+	if(should_specialise)
+		if(new_owner.current && isAI(new_owner.current))
+			return new ai_datum()
+		else
+			return new human_datum()
+	else
+		return ..()
 
 /datum/antagonist/traitor/on_gain()
-	if(should_specialise)
-		specialise()
-		return
 	SSticker.mode.traitors += owner
 	owner.special_role = special_role
 	if(give_objectives)
@@ -49,8 +55,6 @@
 			traitor_mob.dna.add_mutation(CLOWNMUT)
 
 /datum/antagonist/traitor/on_removal()
-	if(should_specialise)
-		return ..()//we never did any of this anyway
 	SSticker.mode.traitors -= owner
 	for(var/O in objectives)
 		owner.objectives -= O
@@ -79,6 +83,7 @@
 
 /datum/antagonist/traitor/proc/forge_traitor_objectives()
 	return
+
 /datum/antagonist/traitor/human/forge_traitor_objectives()
 	var/is_hijacker = prob(10)
 	var/martyr_chance = prob(20)
@@ -229,8 +234,8 @@
 	to_chat(traitor_mob, "<B>Code Phrase</B>: <span class='danger'>[GLOB.syndicate_code_phrase]</span>")
 	to_chat(traitor_mob, "<B>Code Response</B>: <span class='danger'>[GLOB.syndicate_code_response]</span>")
 
-	traitor_mob.mind.store_memory("<b>Code Phrase</b>: [GLOB.syndicate_code_phrase]")
-	traitor_mob.mind.store_memory("<b>Code Response</b>: [GLOB.syndicate_code_response]")
+	antag_memory += "<b>Code Phrase</b>: [GLOB.syndicate_code_phrase]<br>"
+	antag_memory += "<b>Code Response</b>: [GLOB.syndicate_code_response]<br>"
 
 	to_chat(traitor_mob, "Use the code words in the order provided, during regular conversation, to identify other agents. Proceed with caution, however, as everyone is a potential foe.")
 
@@ -249,7 +254,7 @@
 	return
 
 /datum/antagonist/traitor/human/equip(var/silent = FALSE)
-	owner.equip_traitor(employer, silent)
+	owner.equip_traitor(employer, silent, src)
 
 /datum/antagonist/traitor/human/proc/assign_exchange_role()
 	//set faction
@@ -339,4 +344,7 @@
 
 /datum/antagonist/traitor/roundend_report_footer()
 	return "<br><b>The code phrases were:</b> <span class='codephrase'>[GLOB.syndicate_code_phrase]</span><br>\
-		<b>The code responses were:</b> <span class='codephrase'>[GLOB.syndicate_code_response]</span><br>"
+		<b>The code responses were:</b> <span class='codephrase'>[GLOB.syndicate_code_response]</span><br>"
+
+/datum/antagonist/traitor/is_gamemode_hero()
+	return SSticker.mode.name == "traitor"

code/datums/antagonists/devil.dm

@@ -87,6 +87,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
 /datum/antagonist/devil
 	name = "Devil"
 	roundend_category = "devils"
+	antagpanel_category = "Devil"
 	job_rank = ROLE_DEVIL
 	//Don't delete upon mind destruction, otherwise soul re-selling will break.
 	delete_on_mind_deletion = FALSE
@@ -111,17 +112,35 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
 		/obj/effect/proc_holder/spell/targeted/summon_dancefloor))
 	var/ascendable = FALSE
 
+/datum/antagonist/devil/can_be_owned(datum/mind/new_owner)
+	. = ..()
+	return . && (ishuman(new_owner.current) || iscyborg(new_owner.current))
 
-/datum/antagonist/devil/New()
-	..()
-	truename = randomDevilName()
-	ban = randomdevilban()
-	bane = randomdevilbane()
-	obligation = randomdevilobligation()
-	banish = randomdevilbanish()
-	GLOB.allDevils[lowertext(truename)] = src
+/datum/antagonist/devil/get_admin_commands()
+	. = ..()
+	.["Toggle ascendable"] = CALLBACK(src,.proc/admin_toggle_ascendable)
 
 
+/datum/antagonist/devil/proc/admin_toggle_ascendable(mob/admin)
+	ascendable = !ascendable
+	message_admins("[key_name_admin(admin)] set [owner.current] devil ascendable to [ascendable]")
+	log_admin("[key_name_admin(admin)] set [owner.current] devil ascendable to [ascendable])")
+
+/datum/antagonist/devil/admin_add(datum/mind/new_owner,mob/admin)
+	switch(alert(admin,"Should the devil be able to ascend",,"Yes","No","Cancel"))
+		if("Yes")
+			ascendable = TRUE
+		if("No")
+			ascendable = FALSE
+		else
+			return
+	new_owner.add_antag_datum(src)
+	message_admins("[key_name_admin(admin)] has devil'ed [new_owner.current]. [ascendable ? "(Ascendable)":""]")
+	log_admin("[key_name(admin)] has devil'ed [new_owner.current]. [ascendable ? "(Ascendable)":""]")
+
+/datum/antagonist/devil/antag_listing_name()
+	return ..() + "([truename])"
+
 /proc/devilInfo(name)
 	if(GLOB.allDevils[lowertext(name)])
 		return GLOB.allDevils[lowertext(name)]
@@ -480,7 +499,14 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
 	.=..()
 
 /datum/antagonist/devil/on_gain()
-	owner.store_memory("Your devilic true name is [truename]<br>[GLOB.lawlorify[LAW][ban]]<br>You may not use violence to coerce someone into selling their soul.<br>You may not directly and knowingly physically harm a devil, other than yourself.<br>[GLOB.lawlorify[LAW][bane]]<br>[GLOB.lawlorify[LAW][obligation]]<br>[GLOB.lawlorify[LAW][banish]]<br>")
+	truename = randomDevilName()
+	ban = randomdevilban()
+	bane = randomdevilbane()
+	obligation = randomdevilobligation()
+	banish = randomdevilbanish()
+	GLOB.allDevils[lowertext(truename)] = src
+
+	antag_memory += "Your devilic true name is [truename]<br>[GLOB.lawlorify[LAW][ban]]<br>You may not use violence to coerce someone into selling their soul.<br>You may not directly and knowingly physically harm a devil, other than yourself.<br>[GLOB.lawlorify[LAW][bane]]<br>[GLOB.lawlorify[LAW][obligation]]<br>[GLOB.lawlorify[LAW][banish]]<br>"
 	if(issilicon(owner.current))
 		var/mob/living/silicon/robot_devil = owner.current
 		var/laws = list("You may not use violence to coerce someone into selling their soul.", "You may not directly and knowingly physically harm a devil, other than yourself.", GLOB.lawlorify[LAW][ban], GLOB.lawlorify[LAW][obligation], "Accomplish your objectives at all costs.")

code/datums/antagonists/internal_affairs.dm

@@ -5,32 +5,31 @@
 #define TRAITOR_AGENT_ROLE "Syndicate External Affairs Agent"
 
 /datum/antagonist/traitor/internal_affairs
+	name = "Internal Affairs Agent"
 	human_datum = ANTAG_DATUM_IAA_HUMAN
 	ai_datum = ANTAG_DATUM_IAA_AI
-
-	
+	antagpanel_category = "IAA"
 
 /datum/antagonist/traitor/AI/internal_affairs
 	name = "Internal Affairs Agent"
 	employer = "Nanotrasen"
 	special_role = "internal affairs agent"
+	antagpanel_category = "IAA"
 	var/syndicate = FALSE
 	var/last_man_standing = FALSE
 	var/list/datum/mind/targets_stolen
-
-/datum/antagonist/traitor/AI/internal_affairs/custom
-	silent = TRUE
-	should_give_codewords = FALSE
-	give_objectives = FALSE
+	
 
 /datum/antagonist/traitor/human/internal_affairs
 	name = "Internal Affairs Agent"
 	employer = "Nanotrasen"
 	special_role = "internal affairs agent"
+	antagpanel_category = "IAA"
 	var/syndicate = FALSE
 	var/last_man_standing = FALSE
 	var/list/datum/mind/targets_stolen
 	
+	
 /datum/antagonist/traitor/human/internal_affairs/proc/give_pinpointer()
 	if(owner && owner.current)
 		owner.current.apply_status_effect(/datum/status_effect/agent_pinpointer)
@@ -292,6 +291,7 @@
 
 /datum/antagonist/traitor/AI/internal_affairs/greet()
 	greet_iaa()
+
 /datum/antagonist/traitor/human/internal_affairs/greet()
 	greet_iaa()
 

code/datums/antagonists/monkey.dm

@@ -7,7 +7,15 @@
 	name = "Monkey"
 	job_rank = ROLE_MONKEY
 	roundend_category = "monkeys"
+	antagpanel_category = "Monkey"
 	var/datum/team/monkey/monkey_team
+	var/monkey_only = TRUE
+
+/datum/antagonist/monkey/can_be_owned(datum/mind/new_owner)
+	return ..() && (!monkey_only || ismonkey(new_owner.current))
+
+/datum/antagonist/monkey/get_team()
+	return monkey_team
 
 /datum/antagonist/monkey/on_gain()
 	. = ..()
@@ -29,13 +37,15 @@
 	SEND_SOUND(owner.current, sound('sound/ambience/antag/monkey.ogg'))
 
 /datum/antagonist/monkey/on_removal()
-	. = ..()
 	owner.special_role = null
 	SSticker.mode.ape_infectees -= owner
 
-	var/datum/disease/D = (/datum/disease/transformation/jungle_fever in owner.current.viruses)
+	var/datum/disease/transformation/jungle_fever/D =  locate() in owner.current.viruses
 	if(D)
-		D.cure()
+		D.remove_virus()
+		qdel(D)
+	
+	. = ..()
 
 /datum/antagonist/monkey/create_team(datum/team/monkey/new_team)
 	if(!new_team)
@@ -50,15 +60,45 @@
 		stack_trace("Wrong team type passed to [type] initialization.")
 	monkey_team = new_team
 
-/datum/antagonist/monkey/get_team()
-	return monkey_team
-
 /datum/antagonist/monkey/proc/forge_objectives()
 	objectives |= monkey_team.objectives
 	owner.objectives |= objectives
 
+/datum/antagonist/monkey/admin_remove(mob/admin)
+	var/mob/living/carbon/monkey/M = owner.current
+	if(istype(M))
+		switch(alert(admin, "Humanize?", "Humanize", "Yes", "No"))
+			if("Yes")
+				if(admin == M)
+					admin = M.humanize(TR_KEEPITEMS  |  TR_KEEPIMPLANTS  |  TR_KEEPORGANS  |  TR_KEEPDAMAGE  |  TR_KEEPVIRUS  |  TR_DEFAULTMSG)
+				else
+					M.humanize(TR_KEEPITEMS  |  TR_KEEPIMPLANTS  |  TR_KEEPORGANS  |  TR_KEEPDAMAGE  |  TR_KEEPVIRUS  |  TR_DEFAULTMSG)
+			if("No")
+				//nothing
+			else
+				return
+	. = ..()
+
 /datum/antagonist/monkey/leader
 	name = "Monkey Leader"
+	monkey_only = FALSE
+
+/datum/antagonist/monkey/leader/admin_add(datum/mind/new_owner,mob/admin)
+	var/mob/living/carbon/human/H = new_owner.current
+	if(istype(H))
+		switch(alert(admin, "Monkeyize?", "Monkeyize", "Yes", "No"))
+			if("Yes")
+				if(admin == H)
+					admin = H.monkeyize()
+				else
+					H.monkeyize()
+			if("No")
+				//nothing
+			else
+				return
+	new_owner.add_antag_datum(src)
+	log_admin("[key_name(admin)] made [key_name(new_owner.current)] a monkey leader!")
+	message_admins("[key_name_admin(admin)] made [key_name_admin(new_owner.current)] a monkey leader!")
 
 /datum/antagonist/monkey/leader/on_gain()
 	. = ..()
@@ -68,11 +108,12 @@
 	owner.special_role = "Monkey Leader"
 
 /datum/antagonist/monkey/leader/on_removal()
-	. = ..()
 	SSticker.mode.ape_leaders -= owner
 	var/obj/item/organ/heart/H = new
 	H.Insert(owner.current, drop_if_replaced = FALSE) //replace freedom heart with normal heart
 
+	. = ..()
+
 /datum/antagonist/monkey/leader/greet()
 	to_chat(owner, "<B><span class='notice'>You are the Jungle Fever patient zero!!</B></span>")
 	to_chat(owner, "<b>You have been planted onto this station by the Animal Rights Consortium.</b>")

code/datums/antagonists/ninja.dm

@@ -1,31 +1,27 @@
 /datum/antagonist/ninja
 	name = "Ninja"
+	antagpanel_category = "Ninja"
 	job_rank = ROLE_NINJA
-	var/helping_station = 0
+	var/helping_station = FALSE
 	var/give_objectives = TRUE
+	var/give_equipment = TRUE
 
-/datum/antagonist/ninja/friendly
-	helping_station = 1
 
-/datum/antagonist/ninja/friendly/noobjective
-	give_objectives = FALSE
+/datum/antagonist/ninja/apply_innate_effects(mob/living/mob_override)
+	var/mob/living/M = mob_override || owner.current
+	update_ninja_icons_added(M)
 
-/datum/antagonist/ninja/New(datum/mind/new_owner)
-	if(new_owner && !ishuman(new_owner.current))//It's fine if we aren't passed a mind, but if we are, they have to be human.
-		throw EXCEPTION("Only humans and/or humanoids may be ninja'ed")
-	..(new_owner)
-
-/datum/antagonist/ninja/randomAllegiance/New(datum/mind/new_owner)
-	..(new_owner)
-	helping_station = rand(0,1)
+/datum/antagonist/ninja/remove_innate_effects(mob/living/mob_override)
+	var/mob/living/M = mob_override || owner.current
+	update_ninja_icons_removed(M)	
 
 /datum/antagonist/ninja/proc/equip_space_ninja(mob/living/carbon/human/H = owner.current)
 	return H.equipOutfit(/datum/outfit/ninja)
 
 /datum/antagonist/ninja/proc/addMemories()
-	owner.store_memory("I am an elite mercenary assassin of the mighty Spider Clan. A <font color='red'><B>SPACE NINJA</B></font>!")
-	owner.store_memory("Surprise is my weapon. Shadows are my armor. Without them, I am nothing. (//initialize your suit by right clicking on it, to use abilities like stealth)!")
-	owner.store_memory("Officially, [helping_station?"Nanotrasen":"The Syndicate"] are my employer.")
+	antag_memory += "I am an elite mercenary assassin of the mighty Spider Clan. A <font color='red'><B>SPACE NINJA</B></font>!<br>"
+	antag_memory += "Surprise is my weapon. Shadows are my armor. Without them, I am nothing. (//initialize your suit by right clicking on it, to use abilities like stealth)!<br>"
+	antag_memory += "Officially, [helping_station?"Nanotrasen":"The Syndicate"] are my employer.<br>"
 
 /datum/antagonist/ninja/proc/addObjectives(quantity = 6)
 	var/list/possible_targets = list()
@@ -103,11 +99,6 @@
 	datum.on_removal()
 	return TRUE
 
-/proc/add_ninja(mob/living/carbon/human/H, type = ANTAG_DATUM_NINJA_RANDOM)
-	if(!H || !H.mind)
-		return FALSE
-	return H.mind.add_antag_datum(type)
-
 /proc/is_ninja(mob/living/M)
 	return M && M.mind && M.mind.has_antag_datum(ANTAG_DATUM_NINJA)
 
@@ -123,3 +114,42 @@
 	if(give_objectives)
 		addObjectives()
 	addMemories()
+	if(give_equipment)
+		equip_space_ninja(owner.current)
+	. = ..()
+
+/datum/antagonist/ninja/admin_add(datum/mind/new_owner,mob/admin)
+	var/adj
+	switch(input("What kind of ninja?", "Ninja") as null|anything in list("Random","Syndicate","Nanotrasen","No objectives"))
+		if("Random")
+			helping_station = pick(TRUE,FALSE)
+			adj = ""
+		if("Syndicate")
+			helping_station = FALSE
+			adj = "syndie"
+		if("Nanotrasen")
+			helping_station = TRUE
+			adj = "friendly"
+		if("No objectives")
+			give_objectives = FALSE
+			adj = "objectiveless"
+		else
+			return
+	new_owner.assigned_role = "Space Ninja"
+	new_owner.special_role = "Space Ninja"
+	new_owner.add_antag_datum(src)
+	message_admins("[key_name_admin(admin)] has [adj] ninja'ed [new_owner.current].")
+	log_admin("[key_name(admin)] has [adj] ninja'ed [new_owner.current].")
+
+/datum/antagonist/ninja/antag_listing_name()
+	return ..() + "(Ninja)"
+
+/datum/antagonist/ninja/proc/update_ninja_icons_added(var/mob/living/carbon/human/ninja)
+	var/datum/atom_hud/antag/ninjahud = GLOB.huds[ANTAG_HUD_NINJA]
+	ninjahud.join_hud(ninja)
+	set_antag_hud(ninja, "ninja")
+
+/datum/antagonist/ninja/proc/update_ninja_icons_removed(var/mob/living/carbon/human/ninja)
+	var/datum/atom_hud/antag/ninjahud = GLOB.huds[ANTAG_HUD_NINJA]
+	ninjahud.leave_hud(ninja)
+	set_antag_hud(ninja, null)

code/datums/antagonists/nukeop.dm

@@ -11,6 +11,7 @@
 /datum/antagonist/nukeop
 	name = "Nuclear Operative"
 	roundend_category = "syndicate operatives" //just in case
+	antagpanel_category = "NukeOp"
 	job_rank = ROLE_OPERATIVE
 	var/datum/team/nuclear/nuke_team
 	var/always_new_team = FALSE //If not assigned a team by default ops will try to join existing ones, set this to TRUE to always create new team.
@@ -85,7 +86,7 @@
 
 /datum/antagonist/nukeop/proc/memorize_code()
 	if(nuke_team && nuke_team.tracked_nuke && nuke_team.memorized_code)
-		owner.store_memory("<B>[nuke_team.tracked_nuke] Code</B>: [nuke_team.memorized_code]", 0, 0)
+		antag_memory += "<B>[nuke_team.tracked_nuke] Code</B>: [nuke_team.memorized_code]<br>"
 		to_chat(owner, "The nuclear authorization code is: <B>[nuke_team.memorized_code]</B>")
 	else
 		to_chat(owner, "Unfortunately the syndicate was unable to provide you with nuclear authorization code.")
@@ -107,6 +108,8 @@
 	if(!new_team)
 		if(!always_new_team)
 			for(var/datum/antagonist/nukeop/N in GLOB.antagonists)
+				if(!N.owner)
+					continue
 				if(N.nuke_team)
 					nuke_team = N.nuke_team
 					return
@@ -118,6 +121,32 @@
 		stack_trace("Wrong team type passed to [type] initialization.")
 	nuke_team = new_team
 
+/datum/antagonist/nukeop/admin_add(datum/mind/new_owner,mob/admin)
+	new_owner.assigned_role = "Syndicate"
+	new_owner.add_antag_datum(src)
+	message_admins("[key_name_admin(admin)] has nuke op'ed [new_owner.current].")
+	log_admin("[key_name(admin)] has nuke op'ed [new_owner.current].")
+
+/datum/antagonist/nukeop/get_admin_commands()
+	. = ..()
+	.["Send to base"] = CALLBACK(src,.proc/admin_send_to_base)
+	.["Tell code"] = CALLBACK(src,.proc/admin_tell_code)
+
+/datum/antagonist/nukeop/proc/admin_send_to_base(mob/admin)
+	owner.current.forceMove(pick(GLOB.nukeop_start))
+
+/datum/antagonist/nukeop/proc/admin_tell_code(mob/admin)
+	var/code
+	for (var/obj/machinery/nuclearbomb/bombue in GLOB.machines)
+		if (length(bombue.r_code) <= 5 && bombue.r_code != initial(bombue.r_code))
+			code = bombue.r_code
+			break
+	if (code)
+		antag_memory += "<B>Syndicate Nuclear Bomb Code</B>: [code]<br>"
+		to_chat(owner.current, "The nuclear authorization code is: <B>[code]</B>")
+	else
+		to_chat(admin, "<span class='danger'>No valid nuke found!</span>")
+		
 /datum/antagonist/nukeop/leader
 	name = "Nuclear Operative Leader"
 	nukeop_outfit = /datum/outfit/syndicate/leader
@@ -201,6 +230,10 @@
 			stack_trace("Station self destruct ot found during lone op team creation.")
 			nuke_team.memorized_code = null
 
+/datum/antagonist/nukeop/reinforcement
+	send_to_spawnpoint = FALSE
+	nukeop_outfit = /datum/outfit/syndicate/no_crystals
+
 /datum/team/nuclear
 	var/syndicate_name
 	var/obj/machinery/nuclearbomb/tracked_nuke
@@ -316,3 +349,31 @@
 	parts += text
 
 	return "<div class='panel redborder'>[parts.Join("<br>")]</div>"
+
+/datum/team/nuclear/antag_listing_name()
+	if(syndicate_name)
+		return "[syndicate_name] Syndicates"
+	else
+		return "Syndicates"
+
+/datum/team/nuclear/antag_listing_entry()
+	var/disk_report = "<b>Nuclear Disk(s)</b><br>"
+	disk_report += "<table cellspacing=5>"
+	for(var/obj/item/disk/nuclear/N in GLOB.poi_list)
+		disk_report += "<tr><td>[N.name], "
+		var/atom/disk_loc = N.loc
+		while(!isturf(disk_loc))
+			if(ismob(disk_loc))
+				var/mob/M = disk_loc
+				disk_report += "carried by <a href='?_src_=holder;[HrefToken()];adminplayeropts=[REF(M)]'>[M.real_name]</a> "
+			if(isobj(disk_loc))
+				var/obj/O = disk_loc
+				disk_report += "in \a [O.name] "
+			disk_loc = disk_loc.loc
+		disk_report += "in [disk_loc.loc] at ([disk_loc.x], [disk_loc.y], [disk_loc.z])</td><td><a href='?_src_=holder;[HrefToken()];adminplayerobservefollow=[REF(N)]'>FLW</a></td></tr>"
+	disk_report += "</table>"
+	var/common_part = ..()
+	return common_part + disk_report
+
+/datum/team/nuclear/is_gamemode_hero()
+	return SSticker.mode.name == "nuclear emergency"

code/datums/antagonists/pirate.dm

@@ -2,6 +2,7 @@
 	name = "Space Pirate"
 	job_rank = ROLE_TRAITOR
 	roundend_category = "space pirates"
+	antagpanel_category = "Pirate"
 	var/datum/team/pirate/crew
 
 /datum/antagonist/pirate/greet()
@@ -15,6 +16,8 @@
 /datum/antagonist/pirate/create_team(datum/team/pirate/new_team)
 	if(!new_team)
 		for(var/datum/antagonist/pirate/P in GLOB.antagonists)
+			if(!P.owner)
+				continue
 			if(P.crew)
 				crew = P.crew
 				return

code/datums/antagonists/revolution.dm

@@ -4,16 +4,20 @@
 /datum/antagonist/rev
 	name = "Revolutionary"
 	roundend_category = "revolutionaries" // if by some miracle revolutionaries without revolution happen
+	antagpanel_category = "Revolution"
 	job_rank = ROLE_REV
 	var/hud_type = "rev"
 	var/datum/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
+	if(.)
+		if(new_owner.assigned_role in GLOB.command_positions)
+			return FALSE
+		if(new_owner.unconvertable)
+			return FALSE
+		if(new_owner.current && new_owner.current.isloyal())
+			return FALSE
 
 /datum/antagonist/rev/apply_innate_effects(mob/living/mob_override)
 	var/mob/living/M = mob_override || owner.current
@@ -26,9 +30,6 @@
 /datum/antagonist/rev/proc/equip_rev()
 	return
 
-/datum/antagonist/rev/New()
-	. = ..()
-
 /datum/antagonist/rev/on_gain()
 	. = ..()
 	create_objectives()
@@ -47,6 +48,8 @@
 	if(!new_team)
 		//For now only one revolution at a time
 		for(var/datum/antagonist/rev/head/H in GLOB.antagonists)
+			if(!H.owner)
+				continue
 			if(H.rev_team)
 				rev_team = H.rev_team
 				return
@@ -73,12 +76,73 @@
 	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)
+	var/datum/antagonist/rev/head/new_revhead = new()
 	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/get_admin_commands()
+	. = ..()
+	.["Promote"] = CALLBACK(src,.proc/admin_promote)
+
+/datum/antagonist/rev/proc/admin_promote(mob/admin)
+	var/datum/mind/O = owner
+	promote()
+	message_admins("[key_name_admin(admin)] has head-rev'ed [O].")
+	log_admin("[key_name(admin)] has head-rev'ed [O].")
+
+/datum/antagonist/rev/head/admin_add(datum/mind/new_owner,mob/admin)
+	give_flash = TRUE
+	give_hud = TRUE
+	remove_clumsy = TRUE
+	new_owner.add_antag_datum(src)
+	message_admins("[key_name_admin(admin)] has head-rev'ed [new_owner.current].")
+	log_admin("[key_name(admin)] has head-rev'ed [new_owner.current].")
+	to_chat(new_owner.current, "<span class='userdanger'>You are a member of the revolutionaries' leadership now!</span>")
+
+/datum/antagonist/rev/head/get_admin_commands()
+	. = ..()
+	. -= "Promote"
+	.["Take flash"] = CALLBACK(src,.proc/admin_take_flash)
+	.["Give flash"] = CALLBACK(src,.proc/admin_give_flash)
+	.["Repair flash"] = CALLBACK(src,.proc/admin_repair_flash)
+	.["Demote"] = CALLBACK(src,.proc/admin_demote)
+
+/datum/antagonist/rev/head/proc/admin_take_flash(mob/admin)
+	var/list/L = owner.current.get_contents()
+	var/obj/item/device/assembly/flash/flash = locate() in L
+	if (!flash)
+		to_chat(admin, "<span class='danger'>Deleting flash failed!</span>")
+		return
+	qdel(flash)
+
+/datum/antagonist/rev/head/proc/admin_give_flash(mob/admin)
+	//This is probably overkill but making these impact state annoys me
+	var/old_give_flash = give_flash
+	var/old_give_hud = give_hud
+	var/old_remove_clumsy = remove_clumsy
+	give_flash = TRUE
+	give_hud = FALSE
+	remove_clumsy = FALSE
+	equip_rev()
+	give_flash = old_give_flash
+	give_hud = old_give_hud
+	remove_clumsy = old_remove_clumsy
+
+/datum/antagonist/rev/head/proc/admin_repair_flash(mob/admin)
+	var/list/L = owner.current.get_contents()
+	var/obj/item/device/assembly/flash/flash = locate() in L
+	if (!flash)
+		to_chat(admin, "<span class='danger'>Repairing flash failed!</span>")
+	else
+		flash.crit_fail = 0
+		flash.update_icon()
+
+/datum/antagonist/rev/head/proc/admin_demote(datum/mind/target,mob/user)
+	message_admins("[key_name_admin(user)] has demoted [owner.current] from head revolutionary.")
+	log_admin("[key_name(user)] has demoted [owner.current] from head revolutionary.")
+	demote()
 
 /datum/antagonist/rev/head
 	name = "Head Revolutionary"
@@ -87,6 +151,9 @@
 	var/give_flash = FALSE
 	var/give_hud = TRUE
 
+/datum/antagonist/rev/head/antag_listing_name()
+	return ..() + "(Leader)"
+
 /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)
@@ -105,8 +172,6 @@
 	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)
@@ -127,7 +192,7 @@
 	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)
+	var/datum/antagonist/rev/new_rev = new /datum/antagonist/rev()
 	new_rev.silent = TRUE
 	old_owner.add_antag_datum(new_rev,old_team)
 	new_rev.silent = FALSE
@@ -279,4 +344,25 @@
 
 	result += "</div>"
 
-	return result.Join()
+	return result.Join()
+
+/datum/team/revolution/antag_listing_entry()
+	var/common_part = ..()
+	var/heads_report = "<b>Heads of Staff</b><br>"
+	heads_report += "<table cellspacing=5>"
+	for(var/datum/mind/N in SSjob.get_living_heads())
+		var/mob/M = N.current
+		if(M)
+			heads_report += "<tr><td><a href='?_src_=holder;[HrefToken()];adminplayeropts=[REF(M)]'>[M.real_name]</a>[M.client ? "" : " <i>(No Client)</i>"][M.stat == DEAD ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
+			heads_report += "<td><A href='?priv_msg=[M.ckey]'>PM</A></td>"
+			heads_report += "<td><A href='?_src_=holder;[HrefToken()];adminplayerobservefollow=[REF(M)]'>FLW</a></td>"
+			var/turf/mob_loc = get_turf(M)
+			heads_report += "<td>[mob_loc.loc]</td></tr>"
+		else
+			heads_report += "<tr><td><a href='?_src_=vars;[HrefToken()];Vars=[REF(N)]'>[N.name]([N.key])</a><i>Head body destroyed!</i></td>"
+			heads_report += "<td><A href='?priv_msg=[N.key]'>PM</A></td></tr>"
+	heads_report += "</table>"
+	return common_part + heads_report
+
+/datum/team/revolution/is_gamemode_hero()
+	return SSticker.mode.name == "revolution"

code/datums/antagonists/wizard.dm

@@ -6,6 +6,7 @@
 /datum/antagonist/wizard
 	name = "Space Wizard"
 	roundend_category = "wizards/witches"
+	antagpanel_category = "Wizard"
 	job_rank = ROLE_WIZARD
 	var/give_objectives = TRUE
 	var/strip = TRUE //strip before equipping
@@ -167,6 +168,14 @@
 	update_wiz_icons_removed(M)
 	M.faction -= "wizard"
 
+
+/datum/antagonist/wizard/get_admin_commands()
+	. = ..()
+	.["Send to Lair"] = CALLBACK(src,.proc/admin_send_to_lair)
+
+/datum/antagonist/wizard/proc/admin_send_to_lair(mob/admin)
+	owner.current.forceMove(pick(GLOB.wizardstart))
+
 /datum/antagonist/wizard/apprentice
 	name = "Wizard Apprentice"
 	hud_version = "apprentice"