From e0dd0e8f0014e162e71e02f7223ac03ea28a78ca Mon Sep 17 00:00:00 2001 From: Luca Date: Wed, 20 Nov 2019 13:30:37 +1100 Subject: [PATCH 1/2] Traitor Fix --- code/modules/antagonists/traitor/datum_mindslave.dm | 2 +- code/modules/antagonists/traitor/datum_traitor.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/antagonists/traitor/datum_mindslave.dm b/code/modules/antagonists/traitor/datum_mindslave.dm index c96b2182d9e..490452a496c 100644 --- a/code/modules/antagonists/traitor/datum_mindslave.dm +++ b/code/modules/antagonists/traitor/datum_mindslave.dm @@ -4,7 +4,7 @@ name = "Mindslave" roundend_category = "mindslaves" job_rank = ROLE_MINDSLAVE - var/special_role = ROLE_MINDSLAVE + var/special_role = SPECIAL_ROLE_TRAITOR /datum/antagonist/mindslave/on_gain() owner.special_role = special_role diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index 4e9a5ad4bf7..9c06c94bb5b 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -6,7 +6,7 @@ name = "Traitor" roundend_category = "traitors" job_rank = ROLE_TRAITOR - var/special_role = ROLE_TRAITOR + var/special_role = SPECIAL_ROLE_TRAITOR var/give_objectives = TRUE var/should_give_codewords = TRUE var/should_equip = TRUE From 0ab4a87c5df631f45962692acdae3f63826db822 Mon Sep 17 00:00:00 2001 From: Luca Date: Thu, 21 Nov 2019 12:02:47 +1100 Subject: [PATCH 2/2] Further_Updated_Special_Role_Traitor --- code/__DEFINES/role_preferences.dm | 1 - code/game/gamemodes/autotraitor/autotraitor.dm | 3 +-- code/game/gamemodes/traitor/traitor.dm | 1 - code/modules/antagonists/traitor/datum_mindslave.dm | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/code/__DEFINES/role_preferences.dm b/code/__DEFINES/role_preferences.dm index 5b93e570222..34ad4d69e54 100644 --- a/code/__DEFINES/role_preferences.dm +++ b/code/__DEFINES/role_preferences.dm @@ -10,7 +10,6 @@ // justice if someone's abusing your role #define ROLE_SYNDICATE "Syndicate" #define ROLE_TRAITOR "traitor" -#define ROLE_MINDSLAVE "mindslave" #define ROLE_OPERATIVE "operative" #define ROLE_CHANGELING "changeling" #define ROLE_WIZARD "wizard" diff --git a/code/game/gamemodes/autotraitor/autotraitor.dm b/code/game/gamemodes/autotraitor/autotraitor.dm index cc0cc307ed5..1a0d71d0544 100644 --- a/code/game/gamemodes/autotraitor/autotraitor.dm +++ b/code/game/gamemodes/autotraitor/autotraitor.dm @@ -52,8 +52,7 @@ if(!traitor || !istype(traitor)) pre_traitors.Remove(traitor) continue - if(istype(traitor)) - traitor.special_role = SPECIAL_ROLE_TRAITOR + if(istype(traitor)) traitor.restricted_roles = restricted_jobs // if(!traitors.len) diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index ae131286afd..b55fdf70120 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -49,7 +49,6 @@ break var/datum/mind/traitor = pick(possible_traitors) pre_traitors += traitor - traitor.special_role = SPECIAL_ROLE_TRAITOR traitor.restricted_roles = restricted_jobs possible_traitors.Remove(traitor) diff --git a/code/modules/antagonists/traitor/datum_mindslave.dm b/code/modules/antagonists/traitor/datum_mindslave.dm index 490452a496c..5efd35715ad 100644 --- a/code/modules/antagonists/traitor/datum_mindslave.dm +++ b/code/modules/antagonists/traitor/datum_mindslave.dm @@ -3,7 +3,7 @@ /datum/antagonist/mindslave name = "Mindslave" roundend_category = "mindslaves" - job_rank = ROLE_MINDSLAVE + job_rank = SPECIAL_ROLE_TRAITOR var/special_role = SPECIAL_ROLE_TRAITOR /datum/antagonist/mindslave/on_gain()