Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos

2021-01-20 18:38:52 -08:00
parent 165cdbf040 d1bcfbbf67
commit 51100c9bf9
403 changed files with 1891 additions and 2633 deletions
@@ -61,7 +61,12 @@

 /turf/open/transparent/glass/Initialize()
 	icon_state = "" //Prevent the normal icon from appearing behind the smooth overlays
-	return ..()
+	..()
+	return INITIALIZE_HINT_LATELOAD
+
+/turf/open/floor/glass/LateInitialize()
+	. = ..()
+	// AddElement(/datum/element/turf_z_transparency, TRUE)

 /turf/open/transparent/glass/wrench_act(mob/living/user, obj/item/I)
 	to_chat(user, "<span class='notice'>You begin removing glass...</span>")