diff --git a/code/modules/admin/admin_tools.dm b/code/modules/admin/admin_tools.dm index 376aa2da44..8b4e1ae44c 100644 --- a/code/modules/admin/admin_tools.dm +++ b/code/modules/admin/admin_tools.dm @@ -9,18 +9,18 @@ if(M.mind) dat += "Current Antag?: [(M.mind.special_role)?"Yes":"No"]
" dat += "
Note: This is arranged from earliest to latest.

" - + if(!isemptylist(M.attack_log)) - dat += "
" + dat += "
" for(var/l in M.attack_log) dat += "[l]
" - + dat += "
" - + else dat += "No attack logs found for [M]." - + var/datum/browser/popup = new(usr, "admin_attack_log", "[src]", 650, 650, src) popup.set_content(jointext(dat,null)) popup.open() @@ -43,13 +43,13 @@ if(!isemptylist(M.dialogue_log)) dat += "
" - + for(var/d in M.dialogue_log) dat += "[d]
" - + dat += "
" else - dat += "No dialogue logs found for [M]." + dat += "No dialogue logs found for [M]." var/datum/browser/popup = new(usr, "admin_dialogue_log", "[src]", 650, 650, src) popup.set_content(jointext(dat,null)) popup.open() @@ -58,5 +58,8 @@ feedback_add_details("admin_verb","PDL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - + +// Used to get `atom/O as obj|mob|turf in view()` to match against strings containing apostrophes immediately after substrings that match to other objects. Somehow. - Ater +/proc/admin_atom_validate(atom/A) + return view() \ No newline at end of file diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index ace7d48e91..d85a88cbef 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -616,7 +616,7 @@ Traitors and the like can also be revived with the previous role mostly intact. message_admins("[key_name_admin(src)] has created a command report", 1) feedback_add_details("admin_verb","CCR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/cmd_admin_delete(atom/O as obj|mob|turf in view()) +/client/proc/cmd_admin_delete(atom/O as obj|mob|turf in admin_atom_validate(O)) // I don't understand precisely how this fixes the string matching against a substring, but it does - Ater set category = "Admin" set name = "Delete"