Merge remote-tracking branch 'upstream/master' into bay_equipping

Conflicts:
	code/modules/client/preference/preferences.dm

code/__DEFINES/error_handler.dm

@@ -0,0 +1,9 @@
+// Settings for the error handler and error viewer
+
+#define ERROR_COOLDOWN 600 // The "cooldown" time for each occurrence of a unique error
+#define ERROR_LIMIT 9 // How many occurrences before the next will silence them
+#define ERROR_MAX_COOLDOWN (ERROR_COOLDOWN * ERROR_LIMIT)
+#define ERROR_SILENCE_TIME 6000 // How long a unique error will be silenced for
+
+// How long to wait between messaging admins about occurrences of a unique error
+#define ERROR_MSG_DELAY 50

code/__DEFINES/flags.dm

@@ -62,11 +62,12 @@
 #define HAS_TAIL 			16
 #define TAIL_OVERLAPPED		32
 #define HAS_SKIN_TONE 		64
-#define HAS_SKIN_COLOR		128
-#define HAS_MARKINGS		256
-#define TAIL_WAGGING    	512
-#define NO_EYES				1024
-#define HAS_FUR				2048
+#define HAS_ICON_SKIN_TONE	128
+#define HAS_SKIN_COLOR		256
+#define HAS_MARKINGS		512
+#define TAIL_WAGGING    	1024
+#define NO_EYES				2048
+#define HAS_FUR				4096
 
 //Species Diet Flags
 #define DIET_CARN		1