in-his-name-amen

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()

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)
 	..()