Skip to content

Commit

Permalink
Marked_admin and ckey. (#5872)
Browse files Browse the repository at this point in the history
# About the pull request

Byond is being Byond. Key and ckey are not the same thing.

# Explain why it's good for the game

Selfevident.

# Changelog


:cl:
admin: Marking tickets properly recognises your ckey.
/:cl:
  • Loading branch information
Segrain committed Mar 4, 2024
1 parent b6d4943 commit 7af87cd
Showing 1 changed file with 20 additions and 8 deletions.
28 changes: 20 additions & 8 deletions code/modules/admin/verbs/adminhelp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -470,8 +470,11 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
if(state != AHELP_ACTIVE)
return

if(marked_admin && marked_admin != usr.ckey)
to_chat(usr, SPAN_WARNING("This ticket is currently marked by [marked_admin]. Please override their mark to interact with this ticket!"))
if(marked_admin != usr.ckey)
if(marked_admin)
to_chat(usr, SPAN_WARNING("This ticket is currently marked by [marked_admin]. Please override their mark to interact with this ticket!"))
else
to_chat(usr, SPAN_WARNING("This ticket is not currently marked. Please mark it first to interact with this ticket!"))
return

RemoveActive()
Expand All @@ -489,8 +492,11 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
if(state != AHELP_ACTIVE)
return

if(marked_admin && marked_admin != usr.ckey)
to_chat(usr, SPAN_WARNING("This ticket is currently marked by [marked_admin]. Please override their mark to interact with this ticket!"))
if(marked_admin != usr.ckey)
if(marked_admin)
to_chat(usr, SPAN_WARNING("This ticket is currently marked by [marked_admin]. Please override their mark to interact with this ticket!"))
else
to_chat(usr, SPAN_WARNING("This ticket is not currently marked. Please mark it first to interact with this ticket!"))
return

RemoveActive()
Expand Down Expand Up @@ -573,8 +579,11 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
if(state != AHELP_ACTIVE)
return

if(marked_admin != usr.key)
to_chat(usr, SPAN_WARNING("This ticket is currently marked by [marked_admin]. Please override their mark to interact with this ticket!"))
if(marked_admin != usr.ckey)
if(marked_admin)
to_chat(usr, SPAN_WARNING("This ticket is currently marked by [marked_admin]. Please override their mark to interact with this ticket!"))
else
to_chat(usr, SPAN_WARNING("This ticket is not currently marked. Please mark it first to interact with this ticket!"))
return

if(initiator)
Expand All @@ -600,8 +609,11 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
to_chat(usr, SPAN_WARNING("This ticket is already closed!"))
return

if(marked_admin != usr.key)
to_chat(usr, SPAN_WARNING("This ticket is currently marked by [marked_admin]. Please override their mark to interact with this ticket!"))
if(marked_admin != usr.ckey)
if(marked_admin)
to_chat(usr, SPAN_WARNING("This ticket is currently marked by [marked_admin]. Please override their mark to interact with this ticket!"))
else
to_chat(usr, SPAN_WARNING("This ticket is not currently marked. Please mark it first to interact with this ticket!"))
return

var/chosen = tgui_input_list(usr, "Which auto response do you wish to send?", "AutoReply", GLOB.adminreplies)
Expand Down

0 comments on commit 7af87cd

Please sign in to comment.