Merge branch 'master' into digileg-runtime

code/__DEFINES/cinematics.dm

@@ -8,4 +8,5 @@
 #define CINEMATIC_CULT 8
 #define CINEMATIC_NUKE_FAKE 9
 #define CINEMATIC_NUKE_NO_CORE 10
-#define CINEMATIC_NUKE_FAR 11
+#define CINEMATIC_NUKE_FAR 11
+#define CINEMATIC_NUKE_CLOWNOP 12

code/__DEFINES/citadel_defines.dm

@@ -110,6 +110,11 @@
 
 #define CITADEL_MENTOR_OOC_COLOUR "#224724"
 
+//xenobio console upgrade stuff
+#define XENOBIO_UPGRADE_MONKEYS				1
+#define XENOBIO_UPGRADE_SLIMEBASIC		2
+#define XENOBIO_UPGRADE_SLIMEADV			4
+
 //stamina stuff
 #define STAMINA_SOFTCRIT							100 //softcrit for stamina damage. prevents standing up, prevents performing actions that cost stamina, etc, but doesn't force a rest or stop movement
 #define STAMINA_CRIT									140 //crit for stamina damage. forces a rest, and stops movement until stamina goes back to stamina softcrit

code/__DEFINES/combat.dm

@@ -142,3 +142,7 @@
 
 #define EMP_HEAVY 1
 #define EMP_LIGHT 2
+
+#define GRENADE_CLUMSY_FUMBLE 1
+#define GRENADE_NONCLUMSY_FUMBLE 2
+#define GRENADE_NO_FUMBLE 3

code/__DEFINES/components.dm

@@ -86,3 +86,8 @@
 
 #define CALTROP_BYPASS_SHOES 1
 #define CALTROP_IGNORE_WALKERS 2
+
+//Component Specific Signals
+//Wet floors
+#define COMSIG_TURF_IS_WET "check_turf_wet"							//(): Returns bitflags of wet values.
+#define COMSIG_TURF_MAKE_DRY "make_turf_try"						//(max_strength, immediate, duration_decrease = INFINITY): Returns bool.

code/__DEFINES/machines.dm

@@ -85,3 +85,16 @@
 #define SUPERMATTER_DANGER 4		// Integrity < 50%
 #define SUPERMATTER_EMERGENCY 5		// Integrity < 25%
 #define SUPERMATTER_DELAMINATING 6	// Pretty obvious.
+
+//Nuclear bomb stuff
+#define NUKESTATE_INTACT		5
+#define NUKESTATE_UNSCREWED		4
+#define NUKESTATE_PANEL_REMOVED		3
+#define NUKESTATE_WELDED		2
+#define NUKESTATE_CORE_EXPOSED	1
+#define NUKESTATE_CORE_REMOVED	0
+
+#define NUKE_OFF_LOCKED		0
+#define NUKE_OFF_UNLOCKED	1
+#define NUKE_ON_TIMING		2
+#define NUKE_ON_EXPLODING	3

code/__DEFINES/misc.dm

@@ -185,15 +185,17 @@ GLOBAL_LIST_EMPTY(bloody_footprints_cache)
 #define HAS_SENSORS 1
 #define LOCKED_SENSORS 2
 
-//Turf wet states
+//Wet floor type flags. Stronger ones should be higher in number.
 #define TURF_DRY		0
 #define TURF_WET_WATER	1
 #define TURF_WET_LUBE	2
-#define TURF_WET_ICE	3
-#define TURF_WET_PERMAFROST 4
+#define TURF_WET_ICE 4
+#define TURF_WET_PERMAFROST	8
 
-//Maximum amount of time, (in approx. seconds.) a tile can be wet for.
-#define MAXIMUM_WET_TIME 300
+#define IS_WET_OPEN_TURF(O) O.GetComponent(/datum/component/wet_floor)
+
+//Maximum amount of time, (in deciseconds) a tile can be wet for.
+#define MAXIMUM_WET_TIME 3000
 
 //unmagic-strings for types of polls
 #define POLLTYPE_OPTION		"OPTION"

code/__DEFINES/subsystems.dm

@@ -86,6 +86,7 @@
 #define FIRE_PRIORITY_SERVER_MAINT	10
 #define FIRE_PRIORITY_RESEARCH		10
 #define FIRE_PRIORITY_GARBAGE		15
+#define FIRE_PRIORITY_WET_FLOORS	20
 #define FIRE_PRIORITY_AIR			20
 #define FIRE_PRIORITY_NPC			20
 #define FIRE_PRIORITY_PROCESS		25