diff --git a/code/__defines/gamemode.dm b/code/__defines/gamemode.dm index 3054e94702..457b5e5c96 100644 --- a/code/__defines/gamemode.dm +++ b/code/__defines/gamemode.dm @@ -38,9 +38,11 @@ #define BE_LOYALIST 0x4000 #define BE_PAI 0x8000 //VOREStation Add -#define BE_LOSTDRONE 0x10000 -#define BE_MAINTPRED 0x20000 -#define BE_MORPH 0x40000 +#define BE_LOSTDRONE 0x10000 +#define BE_MAINTPRED 0x20000 +#define BE_MORPH 0x40000 +#define BE_CORGI 0x80000 +#define BE_CURSEDSWORD 0x100000 //VOREStation Add End var/list/be_special_flags = list( @@ -64,6 +66,8 @@ var/list/be_special_flags = list( "Lost Drone" = BE_LOSTDRONE, "Maint Pred" = BE_MAINTPRED, "Morph" = BE_MORPH, + "Corgi" = BE_CORGI, + "Cursed Sword" = BE_CURSEDSWORD, //VOREStation Add End ) diff --git a/code/datums/ghost_query.dm b/code/datums/ghost_query.dm index c471c47c81..6a342f5820 100644 --- a/code/datums/ghost_query.dm +++ b/code/datums/ghost_query.dm @@ -47,7 +47,7 @@ for(var/ban in check_bans) if(jobban_isbanned(candidate, ban)) return FALSE // They're banned from this role. - + return TRUE /// Send async alerts and ask for responses. Expects you to have tested D for client and type already @@ -59,10 +59,10 @@ var/client/C = D.client window_flash(C) - + if(query_sound) SEND_SOUND(C, sound(query_sound)) - + tgui_alert_async(D, question, "[role_name] request", list("Yes", "No", "Never for this round"), CALLBACK(src, .proc/get_reply), wait_time SECONDS) /// Process an async alert response @@ -70,9 +70,9 @@ var/mob/observer/dead/D = usr if(!D?.client) return - + // Unhandled are "No" and "Nevermind" responses, which should just do nothing - + // This response is always fine, doesn't warrant retesting switch(response) if("Never for this round") @@ -189,10 +189,12 @@ role_name = "Dark Creature" question = "A curious explorer has touched a mysterious rune. \ Would you like to play as the creature it summons?" + be_special_flag = BE_CORGI cutoff_number = 1 /datum/ghost_query/cursedblade role_name = "Cursed Sword" question = "A cursed blade has been discovered by a curious explorer. \ Would you like to play as the soul imprisoned within?" + be_special_flag = BE_CURSEDSWORD cutoff_number = 1 diff --git a/code/modules/client/preference_setup/antagonism/02_candidacy.dm b/code/modules/client/preference_setup/antagonism/02_candidacy.dm index fae7e35118..d922f10669 100644 --- a/code/modules/client/preference_setup/antagonism/02_candidacy.dm +++ b/code/modules/client/preference_setup/antagonism/02_candidacy.dm @@ -21,6 +21,8 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set "lost drone" = 1, // 16 "maint pred" = 1, // 17 "morph" = 1, // 18 + "corgi" = 1, // 19 + "cursed sword" = 1, // 20 //VOREStation Add End )