GM Sound Panel [WIP] (#255)

cmss13-devs · Jun 8, 2024 · 93aa0e8 · 93aa0e8
1 parent 93d95b5
commit 93aa0e8
Show file tree

Hide file tree

Showing 7 changed files with 958 additions and 112 deletions.
diff --git a/code/__DEFINES/sounds.dm b/code/__DEFINES/sounds.dm
@@ -1,6 +1,6 @@
 #define FALLOFF_SOUNDS 1
 
-#define FREE_CHAN_END 1016
+#define FREE_CHAN_END 1014
 #define INITIAL_SOUNDSCAPE_COOLDOWN 20
 
 #define EAR_DEAF_MUTE 1
@@ -21,6 +21,7 @@
 #define ITEM_EQUIP_VOLUME 50
 
 //Reserved channels
+#define SOUND_CHANNEL_TEST 1015
 #define SOUND_CHANNEL_NOTIFY 1016
 #define SOUND_CHANNEL_VOX    1017
 #define SOUND_CHANNEL_MUSIC 1018

diff --git a/code/datums/soundOutput.dm b/code/datums/soundOutput.dm
@@ -13,14 +13,16 @@
 	. = ..()
 
 /datum/soundOutput/proc/process_sound(datum/sound_template/T)
-	var/sound/S = sound(T.file, T.wait, T.repeat)
+	var/sound/S = sound(T.file, T.repeat, T.wait)
 	S.volume = owner.volume_preferences[T.volume_cat] * T.volume
 	if(T.channel == 0)
 		S.channel = get_free_channel()
 	else
 		S.channel = T.channel
 	S.frequency = T.frequency
 	S.falloff = T.falloff
+	S.offset = T.offset
+	S.pitch = T.pitch
 	S.status = T.status
 	S.echo = T.echo
 	if(T.x && T.y && T.z)