Merge branch 'master' into upstream-merge-29741

code/controllers/subsystem/air.dm

@@ -322,7 +322,7 @@ SUBSYSTEM_DEF(air)
 			EG.dismantle()
 			CHECK_TICK
 
-		var/msg = "HEY! LISTEN! [(world.timeofday - timer)/10] Seconds were wasted processing [starting_ats] turf(s) (connected to [ending_ats] other turfs) with atmos differences at round start."
+		var/msg = "HEY! LISTEN! [DisplayTimeText(world.timeofday - timer)] were wasted processing [starting_ats] turf(s) (connected to [ending_ats] other turfs) with atmos differences at round start."
 		to_chat(world, "<span class='boldannounce'>[msg]</span>")
 		warning(msg)
 

code/controllers/subsystem/server_maint.dm

@@ -29,7 +29,7 @@ SUBSYSTEM_DEF(server_maint)
 				var/cmob = C.mob
 				if(!(isobserver(cmob) || (isdead(cmob) && C.holder)))
 					log_access("AFK: [key_name(C)]")
-					to_chat(C, "<span class='danger'>You have been inactive for more than [config.afk_period / 600] minutes and have been disconnected.</span>")
+					to_chat(C, "<span class='danger'>You have been inactive for more than [DisplayTimeText(config.afk_period)] and have been disconnected.</span>")
 					qdel(C)
 
 		if (!(!C || world.time - C.connection_time < PING_BUFFER_TIME || C.inactivity >= (wait-1)))

code/controllers/subsystem/shuttle.dm

@@ -178,7 +178,7 @@ SUBSYSTEM_DEF(shuttle)
 		emergency = backup_shuttle
 
 	if(world.time - SSticker.round_start_time < config.shuttle_refuel_delay)
-		to_chat(user, "The emergency shuttle is refueling. Please wait another [abs(round(((world.time - SSticker.round_start_time) - config.shuttle_refuel_delay)/600))] minutes before trying again.")
+		to_chat(user, "The emergency shuttle is refueling. Please wait [DisplayTimeText((world.time - SSticker.round_start_time) - config.shuttle_refuel_delay)] before trying again.")
 		return
 
 	switch(emergency.mode)

code/controllers/subsystem/squeak.dm

@@ -11,6 +11,7 @@ SUBSYSTEM_DEF(squeak)
 
 /datum/controller/subsystem/squeak/Initialize(timeofday)
 	trigger_migration(config.mice_roundstart)
+	return ..()
 
 /datum/controller/subsystem/squeak/proc/trigger_migration(num_mice=10)
 	if(!num_mice)

code/controllers/subsystem/throwing.dm

@@ -57,6 +57,9 @@ SUBSYSTEM_DEF(throwing)
 	var/pure_diagonal
 	var/diagonal_error
 	var/datum/callback/callback
+	var/paused = FALSE
+	var/delayed_time = 0
+	var/last_move = 0
 
 /datum/thrownthing/proc/tick()
 	var/atom/movable/AM = thrownthing
@@ -64,14 +67,20 @@ SUBSYSTEM_DEF(throwing)
 		finalize()
 		return
 
+	if(paused)
+		delayed_time += world.time - last_move
+		return
+
 	if (dist_travelled && hitcheck()) //to catch sneaky things moving on our tile while we slept
 		finalize()
 		return
 
 	var/atom/step
 
+	last_move = world.time
+
 	//calculate how many tiles to move, making up for any missed ticks.
-	var/tilestomove = Ceiling(min(((((world.time+world.tick_lag) - start_time) * speed) - (dist_travelled ? dist_travelled : -1)), speed*MAX_TICKS_TO_MAKE_UP) * (world.tick_lag * SSthrowing.wait))
+	var/tilestomove = Ceiling(min(((((world.time+world.tick_lag) - start_time + delayed_time) * speed) - (dist_travelled ? dist_travelled : -1)), speed*MAX_TICKS_TO_MAKE_UP) * (world.tick_lag * SSthrowing.wait))
 	while (tilestomove-- > 0)
 		if ((dist_travelled >= maxrange || AM.loc == target_turf) && AM.has_gravity(AM.loc))
 			finalize()

code/controllers/subsystem/ticker.dm

@@ -51,14 +51,14 @@ SUBSYSTEM_DEF(ticker)
 	var/queue_delay = 0
 	var/list/queued_players = list()		//used for join queues when the server exceeds the hard population cap
 
-	var/obj/screen/cinematic = null			//used for station explosion cinematic
-
 	var/maprotatechecked = 0
 
 	var/news_report
 
 	var/late_join_disabled
 
+	var/roundend_check_paused = FALSE
+
 	var/round_start_time = 0
 	var/list/round_start_events
 	var/mode_result = "undefined"
@@ -137,7 +137,7 @@ SUBSYSTEM_DEF(ticker)
 			scripture_states = scripture_unlock_alert(scripture_states)
 			SSshuttle.autoEnd()
 
