Merge branch 'dynamicport'

code/__DEFINES/dcs/signals.dm

@@ -21,6 +21,10 @@
 #define COMSIG_GLOB_PLAY_CINEMATIC "!play_cinematic"
 	#define COMPONENT_GLOB_BLOCK_CINEMATIC 1
 
+#define COMSIG_GLOB_PRE_RANDOM_EVENT "!pre_random_event"
+	/// Do not allow this random event to continue.
+	#define CANCEL_PRE_RANDOM_EVENT (1<<0)
+
 // signals from globally accessible objects
 /// from SSsun when the sun changes position : (primary_sun, suns)
 #define COMSIG_SUN_MOVED "sun_moved"

code/__DEFINES/dynamic.dm

@@ -1,19 +1,17 @@
-#define CURRENT_LIVING_PLAYERS	1
-#define CURRENT_LIVING_ANTAGS	2
-#define CURRENT_DEAD_PLAYERS	3
-#define CURRENT_OBSERVERS		4
+/// This is the only ruleset that should be picked this round, used by admins and should not be on rulesets in code.
+#define ONLY_RULESET (1 << 0)
 
-#define NO_ASSASSIN				(1<<0)
-#define WAROPS_ALWAYS_ALLOWED	(1<<1)
-#define USE_PREF_WEIGHTS		(1<<2)
-#define FORCE_IF_WON			(1<<3)
-#define USE_PREV_ROUND_WEIGHTS	(1<<4)
+/// Only one ruleset with this flag will be picked.
+#define HIGH_IMPACT_RULESET (1 << 1)
 
-#define ONLY_RULESET				(1<<0)
-#define HIGHLANDER_RULESET			(1<<1)
-#define TRAITOR_RULESET				(1<<2)
-#define MINOR_RULESET				(1<<3)
-#define FAKE_ANTAG_RULESET			(1<<4)
-#define ALWAYS_MAX_WEIGHT_RULESET	(1<<5)
+/// This ruleset can only be picked once. Anything that does not have a scaling_cost MUST have this.
+#define LONE_RULESET (1 << 2)
 
-#define RULESET_STOP_PROCESSING 1
+/// No round event was hijacked this cycle
+#define HIJACKED_NOTHING "HIJACKED_NOTHING"
+
+/// This cycle, a round event was hijacked when the last midround event was too recent.
+#define HIJACKED_TOO_RECENT "HIJACKED_TOO_RECENT"
+
+/// This cycle, a round event was hijacked when the next midround event is too soon.
+#define HIJACKED_TOO_SOON "HIJACKED_TOO_SOON"

code/__DEFINES/mobs.dm

@@ -351,3 +351,9 @@
 //Gremlins
 #define NPC_TAMPER_ACT_FORGET 1 //Don't try to tamper with this again
 #define NPC_TAMPER_ACT_NOMSG  2 //Don't produce a visible message
+
+//Game mode list indexes
+#define CURRENT_LIVING_PLAYERS	"living_players_list"
+#define CURRENT_LIVING_ANTAGS	"living_antags_list"
+#define CURRENT_DEAD_PLAYERS	"dead_players_list"
+#define CURRENT_OBSERVERS		"current_observers_list"

code/__DEFINES/role_preferences.dm

@@ -14,6 +14,7 @@
 #define ROLE_MALF					"malf AI"
 #define ROLE_REV					"revolutionary"
 #define ROLE_REV_HEAD				"Head Revolutionary"
+#define ROLE_REV_SUCCESSFUL			"Victorious Revolutionary"
 #define ROLE_ALIEN					"xenomorph"
 #define ROLE_PAI					"pAI"
 #define ROLE_CULTIST				"cultist"
@@ -44,6 +45,8 @@
 #define ROLE_RESPAWN				"respawnsystem"
 /// Not an actual antag. Lets players force all antags off.
 #define ROLE_NO_ANTAGONISM			"NO_ANTAGS"
+//Define for disabling individual antagonists for dynamic
+#define HAS_ANTAG_PREF(C,ROLE) (!(ROLE_NO_ANTAGONISM in C.prefs.be_special) && (ROLE in C.prefs.be_special))
 //Missing assignment means it's not a gamemode specific role, IT'S NOT A BUG OR ERROR.
 //The gamemode specific ones are just so the gamemodes can query whether a player is old enough
 //(in game days played) to play that role