Merge branch 'master' into Pre-awaking-equipment

cmss13-devs · Jan 22, 2024 · 0000f42 · 0000f42
2 parents 4209312 + 9c97136
commit 0000f42
Show file tree

Hide file tree

Showing 34 changed files with 813 additions and 396 deletions.
diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm
@@ -156,6 +156,7 @@ GLOBAL_LIST_INIT(ROLES_UNASSIGNED, list(JOB_SQUAD_MARINE))
 GLOBAL_LIST_INIT(whitelist_hierarchy, list(WHITELIST_NORMAL, WHITELIST_COUNCIL, WHITELIST_LEADER))
 
 //=================================================
+
 #define WHITELIST_YAUTJA (1<<0)
 ///Old holders of YAUTJA_ELDER
 #define WHITELIST_YAUTJA_LEGACY (1<<1)
@@ -170,23 +171,50 @@ GLOBAL_LIST_INIT(whitelist_hierarchy, list(WHITELIST_NORMAL, WHITELIST_COUNCIL,
 ///Old holders of COMMANDER_COUNCIL for 3 months
 #define WHITELIST_COMMANDER_COUNCIL_LEGACY (1<<7)
 #define WHITELIST_COMMANDER_LEADER (1<<8)
+///Former CO senator/whitelist overseer award
+#define WHITELIST_COMMANDER_COLONEL (1<<9)
 
-#define WHITELIST_JOE (1<<9)
-#define WHITELIST_SYNTHETIC (1<<10)
-#define WHITELIST_SYNTHETIC_COUNCIL (1<<11)
+#define WHITELIST_JOE (1<<10)
+#define WHITELIST_SYNTHETIC (1<<11)
+#define WHITELIST_SYNTHETIC_COUNCIL (1<<12)
 ///Old holders of SYNTHETIC_COUNCIL for 3 months
-#define WHITELIST_SYNTHETIC_COUNCIL_LEGACY (1<<12)
-#define WHITELIST_SYNTHETIC_LEADER (1<<13)
+#define WHITELIST_SYNTHETIC_COUNCIL_LEGACY (1<<13)
+#define WHITELIST_SYNTHETIC_LEADER (1<<14)
+
+///Senior Enlisted Advisor, auto granted by R_MENTOR
+#define WHITELIST_MENTOR (1<<15)
+
 
-#define WHITELIST_MENTOR (1<<14)
 #define WHITELISTS_GENERAL (WHITELIST_YAUTJA|WHITELIST_COMMANDER|WHITELIST_SYNTHETIC|WHITELIST_MENTOR|WHITELIST_JOE)
 #define WHITELISTS_COUNCIL (WHITELIST_YAUTJA_COUNCIL|WHITELIST_COMMANDER_COUNCIL|WHITELIST_SYNTHETIC_COUNCIL)
 #define WHITELISTS_LEGACY_COUNCIL (WHITELIST_YAUTJA_COUNCIL_LEGACY|WHITELIST_COMMANDER_COUNCIL_LEGACY|WHITELIST_SYNTHETIC_COUNCIL_LEGACY)
 #define WHITELISTS_LEADER (WHITELIST_YAUTJA_LEADER|WHITELIST_COMMANDER_LEADER|WHITELIST_SYNTHETIC_LEADER)
 
 #define WHITELIST_EVERYTHING (WHITELISTS_GENERAL|WHITELISTS_COUNCIL|WHITELISTS_LEADER)
 
-#define isCouncil(A) (GLOB.RoleAuthority.roles_whitelist[A.ckey] & WHITELIST_YAUTJA_COUNCIL) || (GLOB.RoleAuthority.roles_whitelist[A.ckey] & WHITELIST_SYNTHETIC_COUNCIL) || (GLOB.RoleAuthority.roles_whitelist[A.ckey] & WHITELIST_COMMANDER_COUNCIL)
+#define COUNCIL_LIST list(WHITELIST_COMMANDER_COUNCIL, WHITELIST_SYNTHETIC_COUNCIL, WHITELIST_YAUTJA_COUNCIL)
+#define SENATOR_LIST list(WHITELIST_COMMANDER_LEADER, WHITELIST_SYNTHETIC_LEADER, WHITELIST_YAUTJA_LEADER)
+#define isCouncil(A) (A.check_whitelist_status_list(COUNCIL_LIST))
+#define isSenator(A) (A.check_whitelist_status_list(SENATOR_LIST))
+
+DEFINE_BITFIELD(whitelist_status, list(
+	"WHITELIST_YAUTJA" = WHITELIST_YAUTJA,
+	"WHITELIST_YAUTJA_LEGACY" = WHITELIST_YAUTJA_LEGACY,
+	"WHITELIST_YAUTJA_COUNCIL" = WHITELIST_YAUTJA_COUNCIL,
+	"WHITELIST_YAUTJA_COUNCIL_LEGACY" = WHITELIST_YAUTJA_COUNCIL_LEGACY,
+	"WHITELIST_YAUTJA_LEADER" = WHITELIST_YAUTJA_LEADER,
+	"WHITELIST_COMMANDER" = WHITELIST_COMMANDER,
+	"WHITELIST_COMMANDER_COUNCIL" = WHITELIST_COMMANDER_COUNCIL,
+	"WHITELIST_COMMANDER_COUNCIL_LEGACY" = WHITELIST_COMMANDER_COUNCIL_LEGACY,
+	"WHITELIST_COMMANDER_COLONEL" = WHITELIST_COMMANDER_COLONEL,
+	"WHITELIST_COMMANDER_LEADER" = WHITELIST_COMMANDER_LEADER,
+	"WHITELIST_JOE" = WHITELIST_JOE,
+	"WHITELIST_SYNTHETIC" = WHITELIST_SYNTHETIC,
+	"WHITELIST_SYNTHETIC_COUNCIL" = WHITELIST_SYNTHETIC_COUNCIL,
+	"WHITELIST_SYNTHETIC_COUNCIL_LEGACY" = WHITELIST_SYNTHETIC_COUNCIL_LEGACY,
+	"WHITELIST_SYNTHETIC_LEADER" = WHITELIST_SYNTHETIC_LEADER,
+	"WHITELIST_MENTOR" = WHITELIST_MENTOR,
+))
 
 //=================================================