cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2032 from Citadel-Station-13/upstream-merge-29257

Browse Source 
[MIRROR] Fixes monkeys trying to take offhands
This commit is contained in:
LetterJay
2017-07-15 23:19:59 -05:00
committed by GitHub
parent 2ea1fff7f3 f634966a34
commit 344dc1a061
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mob/living/carbon/monkey/combat.dm
View File

@@ -272,7 +272,11 @@
if(Adjacent(target) && isturf(target.loc)) // if right next to perp if(Adjacent(target) && isturf(target.loc)) // if right next to perp
// check if target has a weapon // 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 the target has a weapon, chance to disarm them
if(W && prob(MONKEY_ATTACK_DISARM_PROB)) if(W && prob(MONKEY_ATTACK_DISARM_PROB))