From 82f09c16420a2e6f77dd937691033ee7d2a8768b Mon Sep 17 00:00:00 2001 From: silveryferret Date: Mon, 16 May 2016 21:20:30 -0500 Subject: [PATCH] Replaces BE_MONKEY with BE_RENEGADE As title. Also adds Renegade into the antagonism tab underneath character set up. --- code/__defines/gamemode.dm | 4 ++-- code/game/antagonist/station/renegade.dm | 8 +++++--- .../client/preference_setup/antagonism/02_candidacy.dm | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/code/__defines/gamemode.dm b/code/__defines/gamemode.dm index 815c55b2ec..fc2d16ea63 100644 --- a/code/__defines/gamemode.dm +++ b/code/__defines/gamemode.dm @@ -18,7 +18,7 @@ #define BE_ALIEN 0x40 #define BE_AI 0x80 #define BE_CULTIST 0x100 -#define BE_MONKEY 0x200 +#define BE_RENEGADE 0x200 #define BE_NINJA 0x400 #define BE_RAIDER 0x800 #define BE_PLANT 0x1000 @@ -37,7 +37,7 @@ var/list/be_special_flags = list( "Xenomorph" = BE_ALIEN, "Positronic Brain" = BE_AI, "Cultist" = BE_CULTIST, - "Monkey" = BE_MONKEY, + "Renegade" = BE_RENEGADE, "Ninja" = BE_NINJA, "Raider" = BE_RAIDER, "Diona" = BE_PLANT, diff --git a/code/game/antagonist/station/renegade.dm b/code/game/antagonist/station/renegade.dm index 887b3a1b3f..efcdbad236 100644 --- a/code/game/antagonist/station/renegade.dm +++ b/code/game/antagonist/station/renegade.dm @@ -1,8 +1,12 @@ var/datum/antagonist/renegade/renegades /datum/antagonist/renegade + id = MODE_RENEGADE + role_type = BE_RENEGADE role_text = "Renegade" role_text_plural = "Renegades" + bantype = "renegade" + restricted_jobs = list("AI", "Cyborg") welcome_text = "Something's going to go wrong today, you can just feel it. You're paranoid, you've got a gun, and you're going to survive." antag_text = "You are a minor antagonist! Within the rules, \ try to protect yourself and what's important to you. You aren't here to cause trouble, \ @@ -12,10 +16,8 @@ var/datum/antagonist/renegade/renegades and before taking extreme actions, please try to also contact the administration! \ Think through your actions and make the roleplay immersive! Please remember all \ rules aside from those without explicit exceptions apply to antagonists." - - id = MODE_RENEGADE flags = ANTAG_SUSPICIOUS | ANTAG_IMPLANT_IMMUNE | ANTAG_RANDSPAWN | ANTAG_VOTABLE - + hard_cap = 8 hard_cap_round = 12 initial_spawn_req = 2 diff --git a/code/modules/client/preference_setup/antagonism/02_candidacy.dm b/code/modules/client/preference_setup/antagonism/02_candidacy.dm index 82d44027af..530fc721ee 100644 --- a/code/modules/client/preference_setup/antagonism/02_candidacy.dm +++ b/code/modules/client/preference_setup/antagonism/02_candidacy.dm @@ -10,7 +10,7 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set "alien candidate" = 1, //always show // 6 "positronic brain" = 1, // 7 "cultist" = IS_MODE_COMPILED("cult"), // 8 - "infested monkey" = IS_MODE_COMPILED("monkey"), // 9 + "renegade" = 1, // 9 "ninja" = "true", // 10 "raider" = IS_MODE_COMPILED("heist"), // 11 "diona" = 1, // 12