From 78cd94b1133fe17e331f08cc83d140d46715ec6d Mon Sep 17 00:00:00 2001 From: HarpyEagle Date: Tue, 24 May 2016 16:14:05 -0400 Subject: [PATCH] Fixes #12877 --- code/modules/mob/holder.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 121b999d21..d608bb0988 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -114,6 +114,11 @@ var/list/holder_mob_icon_cache = list() if(!holder_type || buckled || pinned.len) return + if(self_grab) + if(src.incapacitated()) return + else + if(grabber.incapacitated()) return + var/obj/item/weapon/holder/H = new holder_type(get_turf(src)) H.held_mob = src src.forceMove(H)