Merge remote-tracking branch 'origin/master' into rustsql

code/__DEFINES/instruments.dm

@@ -19,7 +19,7 @@
 #define INSTRUMENT_EXP_FALLOFF_MAX			10
 
 /// Minimum volume for when the sound is considered dead.
-#define INSTRUMENT_MIN_SUSTAIN_DROPOFF 0
+#define INSTRUMENT_MIN_SUSTAIN_DROPOFF 1
 
 #define SUSTAIN_LINEAR 1
 #define SUSTAIN_EXPONENTIAL 2

code/__DEFINES/say.dm

@@ -86,8 +86,8 @@
 #define EMOTE_OMNI 4
 
 //Don't set this very much higher then 1024 unless you like inviting people in to dos your server with message spam
-#define MAX_MESSAGE_LEN			2048		//Citadel edit: What's the WORST that could happen?
-#define MAX_FLAVOR_LEN			4096		//double the maximum message length.
+#define MAX_MESSAGE_LEN			4096		//Citadel edit: What's the WORST that could happen?
+#define MAX_FLAVOR_LEN			4096		
 #define MAX_TASTE_LEN			40 //lick... vore... ew...
 #define MAX_NAME_LEN			42
 #define MAX_BROADCAST_LEN		512