cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 21:19:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Conflict Resolution Part One

Browse Source
This commit is contained in:
Unknown
2019-03-27 15:21:58 -04:00
parent fe0b7373b3
commit 55b4d304f5
12 changed files with 30 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin_verbs.dm
-3
View File
@@ -215,7 +215,6 @@ var/list/admin_verbs_debug = list(
/client/proc/show_plant_genes,
/client/proc/enable_debug_verbs,
/client/proc/callproc,
<<<<<<< HEAD
/client/proc/callproc_target,
/client/proc/debug_process, //VOREStation Add,
/client/proc/callproc_datum,
@@ -237,7 +236,6 @@ var/list/admin_verbs_debug = list(
var/list/admin_verbs_paranoid_debug = list(
/client/proc/callproc,
<<<<<<< HEAD
/client/proc/callproc_target,
/client/proc/debug_process, //VOREStation Add,
/client/proc/callproc_datum,
@@ -308,7 +306,6 @@ var/list/admin_verbs_hideable = list(
/client/proc/restart_controller,
/client/proc/cmd_admin_list_open_jobs,
/client/proc/callproc,
<<<<<<< HEAD
/client/proc/callproc_target,
/client/proc/debug_process, //VOREStation Add,
/client/proc/callproc_datum,