Merge pull request #5445 from tkdrg/pointandlaugh

Makes point into a mob verb.

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

@@ -6,11 +6,6 @@
 	anchored = 1
 	mouse_opacity = 0
 
-/obj/effect/decal/point/point()
-	set src in oview()
-	set hidden = 1
-	return
-
 // Used for spray that you spray at walls, tables, hydrovats etc
 /obj/effect/decal/spraystill
 	density = 0

code/game/verbs/atom_verbs.dm

@@ -6,28 +6,3 @@
 	if(Adjacent(usr))
 		usr.start_pulling(src)
 	return
-
-/atom/verb/point()
-	set name = "Point To"
-	set category = "Object"
-	set src in oview()
-	var/atom/this = src//detach proc from src
-	src = null
-
-	if(!usr || !isturf(usr.loc))
-		return
-	if(usr.stat || usr.restrained())
-		return
-	if(usr.status_flags & FAKEDEATH)
-		return
-
-	var/tile = get_turf(this)
-	if (!tile)
-		return
-
-	var/obj/P = new /obj/effect/decal/point(tile)
-	spawn (20)
-		if(P)
-			P.loc = null
-
-	usr.visible_message("<b>[usr]</b> points to [this]")

code/modules/mob/living/emote.dm

@@ -158,19 +158,16 @@
 
 		if ("point")
 			if (!src.restrained())
-				var/mob/M = null
+				var/atom/M = null
 				if (param)
-					for (var/atom/A as mob|obj|turf|area in view(1, src))
+					for (var/atom/A as mob|obj|turf in view())
 						if (param == A.name)
 							M = A
 							break
 				if (!M)
 					message = "<B>[src]</B> points."
 				else
-					M.point()
-				if (M)
-					message = "<B>[src]</B> points to [M]."
-				else
+					pointed(M)
 			m_type = 1
 
 		if ("scream")

code/modules/mob/mob.dm

@@ -298,6 +298,34 @@ var/list/slot_equipment_priority = list( \
 	face_atom(A)
 	A.examine(src)
 
+//same as above
+/mob/verb/pointed(atom/A as mob|obj|turf in view())
+	set name = "Point To"
+	set category = "Object"
+
+	if(!src || !isturf(src.loc))
+		return
+	if(src.stat || src.restrained())
+		return
+	if(src.status_flags & FAKEDEATH)
+		return
+	if(!(A in view(src.loc)))
+		return
+	if(istype(A, /obj/effect/decal/point))
+		return
+
+	var/tile = get_turf(A)
+	if (!tile)
+		return
+
+	var/obj/P = new /obj/effect/decal/point(tile)
+	spawn (20)
+		if(P)
+			P.loc = null
+
+	usr.visible_message("<b>[src]</b> points to [A]")
+
+
 /mob/verb/mode()
 	set name = "Activate Held Object"
 	set category = "Object"