diff --git a/code/modules/mentor/mentor.dm b/code/modules/mentor/mentor.dm index ce7a046101..6c01111065 100644 --- a/code/modules/mentor/mentor.dm +++ b/code/modules/mentor/mentor.dm @@ -116,6 +116,9 @@ var/list/mentor_verbs_default = list( to_chat(C, create_text_tag("mentor", "MENTOR:", C) + " [src]: [msg]") /proc/mentor_commands(href, href_list, client/C) + if(C.holder) // CHOMPedit - Skip this because client is already admin + return + // CHOMPedit Start - Tickets System if(href_list["ticket"]) var/ticket_ref = href_list["ticket"] diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index 63c117a8fa..7225b0173d 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -135,7 +135,7 @@ trashman.reset_view(src) START_PROCESSING(SSobj, src) user.visible_message("[hound.name]'s [src.name] groans lightly as [trashman] slips inside.", "Your [src.name] groans lightly as [trashman] slips inside.") - log_attack("[key_name(hound)] has eaten [key_name(patient)] as a dogborg. ([hound ? "JMP" : "null"])")//CHOMPEdit from message_admins + log_attack("[key_name(hound)] has eaten [key_name(patient)] as a dogborg. ([hound ? "JMP" : "null"])")//CHOMPEdit from message_admins playsound(src, gulpsound, vol = 100, vary = 1, falloff = 0.1, preference = /datum/client_preference/eating_noises) if(delivery) if(islist(deliverylists[delivery_tag])) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 367c8d457e..749aea1d97 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -510,7 +510,7 @@ //CHOMPEdit Begin - non-crew join don't get a message if(rank == JOB_OUTSIDER) - log_and_message_admins("has joined the round as non-crew. (JMP)",character) + log_and_message_admins("has joined the round as non-crew. (JMP)",character) if(!(J.mob_type & JOB_SILICON)) ticker.minds += character.mind //CHOMPEdit End diff --git a/modular_chomp/code/modules/tickets/tickets.dm b/modular_chomp/code/modules/tickets/tickets.dm index 66d8390f05..69d184c90d 100644 --- a/modular_chomp/code/modules/tickets/tickets.dm +++ b/modular_chomp/code/modules/tickets/tickets.dm @@ -794,7 +794,7 @@ GLOBAL_DATUM_INIT(tickets, /datum/tickets, new) if(found.mind && found.mind.special_role) is_antag = 1 founds += "Name: [found.name]([found.real_name]) Ckey: [found.ckey] [is_antag ? "(Antag)" : null] " - msg += "[original_word](?|F) " + msg += "[original_word](?|F) " continue msg += "[original_word] " if(irc)