Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos

code/game/turfs/simulated/floor/misc_floor.dm

@@ -196,7 +196,7 @@
 			if(M.client && (is_servant_of_ratvar(M) || isobserver(M) || M.stat == DEAD))
 				viewing += M.client
 		flick_overlay(I, viewing, 8)
-		L.adjustToxLoss(-3, TRUE, TRUE)
+		L.adjustToxLoss(-3, TRUE, TRUE, toxins_type = TOX_OMNI)
 
 /turf/open/floor/clockwork/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
 	return
@@ -278,4 +278,4 @@
 	heavyfootstep = FOOTSTEP_RUST
 
 /turf/open/floor/plating/rust/rust_heretic_act()
-	return 
+	return

code/game/turfs/simulated/floor/plating.dm

@@ -61,6 +61,9 @@
 			to_chat(user, "<span class='notice'>You begin reinforcing the floor...</span>")
 			if(do_after(user, 30, target = src))
 				if (R.get_amount() >= 2 && !istype(src, /turf/open/floor/engine))
+					for(var/obj/effect/decal/cleanable/decal in src)
+						if(decal.wiped_by_floor_change)
+							qdel(decal)
 					PlaceOnTop(/turf/open/floor/engine, flags = CHANGETURF_INHERIT_AIR)
 					playsound(src, 'sound/items/deconstruct.ogg', 80, 1)
 					R.use(2)
@@ -78,6 +81,9 @@
 			to_chat(user, "<span class='notice'>You begin adding glass to the floor...</span>")
 			if(do_after(user, 5, target = src))
 				if (G.get_amount() >= 2 && !istype(src, /turf/open/transparent/glass))
+					for(var/obj/effect/decal/cleanable/decal in src)
+						if(decal.wiped_by_floor_change)
+							qdel(decal)
 					PlaceOnTop(/turf/open/transparent/glass, flags = CHANGETURF_INHERIT_AIR)
 					playsound(src, 'sound/items/deconstruct.ogg', 80, 1)
 					G.use(2)
@@ -95,6 +101,9 @@
 			to_chat(user, "<span class='notice'>You begin adding reinforced glass to the floor...</span>")
 			if(do_after(user, 10, target = src))
 				if (RG.get_amount() >= 2 && !istype(src, /turf/open/transparent/glass/reinforced))
+					for(var/obj/effect/decal/cleanable/decal in src)
+						if(decal.wiped_by_floor_change)
+							qdel(decal)
 					PlaceOnTop(/turf/open/transparent/glass/reinforced, flags = CHANGETURF_INHERIT_AIR)
 					playsound(src, 'sound/items/deconstruct.ogg', 80, 1)
 					RG.use(2)
@@ -110,6 +119,9 @@
 			var/obj/item/stack/tile/W = C
 			if(!W.use(1))
 				return
+			for(var/obj/effect/decal/cleanable/decal in src)
+				if(decal.wiped_by_floor_change)
+					qdel(decal)
 			if(istype(W, /obj/item/stack/tile/material))
 				var/turf/newturf = PlaceOnTop(/turf/open/floor/material, flags = CHANGETURF_INHERIT_AIR)
 				newturf.set_custom_materials(W.custom_materials)

code/game/turfs/simulated/floor/reinf_floor.dm

@@ -43,6 +43,9 @@
 			return TRUE
 		if(floor_tile)
 			new floor_tile(src, 2)
+		for(var/obj/effect/decal/cleanable/C in src)
+			if(C.wiped_by_floor_change)
+				qdel(C)
 		ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
 	return TRUE