diff --git a/code/modules/mob/living/carbon/monkey/combat.dm b/code/modules/mob/living/carbon/monkey/combat.dm index c38c624ebb..92528de148 100644 --- a/code/modules/mob/living/carbon/monkey/combat.dm +++ b/code/modules/mob/living/carbon/monkey/combat.dm @@ -272,7 +272,11 @@ if(Adjacent(target) && isturf(target.loc)) // if right next to perp // check if target has a weapon - var/obj/item/weapon/W = locate(/obj/item/weapon) in target.held_items + var/obj/item/weapon/W + for(var/obj/item/weapon/I in target.held_items) + if(!(I.flags & ABSTRACT)) + W = I + break // if the target has a weapon, chance to disarm them if(W && prob(MONKEY_ATTACK_DISARM_PROB))