Merge pull request #7633 from VOREStation/aro-roles

Add prefs for Be Morph, Be Maintpred, Be Lost Drone

code/__defines/gamemode.dm

@@ -35,8 +35,13 @@
 #define BE_RAIDER     0x800
 #define BE_PLANT      0x1000
 #define BE_MUTINEER   0x2000
-#define BE_PAI        0x4000
-#define BE_LOYALIST   0x8000
+#define BE_LOYALIST   0x4000
+#define BE_PAI        0x8000
+//VOREStation Add
+#define BE_LOSTDRONE  0x10000
+#define BE_MAINTPRED  0x20000
+#define BE_MORPH      0x40000
+//VOREStation Add End
 
 var/list/be_special_flags = list(
 	"Traitor"          = BE_TRAITOR,
@@ -45,7 +50,6 @@ var/list/be_special_flags = list(
 	"Wizard"           = BE_WIZARD,
 	"Malf AI"          = BE_MALF,
 	"Revolutionary"    = BE_REV,
-	"Loyalist"         = BE_LOYALIST,
 	"Xenomorph"        = BE_ALIEN,
 	"Positronic Brain" = BE_AI,
 	"Cultist"          = BE_CULTIST,
@@ -54,7 +58,13 @@ var/list/be_special_flags = list(
 	"Raider"           = BE_RAIDER,
 	"Diona"            = BE_PLANT,
 	"Mutineer"         = BE_MUTINEER,
-	"pAI"              = BE_PAI
+	"Loyalist"         = BE_LOYALIST,
+	"pAI"              = BE_PAI,
+	//VOREStation Add
+	"Lost Drone"       = BE_LOSTDRONE,
+	"Maint Pred"       = BE_MAINTPRED,
+	"Morph"            = BE_MORPH,
+	//VOREStation Add End
 )
 
 

code/datums/ghost_query.dm

@@ -125,7 +125,7 @@
 /datum/ghost_query/lost_drone
 	role_name = "Lost Drone"
 	question = "A lost drone onboard has been discovered by a crewmember and they are attempting to reactivate it.  Would you like to play as the drone?"
-	//be_special_flag = BE_AI	//VOREStation Removal: Positronic role is never used because intended purpose is unfitting, so remove the check
+	be_special_flag = BE_LOSTDRONE	//VOREStation Edit
 	check_bans = list("AI", "Cyborg")
 	cutoff_number = 1
 

code/datums/ghost_query_vr.dm

@@ -1,9 +1,11 @@
 /datum/ghost_query/morph
 	role_name = "Morph"
+	be_special_flag = BE_MORPH
 	question = "A weird morphic creature appears to have snuck onstation. Do you want to play as it? ((Expect to be treated as vore predator.))"
 	cutoff_number = 1
 
 /datum/ghost_query/maints_pred
 	role_name = "Maintenance Predator"
+	be_special_flag = BE_MAINTPRED
 	question = "It appears a predatory critter is lurking in the maintenance. Do you want to play as it? ((You get to choose type of critter. Expect to be treated as vore predator.))"
 	cutoff_number = 1

code/modules/client/preference_setup/antagonism/02_candidacy.dm

@@ -5,17 +5,23 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
 	"operative" = 1,									// 1
 	"changeling" = 1,									// 2
 	"wizard" = 1,										// 3
-	"malf AI" = 1,								        // 4
+	"malf AI" = 1,										// 4
 	"revolutionary" = 1,								// 5
 	"alien candidate" = 1,								// 6
 	"positronic brain" = 1,								// 7
 	"cultist" = 1,										// 8
-	"renegade" = 1,                                     // 9
-	"ninja" = 1,	                                  	// 10
+	"renegade" = 1,										// 9
+	"ninja" = 1,										// 10
 	"raider" = 1,										// 11
-	"diona" = 1,                                        // 12
-	"loyalist" = 1,										// 13
-	"pAI candidate" = 1, // -- TLE                      // 14
+	"diona" = 1,										// 12
+	"mutineer" = 1,										// 13
+	"loyalist" = 1,										// 14
+	"pAI candidate" = 1,								// 15
+	//VOREStation Add
+	"lost drone" = 1,									// 16
+	"maint pred" = 1,									// 17
+	"morph" = 1,										// 18
+	//VOREStation Add End
 )
 
 /datum/category_item/player_setup_item/antagonism/candidacy