Roundend report refactor

code/game/gamemodes/antag_spawner.dm

@@ -242,6 +242,7 @@
 	new_objective2.owner = S.mind
 	new_objective2.explanation_text = "[objective_verb] everyone[usr ? " else while you're at it":""]."
 	S.mind.objectives += new_objective2
+	S.mind.add_antag_datum(/datum/antagonist/auto_custom)
 	to_chat(S, S.playstyle_string)
 	to_chat(S, "<B>You are currently not currently in the same plane of existence as the station. \
 	Ctrl+Click a blood pool to manifest.</B>")

code/game/gamemodes/brother/traitor_bro.dm

@@ -1,41 +1,3 @@
-/datum/objective_team/brother_team
-	name = "brotherhood"
-	member_name = "blood brother"
-	var/list/objectives = list()
-	var/meeting_area
-
-/datum/objective_team/brother_team/is_solo()
-	return FALSE
-
-/datum/objective_team/brother_team/proc/add_objective(datum/objective/O, needs_target = FALSE)
-	O.team = src
-	if(needs_target)
-		O.find_target()
-	O.update_explanation_text()
-	objectives += O
-
-/datum/objective_team/brother_team/proc/forge_brother_objectives()
-	objectives = list()
-	var/is_hijacker = prob(10)
-	for(var/i = 1 to max(1, CONFIG_GET(number/brother_objectives_amount) + (members.len > 2) - is_hijacker))
-		forge_single_objective()
-	if(is_hijacker)
-		if(!locate(/datum/objective/hijack) in objectives)
-			add_objective(new/datum/objective/hijack)
-	else if(!locate(/datum/objective/escape) in objectives)
-		add_objective(new/datum/objective/escape)
-
-/datum/objective_team/brother_team/proc/forge_single_objective()
-	if(prob(50))
-		if(LAZYLEN(active_ais()) && prob(100/GLOB.joined_player_list.len))
-			add_objective(new/datum/objective/destroy, TRUE)
-		else if(prob(30))
-			add_objective(new/datum/objective/maroon, TRUE)
-		else
-			add_objective(new/datum/objective/assassinate, TRUE)
-	else
-		add_objective(new/datum/objective/steal, TRUE)
-
 /datum/game_mode
 	var/list/datum/mind/brothers = list()
 	var/list/datum/objective_team/brother_team/brother_teams = list()
@@ -54,6 +16,7 @@
 	var/list/datum/objective_team/brother_team/pre_brother_teams = list()
 	var/const/team_amount = 2 //hard limit on brother teams if scaling is turned off
 	var/const/min_team_size = 2
+	traitors_required = FALSE //Only teams are possible
 
 	var/meeting_areas = list("The Bar", "Dorms", "Escape Dock", "Arrivals", "Holodeck", "Primary Tool Storage", "Recreation Area", "Chapel", "Library")
 
@@ -92,12 +55,14 @@
 		team.forge_brother_objectives()
 		for(var/datum/mind/M in team.members)
 			M.add_antag_datum(ANTAG_DATUM_BROTHER, team)
+		team.update_name()
 	brother_teams += pre_brother_teams
 	return ..()
 
 /datum/game_mode/traitor/bros/generate_report()
 	return "It's Syndicate recruiting season. Be alert for potential Syndicate infiltrators, but also watch out for disgruntled employees trying to defect. Unlike Nanotrasen, the Syndicate prides itself in teamwork and will only recruit pairs that share a brotherly trust."
 
+<<<<<<< HEAD
 /datum/game_mode/proc/auto_declare_completion_brother()
 	if(!LAZYLEN(brother_teams))
 		return
@@ -130,6 +95,8 @@
 		text += "<br>"
 	to_chat(world, text)
 
