cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-19 20:06:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	maps/aurora/aurora-1_centcomm.dmm
This commit is contained in:
skull132
2017-10-29 16:15:53 +02:00
parent 0d50eed14e 2d52377ad8
commit c0f22a1cdd
47 changed files with 3560 additions and 90287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/lighting/lighting_turf.dm
+4 -2
View File
@@ -205,11 +205,13 @@
var/list/old_affecting_lights = affecting_lights
var/old_lighting_overlay = lighting_overlay
var/list/old_corners = corners
var/old_ao_neighbors = ao_neighbors
. = ..()
ao_neighbors = old_ao_neighbors
#ifndef AO_USE_LIGHTING_OPACITY
if (permit_ao)
regenerate_ao()
#endif
recalc_atom_opacity()
lighting_overlay = old_lighting_overlay