Merge branch 'master' into development

# Conflicts:
#	code/controllers/subsystems/initialization/misc_early.dm
#	config/example/config.txt
#	maps/aurora/aurora-1_centcomm.dmm
#	maps/aurora/aurora-4_mainlevel.dmm
This commit is contained in:
skull132
2017-11-11 20:57:28 +02:00
68 changed files with 276321 additions and 133747 deletions
@@ -24,7 +24,7 @@
charge_max = 300
invocation = "Bla'yo daya!"
invocation_type = SpI_SHOUT
level_max = list(Sp_TOTAL = 3, Sp_SPEED = 3, Sp_POWER = 3)
level_max = list(Sp_TOTAL = 3, Sp_SPEED = 4, Sp_POWER = 3)
range = 1