diff --git a/code/__DEFINES/role_preferences.dm b/code/__DEFINES/role_preferences.dm index 81d48274aa9..b7138d06792 100644 --- a/code/__DEFINES/role_preferences.dm +++ b/code/__DEFINES/role_preferences.dm @@ -18,7 +18,6 @@ #define ROLE_PAI "pAI" #define ROLE_CULTIST "cultist" #define ROLE_BLOB "blob" -#define ROLE_NINJA "space ninja" #define ROLE_MONKEY "monkey" #define ROLE_GANG "gangster" #define ROLE_ABDUCTOR "abductor" @@ -30,12 +29,10 @@ // Role tags for EVERYONE! #define ROLE_DEMON "demon" #define ROLE_SENTIENT "sentient animal" -#define ROLE_POSIBRAIN "positronic brain" #define ROLE_GUARDIAN "guardian" #define ROLE_MORPH "morph" #define ROLE_ERT "emergency response team" #define ROLE_NYMPH "Dionaea" -#define ROLE_GSPIDER "giant spider" #define ROLE_TSPIDER "terror spider" #define ROLE_DRONE "drone" #define ROLE_DEATHSQUAD "deathsquad" @@ -55,18 +52,15 @@ GLOBAL_LIST_INIT(special_roles, list( ROLE_BLOB, // Blob ROLE_CHANGELING = /datum/game_mode/changeling, // Changeling ROLE_CULTIST = /datum/game_mode/cult, // Cultist - ROLE_GSPIDER, // Giant spider ROLE_GUARDIAN, // Guardian ROLE_MORPH, // Morph ROLE_OPERATIVE = /datum/game_mode/nuclear, // Operative ROLE_PAI, // PAI - ROLE_POSIBRAIN, // Positronic brain ROLE_REVENANT, // Revenant ROLE_REV = /datum/game_mode/revolution, // Revolutionary ROLE_SENTIENT, // Sentient animal ROLE_DEMON, // Slaguther demon ROLE_ELITE, // Lavaland Elite - ROLE_NINJA, // Space ninja ROLE_TRADER, // Trader ROLE_TRAITOR = /datum/game_mode/traitor, // Traitor ROLE_VAMPIRE = /datum/game_mode/vampire, // Vampire diff --git a/code/__DEFINES/rolebans.dm b/code/__DEFINES/rolebans.dm index ec5dd31daa8..c400ddb5c3e 100644 --- a/code/__DEFINES/rolebans.dm +++ b/code/__DEFINES/rolebans.dm @@ -8,13 +8,11 @@ GLOBAL_LIST_INIT(antag_roles, list( ROLE_ALIEN, ROLE_CULTIST, ROLE_BLOB, - ROLE_NINJA, ROLE_VAMPIRE, ROLE_DEMON, ROLE_REVENANT, ROLE_GUARDIAN, ROLE_MORPH, - ROLE_GSPIDER, ROLE_TSPIDER, )) diff --git a/code/game/jobs/job_exp.dm b/code/game/jobs/job_exp.dm index 108545cf368..cf9a76969f5 100644 --- a/code/game/jobs/job_exp.dm +++ b/code/game/jobs/job_exp.dm @@ -3,7 +3,6 @@ GLOBAL_LIST_INIT(role_playtime_requirements, list( // NT ROLES ROLE_PAI = 0, - ROLE_POSIBRAIN = 5, // Same as cyborg job. ROLE_SENTIENT = 5, ROLE_ERT = 40, // High, because they're team-based, and we want ERT to be robust ROLE_DEATHSQUAD = 50, // Higher, see ERT and also they're OP as heck @@ -17,14 +16,12 @@ GLOBAL_LIST_INIT(role_playtime_requirements, list( ROLE_VAMPIRE = 5, ROLE_BLOB = 20, ROLE_REVENANT = 3, - ROLE_NINJA = 20, ROLE_MORPH = 5, ROLE_DEMON = 5, ROLE_ELITE = 5, // DUO ANTAGS ROLE_GUARDIAN = 20, - ROLE_GSPIDER = 5, // TEAM ANTAGS // Higher numbers here, because they require more experience to be played correctly diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 2f4fe5f67c8..c17e99f0f8e 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -101,8 +101,6 @@ message_say = "FOR THE HIVE!" else if(role == ROLE_CULTIST) message_say = "FOR NARSIE!" - else if(role == ROLE_NINJA) - message_say = "FOR THE CLAN!" else if(role == ROLE_WIZARD) message_say = "FOR THE FEDERATION!" else if(role == ROLE_REV || role == "head revolutionary") diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm index 21b7f99874b..ad5bc0753ca 100644 --- a/code/modules/client/preference/preferences.dm +++ b/code/modules/client/preference/preferences.dm @@ -1,6 +1,5 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts to play these roles ROLE_PAI = 0, - ROLE_POSIBRAIN = 0, ROLE_GUARDIAN = 0, ROLE_TRAITOR = 7, ROLE_CHANGELING = 14, @@ -16,8 +15,6 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts ROLE_SENTIENT = 21, ROLE_ELITE = 21, // ROLE_GANG = 21, - ROLE_NINJA = 21, - ROLE_GSPIDER = 21, ROLE_ABDUCTOR = 30 )) diff --git a/code/modules/mob/living/brain/robotic_brain.dm b/code/modules/mob/living/brain/robotic_brain.dm index c53285084c4..507af8e3241 100644 --- a/code/modules/mob/living/brain/robotic_brain.dm +++ b/code/modules/mob/living/brain/robotic_brain.dm @@ -72,18 +72,6 @@ return TRUE return FALSE -/obj/item/mmi/robotic_brain/proc/question(client/C) - spawn(0) - if(!C) - return - var/response = alert(C, "Someone is requesting a personality for a [src]. Would you like to play as one?", "[src] request", "Yes", "No", "Never for this round") - if(!C || brainmob.key || !searching) - return //handle logouts that happen whilst the alert is waiting for a response, and responses issued after a brain has been located. - if(response == "Yes") - transfer_personality(C.mob) - else if(response == "Never for this round") - C.prefs.be_special -= ROLE_POSIBRAIN - // This should not ever happen, but let's be safe /obj/item/mmi/robotic_brain/dropbrain(turf/dropspot) CRASH("[src] at [loc] attempted to drop brain without a contained brain.")