Merge pull request #14513 from Putnam3145/chaos-for-secret

Makes threat a subsystem instead of dynamic-attached

code/game/gamemodes/dynamic/dynamic.dm

@@ -58,14 +58,6 @@ GLOBAL_VAR_INIT(dynamic_forced_storyteller, null)
 	var/threat_level = 0
 	/// The current antag threat. Recalculated every time a ruletype starts or ends.
 	var/threat = 0
-	/// Threat average over the course of the round, for endgame logs.
-	var/threat_average = 0
-	/// Number of times threat average has been calculated, for calculating above.
-	var/threat_average_weight = 0
-	/// Last time a threat average sample was taken. Used for weighting the rolling average.
-	var/last_threat_sample_time = 0
-	/// Maximum threat recorded so far, for cross-round chaos adjustment.
-	var/max_threat = 0
 	/// Things that cause a rolling threat adjustment to be displayed at roundend.
 	var/list/threat_tallies = list()
 	/// Running information about the threat. Can store text or datum entries.
@@ -745,17 +737,7 @@ GLOBAL_VAR_INIT(dynamic_forced_storyteller, null)
 					continue
 			if(!M.voluntary_ghosted)
 				current_players[CURRENT_DEAD_PLAYERS].Add(M) // Players who actually died (and admins who ghosted, would be nice to avoid counting them somehow)
-	threat = storyteller.calculate_threat() + added_threat
-	max_threat = max(max_threat,threat)
-	if(threat_average_weight)
-		var/cur_sample_weight = world.time - last_threat_sample_time
-		threat_average = ((threat_average * threat_average_weight) + (threat * cur_sample_weight)) / (threat_average_weight + cur_sample_weight)
-		threat_average_weight += cur_sample_weight
-		last_threat_sample_time  = world.time
-	else
-		threat_average = threat
-		threat_average_weight++
-		last_threat_sample_time = world.time
+	threat = (SSactivity.current_threat * 0.6 + SSactivity.get_max_threat() * 0.2 + SSactivity.get_average_threat() * 0.2) + added_threat
 
 /// Removes type from the list
 /datum/game_mode/dynamic/proc/remove_from_list(list/type_list, type)

code/game/gamemodes/dynamic/dynamic_storytellers.dm

@@ -45,27 +45,6 @@ Property weights are added to the config weight of the ruleset. They are:
 	var/midround_injection_cooldown_middle = 0.5*(GLOB.dynamic_first_midround_delay_min + GLOB.dynamic_first_midround_delay_max)
 	mode.midround_injection_cooldown = round(clamp(EXP_DISTRIBUTION(midround_injection_cooldown_middle), GLOB.dynamic_first_midround_delay_min, GLOB.dynamic_first_midround_delay_max)) + world.time
 
-/datum/dynamic_storyteller/proc/calculate_threat()
-	var/threat = 0
-	for(var/datum/antagonist/A in GLOB.antagonists)
-		if(A?.owner?.current && A.owner.current.stat != DEAD)
-			threat += A.threat()
-	for(var/r in SSevents.running)
-		var/datum/round_event/R = r
-		threat += R.threat()
-	for(var/obj/item/phylactery/P in GLOB.poi_list)
-		threat += 25 // can't be giving them too much of a break
-	for (var/mob/M in mode.current_players[CURRENT_LIVING_PLAYERS])
-		if (M?.mind?.assigned_role && M.stat != DEAD)
-			var/datum/job/J = SSjob.GetJob(M.mind.assigned_role)
-			if(J)
-				if(length(M.mind.antag_datums))
-					threat += J.GetThreat()
-				else
-					threat -= J.GetThreat()
-	threat += (mode.current_players[CURRENT_DEAD_PLAYERS].len)*dead_player_weight
-	return round(threat,0.1)
-
 /datum/dynamic_storyteller/proc/do_process()
 	return
 
@@ -95,7 +74,7 @@ Property weights are added to the config weight of the ruleset. They are:
 			if(voters)
 				GLOB.dynamic_curve_centre += (mean/voters)
 		if(flags & USE_PREV_ROUND_WEIGHTS)
-			GLOB.dynamic_curve_centre += (50 - SSpersistence.average_dynamic_threat) / 10
+			GLOB.dynamic_curve_centre += (SSpersistence.average_threat) / 10
 		GLOB.dynamic_forced_threat_level = forced_threat_level
 
 /datum/dynamic_storyteller/proc/get_midround_cooldown()

code/game/machinery/cryopod.dm

@@ -409,7 +409,10 @@
 		visible_message("<span class='notice'>\The [src] hums and hisses as it moves [mob_occupant.real_name] into storage.</span>")
 
 	// Ghost and delete the mob.
-	if(!mob_occupant.get_ghost(1))
+	var/mob/dead/observer/G = mob_occupant.get_ghost(TRUE)
+	if(G)
+		G.voluntary_ghosted = TRUE
+	else
 		mob_occupant.ghostize(FALSE, penalize = TRUE, voluntary = TRUE, cryo = TRUE)
 
 	QDEL_NULL(occupant)