From 09f2c19f0f1e5e5d99054b22a4f69dc4963b14b8 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 13 Nov 2017 11:40:22 -0600 Subject: [PATCH] Update admin_verbs.dm --- code/modules/admin/admin_verbs.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 4968b6497c..594e6ba7fb 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -156,13 +156,9 @@ GLOBAL_LIST_INIT(admin_verbs_debug, world.AVerbsDebug()) /client/proc/toggle_medal_disable, /client/proc/view_runtimes, /client/proc/pump_random_event, -<<<<<<< HEAD - /client/proc/cmd_display_init_log -======= /client/proc/cmd_display_init_log, /client/proc/cmd_display_overlay_log, /datum/admins/proc/create_or_modify_area ->>>>>>> 28e6359... makes blueprints work on station and able to expand old areas (#32280) ) GLOBAL_PROTECT(admin_verbs_possess) GLOBAL_LIST_INIT(admin_verbs_possess, list(/proc/possess, /proc/release))