diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 1fc80ccd00..975e8aa731 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1,4 +1,3 @@ -<<<<<<< HEAD /client/proc/cmd_admin_drop_everything(mob/M in GLOB.mob_list) set category = null set name = "Drop Everything" @@ -845,8 +844,9 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits var/dat = {"