diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm
index b3d559059ed..eb54b52c225 100644
--- a/code/game/gamemodes/malfunction/Malf_Modules.dm
+++ b/code/game/gamemodes/malfunction/Malf_Modules.dm
@@ -321,7 +321,7 @@
 	for(var/obj/machinery/porta_turret/turret in GLOB.machines)
 		var/turf/T = get_turf(turret)
 		if(is_station_level(T.z))
-			turret.obj_integrity += 30
+			turret.health += 30
 			turret.eprojectile = /obj/item/projectile/beam/laser/heavylaser //Once you see it, you will know what it means to FEAR.
 			turret.eshot_sound = 'sound/weapons/lasercannonfire.ogg'
 
diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm
index ce08fc165ac..cf025ba4746 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -183,18 +183,15 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
 
 ///the proc called by the acid subsystem to process the acid that's on the obj
 /obj/proc/acid_processing()
-	. = 1
+	. = TRUE
 	if(!(resistance_flags & ACID_PROOF))
-		for(var/armour_value in armor)
-			if(armour_value != "acid" && armour_value != "fire")
-				armor[armour_value] = max(armor[armour_value] - round(sqrt(acid_level) * 0.1), 0)
 		if(prob(33))
 			playsound(loc, 'sound/items/welder.ogg', 150, TRUE)
 		take_damage(min(1 + round(sqrt(acid_level) * 0.3), 300), BURN, "acid", 0)
 
 	acid_level = max(acid_level - (5 + 3 * round(sqrt(acid_level))), 0)
 	if(!acid_level)
-		return 0
+		return FALSE
 
 ///called when the obj is destroyed by acid.
 /obj/proc/acid_melt()
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index f8cc47254f5..0fcfedc07a8 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -275,6 +275,7 @@ a {
 /obj/water_act(volume, temperature, source, method = TOUCH)
 	. = ..()
 	extinguish()
+	acid_level = 0
 
 /obj/singularity_pull(S, current_size)
 	..()
diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm
index c4f07385aae..9a94ec4a5e4 100644
--- a/code/modules/reagents/chemistry/machinery/chem_heater.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm
@@ -75,6 +75,7 @@
 			to_chat(user, "<span class='notice'>You add the beaker to the machine!</span>")
 			icon_state = "mixer1b"
 			SSnanoui.update_uis(src)
+			return
 
 	if(default_deconstruction_screwdriver(user, "mixer0b", "mixer0b", I))
 		return
@@ -87,7 +88,6 @@
 			eject_beaker()
 			default_deconstruction_crowbar(I)
 			return 1
-		return
 	return ..()
 
 /obj/machinery/chem_heater/attack_hand(mob/user)
diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm
index 0ac02087763..e42d53f3f5b 100644
--- a/code/modules/reagents/chemistry/reagents/water.dm
+++ b/code/modules/reagents/chemistry/reagents/water.dm
@@ -31,7 +31,6 @@
 		A.acid_level = max(A.acid_level - volume*  50, 0)
 
 /datum/reagent/water/reaction_obj(obj/O, volume)
-	O.acid_level = 0
 	O.water_act(volume, water_temperature, src)
 
 /datum/reagent/lube