Code improvements

code/__DEFINES/citadel_defines.dm

@@ -119,12 +119,3 @@
 
 //belly sound pref things
 #define NORMIE_HEARCHECK 4
-
-// Voting stuff (move this somewhere else eventually probs)
-#define PLURALITY_VOTING 0
-#define APPROVAL_VOTING 1
-#define RANKED_CHOICE_VOTING 2
-
-// Dynamic storyteller stuff (see above, move later)
-#define NO_ASSASSIN				(1<<0)
-#define WAROPS_ALWAYS_ALLOWED	(1<<1)

code/__DEFINES/dynamic.dm

@@ -0,0 +1,14 @@
+#define CURRENT_LIVING_PLAYERS	1
+#define CURRENT_LIVING_ANTAGS	2
+#define CURRENT_DEAD_PLAYERS	3
+#define CURRENT_OBSERVERS	    4
+
+#define NO_ASSASSIN				(1<<0)
+#define WAROPS_ALWAYS_ALLOWED	(1<<1)
+
+#define ONLY_RULESET       (1<<0)
+#define HIGHLANDER_RULESET (1<<1)
+#define TRAITOR_RULESET    (1<<2)
+#define MINOR_RULESET      (1<<3)
+
+#define RULESET_STOP_PROCESSING 1

code/__DEFINES/vote.dm

@@ -0,0 +1,5 @@
+// Voting stuff (move this somewhere else eventually probs)
+#define PLURALITY_VOTING 0
+#define APPROVAL_VOTING 1
+#define RANKED_CHOICE_VOTING 2
+

code/controllers/subsystem/vote.dm

@@ -251,7 +251,7 @@ SUBSYSTEM_DEF(vote)
 	if(mode)
 		if(CONFIG_GET(flag/no_dead_vote) && usr.stat == DEAD && !usr.client.holder)
 			return 0
-		if(vote && vote >= 1 && vote <= choices.len)
+		if(vote && ISINRANGE(vote, 1, choices.len))
 			switch(vote_system)
 				if(PLURALITY_VOTING)
 					if(usr.ckey in voted)

code/game/gamemodes/dynamic/dynamic.dm

@@ -1,14 +1,3 @@
-#define CURRENT_LIVING_PLAYERS	1
-#define CURRENT_LIVING_ANTAGS	2
-#define CURRENT_DEAD_PLAYERS	3
-#define CURRENT_OBSERVERS	    4
-
-#define ONLY_RULESET       1
-#define HIGHLANDER_RULESET 2
-#define TRAITOR_RULESET    4
-#define MINOR_RULESET      8
-
-#define RULESET_STOP_PROCESSING 1
 
 // -- Injection delays
 GLOBAL_VAR_INIT(dynamic_latejoin_delay_min, (10 MINUTES))

tgstation.dme

@@ -43,6 +43,7 @@
 #include "code\__DEFINES\diseases.dm"
 #include "code\__DEFINES\DNA.dm"
 #include "code\__DEFINES\donator_groupings.dm"
+#include "code\__DEFINES\dynamic.dm"
 #include "code\__DEFINES\events.dm"
 #include "code\__DEFINES\exports.dm"
 #include "code\__DEFINES\fantasy_affixes.dm"
@@ -108,6 +109,7 @@
 #include "code\__DEFINES\typeids.dm"
 #include "code\__DEFINES\vehicles.dm"
 #include "code\__DEFINES\voreconstants.dm"
+#include "code\__DEFINES\vote.dm"
 #include "code\__DEFINES\vv.dm"
 #include "code\__DEFINES\wall_dents.dm"
 #include "code\__DEFINES\wires.dm"