[Goonchem] Reagent Decals

code/game/objects/effects/decals/Cleanable/misc.dm

@@ -16,6 +16,10 @@
 	icon_state = "ash"
 	anchored = 1
 
+/obj/effect/decal/cleanable/ash/New()
+	..()
+	reagents.add_reagent("ash", 10)
+
 /obj/effect/decal/cleanable/dirt
 	name = "dirt"
 	desc = "Someone should clean that up."
@@ -27,6 +31,16 @@
 	icon_state = "dirt"
 	mouse_opacity = 0
 
+/obj/effect/decal/cleanable/dirt/blackpowder
+	name = "black powder"
+	icon_state = "flour"
+	color = "#323232"
+	mouse_opacity = 1
+	noscoop = 1
+
+/obj/effect/decal/cleanable/dirt/blackpowder/New()
+	..()
+	reagents.add_reagent("blackpowder", 40) //size 2 explosion when activated
 
 /obj/effect/decal/cleanable/flour
 	name = "flour"
@@ -103,6 +117,11 @@
 	icon_state = "vomit_1"
 	random_icon_states = list("vomit_1", "vomit_2", "vomit_3", "vomit_4")
 	var/list/datum/disease2/disease/virus2 = list()
+	noclear = 1
+
+/obj/effect/decal/cleanable/vomit/New()
+	..()
+	reagents.add_reagent("vomit", 5)
 
 
 /obj/effect/decal/cleanable/vomit/green
@@ -111,6 +130,11 @@
 	icon_state = "gvomit_1"
 	random_icon_states = list("gvomit_1", "gvomit_2", "gvomit_3", "gvomit_4")
 
+/obj/effect/decal/cleanable/vomit/green/New()
+	..()
+	reagents.remove_reagent("vomit", 5)
+	reagents.add_reagent("green_vomit", 5)
+
 /obj/effect/decal/cleanable/poop
 	name = "poop"
 	desc = "Gosh, how unpleasant."
@@ -148,3 +172,17 @@
 	layer = 2
 	icon = 'icons/effects/tomatodecal.dmi'
 	random_icon_states = list("smashed_pie")
+
+/obj/effect/decal/cleanable/fungus
+	name = "space fungus"
+	desc = "A fungal growth. Looks pretty nasty."
+	density = 0
+	anchored = 1
+	layer = 2
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "flour"
+	color = "#D5820B"
+
+/obj/effect/decal/cleanable/fungus/New()
+	..()
+	reagents.add_reagent("fungus", 10)

code/game/objects/effects/decals/cleanable.dm

@@ -1,7 +1,43 @@
 /obj/effect/decal/cleanable
 	var/list/random_icon_states = list()
 	var/targeted_by = null			// Used so cleanbots can't claim a mess.
+	var/noscoop = 0   //if it has this, don't let it be scooped up
+	var/noclear = 0    //if it has this, don't delete it when its' scooped up
+
 /obj/effect/decal/cleanable/New()
 	if (random_icon_states && length(src.random_icon_states) > 0)
 		src.icon_state = pick(src.random_icon_states)
+	create_reagents(100)
+	..()
+
+/obj/effect/decal/cleanable/attackby(obj/item/weapon/W as obj, mob/user as mob,)
+	if(istype(W, /obj/item/weapon/reagent_containers/glass) || istype(W, /obj/item/weapon/reagent_containers/food/drinks))
+		if(src.reagents && W.reagents && !noscoop)
+			if(!src.reagents.total_volume)
+				user << "<span class='notice'>There isn't enough [src] to scoop up!</span>"
+				return
+			if(W.reagents.total_volume >= W.reagents.maximum_volume)
+				user << "<span class='notice'>[W] is full!</span>"
+				return
+			user << "<span class='notice'>You scoop the [src] into [W]!</span>"
+			reagents.trans_to(W, reagents.total_volume)
+			if(!reagents.total_volume && !noclear) //scooped up all of it
+				qdel(src)
+				return
+	if(is_hot(W)) //todo: make heating a reagent holder proc
+		if(istype(W, /obj/item/clothing/mask/cigarette)) return
+		else
+			src.reagents.chem_temp += 15
+			src.reagents.handle_reactions()
+			user << "<span class='notice'>You heat [src] with [W]!</span>"
+
+/obj/effect/decal/cleanable/ex_act()
+	if(reagents)
+		for(var/datum/reagent/R in reagents.reagent_list)
+			R.on_ex_act()
+	..()
+
+/obj/effect/decal/cleanable/fire_act()
+	reagents.chem_temp += 30
+	reagents.handle_reactions()
 	..()