Merge branch 'master' into upstream-merge-37476

# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
2018-05-20 23:11:16 -05:00
parent 1e207a7430 d421ad846a
commit ea9b3622fd
242 changed files with 3178 additions and 2201 deletions
@@ -1,4 +1,5 @@
 /turf/open
+	plane = FLOOR_PLANE
 	var/slowdown = 0 //negative for faster, positive for slower

 	var/mutable_appearance/wet_overlay