more stuff

Monkestation · Sep 14, 2023 · fc8a176 · fc8a176
1 parent e710e3c
commit fc8a176
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/monkestation/code/modules/outdoors/code/datum/particle_weathers/_particle_weather.dm b/monkestation/code/modules/outdoors/code/datum/particle_weathers/_particle_weather.dm
@@ -62,7 +62,7 @@ GLOBAL_LIST_EMPTY(siren_objects)
 			color_animating = pick(affecting_value)
 			animate_flags = ELASTIC_EASING | EASE_IN | EASE_OUT
 			spawn(duration - rand(0, duration*10)/10)
-				playsound_z(SSmapping.levels_by_trait(ZTRAIT_STATION), pick(sound_effects), 50)
+				playsound_z(SSmapping.levels_by_trait(ZTRAIT_STATION), pick(sound_effects), 50, mixer_channel = CHANNEL_WEATHER)
 		if(GLE_STAGE_THIRD)
 			color_animating = SSoutdoor_effects.current_color
 			animate_flags = CIRCULAR_EASING | EASE_IN
@@ -372,7 +372,7 @@ GLOBAL_LIST_EMPTY(siren_objects)
 				message += weather_message
 			for(var/mob/living/carbon/human/affected_human in GLOB.alive_mob_list)
 				if(!affected_human.stat && affected_human.client && (affected_human.z in affected_zlevels))
-					affected_human.playsound_local('monkestation/code/modules/outdoors/sound/effects/radiostatic.ogg', affected_human.loc, 25, FALSE)
+					affected_human.playsound_local('monkestation/code/modules/outdoors/sound/effects/radiostatic.ogg', affected_human.loc, 25, FALSE, mixer_channel = CHANNEL_MACHINERY)
 					affected_human.play_screen_text("<span class='langchat' style=font-size:16pt;text-align:center valign='top'><u>Weather Alert:</u></span><br>" + message["human"], /atom/movable/screen/text/screen_text/command_order, rgb(103, 214, 146))
     return FALSE
 
@@ -423,7 +423,7 @@ GLOBAL_LIST_EMPTY(siren_objects)
 	var/sound = 'monkestation/code/modules/outdoors/sound/effects/weather_warning.ogg'
 
 /obj/machinery/siren/proc/siren_warning(var/msg = "WARNING, bla bla bla bluh.", var/sound_ch = 'monkestation/code/modules/outdoors/sound/effects/weather_warning.ogg')
-	playsound(loc, sound_ch, 50, 0)
+	playsound(loc, sound_ch, 50, 0, mixer_channel = CHANNEL_MACHINERY)
 	visible_message(span_danger("[src] make signal. [msg]."))
 
 /obj/machinery/siren/proc/siren_warning_start(var/msg, var/sound_ch = 'monkestation/code/modules/outdoors/sound/effects/weather_warning.ogg')
@@ -438,7 +438,7 @@ GLOBAL_LIST_EMPTY(siren_objects)
 
 /obj/machinery/siren/process()
 	if(prob(2))
-		playsound(loc, sound, 80, 0)
+		playsound(loc, sound, 80, 0, mixer_channel = CHANNEL_MACHINERY)
 		visible_message(span_danger("[src] make signal. [message]."))
 
 

diff --git a/monkestation/code/modules/outdoors/code/misc_procs.dm b/monkestation/code/modules/outdoors/code/misc_procs.dm
@@ -8,8 +8,8 @@
 	SSparticle_weather.running_weather.process_mob_effect(src, delta_time)
 
 /// Play sound for all on-map clients on a given Z-level. Good for ambient sounds.
-/proc/playsound_z(z, soundin, volume = 100)
+/proc/playsound_z(z, soundin, volume = 100, _mixer_channel)
 	var/sound/S = sound(soundin)
 	for(var/mob/M in GLOB.player_list)
 		if(M.z in z)
-			M.playsound_local(get_turf(M), soundin, volume, channel = CHANNEL_Z, soundin = S)
+			M.playsound_local(get_turf(M), soundin, volume, channel = CHANNEL_Z, soundin = S, mixer_channel = _mixer_channel)