+=======
+>>>>>>> 3d81385... Roundend report refactor (#33246)
 /datum/game_mode/proc/update_brother_icons_added(datum/mind/brother_mind)
 	var/datum/atom_hud/antag/brotherhud = GLOB.huds[ANTAG_HUD_BROTHER]
 	brotherhud.join_hud(brother_mind.current)

code/game/gamemodes/changeling/changeling.dm

@@ -94,6 +94,7 @@ GLOBAL_VAR(changeling_team_objective_type) //If this is not null, we hand our th
 			of the Thing being sent to a station in this sector is highly likely. It may be in the guise of any crew member. Trust nobody - suspect everybody. Do not announce this to the crew, \
 			as paranoia may spread and inhibit workplace efficiency."
 
+<<<<<<< HEAD
 /datum/game_mode/proc/auto_declare_completion_changeling()
 	var/list/changelings = get_antagonists(/datum/antagonist/changeling,TRUE) //Only real lings get a mention
 	if(changelings.len)
@@ -135,6 +136,8 @@ GLOBAL_VAR(changeling_team_objective_type) //If this is not null, we hand our th
 
 	return 1
 
+=======
+>>>>>>> 3d81385... Roundend report refactor (#33246)
 /proc/changeling_transform(mob/living/carbon/human/user, datum/changelingprofile/chosen_prof)
 	var/datum/dna/chosen_dna = chosen_prof.dna
 	user.real_name = chosen_prof.name

code/game/gamemodes/clock_cult/clock_cult.dm

@@ -65,13 +65,16 @@ Credit where due:
 		return TRUE
 	return FALSE
 
-/proc/add_servant_of_ratvar(mob/L, silent = FALSE)
+/proc/add_servant_of_ratvar(mob/L, silent = FALSE, create_team = TRUE)
 	if(!L || !L.mind)
 		return
 	var/update_type = ANTAG_DATUM_CLOCKCULT
 	if(silent)
 		update_type = ANTAG_DATUM_CLOCKCULT_SILENT
-	. = L.mind.add_antag_datum(update_type)
+	var/datum/antagonist/clockcult/C = new update_type(L.mind)
+	C.make_team = create_team
+	C.show_in_roundend = create_team //tutorial scarabs begone
+	. = L.mind.add_antag_datum(C)
 
 /proc/remove_servant_of_ratvar(mob/L, silent = FALSE)
 	if(!L || !L.mind)
@@ -88,7 +91,6 @@ Credit where due:
 ///////////////
 
 /datum/game_mode
-	var/datum/mind/eminence //The clockwork Eminence
 	var/list/servants_of_ratvar = list() //The Enlightened servants of Ratvar
 	var/clockwork_explanation = "Defend the Ark of the Clockwork Justiciar and free Ratvar." //The description of the current objective
 
@@ -110,6 +112,8 @@ Credit where due:
 	var/servants_to_serve = list()
 	var/roundstart_player_count
 	var/ark_time //In minutes, how long the Ark waits before activation; this is equal to 30 + (number of players / 5) (max 40 mins.)
+	
+	var/datum/objective_team/clockcult/main_clockcult
 
 /datum/game_mode/clockwork_cult/pre_setup()
 	if(CONFIG_GET(flag/protect_roles_from_antagonist))
@@ -191,16 +195,16 @@ Credit where due:
 	. = ..()
 
 /datum/game_mode/clockwork_cult/proc/check_clockwork_victory()
+	return main_clockcult.check_clockwork_victory()
+
+/datum/game_mode/clock_cult/set_round_result()
+	..()
 	if(GLOB.clockwork_gateway_activated)
 		SSticker.news_report = CLOCK_SUMMON
-		return TRUE
+		SSticker.mode_result = "win - servants completed their objective (summon ratvar)"
 	else
 		SSticker.news_report = CULT_FAILURE
-	return FALSE
-
-/datum/game_mode/clockwork_cult/declare_completion()
-	..()
-	return //Doesn't end until the round does
+		SSticker.mode_result = "loss - servants failed their objective (summon ratvar)"
 
 /datum/game_mode/clockwork_cult/generate_report()
 	return "Bluespace monitors near your sector have detected a continuous stream of patterned fluctuations since the station was completed. It is most probable that a powerful entity \
@@ -210,30 +214,6 @@ Credit where due:
 	working for this entity and utilizing highly-advanced technology to cross the great distance at will. If they should turn out to be a credible threat, the task falls on you and \
 	your crew to dispatch it in a timely manner."
 
-/datum/game_mode/proc/auto_declare_completion_clockwork_cult()
-	var/text = ""
-	if(istype(SSticker.mode, /datum/game_mode/clockwork_cult)) //Possibly hacky?
-		var/datum/game_mode/clockwork_cult/C = SSticker.mode
-		if(C.check_clockwork_victory())
-			text += "<span class='bold large_brass'>Ratvar's servants defended the Ark until its activation!</span>"
-			SSticker.mode_result = "win - servants completed their objective (summon ratvar)"
-		else
-			text += "<span class='userdanger'>The Ark was destroyed! Ratvar will rust away for all eternity!</span>"
-			SSticker.mode_result = "loss - servants failed their objective (summon ratvar)"
-		text += "<br><b>The servants' objective was:</b> [CLOCKCULT_OBJECTIVE]."
-		text += "<br>Ratvar's servants had <b>[GLOB.clockwork_caches]</b> Tinkerer's Caches."
-		text += "<br><b>Construction Value(CV)</b> was: <b>[GLOB.clockwork_construction_value]</b>"
-		for(var/i in SSticker.scripture_states)
-			if(i != SCRIPTURE_DRIVER)
-				text += "<br><b>[i] scripture</b> was: <b>[SSticker.scripture_states[i] ? "UN":""]LOCKED</b>"
-	if(SSticker.mode.eminence)
-		text += "<br><b>The Eminence was:</b> [printplayer(SSticker.mode.eminence)]"
-	if(servants_of_ratvar.len)
-		text += "<br><b>Ratvar's servants were:</b>"
-		for(var/datum/mind/M in servants_of_ratvar - SSticker.mode.eminence)
-			text += printplayer(M)
-	to_chat(world, text)
-
 /datum/game_mode/proc/update_servant_icons_added(datum/mind/M)
 	var/datum/atom_hud/antag/A = GLOB.huds[ANTAG_HUD_CLOCKWORK]
 	A.join_hud(M.current)

code/game/gamemodes/clock_cult/clock_items/construct_chassis.dm

@@ -91,7 +91,8 @@
 
 /obj/item/clockwork/construct_chassis/cogscarab/pre_spawn()
 	if(infinite_resources)
-		construct_type = /mob/living/simple_animal/drone/cogscarab/ratvar //During rounds where they can't interact with the station, let them experiment with builds
+		//During rounds where they can't interact with the station, let them experiment with builds
+		construct_type = /mob/living/simple_animal/drone/cogscarab/ratvar
 
 /obj/item/clockwork/construct_chassis/cogscarab/post_spawn(mob/living/construct)
 	if(infinite_resources) //Allow them to build stuff and recite scripture

code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm

@@ -14,16 +14,6 @@
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	var/static/superheated_walls = 0
 
-/mob/camera/eminence/Initialize()
-	if(SSticker.mode.eminence)
-		return INITIALIZE_HINT_QDEL
-	. = ..()
-
-/mob/camera/eminence/Destroy(force)
-	if(!force && mind && SSticker.mode.eminence == mind)
-		return QDEL_HINT_LETMELIVE
-	return ..()
-
 /mob/camera/eminence/CanPass(atom/movable/mover, turf/target)
 	return TRUE
 
@@ -39,12 +29,20 @@
 
 /mob/camera/eminence/Login()
 	..()
-	add_servant_of_ratvar(src, TRUE)
+	var/datum/antagonist/clockcult/C = mind.has_antag_datum(/datum/antagonist/clockcult,TRUE)
+	if(!C)
+		add_servant_of_ratvar(src, TRUE)
+		C = mind.has_antag_datum(/datum/antagonist/clockcult,TRUE)
+		if(C && C.clock_team)
+			if(C.clock_team.eminence)
+				remove_servant_of_ratvar(src,TRUE)
+				qdel(src)
+			else
+				C.clock_team.eminence = src
 	to_chat(src, "<span class='bold large_brass'>You have been selected as the Eminence!</span>")
 	to_chat(src, "<span class='brass'>As the Eminence, you lead the servants. Anything you say will be heard by the entire cult.</span>")
 	to_chat(src, "<span class='brass'>Though you can move through walls, you're also incorporeal, and largely can't interact with the world except for a few ways.</span>")
 	to_chat(src, "<span class='brass'>Additionally, unless the herald's beacon is activated, you can't understand any speech while away from Reebe.</span>")
-	SSticker.mode.eminence = mind
 	eminence_help()
 	for(var/V in actions)
 		var/datum/action/A = V

code/game/gamemodes/clock_cult/clock_structures/eminence_spire.dm

@@ -17,7 +17,11 @@
 		return
 	if(kingmaking)
 		return
-	if(SSticker.mode.eminence)
+
+	var/datum/antagonist/clockcult/C = user.mind.has_antag_datum(/datum/antagonist/clockcult)
+	if(!C || !C.clock_team)
+		return
+	if(C.clock_team.eminence)
 		to_chat(user, "<span class='warning'>There's already an Eminence!</span>")
 		return
 	if(!GLOB.servants_active)
@@ -34,7 +38,9 @@
 /obj/structure/destructible/clockwork/eminence_spire/attack_ghost(mob/user)
 	if(!IsAdminGhost(user))
 		return
-	if(SSticker.mode.eminence)
+
+	var/datum/antagonist/clockcult/random_cultist = locate() in GLOB.antagonists //if theres no cultists new team without eminence will be created anyway.
+	if(random_cultist && random_cultist.clock_team && random_cultist.clock_team.eminence)
 		to_chat(user, "<span class='warning'>There's already an Eminence - too late!</span>")
 		return
 	if(!GLOB.servants_active)

code/game/gamemodes/cult/cult.dm

@@ -2,24 +2,23 @@
 
 /datum/game_mode
 	var/list/datum/mind/cult = list()
-	var/list/cult_objectives = list()
-	var/eldergod = 1 //for the summon god objective
 
 /proc/iscultist(mob/living/M)
 	return istype(M) && M.mind && M.mind.has_antag_datum(ANTAG_DATUM_CULT)
 
-/proc/is_sacrifice_target(datum/mind/mind)
-	if(mind == GLOB.sac_mind)
-		return TRUE
+/datum/objective_team/cult/proc/is_sacrifice_target(datum/mind/mind)
+	for(var/datum/objective/sacrifice/sac_objective in objectives)
+		if(mind == sac_objective.target)
+			return TRUE
 	return FALSE
-
-/proc/is_convertable_to_cult(mob/living/M)
+ 
+/proc/is_convertable_to_cult(mob/living/M,datum/objective_team/cult/specific_cult)
 	if(!istype(M))
 		return FALSE
 	if(M.mind)
 		if(ishuman(M) && (M.mind.assigned_role in list("Captain", "Chaplain")))
 			return FALSE
-		if(is_sacrifice_target(M.mind))
+		if(specific_cult && specific_cult.is_sacrifice_target(M.mind))
 			return FALSE
 		if(M.mind.enslaved_to && !iscultist(M.mind.enslaved_to))
 			return FALSE
@@ -55,10 +54,10 @@
 
 	var/list/cultists_to_cult = list() //the cultists we'll convert
 
+	var/datum/objective_team/cult/main_cult
+
 
 /datum/game_mode/cult/pre_setup()
-	cult_objectives += "sacrifice"
-
 	if(CONFIG_GET(flag/protect_roles_from_antagonist))
 		restricted_jobs += protected_jobs
 
@@ -86,82 +85,19 @@
 
 
 /datum/game_mode/cult/post_setup()
-	if("sacrifice" in cult_objectives)
-		var/list/possible_targets = get_unconvertables()
-		if(!possible_targets.len)
-			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 in cultists_to_cult))
-					possible_targets += player.mind
-		if(possible_targets.len > 0)
-			GLOB.sac_mind = pick(possible_targets)
-			if(!GLOB.sac_mind)
-				message_admins("Cult Sacrifice: ERROR -  Null target chosen!")
-			else
-				var/datum/job/sacjob = SSjob.GetJob(GLOB.sac_mind.assigned_role)
-				var/datum/preferences/sacface = GLOB.sac_mind.current.client.prefs
-				var/icon/reshape = get_flat_human_icon(null, sacjob, sacface)
-				reshape.Shift(SOUTH, 4)
-				reshape.Shift(EAST, 1)
-				reshape.Crop(7,4,26,31)
-				reshape.Crop(-5,-3,26,30)
-				GLOB.sac_image = reshape
-		else
-			message_admins("Cult Sacrifice: Could not find unconvertable or convertable target. WELP!")
-	if(!GLOB.summon_spots.len)
-		while(GLOB.summon_spots.len < SUMMON_POSSIBILITIES)
-			var/area/summon = pick(GLOB.sortedAreas - GLOB.summon_spots)
-			if((summon.z in GLOB.station_z_levels) && summon.valid_territory)
-				GLOB.summon_spots += summon
-	cult_objectives += "eldergod"
-
 	for(var/datum/mind/cult_mind in cultists_to_cult)
-		equip_cultist(cult_mind.current)
-		update_cult_icons_added(cult_mind)
-		to_chat(cult_mind.current, "<span class='userdanger'>You are a member of the cult!</span>")
-		cult_mind.current.playsound_local(get_turf(cult_mind.current), 'sound/ambience/antag/bloodcult.ogg', 100, FALSE, pressure_affected = FALSE)//subject to change
-		add_cultist(cult_mind, 0)
+		add_cultist(cult_mind, 0, equip=TRUE)
 	..()
 
