Merge branch 'master' into tgglassfloors

code/game/objects/items/devices/painter/floor_painter.dm

@@ -23,6 +23,7 @@
 /datum/painter/floor/paint_atom(atom/target, mob/user)
 	if(!istype(target, /turf/simulated/floor/plasteel))
 		to_chat(user, "<span class='warning'>[holder] can only be used on station flooring.</span>")
+		return
 	var/turf/simulated/floor/plasteel/F = target
 
 	if(F.icon_state == floor_state && F.dir == floor_dir)

code/game/objects/items/devices/painter/painter.dm

@@ -1,6 +1,7 @@
 /obj/item/painter
 	name = "modular painter"
 	icon = 'icons/obj/painting.dmi'
+	icon_state = "floor_painter"
 	usesound = 'sound/effects/spray2.ogg'
 	flags = CONDUCT | NOBLUDGEON
 	w_class = WEIGHT_CLASS_SMALL

code/game/objects/items/devices/scanners.dm

@@ -264,6 +264,9 @@ REAGENT SCANNER
 	else
 		to_chat(user, "<span class='notice'>Subject's genes are stable.</span>")
 
+	if(HAS_TRAIT(H, TRAIT_HUSK))
+		to_chat(user, "<span class='danger'>Subject is husked. Application of synthflesh is recommended.</span>")
+
 /obj/item/healthanalyzer/attack_self(mob/user)
 	toggle_mode()