mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2025-12-30 04:02:33 +00:00
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:
committed by
ZomgPonies
parent
b9fe3ab514
commit
33cd27e032
@@ -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
|
||||
|
||||
|
||||
@@ -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>"
|
||||
|
||||
@@ -510,4 +510,4 @@
|
||||
return client.prefs.gender
|
||||
|
||||
/mob/new_player/is_ready()
|
||||
return ready && !!client
|
||||
return ready && ..()
|
||||
|
||||
Reference in New Issue
Block a user