diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index ee49230406e..f7466b9d380 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -747,14 +747,15 @@ msg = job else msg += ", [job]" - - // Reload their job ban holder (refresh this round) - M.client.jbh.reload_jobbans(M.client) add_note(M.ckey, "Banned from [msg] - [reason]", null, usr.ckey, 0) message_admins("[key_name_admin(usr)] banned [key_name_admin(M)] from [msg] for [mins] minutes", 1) - to_chat(M, "You have been jobbanned by [usr.client.ckey] from: [msg].") - to_chat(M, "The reason is: [reason]") - to_chat(M, "This jobban will be lifted in [mins] minutes.") + + // Reload their job ban holder (refresh this round) + if(M.client) + M.client.jbh.reload_jobbans(M.client) + to_chat(M, "You have been jobbanned by [usr.client.ckey] from: [msg].") + to_chat(M, "The reason is: [reason]") + to_chat(M, "This jobban will be lifted in [mins] minutes.") href_list["jobban2"] = 1 // lets it fall through and refresh return 1 if("No") @@ -769,14 +770,15 @@ msg = job else msg += ", [job]" - - // Reload their job ban holder (refresh this round) - M.client.jbh.reload_jobbans(M.client) add_note(M.ckey, "Banned from [msg] - [reason]", null, usr.ckey, 0) message_admins("[key_name_admin(usr)] banned [key_name_admin(M)] from [msg]", 1) - to_chat(M, "You have been jobbanned by [usr.client.ckey] from: [msg].") - to_chat(M, "The reason is: [reason]") - to_chat(M, "Jobban can be lifted only upon request.") + + // Reload their job ban holder (refresh this round) + if(M.client) + M.client.jbh.reload_jobbans(M.client) + to_chat(M, "You have been jobbanned by [usr.client.ckey] from: [msg].") + to_chat(M, "The reason is: [reason]") + to_chat(M, "Jobban can be lifted only upon request.") href_list["jobban2"] = 1 // lets it fall through and refresh return 1 if("Cancel")