Fixes Deadminning keeping the AntagHUD on (#25847)

This commit is contained in:
Cyberboss
2017-04-06 13:19:19 -04:00
committed by Leo
parent 9a0b4086a0
commit 5bbf370ad0
2 changed files with 12 additions and 5 deletions
+3
View File
@@ -659,6 +659,9 @@ var/list/admin_verbs_hideable = list(
if(!holder)
return
if(has_antag_hud())
toggle_antag_hud(silent = TRUE)
holder.disassociate()
qdel(holder)
+9 -5
View File
@@ -926,15 +926,14 @@ var/list/datum/outfit/custom_outfits = list() //Admin created outfits
"}
usr << browse(dat, "window=dressup;size=550x600")
/client/proc/toggle_antag_hud()
/client/proc/toggle_antag_hud(silent = FALSE)
set category = "Admin"
set name = "Toggle AntagHUD"
set desc = "Toggles the Admin AntagHUD"
if(!holder) return
var/datum/atom_hud/A = huds[ANTAG_HUD_TRAITOR]
var/adding_hud = (usr in A.hudusers) ? 0 : 1
var/adding_hud = !has_antag_hud()
for(var/datum/atom_hud/H in huds)
if(istype(H, /datum/atom_hud/antag))
@@ -947,7 +946,12 @@ var/list/datum/outfit/custom_outfits = list() //Admin created outfits
to_chat(usr, "You toggled your admin antag HUD [adding_hud ? "ON" : "OFF"].")
message_admins("[key_name_admin(usr)] toggled their admin antag HUD [adding_hud ? "ON" : "OFF"].")
log_admin("[key_name(usr)] toggled their admin antag HUD [adding_hud ? "ON" : "OFF"].")
feedback_add_details("admin_verb","TAH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
if(!silent)
feedback_add_details("admin_verb","TAH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/has_antag_hud()
var/datum/atom_hud/A = huds[ANTAG_HUD_TRAITOR]
return mob in A.hudusers
/client/proc/open_shuttle_manipulator()
set category = "Admin"
@@ -1160,4 +1164,4 @@ var/list/datum/outfit/custom_outfits = list() //Admin created outfits
bluespace_artillery(target)
message_admins("[key_name_admin(usr)] punished [key_name_admin(target)] with [punishment].")
log_admin("[key_name(usr)] punished [key_name(target)] with [punishment].")
log_admin("[key_name(usr)] punished [key_name(target)] with [punishment].")