Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#34907)

* Cleanup

* .

* Synced special_role & factions with role defines

* Revert

* more cleanup

* fix
This commit is contained in:
ShizCalev
2018-02-04 03:03:34 -06:00
committed by duncathan salt
parent 60e4952a27
commit ee18d6f8e2
73 changed files with 193 additions and 211 deletions
+7 -7
View File
@@ -686,20 +686,20 @@
var/datum/antagonist/changeling/C = has_antag_datum(/datum/antagonist/changeling)
if(!C)
C = add_antag_datum(/datum/antagonist/changeling)
special_role = "Changeling"
special_role = ROLE_CHANGELING
return C
/datum/mind/proc/make_Wizard()
if(!has_antag_datum(/datum/antagonist/wizard))
special_role = "Wizard"
assigned_role = "Wizard"
special_role = ROLE_WIZARD
assigned_role = ROLE_WIZARD
add_antag_datum(/datum/antagonist/wizard)
/datum/mind/proc/make_Cultist()
if(!has_antag_datum(/datum/antagonist/cult,TRUE))
SSticker.mode.add_cultist(src,FALSE,equip=TRUE)
special_role = "Cultist"
special_role = ROLE_CULTIST
to_chat(current, "<font color=\"purple\"><b><i>You catch a glimpse of the Realm of Nar-Sie, The Geometer of Blood. You now see how flimsy your world is, you see that it should be open to the knowledge of Nar-Sie.</b></i></font>")
to_chat(current, "<font color=\"purple\"><b><i>Assist your new bretheren in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.</b></i></font>")
@@ -708,7 +708,7 @@
head.give_flash = TRUE
head.give_hud = TRUE
add_antag_datum(head)
special_role = "Head Revolutionary"
special_role = ROLE_REV_HEAD
/datum/mind/proc/AddSpell(obj/effect/proc_holder/spell/S)
spell_list += S
@@ -809,7 +809,7 @@
//XENO
/mob/living/carbon/alien/mind_initialize()
..()
mind.special_role = "Alien"
mind.special_role = ROLE_ALIEN
//AI
/mob/living/silicon/ai/mind_initialize()
@@ -824,5 +824,5 @@
//PAI
/mob/living/silicon/pai/mind_initialize()
..()
mind.assigned_role = "pAI"
mind.assigned_role = ROLE_PAI
mind.special_role = ""