Merge pull request #31668 from tgstation/Cyberboss-patch-2

Fixes slapping while restrained/etc...
2017-10-14 11:05:02 -03:00
parent 2d2adfbee5
commit 635e430ec6
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>")