Merge branch 'master' into development

# Conflicts:
#	maps/aurora/aurora-1_centcomm.dmm
This commit is contained in:
skull132
2017-10-29 16:15:53 +02:00
47 changed files with 3560 additions and 90287 deletions
-2
View File
@@ -54,8 +54,6 @@
luminosity = 1
has_opaque_atom = TRUE
if (!mapload)
regenerate_ao()
if (smooth)
pixel_x = -4