diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm
index f1b35b6b35..b450f344d7 100644
--- a/code/game/turfs/simulated/water.dm
+++ b/code/game/turfs/simulated/water.dm
@@ -16,6 +16,8 @@
 
 	var/depth = 1 // Higher numbers indicates deeper water.
 
+	var/reagent_type = "water"
+
 /turf/simulated/floor/water/Initialize()
 	. = ..()
 	update_icon()
@@ -33,6 +35,21 @@
 /turf/simulated/floor/water/get_edge_icon_state()
 	return "water_shallow"
 
+/turf/simulated/floor/water/attackby(obj/item/O as obj, mob/user as mob)
+	var/obj/item/weapon/reagent_containers/RG = O
+	if (istype(RG) && RG.is_open_container())
+		RG.reagents.add_reagent(reagent_type, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
+		user.visible_message("<span class='notice'>[user] fills \the [RG] using \the [src].</span>","<span class='notice'>You fill \the [RG] using \the [src].</span>")
+		return 1
+
+	else if(istype(O, /obj/item/weapon/mop))
+		O.reagents.add_reagent(reagent_type, 5)
+		to_chat(user, "<span class='notice'>You wet \the [O] in \the [src].</span>")
+		playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
+		return 1
+
+	else return ..()
+
 /turf/simulated/floor/water/return_air_for_internal_lifeform(var/mob/living/L)
 	if(L && L.lying)
 		if(L.can_breathe_water()) // For squid.
diff --git a/html/changelogs/Aronai - wateriswet.yml b/html/changelogs/Aronai - wateriswet.yml
new file mode 100644
index 0000000000..ae523f716b
--- /dev/null
+++ b/html/changelogs/Aronai - wateriswet.yml	
@@ -0,0 +1,36 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Aronai/Arokha
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - tweak: "Allows getting water out of water turfs (or setting a different reagent to get)."