diff --git a/code/game/turfs/simulated/floor/plating/dirt.dm b/code/game/turfs/simulated/floor/plating/dirt.dm
new file mode 100644
index 00000000000..580aadc85f6
--- /dev/null
+++ b/code/game/turfs/simulated/floor/plating/dirt.dm
@@ -0,0 +1,21 @@
+/turf/open/floor/plating/dirt
+	name = "dirt"
+	desc = "Upon closer examination, it's still dirt."
+	icon = 'icons/turf/floors.dmi'
+	icon_state = "dirt"
+	var/smooth_icon = 'icons/turf/floors/dirt.dmi'
+	canSmoothWith = list(/turf/closed, /turf/open/floor/plating/dirt)
+	smooth = SMOOTH_MORE|SMOOTH_BORDER
+	baseturf = /turf/open/chasm/straight_down/lava_land_surface
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
+	planetary_atmos = TRUE
+
+/turf/open/floor/plating/dirt/Initialize()
+	pixel_y = -2
+	pixel_x = -2
+	icon = smooth_icon
+	..()
+
+/turf/open/floor/plating/dirt/dark
+	icon_state = "darkdirt"
+	smooth_icon = 'icons/turf/floors/darkdirt.dmi'
diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm
new file mode 100644
index 00000000000..d0208218a56
--- /dev/null
+++ b/code/game/turfs/simulated/water.dm
@@ -0,0 +1,16 @@
+/turf/open/water
+	name = "water"
+	desc = "Shallow water."
+	icon = 'icons/turf/floors.dmi'
+	icon_state = "riverwater"
+	baseturf = /turf/open/chasm/straight_down/lava_land_surface
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
+	planetary_atmos = TRUE
+	slowdown = 1
+	wet = TURF_WET_WATER
+
+/turf/open/water/HandleWet()
+    if(wet == TURF_WET_WATER)
+        return
+    ..()
+    MakeSlippery(TURF_WET_WATER) //rewet after ..() clears out lube/ice etc.
\ No newline at end of file
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index ada8ba3cf28..a1cd8fb2f98 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/icons/turf/floors/darkdirt.dmi b/icons/turf/floors/darkdirt.dmi
new file mode 100644
index 00000000000..b36b627d6a7
Binary files /dev/null and b/icons/turf/floors/darkdirt.dmi differ
diff --git a/icons/turf/floors/dirt.dmi b/icons/turf/floors/dirt.dmi
new file mode 100644
index 00000000000..4f533a62284
Binary files /dev/null and b/icons/turf/floors/dirt.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 0ce84215f65..cb97fb50741 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -928,6 +928,7 @@
 #include "code\game\turfs\simulated\minerals.dm"
 #include "code\game\turfs\simulated\river.dm"
 #include "code\game\turfs\simulated\walls.dm"
+#include "code\game\turfs\simulated\water.dm"
 #include "code\game\turfs\simulated\floor\fancy_floor.dm"
 #include "code\game\turfs\simulated\floor\light_floor.dm"
 #include "code\game\turfs\simulated\floor\mineral_floor.dm"
@@ -936,6 +937,7 @@
 #include "code\game\turfs\simulated\floor\plating.dm"
 #include "code\game\turfs\simulated\floor\reinf_floor.dm"
 #include "code\game\turfs\simulated\floor\plating\asteroid.dm"
+#include "code\game\turfs\simulated\floor\plating\dirt.dm"
 #include "code\game\turfs\simulated\floor\plating\lava.dm"
 #include "code\game\turfs\simulated\floor\plating\misc_plating.dm"
 #include "code\game\turfs\simulated\wall\mineral_walls.dm"