diff --git a/code/datums/components/deployable_item.dm b/code/datums/components/deployable_item.dm index 25cab18ea7a..92992defdd1 100644 --- a/code/datums/components/deployable_item.dm +++ b/code/datums/components/deployable_item.dm @@ -63,7 +63,7 @@ var/obj/deployed_machine if(user) - if(!ishuman(user) || HAS_TRAIT(item_to_deploy, TRAIT_NODROP)) + if(!ishuman(user) || HAS_TRAIT(item_to_deploy, TRAIT_NODROP) || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)) return if(LinkBlocked(get_turf(user), location)) @@ -145,11 +145,12 @@ if(!undeployed_item) CRASH("[src] is missing it's internal item.") - if(!user) CRASH("[source] has sent the signal COMSIG_ITEM_UNDEPLOY to [undeployed_item] without the arg 'user'") if(!ishuman(user)) return + if(HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)) + return var/obj/machinery/deployable/mounted/sentry/sentry if(issentry(deployed_machine)) sentry = deployed_machine