diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index aca9dafa6a6..525eb10e52f 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -399,7 +399,7 @@
 
 
 /atom/movable/proc/water_act(volume, temperature, source, method = TOUCH) //amount of water acting : temperature of water in kelvin : object that called it (for shennagins)
-	return 1
+	return TRUE
 
 /atom/movable/proc/handle_buckled_mob_movement(newloc,direct)
 	if(!buckled_mob.Move(newloc, direct))
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index a8803ffb6ed..fafb533cad1 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -149,6 +149,10 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 /obj/item/blob_act()
 	qdel(src)
 
+/obj/item/water_act(volume, temperature, source, method = TOUCH)
+	. = ..()
+	O.extinguish()
+
 /obj/item/verb/move_to_top()
 	set name = "Move To Top"
 	set category = null
diff --git a/code/game/objects/items/dehy_carp.dm b/code/game/objects/items/dehy_carp.dm
index 80db39fa5e8..fb59b24aeda 100644
--- a/code/game/objects/items/dehy_carp.dm
+++ b/code/game/objects/items/dehy_carp.dm
@@ -23,6 +23,7 @@
 	return ..()
 
 /obj/item/toy/carpplushie/dehy_carp/water_act(volume, temperature, source, method = TOUCH)
+	. = ..()
 	if(volume >= 1)
 		Swell()
 
diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
index 35d4b943504..db7c08b1863 100644
--- a/code/game/objects/items/stacks/sheets/leather.dm
+++ b/code/game/objects/items/stacks/sheets/leather.dm
@@ -207,6 +207,7 @@ var/global/list/datum/stack_recipe/sinew_recipes = list ( \
 
 //Step two - washing (also handled by water reagent code and washing machine code)
 /obj/item/stack/sheet/hairlesshide/water_act(volume, temperature, source, method = TOUCH)
+	. = ..()
 	if(volume >= 10)
 		new /obj/item/stack/sheet/wetleather(get_turf(src), amount)
 		qdel(src)
diff --git a/code/modules/food_and_drinks/food/foods/meat.dm b/code/modules/food_and_drinks/food/foods/meat.dm
index c895d15b822..fdcf4d2497a 100644
--- a/code/modules/food_and_drinks/food/foods/meat.dm
+++ b/code/modules/food_and_drinks/food/foods/meat.dm
@@ -238,6 +238,7 @@
 	list_reagents = list("nutriment" = 2)
 
 /obj/item/reagent_containers/food/snacks/monkeycube/water_act(volume, temperature, source, method = TOUCH)
+	. = ..()
 	if(volume >= 1)
 		return Expand()
 
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index de71672d138..7b8790076ce 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -15,9 +15,9 @@
 	..()
 
 /mob/living/carbon/water_act(volume, temperature, source, method = TOUCH)
+	. = ..()
 	if(volume > 10) //anything over 10 volume will make the mob wetter.
 		wetlevel = min(wetlevel + 1,5)
-	..()
 
 /mob/living/carbon/attackby(obj/item/I, mob/user, params)
 	if(lying && surgeries.len)
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 18b3ed5a43d..b95920e688b 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -507,7 +507,7 @@ emp_act
 	..()
 
 /mob/living/carbon/human/water_act(volume, temperature, source, method = TOUCH)
-	..()
+	. = ..()
 	dna.species.water_act(src, volume, temperature, source, method)
 
 /mob/living/carbon/human/is_eyes_covered(check_glasses = TRUE, check_head = TRUE, check_mask = TRUE)
diff --git a/code/modules/mob/living/carbon/human/species/grey.dm b/code/modules/mob/living/carbon/human/species/grey.dm
index 18d14a298f6..3b8bbe34ffb 100644
--- a/code/modules/mob/living/carbon/human/species/grey.dm
+++ b/code/modules/mob/living/carbon/human/species/grey.dm
@@ -37,7 +37,7 @@
 	H.dna.default_blocks.Add(REMOTETALKBLOCK)
 
 /datum/species/grey/water_act(mob/living/carbon/human/H, volume, temperature, source, method = TOUCH)
-	..()
+	. = ..()
 
 	if(method == TOUCH)
 		if(volume > 25)
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 134a892c0df..f0c3b85ece1 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -217,6 +217,7 @@
 		IgniteMob()
 
 /mob/living/water_act(volume, temperature, source, method = TOUCH)
+	. = ..()
 	adjust_fire_stacks(-(volume * 0.2))
 
 //This is called when the mob is thrown into a dense turf
diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm
index d481ac5b6b2..20e2ba82b1e 100644
--- a/code/modules/reagents/chemistry/reagents/water.dm
+++ b/code/modules/reagents/chemistry/reagents/water.dm
@@ -28,7 +28,6 @@
 	T.water_act(volume, water_temperature, src) 
 
 /datum/reagent/water/reaction_obj(obj/O, volume)
-	O.extinguish()
 	O.water_act(volume, water_temperature, src) 
 
 /datum/reagent/lube