Merge branch 'master' into development

# Conflicts:
#	html/changelogs/.all_changelog.yml
#	maps/aurora/aurora-4_mainlevel.dmm
#	maps/aurora/aurora-7_roof.dmm
This commit is contained in:
skull132
2018-10-07 01:33:20 +03:00
50 changed files with 6490 additions and 6249 deletions
+1
View File
@@ -431,6 +431,7 @@ var/list/admin_verbs_cciaa = list(
admin_verbs_spawn,
debug_verbs
)
add_aooc_if_necessary()
/client/proc/hide_most_verbs()//Allows you to keep some functionality while hiding some verbs
set name = "Adminverbs - Hide Most"