Merge pull request #3385 from Citadel-Station-13/upstream-merge-31668

[MIRROR] Fixes slapping while restrained/etc...
2017-10-14 16:20:13 -04:00
parent 0c663a6a9c a69e6d599f
commit 21ec35da1c
1 changed files with 2 additions and 0 deletions
@@ -522,6 +522,8 @@

 /datum/emote/living/slap/run_emote(mob/user, params)
 	. = ..()
+	if(!.)
+		return
 	var/obj/item/slapper/N = new(user)
 	if(user.put_in_hands(N))
 		to_chat(user, "<span class='notice'>You ready your slapping hand.</span>")