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

[MIRROR] Fixes doubled post-round end time.

code/controllers/subsystem/ticker.dm

@@ -857,7 +857,7 @@ SUBSYSTEM_DEF(ticker)
 	to_chat(world, "<span class='boldannounce'>Rebooting World in [delay/10] [(delay >= 10 && delay < 20) ? "second" : "seconds"]. [reason]</span>")
 
 	var/start_wait = world.time
-	UNTIL(round_end_sound_sent && (world.time - start_wait) > (delay * 2))	//don't wait forever
+	UNTIL(round_end_sound_sent || (world.time - start_wait) > (delay * 2))	//don't wait forever
 	sleep(delay - (world.time - start_wait))
 
 	if(delay_end)

code/datums/holocall.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/datums/holocall.dm b/code/datums/holocall.dm	(rejected hunks)
-@@ -45,7 +45,7 @@
- 	var/user_good = !QDELETED(user)
- 	if(user_good)
- 		user.reset_perspective()
--    	user.remote_control = null
-+		user.remote_control = null
- 	
- 	if(!QDELETED(eye))
- 		if(user_good && user.client)

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)

code/modules/cargo/exports/materials.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/modules/cargo/exports/materials.dm b/code/modules/cargo/exports/materials.dm	(rejected hunks)
-@@ -43,7 +43,7 @@
- 
- // Plasma. The oil of 26 century. The reason why you are here.
- /datum/export/material/plasma
--	cost = 500
-+	cost = 300
- 	k_elasticity = 0
- 	material_id = MAT_PLASMA
- 	message = "cm3 of plasma"