Changes for merge

code/game/objects/structures/watercloset.dm

@@ -752,12 +752,14 @@
 	if(!open)
 		icon_state = "closed"
 		layer = WALL_OBJ_LAYER
+		density = TRUE
 		open = FALSE
 		opacity = TRUE
 
 	else
 		icon_state = "open"
 		layer = SIGN_LAYER
+		density = FALSE
 		open = TRUE
 		opacity = FALSE
 

code/game/turfs/simulated/minerals.dm

@@ -459,7 +459,7 @@
 	// base_icon_state = "rock_wall"
 	smooth = SMOOTH_MORE|SMOOTH_BORDER
 	canSmoothWith = list (/turf/closed)
-	baseturfs = /turf/open/floor/spooktime/dirtpatch
+	baseturfs = /turf/open/floor/plating/ashplanet/wateryrock
 	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
 	environment_type = "waste"
 	turf_type = /turf/open/floor/plating/ashplanet/rocky