FOAAAAAAAM

code/game/objects/effects/chem/foam.dm

@@ -14,23 +14,25 @@
 	var/amount = 3
 	var/expand = 1
 	var/metal = 0
+	var/dries = 1 //VOREStation Add
+	var/slips = 0 //VOREStation Add
 
 /obj/effect/effect/foam/Initialize(var/mapload, var/ismetal = 0)
 	. = ..()
-	icon_state = "[ismetal? "m" : ""]foam"
+	//icon_state = "[ismetal? "m" : ""]foam" //VOREStation Removal
 	metal = ismetal
 	playsound(src, 'sound/effects/bubbles2.ogg', 80, 1, -3)
-	
-	addtimer(CALLBACK(src, .proc/post_spread), 3 + metal * 3)
-	addtimer(CALLBACK(src, .proc/pre_harden), 12 SECONDS)
-	addtimer(CALLBACK(src, .proc/harden), 15 SECONDS)
+	if(dries) //VOREStation Add
+		addtimer(CALLBACK(src, .proc/post_spread), 3 + metal * 3)
+		addtimer(CALLBACK(src, .proc/pre_harden), 12 SECONDS)
+		addtimer(CALLBACK(src, .proc/harden), 15 SECONDS)
 
 /obj/effect/effect/foam/proc/post_spread()
 	process()
 	checkReagents()
 
 /obj/effect/effect/foam/proc/pre_harden()
-	STOP_PROCESSING(SSobj, src)
+	return //VOREStation Edit
 
 /obj/effect/effect/foam/proc/harden()
 	if(metal)
@@ -83,7 +85,7 @@
 		return
 	if(metal)
 		return
-	if(istype(AM, /mob/living))
+	if(slips && istype(AM, /mob/living)) //VOREStation Add
 		var/mob/living/M = AM
 		M.slip("the foam", 6)
 

code/game/objects/effects/chem/foam_vr.dm

@@ -0,0 +1,20 @@
+/obj/effect/effect/foam/firefighting
+	name = "firefighting foam"
+	icon_state = "mfoam" //Whiter
+	color = "#A6FAFF"
+	var/lifetime = 3
+	dries = FALSE // We do this ourselves
+	slips = FALSE
+
+/obj/effect/effect/foam/firefighting/Initialize()
+	. = ..()
+	START_PROCESSING(SSobj, src)
+
+/obj/effect/effect/foam/firefighting/Destroy()
+	STOP_PROCESSING(SSobj, src)
+	return ..()
+
+/obj/effect/effect/foam/firefighting/process()
+	if(lifetime-- <= 0)
+		flick("[icon_state]-disolve", src)
+		QDEL_IN(src, 5)

code/game/objects/effects/chem/water.dm

@@ -21,7 +21,7 @@
 		step_towards(src, target)
 		var/turf/T = get_turf(src)
 		if(T && reagents)
-			reagents.touch_turf(T)
+			reagents.touch_turf(T, reagents.total_volume) //VOREStation Add
 			var/mob/M
 			for(var/atom/A in T)
 				if(!ismob(A) && A.simulated) // Mobs are handled differently