Merge pull request #1812 from Citadel-Station-13/upstream-merge-28858

[MIRROR] Adds heartbeats

code/__DEFINES/misc.dm

@@ -437,3 +437,10 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
 
 #define GANGSTER_SOLDIER_STARTING_INFLUENCE 5
 #define GANGSTER_BOSS_STARTING_INFLUENCE 20
+
+//for determining which type of heartbeat sound is playing
+#define BEAT_FAST 1
+#define BEAT_SLOW 2
+#define BEAT_NONE 0
+
+#define BEAT_CHANNEL 150

code/__DEFINES/misc.dm.rej

@@ -0,0 +1,7 @@
+diff a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm	(rejected hunks)
+@@ -440,4 +440,4 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
+ #define BEAT_SLOW 2
+ #define BEAT_NONE 0
+ 
+-#define BEAT_CHANNEL 150 //sound channel for heartbeats
++

code/__DEFINES/sound.dm

@@ -3,6 +3,7 @@
 #define CHANNEL_ADMIN 1023
 #define CHANNEL_VOX 1022
 #define CHANNEL_JUKEBOX 1021
+#define CHANNEL_HEARTBEAT 1019 //sound channel for heartbeats
 
 //Citadel code
 #define CHANNEL_PRED 1020

code/__DEFINES/sound.dm.rej

@@ -0,0 +1,8 @@
+diff a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm	(rejected hunks)
+@@ -9,5 +9,5 @@
+ //THIS SHOULD ALWAYS BE THE LOWEST ONE!
+ //KEEP IT UPDATED
+ 
+-#define CHANNEL_HIGHEST_AVAILABLE 1019
++#define CHANNEL_HIGHEST_AVAILABLE 1018
+