Skip to content

Commit

Permalink
nullcheck
Browse files Browse the repository at this point in the history
  • Loading branch information
@harryob
harryob committed Mar 2, 2024
1 parent 62df30e commit 20a90bb
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions code/modules/admin/verbs/adminhelp.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
if(state != AHELP_ACTIVE)
return

if(marked_admin != usr.ckey)
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!"))
return

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

if(marked_admin != usr.ckey)
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!"))
return

Expand All @@ -511,7 +511,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
if(state != AHELP_ACTIVE || !initial_message)
return

if(marked_admin != usr.ckey)
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!"))
return

Expand Down

0 comments on commit 20a90bb

Please sign in to comment.