Merge pull request #10111 from kappa-sama/patch-11

send help please, or how i vowed to kill kevinz (you can now strip people while aggrograbbing)
2019-12-17 11:38:35 -08:00
parent 1727bf321e f8a05b5ae1
commit 7a6541936c
1 changed files with 3 additions and 2 deletions
@@ -867,8 +867,9 @@
 			return
 		//If you dragged them to you and you're aggressively grabbing try to fireman carry them
 		else if(user != target)
-			fireman_carry(target)
-			return
+			if(user.a_intent == INTENT_GRAB)
+				fireman_carry(target)
+				return
 	. = ..()

 //src is the user that will be carrying, target is the mob to be carried