-/datum/game_mode/proc/equip_cultist(mob/living/carbon/human/mob,tome = 0)
-	if(!istype(mob))
-		return
-	if (mob.mind)
-		if (mob.mind.assigned_role == "Clown")
-			to_chat(mob, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.")
-			mob.dna.remove_mutation(CLOWNMUT)
 
-	if(tome)
-		. += cult_give_item(/obj/item/tome, mob)
-	else
-		. += cult_give_item(/obj/item/paper/talisman/supply, mob)
-	to_chat(mob, "These will help you start the cult on this station. Use them well, and remember - you are not the only one.</span>")
-
-/datum/game_mode/proc/cult_give_item(obj/item/item_path, mob/living/carbon/human/mob)
-	var/list/slots = list(
-		"backpack" = slot_in_backpack,
-		"left pocket" = slot_l_store,
-		"right pocket" = slot_r_store
-	)
-
-	var/T = new item_path(mob)
-	var/item_name = initial(item_path.name)
-	var/where = mob.equip_in_one_of_slots(T, slots)
-	if(!where)
-		to_chat(mob, "<span class='userdanger'>Unfortunately, you weren't able to get a [item_name]. This is very bad and you should adminhelp immediately (press F1).</span>")
-		return 0
-	else
-		to_chat(mob, "<span class='danger'>You have a [item_name] in your [where].</span>")
-		if(where == "backpack")
-			var/obj/item/storage/B = mob.back
-			B.orient2hud(mob)
-			B.show_to(mob)
-		return 1
-
-/datum/game_mode/proc/add_cultist(datum/mind/cult_mind, stun) //BASE
+/datum/game_mode/proc/add_cultist(datum/mind/cult_mind, stun , equip = FALSE) //BASE
 	if (!istype(cult_mind))
 		return 0
-	if(cult_mind.add_antag_datum(ANTAG_DATUM_CULT))
+
+	var/datum/antagonist/cult/new_cultist = new(cult_mind)
+	new_cultist.give_equipment = equip
+	
+	if(cult_mind.add_antag_datum(new_cultist))
 		if(stun)
 			cult_mind.current.Unconscious(100)
 		return 1
@@ -187,25 +123,19 @@
 	culthud.leave_hud(cult_mind.current)
 	set_antag_hud(cult_mind.current, null)
 
-/datum/game_mode/cult/proc/get_unconvertables()
-	var/list/ucs = list()
-	for(var/mob/living/carbon/human/player in GLOB.player_list)
-		if(player.mind && !is_convertable_to_cult(player) && !(player.mind in cultists_to_cult))
-			ucs += player.mind
-	return ucs
-
 /datum/game_mode/cult/proc/check_cult_victory()
-	var/cult_fail = 0
-	if(cult_objectives.Find("survive"))
-		cult_fail += check_survive() //the proc returns 1 if there are not enough cultists on the shuttle, 0 otherwise
-	if(cult_objectives.Find("eldergod"))
-		cult_fail += eldergod //1 by default, 0 if the elder god has been summoned at least once
-	if(cult_objectives.Find("sacrifice"))
-		if(GLOB.sac_mind && !GLOB.sac_complete) //if the target has been GLOB.sacrificed, ignore this step. otherwise, add 1 to cult_fail
-			cult_fail++
-	return cult_fail //if any objectives aren't met, failure
+	return main_cult.check_cult_victory()
 
 
+/datum/game_mode/cult/set_round_result()
+	..()
+	if(check_cult_victory())
+		SSticker.mode_result = "win - cult win"
+		SSticker.news_report = CULT_SUMMON
+	else
+		SSticker.mode_result = "loss - staff stopped the cult"
+		SSticker.news_report = CULT_FAILURE
+
 /datum/game_mode/cult/proc/check_survive()
 	var/acolytes_survived = 0
 	for(var/datum/mind/cult_mind in cult)
@@ -218,57 +148,6 @@
 		return 1
 
 
-/datum/game_mode/cult/declare_completion()
-
-	if(!check_cult_victory())
-		SSticker.mode_result = "win - cult win"
-		to_chat(world, "<span class='greentext'>The cult has succeeded! Nar-sie has snuffed out another torch in the void!</span>")
-	else
-		SSticker.mode_result = "loss - staff stopped the cult"
-		to_chat(world, "<span class='redtext'>The staff managed to stop the cult! Dark words and heresy are no match for Nanotrasen's finest!</span>")
-
-	var/text = ""
-
-	if(cult_objectives.len)
-		text += "<br><b>The cultists' objectives were:</b>"
-		for(var/obj_count=1, obj_count <= cult_objectives.len, obj_count++)
-			var/explanation
-			switch(cult_objectives[obj_count])
-				if("survive")
-					if(!check_survive())
-						explanation = "Make sure at least [acolytes_needed] acolytes escape on the shuttle. ([acolytes_survived] escaped) <span class='greenannounce'>Success!</span>"
-						SSblackbox.record_feedback("nested tally", "cult_objective", 1, list("cult_survive", "SUCCESS"))
-						SSticker.news_report = CULT_ESCAPE
-					else
-						explanation = "Make sure at least [acolytes_needed] acolytes escape on the shuttle. ([acolytes_survived] escaped) <span class='boldannounce'>Fail.</span>"
-						SSblackbox.record_feedback("nested tally", "cult_objective", 1, list("cult_survive", "FAIL"))
-						SSticker.news_report = CULT_FAILURE
-				if("sacrifice")
-					if(GLOB.sac_complete)
-						explanation = "Sacrifice [GLOB.sac_mind], the [GLOB.sac_mind.assigned_role]. <span class='greenannounce'>Success!</span>"
-						SSblackbox.record_feedback("nested tally", "cult_objective", 1, list("cult_sacrifice", "SUCCESS"))
-					else
-						explanation = "Sacrifice [GLOB.sac_mind], the [GLOB.sac_mind.assigned_role]. <span class='boldannounce'>Fail.</span>"
-						SSblackbox.record_feedback("nested tally", "cult_objective", 1, list("cult_sacrifice", "FAIL"))
-				if("eldergod")
-					if(!eldergod)
-						explanation = "Summon Nar-Sie. The summoning can only be accomplished in [english_list(GLOB.summon_spots)].<span class='greenannounce'>Success!</span>"
-						SSblackbox.record_feedback("nested tally", "cult_objective", 1, list("cult_narsie", "SUCCESS"))
-						SSticker.news_report = CULT_SUMMON
-					else
-						explanation = "Summon Nar-Sie. The summoning can only be accomplished in [english_list(GLOB.summon_spots)]<span class='boldannounce'>Fail.</span>"
-						SSblackbox.record_feedback("nested tally", "cult_objective", 1, list("cult_narsie", "FAIL"))
-						SSticker.news_report = CULT_FAILURE
-
-			text += "<br><B>Objective #[obj_count]</B>: [explanation]"
-	if(cult.len)
-		text += "<br><b>The cultists were:</b>"
-		for(var/datum/mind/M in cult)
-			text += printplayer(M)
-	to_chat(world, text)
-	..()
-	return 1
-
 /datum/game_mode/cult/generate_report()
 	return "Some stations in your sector have reported evidence of blood sacrifice and strange magic. Ties to the Wizards' Federation have been proven not to exist, and many employees \
 			have disappeared; even Central Command employees light-years away have felt strange presences and at times hysterical compulsions. Interrogations point towards this being the work of \
@@ -276,41 +155,4 @@
 			devoted to stopping this cult. Note that holy water seems to weaken and eventually return the minds of cultists that ingest it, and mindshield implants will prevent conversion \
 			altogether."
 
-/datum/game_mode/proc/datum_cult_completion()
-	var/text = ""
-	var/cult_fail = 0
-	cult_fail += eldergod
-	if(!GLOB.sac_complete)
-		cult_fail++
-	if(!cult_fail)
-		SSticker.mode_result = "win - cult win"
-		to_chat(world, "<span class='greentext'>The cult has succeeded! Nar-sie has snuffed out another torch in the void!</span>")
-	else
-		SSticker.mode_result = "loss - staff stopped the cult"
-		to_chat(world, "<span class='redtext'>The staff managed to stop the cult! Dark words and heresy are no match for Nanotrasen's finest!</span>")
-	if(cult_objectives.len)
-		text += "<br><b>The cultists' objectives were:</b>"
-		for(var/obj_count in 1 to 2)
-			var/explanation
-			switch(cult_objectives[obj_count])
-				if("sacrifice")
-					if(GLOB.sac_mind)
-						if(GLOB.sac_complete)
-							explanation = "Sacrifice [GLOB.sac_mind], the [GLOB.sac_mind.assigned_role]. <span class='greenannounce'>Success!</span>"
-							SSblackbox.record_feedback("nested tally", "cult_objective", 1, list("cult_sacrifice", "SUCCESS"))
-						else
-							explanation = "Sacrifice [GLOB.sac_mind], the [GLOB.sac_mind.assigned_role]. <span class='boldannounce'>Fail.</span>"
-							SSblackbox.record_feedback("nested tally", "cult_objective", 1, list("cult_sacrifice", "FAIL"))
-				if("eldergod")
-					if(!eldergod)
-						explanation = "Summon Nar-Sie. <span class='greenannounce'>Success!</span>"
-						SSblackbox.record_feedback("nested tally", "cult_objective", 1, list("cult_narsie", "SUCCESS"))
-						SSticker.news_report = CULT_SUMMON
-					else
-						explanation = "Summon Nar-Sie. <span class='boldannounce'>Fail.</span>"
-						SSblackbox.record_feedback("nested tally", "cult_objective", 1, list("cult_narsie", "FAIL"))
-						SSticker.news_report = CULT_FAILURE
-			text += "<br><B>Objective #[obj_count]</B>: [explanation]"
-	to_chat(world, text)
-
 #undef CULT_SCALING_COEFFICIENT

code/game/gamemodes/cult/cult_comms.dm

@@ -88,19 +88,21 @@
 	button_icon_state = "cultvote"
 
 /datum/action/innate/cult/mastervote/IsAvailable()
-	if(GLOB.cult_vote_called || !ishuman(owner))
+	var/datum/antagonist/cult/C = owner.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
+	if(!C || C.cult_team.cult_vote_called || !ishuman(owner))
 		return FALSE
 	return ..()
 
 /datum/action/innate/cult/mastervote/Activate()
-	pollCultists(owner)
+	var/datum/antagonist/cult/C = owner.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
+	pollCultists(owner,C.cult_team)
 
-/proc/pollCultists(var/mob/living/Nominee) //Cult Master Poll
+/proc/pollCultists(var/mob/living/Nominee,datum/objective_team/cult/team) //Cult Master Poll
 	if(world.time < CULT_POLL_WAIT)
 		to_chat(Nominee, "It would be premature to select a leader while everyone is still settling in, try again in [DisplayTimeText(CULT_POLL_WAIT-world.time)].")
 		return
-	GLOB.cult_vote_called = TRUE //somebody's trying to be a master, make sure we don't let anyone else try
-	for(var/datum/mind/B in SSticker.mode.cult)
+	team.cult_vote_called = TRUE //somebody's trying to be a master, make sure we don't let anyone else try
+	for(var/datum/mind/B in team.members)
 		if(B.current)
 			B.current.update_action_buttons_icon()
 			if(!B.current.incapacitated())
@@ -108,39 +110,39 @@
 				to_chat(B.current, "<span class='cultlarge'>Acolyte [Nominee] has asserted that they are worthy of leading the cult. A vote will be called shortly.</span>")
 	sleep(100)
 	var/list/asked_cultists = list()
-	for(var/datum/mind/B in SSticker.mode.cult)
+	for(var/datum/mind/B in team.members)
 		if(B.current && B.current != Nominee && !B.current.incapacitated())
 			SEND_SOUND(B.current, 'sound/magic/exit_blood.ogg')
 			asked_cultists += B.current
 	var/list/yes_voters = pollCandidates("[Nominee] seeks to lead your cult, do you support [Nominee.p_them()]?", poll_time = 300, group = asked_cultists)
 	if(QDELETED(Nominee) || Nominee.incapacitated())
-		GLOB.cult_vote_called = FALSE
-		for(var/datum/mind/B in SSticker.mode.cult)
+		team.cult_vote_called = FALSE
+		for(var/datum/mind/B in team.members)
 			if(B.current)
 				B.current.update_action_buttons_icon()
 				if(!B.current.incapacitated())
 					to_chat(B.current,"<span class='cultlarge'>[Nominee] has died in the process of attempting to win the cult's support!</span>")
 		return FALSE
 	if(!Nominee.mind)
-		GLOB.cult_vote_called = FALSE
-		for(var/datum/mind/B in SSticker.mode.cult)
+		team.cult_vote_called = FALSE
+		for(var/datum/mind/B in team.members)
 			if(B.current)
 				B.current.update_action_buttons_icon()
 				if(!B.current.incapacitated())
 					to_chat(B.current,"<span class='cultlarge'>[Nominee] has gone catatonic in the process of attempting to win the cult's support!</span>")
 		return FALSE
 	if(LAZYLEN(yes_voters) <= LAZYLEN(asked_cultists) * 0.5)
-		GLOB.cult_vote_called = FALSE
-		for(var/datum/mind/B in SSticker.mode.cult)
+		team.cult_vote_called = FALSE
+		for(var/datum/mind/B in team.members)
 			if(B.current)
 				B.current.update_action_buttons_icon()
 				if(!B.current.incapacitated())
 					to_chat(B.current, "<span class='cultlarge'>[Nominee] could not win the cult's support and shall continue to serve as an acolyte.</span>")
 		return FALSE
-	GLOB.cult_mastered = TRUE
+	team.cult_mastered = TRUE
 	SSticker.mode.remove_cultist(Nominee.mind, TRUE)
 	Nominee.mind.add_antag_datum(ANTAG_DATUM_CULT_MASTER)
-	for(var/datum/mind/B in SSticker.mode.cult)
+	for(var/datum/mind/B in team.members)
 		if(B.current)
 			for(var/datum/action/innate/cult/mastervote/vote in B.current.actions)
 				vote.Remove(B.current)
@@ -159,6 +161,9 @@
 	button_icon_state = "sintouch"
 
 /datum/action/innate/cult/master/finalreck/Activate()
+	var/datum/antagonist/cult/antag = owner.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
+	if(!antag)
+		return
 	for(var/i in 1 to 4)
 		chant(i)
 		var/list/destinations = list()
@@ -169,7 +174,7 @@
 			to_chat(owner, "<span class='warning'>You need more space to summon the cult!</span>")
 			return
 		if(do_after(owner, 30, target = owner))
-			for(var/datum/mind/B in SSticker.mode.cult)
+			for(var/datum/mind/B in antag.cult_team.members)
 				if(B.current && B.current.stat != DEAD)
 					var/turf/mobloc = get_turf(B.current)
 					switch(i)
@@ -194,7 +199,7 @@
 								addtimer(CALLBACK(B.current, /mob/.proc/reckon, final), 10)
 		else
 			return
-	GLOB.reckoning_complete = TRUE
+	antag.cult_team.reckoning_complete = TRUE
 	Remove(owner)
 
 /mob/proc/reckon(turf/final)
@@ -269,34 +274,37 @@
 	var/turf/T = get_turf(ranged_ability_user)
 	if(!isturf(T))
 		return FALSE
+
+	var/datum/antagonist/cult/C = caller.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
+	
 	if(target in view(7, get_turf(ranged_ability_user)))
-		GLOB.blood_target = target
+		C.cult_team.blood_target = target
 		var/area/A = get_area(target)
 		attached_action.cooldown = world.time + attached_action.base_cooldown
 		addtimer(CALLBACK(attached_action.owner, /mob.proc/update_action_buttons_icon), attached_action.base_cooldown)
-		GLOB.blood_target_image = image('icons/effects/cult_target.dmi', target, "glow", ABOVE_MOB_LAYER)
-		GLOB.blood_target_image.appearance_flags = RESET_COLOR
-		GLOB.blood_target_image.pixel_x = -target.pixel_x
-		GLOB.blood_target_image.pixel_y = -target.pixel_y
+		C.cult_team.blood_target_image = image('icons/effects/cult_target.dmi', target, "glow", ABOVE_MOB_LAYER)
+		C.cult_team.blood_target_image.appearance_flags = RESET_COLOR
+		C.cult_team.blood_target_image.pixel_x = -target.pixel_x
+		C.cult_team.blood_target_image.pixel_y = -target.pixel_y
 		for(var/datum/mind/B in SSticker.mode.cult)
 			if(B.current && B.current.stat != DEAD && B.current.client)
-				to_chat(B.current, "<span class='cultlarge'><b>Master [ranged_ability_user] has marked [GLOB.blood_target] in the [A.name] as the cult's top priority, get there immediately!</b></span>")
+				to_chat(B.current, "<span class='cultlarge'><b>Master [ranged_ability_user] has marked [C.cult_team.blood_target] in the [A.name] as the cult's top priority, get there immediately!</b></span>")
 				SEND_SOUND(B.current, sound(pick('sound/hallucinations/over_here2.ogg','sound/hallucinations/over_here3.ogg'),0,1,75))
-				B.current.client.images += GLOB.blood_target_image
+				B.current.client.images += C.cult_team.blood_target_image
 		attached_action.owner.update_action_buttons_icon()
 		remove_ranged_ability("<span class='cult'>The marking rite is complete! It will last for 90 seconds.</span>")
-		GLOB.blood_target_reset_timer = addtimer(CALLBACK(GLOBAL_PROC, .proc/reset_blood_target), 900, TIMER_STOPPABLE)
+		C.cult_team.blood_target_reset_timer = addtimer(CALLBACK(GLOBAL_PROC, .proc/reset_blood_target,C.cult_team), 900, TIMER_STOPPABLE)
 		return TRUE
 	return FALSE
 
-/proc/reset_blood_target()
-	for(var/datum/mind/B in SSticker.mode.cult)
+/proc/reset_blood_target(datum/objective_team/cult/team)
+	for(var/datum/mind/B in team.members)
 		if(B.current && B.current.stat != DEAD && B.current.client)
-			if(GLOB.blood_target)
+			if(team.blood_target)
 				to_chat(B.current,"<span class='cultlarge'><b>The blood mark has expired!</b></span>")
-			B.current.client.images -= GLOB.blood_target_image
-	QDEL_NULL(GLOB.blood_target_image)
-	GLOB.blood_target = null
+			B.current.client.images -= team.blood_target_image
+	QDEL_NULL(team.blood_target_image)
+	team.blood_target = null
 
 
 

code/game/gamemodes/cult/ritual.dm

@@ -179,6 +179,13 @@ This file contains the arcane tome files.
 	var/list/shields = list()
 	var/area/A = get_area(src)
 
+	var/datum/antagonist/cult/user_antag = user.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
+	if(!user_antag)
+		return
+
+	var/datum/objective/eldergod/summon_objective = locate() in user_antag.cult_team.objectives
+	var/datum/objective/sacrifice/sac_objective = locate() in user_antag.cult_team.objectives
+
 	if(!check_rune_turf(Turf, user))
 		return
 	entered_rune_name = input(user, "Choose a rite to scribe.", "Sigils of Power") as null|anything in GLOB.rune_types
@@ -196,18 +203,20 @@ This file contains the arcane tome files.
 	A = get_area(src)
 	if(!src || QDELETED(src) || !Adjacent(user) || user.incapacitated() || !check_rune_turf(Turf, user))
 		return
+	
+	//AAAAAAAAAAAAAAAH, i'm rewriting enough for now so TODO: remove this shit
 	if(ispath(rune_to_scribe, /obj/effect/rune/narsie))
-		if(!("eldergod" in SSticker.mode.cult_objectives))
+		if(!summon_objective)
 			to_chat(user, "<span class='warning'>Nar-Sie does not wish to be summoned!</span>")
 			return
-		if(!GLOB.sac_complete)
+		if(sac_objective && !sac_objective.check_completion())
 			to_chat(user, "<span class='warning'>The sacrifice is not complete. The portal would lack the power to open if you tried!</span>")
 			return
-		if(!SSticker.mode.eldergod)
+		if(summon_objective.check_completion())
 			to_chat(user, "<span class='cultlarge'>\"I am already here. There is no need to try to summon me now.\"</span>")
 			return
-		if(!(A in GLOB.summon_spots))
-			to_chat(user, "<span class='cultlarge'>The Geometer can only be summoned where the veil is weak - in [english_list(GLOB.summon_spots)]!</span>")
+		if(!(A in summon_objective.summon_spots))
+			to_chat(user, "<span class='cultlarge'>The Geometer can only be summoned where the veil is weak - in [english_list(summon_objective.summon_spots)]!</span>")
 			return
 		var/confirm_final = alert(user, "This is the FINAL step to summon Nar-Sie; it is a long, painful ritual and the crew will be alerted to your presence", "Are you prepared for the final battle?", "My life for Nar-Sie!", "No")
 		if(confirm_final == "No")
@@ -215,8 +224,8 @@ This file contains the arcane tome files.
 			return
 		Turf = get_turf(user)
 		A = get_area(src)
-		if(!(A in GLOB.summon_spots))  // Check again to make sure they didn't move
-			to_chat(user, "<span class='cultlarge'>The Geometer can only be summoned where the veil is weak - in [english_list(GLOB.summon_spots)]!</span>")
+		if(!(A in summon_objective.summon_spots))  // Check again to make sure they didn't move
+			to_chat(user, "<span class='cultlarge'>The Geometer can only be summoned where the veil is weak - in [english_list(summon_objective.summon_spots)]!</span>")
 			return
 		priority_announce("Figments from an eldritch god are being summoned by [user] into [A.map_name] from an unknown dimension. Disrupt the ritual at all costs!","Central Command Higher Dimensional Affairs", 'sound/ai/spanomalies.ogg')
 		for(var/B in spiral_range_turfs(1, user, 1))

code/game/gamemodes/cult/runes.dm

@@ -349,7 +349,11 @@ structure_check() searches for nearby cultist structures required for the invoca
 	color = RUNE_COLOR_DARKRED
 	var/mob/living/L = pick(myriad_targets)
 	var/is_clock = is_servant_of_ratvar(L)
-	var/is_convertable = is_convertable_to_cult(L)
+
+	var/mob/living/F = invokers[1]
+	var/datum/antagonist/cult/C = F.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
+
+	var/is_convertable = is_convertable_to_cult(L,C.cult_team)
 	if(L.stat != DEAD && (is_clock || is_convertable))
 		invocation = "Mah'weyh pleggh at e'ntrath!"
 		..()
@@ -397,17 +401,27 @@ structure_check() searches for nearby cultist structures required for the invoca
 	return 1
 
 /obj/effect/rune/convert/proc/do_sacrifice(mob/living/sacrificial, list/invokers)
+	var/mob/living/first_invoker = invokers[1]
+	if(!first_invoker)
+		return FALSE
+	var/datum/antagonist/cult/C = first_invoker.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
+	if(!C)
+		return
+	
+	
 	var/big_sac = FALSE
-	if((((ishuman(sacrificial) || iscyborg(sacrificial)) && sacrificial.stat != DEAD) || is_sacrifice_target(sacrificial.mind)) && invokers.len < 3)
+	if((((ishuman(sacrificial) || iscyborg(sacrificial)) && sacrificial.stat != DEAD) || C.cult_team.is_sacrifice_target(sacrificial.mind)) && invokers.len < 3)
 		for(var/M in invokers)
 			to_chat(M, "<span class='cultitalic'>[sacrificial] is too greatly linked to the world! You need three acolytes!</span>")
 		log_game("Offer rune failed - not enough acolytes and target is living or sac target")
 		return FALSE
 	if(sacrificial.mind)
 		GLOB.sacrificed += sacrificial.mind
-		if(is_sacrifice_target(sacrificial.mind))
-			GLOB.sac_complete = TRUE
-			big_sac = TRUE
+		for(var/datum/objective/sacrifice/sac_objective in C.cult_team.objectives)
+			if(sac_objective.target == sacrificial.mind)
+				sac_objective.sacced = TRUE
+				sac_objective.update_explanation_text()
+				big_sac = TRUE
 	else
 		GLOB.sacrificed += sacrificial
 
@@ -481,7 +495,6 @@ structure_check() searches for nearby cultist structures required for the invoca
 	sleep(40)
 	if(src)
 		color = RUNE_COLOR_RED
-	SSticker.mode.eldergod = FALSE
 	new /obj/singularity/narsie/large/cult(T) //Causes Nar-Sie to spawn even if the rune has been removed
 
 /obj/effect/rune/narsie/attackby(obj/I, mob/user, params)	//Since the narsie rune takes a long time to make, add logging to removal.

code/game/gamemodes/devil/game_mode.dm

@@ -3,32 +3,6 @@
 	var/list/datum/mind/devils = list()
 	var/devil_ascended = 0 // Number of arch devils on station
 
-/datum/game_mode/proc/auto_declare_completion_sintouched()
-	var/text = ""
-	if(sintouched.len)
-		text += "<br><span class='big'><b>The sintouched were:</b></span>"
-		var/list/sintouchedUnique = uniqueList(sintouched)
-		for(var/S in sintouchedUnique)
-			var/datum/mind/sintouched_mind = S
-			text += printplayer(sintouched_mind)
-			text += printobjectives(sintouched_mind)
-			text += "<br>"
-		text += "<br>"
-	to_chat(world, text)
-
-/datum/game_mode/proc/auto_declare_completion_devils()
-	/var/text = ""
-	if(devils.len)
-		text += "<br><span class='big'><b>The devils were:</b></span>"
-		for(var/D in devils)
-			var/datum/mind/devil = D
-			text += printplayer(devil)
-			text += printdevilinfo(devil.current)
-			text += printobjectives(devil)
-			text += "<br>"
-		text += "<br>"
-	to_chat(world, text)
-
 /datum/game_mode/proc/add_devil_objectives(datum/mind/devil_mind, quantity)
 	var/list/validtypes = list(/datum/objective/devil/soulquantity, /datum/objective/devil/soulquality, /datum/objective/devil/sintouch, /datum/objective/devil/buy_target)
 	for(var/i = 1 to quantity)
@@ -41,18 +15,6 @@
 		else
 			objective.find_target()
 
-/datum/game_mode/proc/printdevilinfo(mob/living/ply)
-	var/datum/antagonist/devil/devilinfo = is_devil(ply)
-	if(!devilinfo)
-		return "Target is not a devil."
-	var/text = "</br>The devil's true name is: [devilinfo.truename]</br>"
-	text += "The devil's bans were:</br>"
-	text += "	[GLOB.lawlorify[LORE][devilinfo.ban]]</br>"
-	text += "	[GLOB.lawlorify[LORE][devilinfo.bane]]</br>"
-	text += "	[GLOB.lawlorify[LORE][devilinfo.obligation]]</br>"
-	text += "	[GLOB.lawlorify[LORE][devilinfo.banish]]</br></br>"
-	return text
-
 /datum/game_mode/proc/update_devil_icons_added(datum/mind/devil_mind)
 	var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_DEVIL]
 	hud.join_hud(devil_mind.current)

