Prevents mindless candidates for mutiny mode, adds loyalists/mutineers to AntagHUD, allows admins to reassign heads, and adds remaining Directive X objectives to Check Antagonists panel.

Conflicts:
	code/__HELPERS/names.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/mob.dm
	code/modules/mob/new_player/new_player.dm
This commit is contained in:
Jeremy Liberman
2014-06-03 21:26:34 -05:00
committed by ZomgPonies
parent b9fe3ab514
commit 33cd27e032
16 changed files with 183 additions and 85 deletions

View File

@@ -2004,9 +2004,12 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
holder.icon_state = "hudvampthrall"
if("head_loyalist")
holder.icon_state = "loyalist"
if("loyalist")
holder.icon_state = "loyalist"
if("head_mutineer")
holder.icon_state = "mutineer"
if("mutineer")
holder.icon_state = "mutineer"
hud_list[SPECIALROLE_HUD] = holder

View File

@@ -808,7 +808,7 @@ var/list/slot_equipment_priority = list( \
return istype(src, /mob/living/silicon) || get_species() == "Machine"
/mob/proc/is_ready()
return !!client
return client && !!mind
/mob/proc/get_gender()
return gender
@@ -1215,4 +1215,4 @@ mob/proc/yank_out_object()
if(host)
host.ckey = src.ckey
host << "<span class='info'>You are now a mouse. Try to avoid interaction with players, and do not give hints away that you are more than a simple rodent.</span>"
host << "<span class='info'>You are now a mouse. Try to avoid interaction with players, and do not give hints away that you are more than a simple rodent.</span>"

View File

@@ -510,4 +510,4 @@
return client.prefs.gender
/mob/new_player/is_ready()
return ready && !!client
return ready && ..()