Merge branch 'master' into upstream-merge-32183

code/game/gamemodes/blob/blob_report.dm

@@ -6,56 +6,47 @@
 	var/door = 0
 	var/grille = 0
 	var/mach = 0
-	var/num_territories = 1//Number of total valid territories for gang mode
+
+/datum/station_state/proc/count()
+	for(var/Z in GLOB.station_z_levels)
+		for(var/turf/T in block(locate(1,1,Z), locate(world.maxx,world.maxy,Z)))
+			// don't count shuttles since they may have just left
+			if(istype(T.loc, /area/shuttle))
+				continue
+
+			if(isfloorturf(T))
+				var/turf/open/floor/TF = T
+				if(!(TF.burnt))
+					floor += 12
+				else
+					floor += 1
+
+			if(iswallturf(T))
+				var/turf/closed/wall/TW = T
+				if(TW.intact)
+					wall += 2
+				else
+					wall += 1
+
+			if(istype(T, /turf/closed/wall/r_wall))
+				var/turf/closed/wall/r_wall/TRW = T
+				if(TRW.intact)
+					r_wall += 2
+				else
+					r_wall += 1
 
 
-/datum/station_state/proc/count(count_territories)
-	for(var/turf/T in block(locate(1,1,1), locate(world.maxx,world.maxy,1)))
-
-		if(isfloorturf(T))
-			var/turf/open/floor/TF = T
-			if(!(TF.burnt))
-				src.floor += 12
-			else
-				src.floor += 1
-
-		if(iswallturf(T))
-			var/turf/closed/wall/TW = T
-			if(TW.intact)
-				src.wall += 2
-			else
-				src.wall += 1
-
-		if(istype(T, /turf/closed/wall/r_wall))
-			var/turf/closed/wall/r_wall/TRW = T
-			if(TRW.intact)
-				src.r_wall += 2
-			else
-				src.r_wall += 1
-
-
-		for(var/obj/O in T.contents)
-			if(istype(O, /obj/structure/window))
-				src.window += 1
-			else if(istype(O, /obj/structure/grille))
-				var/obj/structure/grille/GR = O
-				if(!GR.broken)
-					src.grille += 1
-			else if(istype(O, /obj/machinery/door))
-				src.door += 1
-			else if(ismachinery(O))
-				src.mach += 1
-
-	if(count_territories)
-		var/list/valid_territories = list()
-		for(var/area/A in world) //First, collect all area types on the station zlevel
-			if(A.z in GLOB.station_z_levels)
-				if(!(A.type in valid_territories) && A.valid_territory)
-					valid_territories |= A.type
-		if(valid_territories.len)
-			num_territories = valid_territories.len //Add them all up to make the total number of area types
-		else
-			to_chat(world, "ERROR: NO VALID TERRITORIES")
+			for(var/obj/O in T.contents)
+				if(istype(O, /obj/structure/window))
+					window += 1
+				else if(istype(O, /obj/structure/grille))
+					var/obj/structure/grille/GR = O
+					if(!GR.broken)
+						grille += 1
+				else if(istype(O, /obj/machinery/door))
+					door += 1
+				else if(ismachinery(O))
+					mach += 1
 
 /datum/station_state/proc/score(datum/station_state/result)
 	if(!result)

code/game/gamemodes/cult/cult.dm

@@ -1,3 +1,5 @@
+#define CULT_SCALING_COEFFICIENT 9.3 //Roughly one new cultist at roundstart per this many players
+
 /datum/game_mode
 	var/list/datum/mind/cult = list()
 	var/list/cult_objectives = list()
@@ -64,7 +66,10 @@
 		restricted_jobs += "Assistant"
 
 	//cult scaling goes here
-	recommended_enemies = 3 + round(num_players()/15)
+	recommended_enemies = 1 + round(num_players()/CULT_SCALING_COEFFICIENT)
+	var/remaining = (num_players() % CULT_SCALING_COEFFICIENT) * 10 //Basically the % of how close the population is toward adding another cultis
+	if(prob(remaining))
+		recommended_enemies++
 
 
 	for(var/cultists_number = 1 to recommended_enemies)
@@ -307,3 +312,5 @@
 						SSticker.news_report = CULT_FAILURE
 			text += "<br><B>Objective #[obj_count]</B>: [explanation]"
 	to_chat(world, text)
+
+#undef CULT_SCALING_COEFFICIENT

code/game/gamemodes/game_mode.dm

@@ -464,8 +464,10 @@
 			text += " <span class='boldannounce'>died</span>"
 		else
 			text += " <span class='greenannounce'>survived</span>"
-		if(fleecheck && (!(ply.current.z in GLOB.station_z_levels)))
-			text += " while <span class='boldannounce'>fleeing the station</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