Merge remote-tracking branch 'citadel/master' into backend_sync

code/controllers/subsystem/explosions.dm

@@ -0,0 +1,23 @@
+SUBSYSTEM_DEF(explosions)
+	name = "Explosions"
+	wait = 1
+	flags = SS_TICKER
+	priority = FIRE_PRIORITY_EXPLOSIONS
+	var/static/list/datum/wave_explosion/wave_explosions = list()
+	var/static/list/datum/wave_explosion/active_wave_explosions = list()
+	var/static/list/datum/wave_explosion/currentrun = list()
+
+/datum/controller/subsystem/explosions/fire(resumed)
+	if(!resumed)
+		currentrun = active_wave_explosions.Copy()
+	var/datum/wave_explosion/E
+	var/ran = 0
+	while(length(currentrun) && !MC_TICK_CHECK)
+		ran = 0
+		for(var/i in currentrun)
+			E = i
+			if(E.tick())
+				currentrun -= E
+			ran++
+		if(!ran)
+			break

code/controllers/subsystem/ticker.dm

@@ -713,7 +713,8 @@ SUBSYSTEM_DEF(ticker)
 		'sound/roundend/disappointed.ogg',
 		'sound/roundend/gondolabridge.ogg',
 		'sound/roundend/haveabeautifultime.ogg',
-		'sound/roundend/CitadelStationHasSeenBetterDays.ogg'\
+		'sound/roundend/CitadelStationHasSeenBetterDays.ogg',
+		'sound/roundend/approachingbaystation.ogg'\
 		)
 
 	SEND_SOUND(world, sound(round_end_sound))