Merge pull request #3052 from Citadel-Station-13/upstream-merge-31165

[MIRROR] fixes delete hotkey triggering messages when the user isn't even a living mob
2017-10-01 16:35:53 -04:00
parent 5b81614e87 fa75534e7d
commit cef0d9ef68
1 changed files with 2 additions and 0 deletions
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -62,6 +62,8 @@
 /client/verb/delete_key_pressed()
 	set hidden = 1

+	if(!isliving(usr))
+		return
 	if(!usr.pulling)
 		to_chat(usr, "<span class='notice'>You are not pulling anything.</span>")
 		return