Merge remote-tracking branch 'VOREStation/master' into medbeam

code/game/objects/effects/alien/aliens.dm

@@ -64,6 +64,19 @@
 	healthcheck()
 	return
 
+/obj/effect/alien/resin/attack_generic(var/mob/user, var/damage, var/attack_verb)
+	visible_message("<span class='danger'>[user] [attack_verb] the [src]!</span>")
+	playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
+	user.do_attack_animation(src)
+	health -= damage
+	healthcheck()
+	return
+
+/obj/effect/alien/resin/take_damage(var/damage)
+	health -= damage
+	healthcheck()
+	return
+
 /obj/effect/alien/resin/ex_act(severity)
 	switch(severity)
 		if(1.0)
@@ -246,6 +259,18 @@ Alien plants should do something if theres a lot of poison
 	health -= damage
 	healthcheck()
 
+/obj/effect/alien/weeds/attack_generic(var/mob/user, var/damage, var/attack_verb)
+	visible_message("<span class='danger'>[user] [attack_verb] the [src]!</span>")
+	user.do_attack_animation(src)
+	health -= damage
+	healthcheck()
+	return
+
+/obj/effect/alien/weeds/take_damage(var/damage)
+	health -= damage
+	healthcheck()
+	return
+
 /obj/effect/alien/weeds/proc/healthcheck()
 	if(health <= 0)
 		qdel(src)
@@ -401,6 +426,18 @@ Alien plants should do something if theres a lot of poison
 	healthcheck()
 	return
 
+/obj/effect/alien/egg/attack_generic(var/mob/user, var/damage, var/attack_verb)
+	visible_message("<span class='danger'>[user] [attack_verb] the [src]!</span>")
+	user.do_attack_animation(src)
+	health -= damage
+	healthcheck()
+	return
+
+/obj/effect/alien/egg/take_damage(var/damage)
+	health -= damage
+	healthcheck()
+	return
+
 
 /obj/effect/alien/egg/attackby(var/obj/item/weapon/W, var/mob/user)
 	if(health <= 0)

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

@@ -0,0 +1,36 @@
+/*
+ * Home of the floor chemical coating.
+ */
+
+/obj/effect/decal/cleanable/chemcoating
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "dirt"
+
+/obj/effect/decal/cleanable/chemcoating/New()
+	..()
+	create_reagents(100)
+
+/obj/effect/decal/cleanable/chemcoating/Initialize()
+	..()
+	var/turf/T = get_turf(src)
+	if(T)
+		for(var/obj/O in get_turf(src))
+			if(O == src)
+				continue
+			if(istype(O, /obj/effect/decal/cleanable/chemcoating))
+				var/obj/effect/decal/cleanable/chemcoating/C = O
+				if(C.reagents && C.reagents.reagent_list.len)
+					C.reagents.trans_to_obj(src,C.reagents.total_volume)
+				qdel(O)
+
+/obj/effect/decal/cleanable/chemcoating/Bumped(A as mob|obj)
+	if(reagents)
+		reagents.touch(A)
+	return ..()
+
+/obj/effect/decal/cleanable/chemcoating/Crossed(AM as mob|obj)
+	Bumped(AM)
+
+/obj/effect/decal/cleanable/chemcoating/update_icon()
+	..()
+	color = reagents.get_color()

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

@@ -53,7 +53,7 @@ var/global/list/image/splatter_cache=list()
 						blood_DNA |= B.blood_DNA.Copy()
 					qdel(B)
 	drytime = world.time + DRYING_TIME * (amount+1)
-	START_PROCESSING(SSobj, src)
+	START_PROCESSING(SSobj, src)
 
 /obj/effect/decal/cleanable/blood/process()
 	if(world.time > drytime)
@@ -93,7 +93,6 @@ var/global/list/image/splatter_cache=list()
 				S.overlays += S.blood_overlay
 			if(S.blood_overlay && S.blood_overlay.color != basecolor)
 				S.blood_overlay.color = basecolor
-				S.overlays.Cut()
 				S.overlays += S.blood_overlay
 			S.blood_DNA |= blood_DNA.Copy()
 			perp.update_inv_shoes()

code/game/objects/effects/effect_system.dm

@@ -408,6 +408,10 @@ steam.start() -- spawns the effect
 			src.processing = 0
 			spawn(0)
 				var/turf/T = get_turf(src.holder)
+				if(istype(holder, /atom/movable))
+					var/atom/movable/AM = holder
+					if(AM.locs && AM.locs.len)
+						T = pick(AM.locs)
 				if(T != src.oldposition)
 					if(isturf(T))
 						var/obj/effect/effect/ion_trails/I = new /obj/effect/effect/ion_trails(src.oldposition)