Merge branch 'master' into upstream-merge-37476

2018-05-20 23:12:07 -05:00
parent ea9b3622fd 6963275d45
commit 0758204515
172 changed files with 6336 additions and 4958 deletions
@@ -117,9 +117,8 @@

 /turf/open/floor/engine/cult
 	name = "engraved floor"
-	desc = "The air hangs heavy over this sinister flooring."
+	desc = "The air smells strangely over this sinister flooring."
 	icon_state = "plating"
-	CanAtmosPass = ATMOS_PASS_NO
 	floor_tile = null
 	var/obj/effect/clockwork/overlay/floor/bloodcult/realappearance