From 01a51e5acdf504694be14a25741acb519b85685d Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Mon, 4 May 2020 20:00:53 -0400 Subject: [PATCH] Add prefs for Be Morph, Be Maintpred, Be Lost Drone Allows the 'never for this round' button to work, and for them to be disabled entirely if you don't want to be asked again. --- code/__defines/gamemode.dm | 10 ++++++++++ code/datums/ghost_query.dm | 2 +- code/datums/ghost_query_vr.dm | 2 ++ .../client/preference_setup/antagonism/02_candidacy.dm | 5 +++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/code/__defines/gamemode.dm b/code/__defines/gamemode.dm index dd49d06445..5f67308094 100644 --- a/code/__defines/gamemode.dm +++ b/code/__defines/gamemode.dm @@ -37,6 +37,11 @@ #define BE_MUTINEER 0x2000 #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, @@ -55,6 +60,11 @@ var/list/be_special_flags = list( "Mutineer" = BE_MUTINEER, "Loyalist" = BE_LOYALIST, "pAI" = BE_PAI, + //VOREStation Add + "Lost Drone" = BE_LOSTDRONE, + "Maint Pred" = BE_MAINTPRED, + "Morph" = BE_MORPH, + //VOREStation Add End ) diff --git a/code/datums/ghost_query.dm b/code/datums/ghost_query.dm index d068e27de2..f3a84d533d 100644 --- a/code/datums/ghost_query.dm +++ b/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 diff --git a/code/datums/ghost_query_vr.dm b/code/datums/ghost_query_vr.dm index aba3165c63..75356029be 100644 --- a/code/datums/ghost_query_vr.dm +++ b/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 \ No newline at end of file diff --git a/code/modules/client/preference_setup/antagonism/02_candidacy.dm b/code/modules/client/preference_setup/antagonism/02_candidacy.dm index 3067134f94..e9c1f82ec0 100644 --- a/code/modules/client/preference_setup/antagonism/02_candidacy.dm +++ b/code/modules/client/preference_setup/antagonism/02_candidacy.dm @@ -17,6 +17,11 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set "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