Merge pull request #6188 from Citadel-Station-13/upstream-merge-36822

[MIRROR] Fixes monkey retaliation from beyond the grave

code/modules/mob/living/carbon/monkey/combat.dm

@@ -477,4 +477,13 @@
 		dropItemToGround(A, TRUE)
 		update_icons()
 
+/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
+			
 #undef MAX_RANGE_FIND