code/game/gamemodes/game_mode.dm

@@ -73,7 +73,6 @@
 /datum/game_mode/proc/pre_setup()
 	return 1
 
-
 ///Everyone should now be on the station and have their normal gear.  This is the place to give the special roles extra things
 /datum/game_mode/proc/post_setup(report) //Gamemodes can override the intercept report. Passing TRUE as the argument will force a report.
 	if(!report)
@@ -241,55 +240,9 @@
 	return 0
 
 
-/datum/game_mode/proc/declare_completion()
-	var/clients = 0
-	var/surviving_humans = 0
-	var/surviving_total = 0
-	var/ghosts = 0
-	var/escaped_humans = 0
-	var/escaped_total = 0
-
-	for(var/mob/M in GLOB.player_list)
-		if(M.client)
-			clients++
-			if(ishuman(M))
-				if(!M.stat)
-					surviving_humans++
-					if(M.z == ZLEVEL_CENTCOM)
-						escaped_humans++
-			if(!M.stat)
-				surviving_total++
-				if(M.z == ZLEVEL_CENTCOM)
-					escaped_total++
-
-
-			if(isobserver(M))
-				ghosts++
-
-	if(clients)
-		SSblackbox.record_feedback("nested tally", "round_end_stats", clients, list("clients"))
-	if(ghosts)
-		SSblackbox.record_feedback("nested tally", "round_end_stats", ghosts, list("ghosts"))
-	if(surviving_humans)
-		SSblackbox.record_feedback("nested tally", "round_end_stats", surviving_humans, list("survivors", "human"))
-	if(surviving_total)
-		SSblackbox.record_feedback("nested tally", "round_end_stats", surviving_total, list("survivors", "total"))
-	if(escaped_humans)
-		SSblackbox.record_feedback("nested tally", "round_end_stats", escaped_humans, list("escapees", "human"))
-	if(escaped_total)
-		SSblackbox.record_feedback("nested tally", "round_end_stats", escaped_total, list("escapees", "total"))
-
-	send2irc("Server", "Round just ended.")
-	if(cult.len && !istype(SSticker.mode, /datum/game_mode/cult))
-		datum_cult_completion()
-
-	return 0
-
-
 /datum/game_mode/proc/check_win() //universal trigger to be called at mob death, nuke explosion, etc. To be called from everywhere.
 	return 0
 
