Merge branch 'master' into upstream-merge-37486

2018-05-21 08:59:32 -05:00
parent 50f8779fc0 6060df5b92
commit 931a950adb
403 changed files with 10034 additions and 7488 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