Clown Ops

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/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/machines.dm

@@ -85,3 +85,19 @@
 #define SUPERMATTER_DANGER 4		// Integrity < 50%
 #define SUPERMATTER_EMERGENCY 5		// Integrity < 25%
 #define SUPERMATTER_DELAMINATING 6	// Pretty obvious.
+<<<<<<< HEAD
+=======
+
+//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
+>>>>>>> 7639492... Added clown ops game mode, and several clown weapons. (#36459)