-
 /datum/game_mode/proc/send_intercept()
 	var/intercepttext = "<b><i>Central Command Status Summary</i></b><hr>"
 	intercepttext += "<b>Central Command has intercepted and partially decoded a Syndicate transmission with vital information regarding their movements. The following report outlines the most \
@@ -451,34 +404,6 @@
 	for (var/C in GLOB.admins)
 		to_chat(C, msg)
 
-/datum/game_mode/proc/printplayer(datum/mind/ply, fleecheck)
-	var/text = "<br><b>[ply.key]</b> was <b>[ply.name]</b> the <b>[ply.assigned_role]</b> and"
-	if(ply.current)
-		if(ply.current.stat == DEAD)
-			text += " <span class='boldannounce'>died</span>"
-		else
-			text += " <span class='greenannounce'>survived</span>"
-		if(fleecheck)
-			var/turf/T = get_turf(ply.current)
-			if(!T || !(T.z in GLOB.station_z_levels))
-				text += " while <span class='boldannounce'>fleeing the station</span>"
-		if(ply.current.real_name != ply.name)
-			text += " as <b>[ply.current.real_name]</b>"
-	else
-		text += " <span class='boldannounce'>had their body destroyed</span>"
-	return text
-
-/datum/game_mode/proc/printobjectives(datum/mind/ply)
-	var/text = ""
-	var/count = 1
-	for(var/datum/objective/objective in ply.objectives)
-		if(objective.check_completion())
-			text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <span class='greenannounce'>Success!</span>"
-		else
-			text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <span class='boldannounce'>Fail.</span>"
-		count++
-	return text
-
 //If the configuration option is set to require players to be logged as old enough to play certain jobs, then this proc checks that they are, otherwise it just returns 1
 /datum/game_mode/proc/age_check(client/C)
 	if(get_remaining_days(C) == 0)
