upstream-merge-28109

upstream-merge-28352
2017-06-13 01:10:21 -05:00
parent 2a5be91970
commit 226345d82a
13 changed files with 594 additions and 369 deletions
--- a/code/modules/admin/adminmenu.dm
+++ b/code/modules/admin/adminmenu.dm
@@ -1,8 +1,8 @@
-/datum/menu/Admin/Generate_list(client/C)
+/datum/verbs/menu/Admin/Generate_list(client/C)
 	if (C.holder)
 		. = ..()

-/datum/menu/Admin/verb/playerpanel()
+/datum/verbs/menu/Admin/verb/playerpanel()
 	set name = "Player Panel"
 	set desc = "Player Panel"
 	set category = "Admin"