-			if(!mode.explosion_in_progress && mode.check_finished(force_ending) || force_ending)
+			if(!roundend_check_paused && mode.check_finished(force_ending) || force_ending)
 				current_state = GAME_STATE_FINISHED
 				toggle_ooc(TRUE) // Turn it on
 				toggle_dooc(TRUE)
@@ -273,144 +273,7 @@ SUBSYSTEM_DEF(ticker)
 		qdel(bomb)
 		if(epi)
 			explosion(epi, 0, 256, 512, 0, TRUE, TRUE, 0, TRUE)
-
-//Plus it provides an easy way to make cinematics for other events. Just use this as a template
-/datum/controller/subsystem/ticker/proc/station_explosion_cinematic(station_missed=0, override = null, atom/bomb = null)
-	if( cinematic )
-		return	//already a cinematic in progress!
-
-	for (var/datum/html_interface/hi in GLOB.html_interfaces)
-		hi.closeAll()
-	SStgui.close_all_uis()
-
-	//Turn off the shuttles, there's no escape now
-	if(!station_missed && bomb)
-		SSshuttle.registerHostileEnvironment(src)
-		SSshuttle.lockdown = TRUE
-
-	//initialise our cinematic screen object
-	cinematic = new /obj/screen{icon='icons/effects/station_explosion.dmi';icon_state="station_intact";layer=21;mouse_opacity = MOUSE_OPACITY_TRANSPARENT;screen_loc="1,0";}(src)
-
-	for(var/mob/M in GLOB.mob_list)
-		M.notransform = TRUE //stop everything moving
-		if(M.client)
-			M.client.screen += cinematic	//show every client the cinematic
-
-	var/actually_blew_up = TRUE
-	//Now animate the cinematic
-	switch(station_missed)
-		if(NUKE_NEAR_MISS)	//nuke was nearby but (mostly) missed
-			if(mode && !override )
-				override = mode.name
-			switch( override )
-				if("nuclear emergency") //Nuke wasn't on station when it blew up
-					flick("intro_nuke",cinematic)
-					sleep(35)
-					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
-					station_explosion_detonation(bomb)
-					flick("station_intact_fade_red",cinematic)
-					cinematic.icon_state = "summary_nukefail"
-				if("cult")
-					cinematic.icon_state = null
-					flick("intro_cult",cinematic)
-					sleep(25)
-					SEND_SOUND(world, sound('sound/magic/enter_blood.ogg'))
-					sleep(28)
-					SEND_SOUND(world, sound('sound/machines/terminal_off.ogg'))
-					sleep(20)
-					flick("station_corrupted",cinematic)
-					SEND_SOUND(world, sound('sound/effects/ghost.ogg'))
-					actually_blew_up = FALSE
-				if("fake") //The round isn't over, we're just freaking people out for fun
-					flick("intro_nuke",cinematic)
-					sleep(35)
-					SEND_SOUND(world, sound('sound/items/bikehorn.ogg'))
-					flick("summary_selfdes",cinematic)
-					actually_blew_up = FALSE
-				else
-					flick("intro_nuke",cinematic)
-					sleep(35)
-					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
-					station_explosion_detonation(bomb)
-
-
-		if(NUKE_MISS_STATION || NUKE_SYNDICATE_BASE)	//nuke was nowhere nearby	//TODO: a really distant explosion animation
-			sleep(50)
-			SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
-			station_explosion_detonation(bomb)
-			actually_blew_up = station_missed == NUKE_SYNDICATE_BASE	//don't kill everyone on station if it detonated off station
-		else	//station was destroyed
-			if( mode && !override )
-				override = mode.name
-			switch( override )
-				if("nuclear emergency") //Nuke Ops successfully bombed the station
-					flick("intro_nuke",cinematic)
-					sleep(35)
-					flick("station_explode_fade_red",cinematic)
-					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
-					station_explosion_detonation(bomb)
-					cinematic.icon_state = "summary_nukewin"
-				if("AI malfunction") //Malf (screen,explosion,summary)
-					flick("intro_malf",cinematic)
-					sleep(76)
-					flick("station_explode_fade_red",cinematic)
-					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
-					station_explosion_detonation(bomb)	//TODO: If we ever decide to actually detonate the vault bomb
-					cinematic.icon_state = "summary_malf"
-				if("blob") //Station nuked (nuke,explosion,summary)
-					flick("intro_nuke",cinematic)
-					sleep(35)
-					flick("station_explode_fade_red",cinematic)
-					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
-					station_explosion_detonation(bomb)	//TODO: no idea what this case could be
-					cinematic.icon_state = "summary_selfdes"
-				if("cult") //Station nuked (nuke,explosion,summary)
-					flick("intro_nuke",cinematic)
-					sleep(35)
-					flick("station_explode_fade_red",cinematic)
-					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
-					station_explosion_detonation(bomb)	//TODO: no idea what this case could be
-					cinematic.icon_state = "summary_cult"
-				if("no_core") //Nuke failed to detonate as it had no core
-					flick("intro_nuke",cinematic)
-					sleep(35)
-					flick("station_intact",cinematic)
-					SEND_SOUND(world, sound('sound/ambience/signal.ogg'))
-					addtimer(CALLBACK(src, .proc/finish_cinematic, null, FALSE), 100)
-					return	//Faster exit, since nothing happened
-				else //Station nuked (nuke,explosion,summary)
-					flick("intro_nuke",cinematic)
-					sleep(35)
-					flick("station_explode_fade_red", cinematic)
-					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
-					station_explosion_detonation(bomb)
-					cinematic.icon_state = "summary_selfdes"
-	//If its actually the end of the round, wait for it to end.
-	//Otherwise if its a verb it will continue on afterwards.
-
-	var/bombloc = null
-	if(actually_blew_up)
-		if(bomb && bomb.loc)
-			bombloc = bomb.z
-		else if(!station_missed)
-			bombloc = ZLEVEL_STATION_PRIMARY
-
-		if(mode)
-			mode.explosion_in_progress = 0
-			to_chat(world, "<B>The station was destoyed by the nuclear blast!</B>")
-			mode.station_was_nuked = (station_missed<2)	//station_missed==1 is a draw. the station becomes irradiated and needs to be evacuated.
-
-	addtimer(CALLBACK(src, .proc/finish_cinematic, bombloc, actually_blew_up), 300)
-
-/datum/controller/subsystem/ticker/proc/finish_cinematic(killz, actually_blew_up)
-	if(cinematic)
-		qdel(cinematic)		//end the cinematic
-		cinematic = null
-	for(var/mob/M in GLOB.mob_list)
-		M.notransform = FALSE
-		if(actually_blew_up && !isnull(killz) && M.stat != DEAD && M.z == killz)
-			M.gib()
-
+			
 /datum/controller/subsystem/ticker/proc/create_characters()
 	for(var/mob/dead/new_player/player in GLOB.player_list)
 		if(player.ready == PLAYER_READY_TO_PLAY && player.mind)
