diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 58a8e1acad6..0139fb90544 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1547,7 +1547,7 @@ var/global/BSACooldown = 0 if (!paths) return else if (length(paths) > 5) - alert("Select less object types, (max 5)") + alert("Select fewer object types, (max 5)") return else if (length(removed_paths)) alert("Removed:\n" + dd_list2text(removed_paths, "\n")) @@ -1614,8 +1614,6 @@ var/global/BSACooldown = 0 var/mob/M = O M.real_name = obj_name - - if (number == 1) log_admin("[key_name(usr)] created a [english_list(paths)]") for(var/path in paths) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 404727b2203..0fbe6e98981 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -81,7 +81,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an", "monkey", "ali if(X.sound_adminhelp) X << 'adminhelp.ogg' var/msg_to_send = "\blue HELP: [key_name(src, X)] (PP) (VV) (SM) (JMP) (CA): [msg]" - msg_to_send = dd_replaceText(msg_to_send, "HOLDERREF", "\ref[holder]") + msg_to_send = dd_replaceText(msg_to_send, "HOLDERREF", "\ref[X.holder]") msg_to_send = dd_replaceText(msg_to_send, "ADMINREF", "\ref[X]") X << msg_to_send else @@ -91,7 +91,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an", "monkey", "ali if(X.sound_adminhelp) X << 'adminhelp.ogg' var/msg_to_send = "\blue HELP: [key_name(src, X)] (VV) (CA): [msg]" - msg_to_send = dd_replaceText(msg_to_send, "HOLDERREF", "\ref[holder]") + msg_to_send = dd_replaceText(msg_to_send, "HOLDERREF", "\ref[X.holder]") msg_to_send = dd_replaceText(msg_to_send, "ADMINREF", "\ref[X]") X << msg_to_send diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index a4fa88221a1..c58932f5121 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -90,10 +90,11 @@ //Calls the rounds wincheck, mainly for wizard, malf, and changeling now ticker.mode.check_win() //Traitor's dead! Oh no! + /* --Admins do not need to know when people die. This was a relic of the singletraitor times where a traitor dying meant there were no antagonists left ~Erro if (ticker.mode.name == "traitor" && src.mind && src.mind.special_role == "traitor") message_admins("\red Traitor [key_name_admin(src)] has died.") log_game("Traitor [key_name(src)] has died.") - + */ return ..(gibbed) /mob/living/carbon/human/proc/ChangeToHusk()