cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into no-more-myisam

Browse Source
This commit is contained in:
AffectedArc07
2021-05-07 15:28:47 +01:00
committed by GitHub
parent 5bc2ebca11 f8966c92f4
commit 314ce28c0b
282 changed files with 11214 additions and 10843 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/genetics.dm
+1
View File
@@ -81,3 +81,4 @@
#define NO_INTORGANS "no_internal_organs"
#define CAN_WINGDINGS "can_wingdings"
#define NO_CLONESCAN "no_clone_scan"
#define NO_HAIR "no_hair"
code/__DEFINES/sound.dm
+4 -1
View File
@@ -6,11 +6,14 @@
#define CHANNEL_HEARTBEAT 1020 //sound channel for heartbeats
#define CHANNEL_BUZZ 1019
#define CHANNEL_AMBIENCE 1018
#define CHANNEL_ENGINE 1017 // Engine ambient sounds
#define USER_VOLUME(M, C) M?.client?.prefs.get_channel_volume(C)
//THIS SHOULD ALWAYS BE THE LOWEST ONE!
//KEEP IT UPDATED
#define CHANNEL_HIGHEST_AVAILABLE 1017
#define CHANNEL_HIGHEST_AVAILABLE 1016
#define MAX_INSTRUMENT_CHANNELS (128 * 6)