cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 02:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals

Browse Source 
# Conflicts:
#	_maps/map_files/cyberiad/z2.dmm
#	code/__DEFINES/is_helpers.dm
#	code/__DEFINES/misc.dm
#	code/_globalvars/lists/objects.dm
#	code/modules/mob/living/living_defines.dm
#	icons/effects/beam.dmi
This commit is contained in:
Markolie
2017-02-05 20:12:51 +01:00
parent ea74866f03 9127d07b4e
commit f2497afd9d
530 changed files with 17239 additions and 11419 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin_verbs.dm
+3 -1
View File
@@ -165,7 +165,9 @@ var/list/admin_verbs_debug = list(
/client/proc/map_template_upload,
/client/proc/view_runtimes,
/client/proc/admin_serialize,
/client/proc/admin_deserialize
/client/proc/admin_deserialize,
/client/proc/jump_to_ruin,
/client/proc/toggle_medal_disable
)
var/list/admin_verbs_possess = list(
/proc/possess,