Merge branch 'master' into upstream-merge-29940

code/__DEFINES/food.dm

@@ -0,0 +1,12 @@
+#define MEAT 1
+#define VEGETABLES 2
+#define RAW 4
+#define JUNKFOOD 8
+#define GRAIN 16
+#define FRUIT 32
+#define DAIRY 64
+#define FRIED 128
+#define ALCOHOL 256
+#define SUGAR 512
+#define GROSS 1024
+#define TOXIC 2048

code/__DEFINES/misc.dm

@@ -441,3 +441,8 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
 #define BEAT_NONE 0
 
 #define BEAT_CHANNEL 150
+
+//http://www.byond.com/docs/ref/info.html#/atom/var/mouse_opacity
+#define MOUSE_OPACITY_TRANSPARENT 0
+#define MOUSE_OPACITY_ICON 1
+#define MOUSE_OPACITY_OPAQUE 2

code/__DEFINES/mobs.dm

@@ -65,6 +65,12 @@
 #define NUTRITION_LEVEL_HUNGRY 250
 #define NUTRITION_LEVEL_STARVING 150
 
+//Disgust levels for humans
+#define DISGUST_LEVEL_MAXEDOUT 150
+#define DISGUST_LEVEL_DISGUSTED 75
+#define DISGUST_LEVEL_VERYGROSS 50
+#define DISGUST_LEVEL_GROSS 25
+
 //Slime evolution threshold. Controls how fast slimes can split/grow
 #define SLIME_EVOLUTION_THRESHOLD 10
 

code/__DEFINES/server_tools.dm

@@ -4,6 +4,9 @@
 
 #define IRC_STATUS_THROTTLE 5
 
+#define PR_ANNOUNCEMENTS_PER_ROUND 5 //The number of unique PR announcements allowed per round
+									//This makes sure that a single person can only spam 3 reopens and 3 closes before being ignored
+
 //keep these in sync with TGS3
 #define SERVICE_WORLD_PARAM "server_service"
 #define SERVICE_PR_TEST_JSON "..\\..\\prtestjob.json"
@@ -17,7 +20,7 @@
 #define SERVICE_CMD_NAME_CHECK "namecheck"
 #define SERVICE_CMD_ADMIN_WHO "adminwho"
 
-//#define SERVICE_CMD_PARAM_KEY //defined in __compile_options.dm
+#define SERVICE_CMD_PARAM_KEY "serviceCommsKey"
 #define SERVICE_CMD_PARAM_COMMAND "command"
 #define SERVICE_CMD_PARAM_MESSAGE "message"
 #define SERVICE_CMD_PARAM_TARGET "target"