@@ -505,7 +368,7 @@ SUBSYSTEM_DEF(ticker)
 	end_state.count()
 	var/station_integrity = min(PERCENT(GLOB.start_state.score(end_state)), 100)
 
-	to_chat(world, "<BR>[GLOB.TAB]Shift Duration: <B>[round(world.time / 36000)]:[add_zero("[world.time / 600 % 60]", 2)]:[world.time / 100 % 6][world.time / 100 % 10]</B>")
+	to_chat(world, "<BR>[GLOB.TAB]Shift Duration: <B>[DisplayTimeText(world.time - SSticker.round_start_time)]</B>")
 	to_chat(world, "<BR>[GLOB.TAB]Station Integrity: <B>[mode.station_was_nuked ? "<font color='red'>Destroyed</font>" : "[station_integrity]%"]</B>")
 	if(mode.station_was_nuked)
 		SSticker.news_report = STATION_DESTROYED_NUKE
@@ -711,13 +574,11 @@ SUBSYSTEM_DEF(ticker)
 
 	queue_delay = SSticker.queue_delay
 	queued_players = SSticker.queued_players
-	cinematic = SSticker.cinematic
 	maprotatechecked = SSticker.maprotatechecked
 	round_start_time = SSticker.round_start_time
 
 	queue_delay = SSticker.queue_delay
 	queued_players = SSticker.queued_players
-	cinematic = SSticker.cinematic
 	maprotatechecked = SSticker.maprotatechecked
 
 	modevoted = SSticker.modevoted

code/controllers/subsystem/vote.dm

@@ -169,7 +169,7 @@ SUBSYSTEM_DEF(vote)
 				admin = TRUE
 
 			if(next_allowed_time > world.time && !admin)
-				to_chat(usr, "<span class='warning'>A vote was initiated recently, you must wait roughly [(next_allowed_time-world.time)/10] seconds before a new vote can be started!</span>")
+				to_chat(usr, "<span class='warning'>A vote was initiated recently, you must wait [DisplayTimeText(next_allowed_time-world.time)] before a new vote can be started!</span>")
 				return 0
 
 		reset()
@@ -198,7 +198,7 @@ SUBSYSTEM_DEF(vote)
 		if(mode == "custom")
 			text += "\n[question]"
 		log_vote(text)
-		to_chat(world, "\n<font color='purple'><b>[text]</b>\nType <b>vote</b> or click <a href='?src=\ref[src]'>here</a> to place your votes.\nYou have [config.vote_period/10] seconds to vote.</font>")
+		to_chat(world, "\n<font color='purple'><b>[text]</b>\nType <b>vote</b> or click <a href='?src=\ref[src]'>here</a> to place your votes.\nYou have [DisplayTimeText(config.vote_period)] to vote.</font>")
 		time_remaining = round(config.vote_period/10)
 		for(var/c in GLOB.clients)
 			var/client/C = c