Fixes monkey retaliation from beyond the grave

2018-03-30 03:24:18 -04:00
parent 71af2a9bc5
commit df9894ff4b
1 changed files with 12 additions and 0 deletions
@@ -477,4 +477,16 @@
 		dropItemToGround(A, TRUE)
 		update_icons()

+<<<<<<< HEAD
+=======
+/mob/living/carbon/monkey/grabbedby(mob/living/carbon/user)
+	. = ..()
+	if(!IsDeadOrIncap() && pulledby && (mode != MONKEY_IDLE || prob(MONKEY_PULL_AGGRO_PROB))) // nuh uh you don't pull me!
+		if(Adjacent(pulledby))
+			a_intent = INTENT_DISARM
+			monkey_attack(pulledby)
+			retaliate(pulledby)
+			return TRUE
+
+>>>>>>> c67b0c1... bad zombie monkey
 #undef MAX_RANGE_FIND