diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index dac5df477d..0972252bf6 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -53162,10 +53162,7 @@
 	pixel_x = 3;
 	pixel_y = 3
 	},
-/turf/open/water{
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS;
-	planetary_atmos = 0
-	},
+/turf/open/water/decorative,
 /area/hallway/secondary/entry)
 "daY" = (
 /obj/structure/disposalpipe/segment,
@@ -57669,10 +57666,7 @@
 /turf/open/space/basic,
 /area/space/nearstation)
 "mJR" = (
-/turf/open/water{
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS;
-	planetary_atmos = 0
-	},
+/turf/open/water/decorative,
 /area/hallway/secondary/entry)
 "mKc" = (
 /obj/structure/bookcase/random/nonfiction,
@@ -58380,10 +58374,7 @@
 	pixel_x = -2;
 	pixel_y = 13
 	},
-/turf/open/water{
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS;
-	planetary_atmos = 0
-	},
+/turf/open/water/decorative,
 /area/hallway/secondary/entry)
 "ous" = (
 /obj/effect/turf_decal/stripes/line,
@@ -59692,10 +59683,7 @@
 	pixel_x = -60;
 	pixel_y = -60
 	},
-/turf/open/water{
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS;
-	planetary_atmos = 0
-	},
+/turf/open/water/decorative,
 /area/hallway/secondary/entry)
 "qVk" = (
 /obj/machinery/door/poddoor/incinerator_atmos_aux,
@@ -61188,10 +61176,7 @@
 /area/hallway/secondary/entry)
 "upX" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/water{
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS;
-	planetary_atmos = 0
-	},
+/turf/open/water/decorative,
 /area/hallway/secondary/entry)
 "uqJ" = (
 /obj/effect/spawner/structure/window/reinforced,
@@ -62348,10 +62333,7 @@
 	pixel_y = -4
 	},
 /obj/structure/flora/rock/pile,
-/turf/open/water{
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS;
-	planetary_atmos = 0
-	},
+/turf/open/water/decorative,
 /area/hallway/secondary/entry)
 "wTD" = (
 /obj/structure/table/wood,
diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm
index 708ca230b1..a72d837495 100644
--- a/code/game/turfs/simulated/water.dm
+++ b/code/game/turfs/simulated/water.dm
@@ -15,3 +15,20 @@
 	barefootstep = FOOTSTEP_WATER
 	clawfootstep = FOOTSTEP_WATER
 	heavyfootstep = FOOTSTEP_WATER
+
+/turf/open/water/decorative
+	gender = PLURAL
+	name = "water"
+	desc = "Shallow water."
+	icon = 'icons/turf/floors.dmi'
+	icon_state = "riverwater_motion"
+	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+	planetary_atmos = FALSE
+	slowdown = 1
+	bullet_sizzle = TRUE
+	bullet_bounce_sound = null //needs a splashing sound one day.
+
+	footstep = FOOTSTEP_WATER
+	barefootstep = FOOTSTEP_WATER
+	clawfootstep = FOOTSTEP_WATER
+	heavyfootstep = FOOTSTEP_WATER
\ No newline at end of file
diff --git a/tgstation.dme b/tgstation.dme
index 298443fd4e..4ffe7a19af 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -3621,6 +3621,7 @@
 #include "code\modules\vehicles\atv.dm"
 #include "code\modules\vehicles\bicycle.dm"
 #include "code\modules\vehicles\lavaboat.dm"
+#include "code\modules\vehicles\motorized_wheelchair.dm"
 #include "code\modules\vehicles\pimpin_ride.dm"
 #include "code\modules\vehicles\ridden.dm"
 #include "code\modules\vehicles\scooter.dm"
@@ -3632,7 +3633,6 @@
 #include "code\modules\vehicles\wheelchair.dm"
 #include "code\modules\vehicles\cars\car.dm"
 #include "code\modules\vehicles\cars\clowncar.dm"
-#include "code\modules\vehicles\motorized_wheelchair.dm"
 #include "code\modules\vending\_vending.dm"
 #include "code\modules\vending\assist.dm"
 #include "code\modules\vending\autodrobe.dm"