From 635e430ec69e2907373e3377e5e4a6cdd10eacd3 Mon Sep 17 00:00:00 2001
From: Leo <lzimann@users.noreply.github.com>
Date: Sat, 14 Oct 2017 11:05:02 -0300
Subject: [PATCH 1/2] Merge pull request #31668 from
 tgstation/Cyberboss-patch-2

Fixes slapping while restrained/etc...
---
 code/modules/mob/living/emote.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index 480836edcf..c656dd7494 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -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>")