cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-05 15:04:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1565 from CHOMPStationBot/upstream-merge-9900

Browse Source 
[MIRROR] [MIRROR] Fixes context-menu examine expanding incorrect target
This commit is contained in:
Nadyr
2021-03-11 00:53:51 -05:00
committed by GitHub
parent 9be6ad7774 081256a0f2
commit c6ceabf308
5 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/admin/admin_tools.dm
View File

@@ -76,9 +76,4 @@
onclose(usr, "admin_dialogue_log")
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()
feedback_add_details("admin_verb","PDL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

2
code/modules/admin/verbs/randomverbs.dm
View File

@@ -629,7 +629,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 admin_atom_validate(O)) // I don't understand precisely how this fixes the string matching against a substring, but it does - Ater
/client/proc/cmd_admin_delete(atom/O as obj|mob|turf in _validate_atom(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"