TG Sync 12/15/17

s

s

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

@@ -47,10 +47,8 @@
 			return
 		else
 			var/hotness = W.is_hot()
-			var/added_heat = (hotness / 100)
-			src.reagents.chem_temp = min(src.reagents.chem_temp + added_heat, hotness)
-			src.reagents.handle_reactions()
-			to_chat(user, "<span class='notice'>You heat [src] with [W]!</span>")
+			reagents.expose_temperature(hotness)
+			to_chat(user, "<span class='notice'>You heat [name] with [W]!</span>")
 	else
 		return ..()
 
@@ -62,8 +60,7 @@
 
 /obj/effect/decal/cleanable/fire_act(exposed_temperature, exposed_volume)
 	if(reagents)
-		reagents.chem_temp += 30
-		reagents.handle_reactions()
+		reagents.expose_temperature(exposed_temperature)
 	..()
 
 

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

@@ -14,7 +14,6 @@
 	if(e_name)
 		name = e_name
 	desc = "A [name] vandalizing the station."
-
 	if(alt_icon)
 		icon = alt_icon
 	if(type)
@@ -28,3 +27,4 @@
 	if(main)
 		paint_colour = main
 	add_atom_colour(paint_colour, FIXED_COLOUR_PRIORITY)
+