Merge branch 'master' into upstream-merge-26129

2017-04-29 11:45:37 -05:00
parent 991fb8335c fca3f200b3
commit 06bfa8770e
131 changed files with 1020 additions and 743 deletions
@@ -42,6 +42,8 @@

 	if (opacity)
 		has_opaque_atom = TRUE
+	
+	return INITIALIZE_HINT_NORMAL

 /turf/open/space/attack_ghost(mob/dead/observer/user)
 	if(destination_z)
@@ -56,6 +56,7 @@

 	if (opacity)
 		has_opaque_atom = TRUE
+	return INITIALIZE_HINT_NORMAL

 /turf/proc/Initalize_Atmos(times_fired)
 	CalculateAdjacentTurfs()