Merge branch 'master' of https://github.com/Baystation12/Baystation12

code/game/objects/items/crayons.dm

@@ -80,6 +80,7 @@
 		if(instant || do_after(user, 50))
 			new /obj/effect/decal/cleanable/crayon(target,colour,shadeColour,drawtype)
 			user << "You finish drawing."
+			target.add_fingerprint(user)		// Adds their fingerprints to the floor the crayon is drawn on.
 			if(uses)
 				uses--
 				if(!uses)
@@ -97,4 +98,4 @@
 				user << "\red You ate your crayon!"
 				del(src)
 	else
-		..()
+		..()

code/game/objects/structures/watercloset.dm

@@ -163,6 +163,7 @@
 				if("boiling")
 					watertemp = "normal"
 			user.visible_message("<span class='notice'>[user] adjusts the shower with the [I].</span>", "<span class='notice'>You adjust the shower with the [I].</span>")
+			add_fingerprint(user)
 
 /obj/machinery/shower/update_icon()	//this is terribly unreadable, but basically it makes the shower mist up
 	overlays.Cut()					//once it's been on for a while, in addition to handling the water overlay.
@@ -412,4 +413,4 @@
 /obj/structure/sink/puddle/attackby(obj/item/O as obj, mob/user as mob)
 	icon_state = "puddle-splash"
 	..()
-	icon_state = "puddle"
+	icon_state = "puddle"