shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2170 from Citadel-Station-13/upstream-merge-29455

Browse Source 
[MIRROR] Adds 3D Sound System
This commit is contained in:
LetterJay
2017-07-31 03:43:20 -05:00
committed by GitHub
parent 35fba1933e 0ac85c6756
commit 62d7f47497
8 changed files with 102 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/misc.dm
-4
View File
@@ -167,10 +167,6 @@ Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a s
#define GAME_STATE_SETTING_UP 2
#define GAME_STATE_PLAYING 3
#define GAME_STATE_FINISHED 4
//SOUND:
#define SOUND_MINIMUM_PRESSURE 10
#define FALLOFF_SOUNDS 1
#define SURROUND_CAP 7
//FONTS:
// Used by Paper and PhotoCopier (and PaperBin once a year).
code/__DEFINES/sound.dm
+7 -1
View File
@@ -5,6 +5,9 @@
#define CHANNEL_JUKEBOX 1021
#define CHANNEL_JUSTICAR_ARK 1020
#define CHANNEL_HEARTBEAT 1019 //sound channel for heartbeats
#define CHANNEL_AMBIENCE 1018
#define CHANNEL_BUZZ 1017
#define CHANNEL_BICYCLE 1016
//Citadel code
#define CHANNEL_PRED 1018
@@ -12,5 +15,8 @@
//THIS SHOULD ALWAYS BE THE LOWEST ONE!
//KEEP IT UPDATED
#define CHANNEL_HIGHEST_AVAILABLE 1017
#define CHANNEL_HIGHEST_AVAILABLE 1015
#define CHANNEL_HIGHEST_AVAILABLE 1017
#define SOUND_MINIMUM_PRESSURE 10
#define FALLOFF_SOUNDS 0.5
code/__DEFINES/sound.dm.rej
+51
View File
@@ -0,0 +1,51 @@
diff a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm (rejected hunks)
@@ -5,42 +5,15 @@
#define CHANNEL_JUKEBOX 1021
#define CHANNEL_JUSTICAR_ARK 1020
#define CHANNEL_HEARTBEAT 1019 //sound channel for heartbeats
+#define CHANNEL_AMBIENCE 1018
+#define CHANNEL_BUZZ 1017
+#define CHANNEL_BICYCLE 1016
//THIS SHOULD ALWAYS BE THE LOWEST ONE!
//KEEP IT UPDATED
-#define CHANNEL_HIGHEST_AVAILABLE 1018
+#define CHANNEL_HIGHEST_AVAILABLE 1015
#define SOUND_MINIMUM_PRESSURE 10
-#define FALLOFF_SOUNDS 0.5
-
-//BYOND Sound Environment defines
-
-#define SOUND_ENV_DEFAULT -1
-#define SOUND_ENV_GENERIC 0
-#define SOUND_ENV_PADDED_CELL 1
-#define SOUND_ENV_ROOM 2
-#define SOUND_ENV_BATHROOM 3
-#define SOUND_ENV_LIVINGROOM 4
-#define SOUND_ENV_STONEROOM 5
-#define SOUND_ENV_AUDITORIUM 6
-#define SOUND_ENV_CONCERT_HALL 7
-#define SOUND_ENV_CAVE 8
-#define SOUND_ENV_ARENA 9
-#define SOUND_ENV_HANGAR 10
-#define SOUND_ENV_CARPETTED_HALLWAY 11
-#define SOUND_ENV_HALLWAY 12
-#define SOUND_ENV_STONE_CORRIDOOR 13
-#define SOUND_ENV_ALLEY 14
-#define SOUND_ENV_FOREST 15
-#define SOUND_ENV_CITY 16
-#define SOUND_ENV_MOUNTAINS 17
-#define SOUND_ENV_QUARRY 18
-#define SOUND_ENV_PLAIN 19
-#define SOUND_ENV_PARKING_LOT 20
-#define SOUND_ENV_SEWER_PIPE 21
-#define SOUND_ENV_UNDERWATER 22
-#define SOUND_ENV_DRUGGED 23
-#define SOUND_ENV_DIZZY 24
-#define SOUND_ENV_PSYCHOTIC 25
\ No newline at end of file
+#define FALLOFF_SOUNDS 0.5
\ No newline at end of file