@@ -518,11 +443,6 @@
 		station_goals += new picked
 
 
-/datum/game_mode/proc/declare_station_goal_completion()
-	for(var/V in station_goals)
-		var/datum/station_goal/G = V
-		G.print_result()
-
 /datum/game_mode/proc/generate_report() //Generates a small text blurb for the gamemode in centcom report
 	return "Gamemode report for [name] not set.  Contact a coder."
 
@@ -530,3 +450,20 @@
 /datum/game_mode/proc/OnNukeExplosion(off_station)
 	if(off_station < 2)
 		station_was_nuked = TRUE //Will end the round on next check.
+<<<<<<< HEAD
+=======
+
+//Additional report section in roundend report
+/datum/game_mode/proc/special_report()
+	return
+
+//Set result and news report here
+/datum/game_mode/proc/set_round_result()
+	SSticker.mode_result = "undefined"
+	if(station_was_nuked)
+		SSticker.news_report = STATION_DESTROYED_NUKE
+	if(EMERGENCY_ESCAPED_OR_ENDGAMED)
+		SSticker.news_report = STATION_EVACUATED
+		if(SSshuttle.emergency.is_hijacked())
+			SSticker.news_report = SHUTTLE_HIJACK
+>>>>>>> 3d81385... Roundend report refactor (#33246)

code/game/gamemodes/meteor/meteor.dm

@@ -30,30 +30,29 @@
 	spawn_meteors(ramp_up_final, wavetype)
 
 
-/datum/game_mode/meteor/declare_completion()
-	var/text
+/datum/game_mode/meteor/special_report()
 	var/survivors = 0
+	var/list/survivor_list = list()
 
 	for(var/mob/living/player in GLOB.player_list)
 		if(player.stat != DEAD)
 			++survivors
 
 			if(player.onCentCom())
-				text += "<br><b><font size=2>[player.real_name] escaped to the safety of CentCom.</font></b>"
+				survivor_list += "<span class='greentext'>[player.real_name] escaped to the safety of CentCom.</span>"
 			else if(player.onSyndieBase())
-				text += "<br><b><font size=2>[player.real_name] escaped to the (relative) safety of Syndicate Space.</font></b>"
+				survivor_list += "<span class='greentext'>[player.real_name] escaped to the (relative) safety of Syndicate Space.</span>"
 			else
-				text += "<br><font size=1>[player.real_name] survived but is stranded without any hope of rescue.</font>"
-
+				survivor_list += "<span class='neutraltext'>[player.real_name] survived but is stranded without any hope of rescue.</span>"
 
 	if(survivors)
-		to_chat(world, "<span class='boldnotice'>The following survived the meteor storm</span>:[text]")
+		return "<span class='header'>The following survived the meteor storm:</span><br>[survivor_list.Join("<br>")]"
 	else
-		to_chat(world, "<span class='boldnotice'>Nobody survived the meteor storm!</span>")
+		return "<span class='redtext big'>Nobody survived the meteor storm!</span>"
 
-	SSticker.mode_result = "end - evacuation"
+/datum/game_mode/meteor/set_round_result()
 	..()
-	return 1
+	SSticker.mode_result = "end - evacuation"
 
 /datum/game_mode/meteor/generate_report()
 	return "[pick("Asteroids have", "Meteors have", "Large rocks have", "Stellar minerals have", "Space hail has", "Debris has")] been detected near your station, and a collision is possible, \

code/game/gamemodes/miniantags/abduction/abduction.dm

@@ -1,19 +1,5 @@
-/datum/objective_team/abductor_team
-	member_name = "abductor" 
-	var/list/objectives = list()
-	var/team_number
-
-/datum/objective_team/abductor_team/is_solo()
-	return FALSE
-
-/datum/objective_team/abductor_team/proc/add_objective(datum/objective/O)
-	O.team = src
-	O.update_explanation_text()
-	objectives += O
-
 /datum/game_mode
 	var/list/datum/mind/abductors = list()
-	var/list/datum/mind/abductees = list()
 
 /datum/game_mode/abduction
 	name = "abduction"
@@ -99,35 +85,6 @@
 					return ..()
 	return ..()
 
-/datum/game_mode/abduction/declare_completion()
-	for(var/datum/objective_team/abductor_team/team in abductor_teams)
-		var/won = TRUE
-		for(var/datum/objective/O in team.objectives)
-			if(!O.check_completion())
-				won = FALSE
-		if(won)
-			to_chat(world, "<span class='greenannounce'>[team.name] team fulfilled its mission!</span>")
-		else
-			to_chat(world, "<span class='boldannounce'>[team.name] team failed its mission.</span>")
-	..()
-	return TRUE
-
-/datum/game_mode/proc/auto_declare_completion_abduction()
-	var/text = ""
-	if(abductors.len)
-		text += "<br><span class='big'><b>The abductors were:</b></span>"
-		for(var/datum/mind/abductor_mind in abductors)
-			text += printplayer(abductor_mind)
-			text += printobjectives(abductor_mind)
-		text += "<br>"
-		if(abductees.len)
-			text += "<br><span class='big'><b>The abductees were:</b></span>"
-			for(var/datum/mind/abductee_mind in abductees)
-				text += printplayer(abductee_mind)
-				text += printobjectives(abductee_mind)
-	text += "<br>"
-	to_chat(world, text)
-
 // LANDMARKS
 /obj/effect/landmark/abductor
 	var/team_number = 1

code/game/gamemodes/miniantags/abduction/machinery/experiment.dm

@@ -151,13 +151,18 @@
 		var/mob/living/mob_occupant = occupant
 		if(mob_occupant.stat != DEAD)
 			if(href_list["experiment"])
-				flash = Experiment(occupant,href_list["experiment"])
+				flash = Experiment(occupant,href_list["experiment"],usr)
 	updateUsrDialog()
 	add_fingerprint(usr)
 
-/obj/machinery/abductor/experiment/proc/Experiment(mob/occupant,type)
+/obj/machinery/abductor/experiment/proc/Experiment(mob/occupant,type,mob/user)
 	LAZYINITLIST(history)
 	var/mob/living/carbon/human/H = occupant
+
+	var/datum/antagonist/abductor/user_abductor = user.mind.has_antag_datum(/datum/antagonist/abductor)
+	if(!user_abductor)
+		return "<span class='bad'>Authorization failure. Contact mothership immidiately.</span>"
+
 	var/point_reward = 0
 	if(H in history)
 		return "<span class='bad'>Specimen already in database.</span>"
@@ -182,15 +187,8 @@
 			if(3)
 				to_chat(H, "<span class='warning'>You feel intensely watched.</span>")
 		sleep(5)
-		to_chat(H, "<span class='warning'><b>Your mind snaps!</b></span>")
-		H.gain_trauma_type(BRAIN_TRAUMA_MILD)
-		to_chat(H, "<big><span class='warning'><b>You can't remember how you got here...</b></span></big>")
-		var/objtype = (prob(75) ? /datum/objective/abductee/random : pick(subtypesof(/datum/objective/abductee/) - /datum/objective/abductee/random))
-		var/datum/objective/abductee/O = new objtype()
-		SSticker.mode.abductees += H.mind
-		H.mind.objectives += O
-		H.mind.announce_objectives()
-		SSticker.mode.update_abductor_icons_added(H.mind)
+		user_abductor.team.abductees += H.mind
+		H.mind.add_antag_datum(/datum/antagonist/abductee)
 
 		for(var/obj/item/organ/heart/gland/G in H.internal_organs)
 			G.Start()

code/game/gamemodes/miniantags/monkey/monkey.dm

@@ -105,13 +105,18 @@
 	monkey_mind.special_role = null
 
 
-/datum/game_mode/monkey/declare_completion()
+/datum/game_mode/monkey/set_round_result()
+	..()
 	if(check_monkey_victory())
 		SSticker.mode_result = "win - monkey win"
-		to_chat(world, "<span class='userdanger'>The monkeys have overthrown their captors! Eeek eeeek!!</span>")
 	else
 		SSticker.mode_result = "loss - staff stopped the monkeys"
-		to_chat(world, "<span class='userdanger'>The staff managed to contain the monkey infestation!</span>")
+
+/datum/game_mode/monkey/special_report()
+	if(check_monkey_victory())
+		return "<span class='redtext big'>The monkeys have overthrown their captors! Eeek eeeek!!</span>"
+	else
+		return "<span class='redtext big'>The staff managed to contain the monkey infestation!</span>"
 
 /datum/game_mode/monkey/generate_report()
 	return "Reports of an ancient [pick("retrovirus", "flesh eating bacteria", "disease", "magical curse blamed on viruses", "banana blight")] outbreak that turn humans into monkeys has been reported in your quadrant.  Any such infections may be treated with banana juice.  If an outbreak occurs, ensure the station is quarantined to prevent a largescale outbreak at CentCom."

code/game/gamemodes/miniantags/morph/morph.dm

@@ -227,6 +227,7 @@
 	player_mind.assigned_role = "Morph"
 	player_mind.special_role = "Morph"
 	SSticker.mode.traitors |= player_mind
+	player_mind.add_antag_datum(/datum/antagonist/auto_custom)
 	to_chat(S, S.playstyle_string)
 	SEND_SOUND(S, sound('sound/magic/mutate.ogg'))
 	message_admins("[key_name_admin(S)] has been made into a morph by an event.")

code/game/gamemodes/miniantags/revenant/revenant.dm

@@ -87,6 +87,7 @@
 		mind.assigned_role = "revenant"
 		mind.special_role = "Revenant"
 		SSticker.mode.traitors |= mind //Necessary for announcing
+		mind.add_antag_datum(/datum/antagonist/auto_custom)
 		AddSpell(new /obj/effect/proc_holder/spell/targeted/night_vision/revenant(null))
 		AddSpell(new /obj/effect/proc_holder/spell/targeted/revenant_transmit(null))
 		AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/revenant/defile(null))

