Merge pull request #1284 from Citadel-Station-13/upstream-merge-27840

[MIRROR] Fixes doubled post-round end time.

code/game/gamemodes/gang/gang.dm.rej

@@ -1,16 +0,0 @@
-diff a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm	(rejected hunks)
-@@ -255,11 +255,13 @@ GLOBAL_LIST_INIT(gang_colors_pool, list("red","orange","yellow","green","blue","
- 	return gang_bosses
- 
- /datum/game_mode/proc/shuttle_check()
-+	if(SSshuttle.emergencyNoRecall)
-+		return
- 	var/alive = 0
- 	for(var/mob/living/L in GLOB.player_list)
- 		if(L.stat != DEAD)
- 			alive++
--	if((alive < (GLOB.joined_player_list.len * 0.4)) && (SSshuttle.emergency.timeLeft(1) < (SSshuttle.emergencyCallTime * 0.4)))
-+	if((alive < (GLOB.joined_player_list.len * 0.4)) && ((SSshuttle.emergency.timeLeft(1) > (SSshuttle.emergencyCallTime * 0.4))))
- 		SSshuttle.emergencyNoRecall = TRUE
- 		SSshuttle.emergency.request(null, set_coefficient = 0.4)
- 		priority_announce("Catastrophic casualties detected: crisis shuttle protocols activated - jamming recall signals across all frequencies.")

code/game/gamemodes/gang/recaller.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/game/gamemodes/gang/recaller.dm b/code/game/gamemodes/gang/recaller.dm	(rejected hunks)
-@@ -165,7 +165,7 @@
- 	if(!can_use(user))
- 		return 0
- 		
--	if(SSticker.mode.forced_shuttle)
-+	if(SSshuttle.emergencyNoRecall)
- 		return 0
- 
- 	if(recalling)