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

code/game/objects/devices/PDA/PDA.dm

@@ -905,7 +905,10 @@
 	if (ismob(loc))
 		var/mob/M = loc
 		M.show_message("\red Your [src] explodes!", 1)
-
+		if (src in M.contents)
+			if(fon)
+				fon = 0
+				M.total_luminosity -= f_lum
 	if(T)
 		T.hotspot_expose(700,125)
 

code/game/objects/toys.dm

@@ -140,7 +140,7 @@ CRAYONS
 				user << "You start drawing a rune on the [target.name]."
 		if(instant || do_after(user, 50))
 			if(user.equipped() == src)
-				new /obj/effect/decal/cleanable/crayon(target,colour,shadeColour,drawtype)
+				new /obj/effect/decal/cleanable/crayon(user.client,target,colour,shadeColour,drawtype)
 				user << "You finish drawing."
 				if(uses)
 					uses--
@@ -175,6 +175,7 @@ CRAYONS
 	icon = 'rune.dmi'
 	layer = 2.1
 	anchored = 1
+	var/client/who_drew_this
 
 
 	examine()
@@ -183,9 +184,10 @@ CRAYONS
 		return
 
 
-	New(location,main = "#FFFFFF",shade = "#000000",var/type = "rune")
+	New(who,location,main = "#FFFFFF",shade = "#000000",var/type = "rune")
 		..()
 		loc = location
+		who_drew_this = who
 
 		name = type
 		desc = "A [type] drawn in crayon."