From dbed8461dc134a8c76b81956d0a62487e40a55c1 Mon Sep 17 00:00:00 2001
From: Bjarl <94164348+Bjarl@users.noreply.github.com>
Date: Fri, 11 Aug 2023 13:07:00 -0700
Subject: [PATCH] code improvements from testmerge

---
 code/game/objects/effects/decals/cleanable.dm         |  5 ++---
 .../objects/effects/effect_system/effects_foam.dm     |  3 ++-
 .../reagents/chemistry/reagents/other_reagents.dm     | 11 +++++++++--
 code/modules/reagents/reagent_dispenser.dm            |  2 ++
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm
index 4161403fefd9..141a2426cf0a 100644
--- a/code/game/objects/effects/decals/cleanable.dm
+++ b/code/game/objects/effects/decals/cleanable.dm
@@ -88,9 +88,8 @@
 
 /obj/effect/decal/cleanable/wash(clean_types)
 	..()
-	if(!(flags_1 & INITIALIZED_1))
-		return FALSE
-	qdel(src)
+	if(clean_types in list(CLEAN_WASH, CLEAN_SCRUB))
+		qdel(src)
 	return TRUE
 
 /obj/effect/decal/cleanable/proc/can_bloodcrawl_in()
diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm
index 7c2a3801caf2..5fedeb47e455 100644
--- a/code/game/objects/effects/effect_system/effects_foam.dm
+++ b/code/game/objects/effects/effect_system/effects_foam.dm
@@ -82,9 +82,10 @@
 	if(rads && istype(T))
 		rads.rad_power = rads.rad_power * rand(0.8, 0.95)
 		if (rads.rad_power <= RAD_BACKGROUND_RADIATION)
+			new /obj/effect/decal/cleanable/greenglow/filled(loc)
 			qdel(rads)
 	for(var/obj/things in get_turf(src))
-		things.wash(CLEAN_RAD)
+		things.wash(CLEAN_TYPE_RADIATION)
 
 /obj/effect/particle_effect/foam/antirad/kill_foam()
 	STOP_PROCESSING(SSfastprocess, src)
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 2dbeeadad021..f679df519715 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -2537,7 +2537,7 @@
 	description = "A tried and tested foam, used for decontaminating nuclear disasters."
 	reagent_state = LIQUID
 	color = "#A6FAFF55"
-	taste_description = "the inside of a fire extinguisher"
+	taste_description = "bitter, foamy awfulness."
 
 /datum/reagent/anti_radiation_foam/expose_turf(turf/open/T, reac_volume)
 	if (!istype(T))
@@ -2554,7 +2554,14 @@
 	O.wash(CLEAN_RAD)
 
 /datum/reagent/anti_radiation_foam/expose_mob(mob/living/M, method=TOUCH, reac_volume)
-	if(method in list(TOUCH))
+	if(method in list(TOUCH, VAPOR))
 		M.radiation = M.radiation - rand(max(M.radiation * 0.95, M.radiation)) //get the hose
 		M.ExtinguishMob()
 	..()
+
+
+/datum/reagent/anti_radiation_foam/on_mob_life(mob/living/carbon/M)
+	M.adjustToxLoss(0.5, 200)
+	M.adjust_disgust(4)
+	..()
+	. = 1
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 8ee3d2100322..54d2fc182398 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -59,6 +59,8 @@
 	tank_volume = 500
 
 /obj/structure/reagent_dispensers/foamtank/antirad
+	name = "anti-radiation foam tank"
+	desc = "A tank full of decontamination foam"
 	reagent_id = /datum/reagent/anti_radiation_foam
 	tank_volume = 1000