Merge branch 'master' of https://github.com/tgstation/-tg-station into planes_on_a_snake

This commit is contained in:
MrPerson
2016-04-27 17:03:32 -07:00
405 changed files with 76657 additions and 10331 deletions
+1 -1
View File
@@ -257,7 +257,7 @@
var/list/affecting_lights //not initialised until used (even empty lists reserve a fair bit of memory)
/turf/ChangeTurf(path)
if(!path || path == type) //Sucks this is here but it would cause problems otherwise.
if(!path || (!use_preloader && path == type)) //Sucks this is here but it would cause problems otherwise.
return ..()
for(var/obj/effect/decal/cleanable/decal in src.contents)