code/game/gamemodes/miniantags/slaughter/slaughterevent.dm

@@ -38,6 +38,7 @@
 	player_mind.assigned_role = "Slaughter Demon"
 	player_mind.special_role = "Slaughter Demon"
 	SSticker.mode.traitors |= player_mind
+	player_mind.add_antag_datum(/datum/antagonist/auto_custom)
 	to_chat(S, S.playstyle_string)
 	to_chat(S, "<B>You are currently not currently in the same plane of existence as the station. Blood Crawl near a blood pool to manifest.</B>")
 	SEND_SOUND(S, 'sound/magic/demon_dies.ogg')

code/game/gamemodes/nuclear/nuclear.dm

@@ -171,6 +171,7 @@
 			return FALSE	//its a static var btw
 	..()
 
+<<<<<<< HEAD
 /datum/game_mode/nuclear/declare_completion()
 	var/disk_rescued = 1
 	for(var/obj/item/disk/nuclear/D in GLOB.poi_list)
@@ -251,12 +252,49 @@
 
 	..()
 	return
+=======
+/datum/game_mode/nuclear/set_round_result()
+	var result = nuke_team.get_result()
+	switch(result)
+		if(NUKE_RESULT_FLUKE)
+			SSticker.mode_result = "loss - syndicate nuked - disk secured"
+			SSticker.news_report = NUKE_SYNDICATE_BASE
+		if(NUKE_RESULT_NUKE_WIN)
+			SSticker.mode_result = "win - syndicate nuke"
+			SSticker.news_report = STATION_NUKED
+		if(NUKE_RESULT_NOSURVIVORS)
+			SSticker.mode_result = "halfwin - syndicate nuke - did not evacuate in time"
+			SSticker.news_report = STATION_NUKED
+		if(NUKE_RESULT_WRONG_STATION)
+			SSticker.mode_result = "halfwin - blew wrong station"
+			SSticker.news_report = NUKE_MISS
+		if(NUKE_RESULT_WRONG_STATION_DEAD)
+			SSticker.mode_result = "halfwin - blew wrong station - did not evacuate in time"
+			SSticker.news_report = NUKE_MISS
+		if(NUKE_RESULT_CREW_WIN_SYNDIES_DEAD)
+			SSticker.mode_result = "loss - evacuation - disk secured - syndi team dead"
+			SSticker.news_report = OPERATIVES_KILLED
+		if(NUKE_RESULT_CREW_WIN)
+			SSticker.mode_result = "loss - evacuation - disk secured"
+			SSticker.news_report = OPERATIVES_KILLED
+		if(NUKE_RESULT_DISK_LOST)
+			SSticker.mode_result = "halfwin - evacuation - disk not secured"
+			SSticker.news_report = OPERATIVE_SKIRMISH
+		if(NUKE_RESULT_DISK_STOLEN)
+			SSticker.mode_result = "halfwin - detonation averted"
+			SSticker.news_report = OPERATIVE_SKIRMISH
+		else
+			SSticker.mode_result = "halfwin - interrupted"
+			SSticker.news_report = OPERATIVE_SKIRMISH
+	return ..()
+>>>>>>> 3d81385... Roundend report refactor (#33246)
 
 /datum/game_mode/nuclear/generate_report()
 	return "One of Central Command's trading routes was recently disrupted by a raid carried out by the Gorlex Marauders. They seemed to only be after one ship - a highly-sensitive \
 			transport containing a nuclear fission explosive, although it is useless without the proper code and authorization disk. While the code was likely found in minutes, the only disk that \
 			can activate this explosive is on your station. Ensure that it is protected at all times, and remain alert for possible intruders."
 
+<<<<<<< HEAD
 /datum/game_mode/proc/auto_declare_completion_nuclear()
 	if( syndicates.len || (SSticker && istype(SSticker.mode, /datum/game_mode/nuclear)) )
 		var/text = "<br><FONT size=3><B>The syndicate operatives were:</B></FONT>"
@@ -298,6 +336,8 @@
 		synd_mind.current.real_name = synd_mind.name
 	return
 
+=======
+>>>>>>> 3d81385... Roundend report refactor (#33246)
 /proc/is_nuclear_operative(mob/M)
 	return M && istype(M) && M.mind && SSticker && SSticker.mode && M.mind in SSticker.mode.syndicates
 

code/game/gamemodes/objective_team.dm

@@ -3,6 +3,7 @@
 	var/list/datum/mind/members = list()
 	var/name = "team"
 	var/member_name = "member"
+	var/list/objectives = list() //common objectives, these won't be added or removed automatically, subtypes handle this, this is here for bookkeeping purposes.
 
 /datum/objective_team/New(starting_members)
 	. = ..()
@@ -12,7 +13,6 @@
 				add_member(M)
 		else
 			add_member(starting_members)
-		members += starting_members
 
 /datum/objective_team/proc/is_solo()
 	return members.len == 1
@@ -21,4 +21,14 @@
 	members |= new_member
 
 /datum/objective_team/proc/remove_member(datum/mind/member)
-	members -= member
+	members -= member
+
+//Display members/victory/failure/objectives for the team
+/datum/objective_team/proc/roundend_report()
+	var/list/report = list()
+
+	report += "<b>[name]:</b>"
+	report += "The [member_name]s were:"
+	report += printplayerlist(members)
+
+	return report.Join("<br>")

code/game/gamemodes/revolution/revolution.dm

@@ -169,62 +169,22 @@
 				return FALSE
 	return TRUE
 
-//////////////////////////////////////////////////////////////////////
-//Announces the end of the game with all relavent information stated//
-//////////////////////////////////////////////////////////////////////
-/datum/game_mode/revolution/declare_completion()
+
+/datum/game_mode/revolution/set_round_result()
+	..()
 	if(finished == 1)
 		SSticker.mode_result = "win - heads killed"
-		to_chat(world, "<span class='redtext'>The heads of staff were killed or exiled! The revolutionaries win!</span>")
-
 		SSticker.news_report = REVS_WIN
-
 	else if(finished == 2)
 		SSticker.mode_result = "loss - rev heads killed"
-		to_chat(world, "<span class='redtext'>The heads of staff managed to stop the revolution!</span>")
-
 		SSticker.news_report = REVS_LOSE
-	..()
-	return TRUE
 
-/datum/game_mode/proc/auto_declare_completion_revolution()
-	var/list/targets = list()
-	var/list/datum/mind/headrevs = get_antagonists(/datum/antagonist/rev/head)
-	var/list/datum/mind/revs = get_antagonists(/datum/antagonist/rev,TRUE)
-	if(headrevs.len)
-		var/num_revs = 0
-		var/num_survivors = 0
-		for(var/mob/living/carbon/survivor in GLOB.alive_mob_list)
-			if(survivor.ckey)
-				num_survivors++
-				if(survivor.mind)
-					if(is_revolutionary(survivor))
-						num_revs++
-		if(num_survivors)
-			to_chat(world, "[GLOB.TAB]Command's Approval Rating: <B>[100 - round((num_revs/num_survivors)*100, 0.1)]%</B>" )
-		var/text = "<br><font size=3><b>The head revolutionaries were:</b></font>"
-		for(var/datum/mind/headrev in headrevs)
-			text += printplayer(headrev, 1)
-		text += "<br>"
-		to_chat(world, text)
-
-	if(revs.len)
-		var/text = "<br><font size=3><b>The revolutionaries were:</b></font>"
-		for(var/datum/mind/rev in revs)
-			text += printplayer(rev, 1)
-		text += "<br>"
-		to_chat(world, text)
-
-	if(revs.len || headrevs.len)
-		var/text = "<br><font size=3><b>The heads of staff were:</b></font>"
-		var/list/heads = SSjob.get_all_heads()
-		for(var/datum/mind/head in heads)
-			var/target = (head in targets)
-			if(target)
-				text += "<span class='boldannounce'>Target</span>"
-			text += printplayer(head, 1)
-		text += "<br>"
-		to_chat(world, text)
+//TODO What should be displayed for revs in non-rev rounds
+/datum/game_mode/revolution/special_report()
+	if(finished == 1)
+		return "<span class='redtext big'>The heads of staff were killed or exiled! The revolutionaries win!</span>"
+	else if(finished == 2)
+		return "<span class='redtext big'>The heads of staff managed to stop the revolution!</span>"
 
 /datum/game_mode/revolution/generate_report()
 	return "Employee unrest has spiked in recent weeks, with several attempted mutinies on heads of staff. Some crew have been observed using flashbulb devices to blind their colleagues, \

code/game/gamemodes/traitor/traitor.dm

@@ -27,6 +27,7 @@
 	var/traitors_possible = 4 //hard limit on traitors if scaling is turned off
 	var/num_modifier = 0 // Used for gamemodes, that are a child of traitor, that need more than the usual.
 	var/antag_datum = ANTAG_DATUM_TRAITOR //what type of antag to create
+	var/traitors_required = TRUE //Will allow no traitors
 
 
 /datum/game_mode/traitor/pre_setup()
@@ -55,7 +56,7 @@
 		log_game("[traitor.key] (ckey) has been selected as a [traitor_name]")
 		antag_candidates.Remove(traitor)
 
-	return pre_traitors.len > 0
+	return !traitors_required || pre_traitors.len > 0
 
 
 /datum/game_mode/traitor/post_setup()
@@ -85,6 +86,7 @@
 	new_antag.should_specialise = TRUE
 	character.add_antag_datum(new_antag)
 
+<<<<<<< HEAD
 
 
 /datum/game_mode/traitor/declare_completion()
@@ -154,11 +156,12 @@
 
 	return TRUE
 
+=======
+>>>>>>> 3d81385... Roundend report refactor (#33246)
 /datum/game_mode/traitor/generate_report()
 	return "Although more specific threats are commonplace, you should always remain vigilant for Syndicate agents aboard your station. Syndicate communications have implied that many \
 		Nanotrasen employees are Syndicate agents with hidden memories that may be activated at a moment's notice, so it's possible that these agents might not even know their positions."
 
-
 /datum/game_mode/proc/update_traitor_icons_added(datum/mind/traitor_mind)
 	var/datum/atom_hud/antag/traitorhud = GLOB.huds[ANTAG_HUD_TRAITOR]
 	traitorhud.join_hud(traitor_mind.current)

code/game/gamemodes/wizard/soulstone.dm

@@ -143,7 +143,8 @@
 
 		if("VICTIM")
 			var/mob/living/carbon/human/T = target
-			if(is_sacrifice_target(T.mind))
+			var/datum/antagonist/cult/C = user.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
+			if(C && C.cult_team.is_sacrifice_target(T.mind))
 				if(iscultist(user))
 					to_chat(user, "<span class='cult'><b>\"This soul is mine.</b></span> <span class='cultlarge'>SACRIFICE THEM!\"</span>")
 				else

code/game/gamemodes/wizard/wizard.dm

@@ -58,20 +58,13 @@
 
 	return TRUE
 
-/datum/game_mode/wizard/declare_completion()
+/datum/game_mode/wizard/set_round_result()
+	..()
 	if(finished)
 		SSticker.mode_result = "loss - wizard killed"
-		to_chat(world, "<span class='userdanger'>The wizard[(wizards.len>1)?"s":""] has been killed by the crew! The Space Wizards Federation has been taught a lesson they will not soon forget!</span>")
-
 		SSticker.news_report = WIZARD_KILLED
-	..()
-	return 1
-
-
-/datum/game_mode/proc/auto_declare_completion_wizard()
-	if(wizards.len)
-		var/text = "<br><font size=3><b>the wizards/witches were:</b></font>"
 
+<<<<<<< HEAD
 		for(var/datum/mind/wizard in wizards)
 
 			text += "<br><b>[wizard.key]</b> was <b>[wizard.name]</b> ("
@@ -114,9 +107,12 @@
 						text += ", "
 					i++
 			text += "<br>"
+=======
+/datum/game_mode/wizard/special_report()
+	if(finished)
+		return "<span class='redtext big'>The wizard[(wizards.len>1)?"s":""] has been killed by the crew! The Space Wizards Federation has been taught a lesson they will not soon forget!</span>"
+>>>>>>> 3d81385... Roundend report refactor (#33246)
 
-		to_chat(world, text)
-	return 1
 //returns whether the mob is a wizard (or apprentice)
 /proc/iswizard(mob/living/M)
 	return M.mind && M.mind.has_antag_datum(/datum/antagonist/wizard,TRUE)

code/game/machinery/wishgranter.dm

@@ -45,6 +45,7 @@
 		var/datum/objective/hijack/hijack = new
 		hijack.owner = user.mind
 		user.mind.objectives += hijack
+		user.mind.add_antag_datum(/datum/antagonist/auto_custom)
 
 		user.mind.announce_objectives()