tackle and puddle

2020-12-25 21:45:07 +00:00
parent 971ea2010f
commit 8c8be2b92e
2 changed files with 9 additions and 2 deletions
@@ -89,6 +89,11 @@
 		to_chat(user, "<span class='warning'>You can't tackle while tased!</span>")
 		return

+	left_paralysis = HAS_TRAIT(sacker, TRAIT_PARALYSIS_L_ARM)
+	right_paralysis = HAS_TRAIT(sacker, TRAIT_PARALYSIS_R_ARM)
+	if(left && right_paralysis)
+		to_chat(user, "<span class='warning'>You can't tackle without the use of your arms!</span>")
+
 	user.face_atom(A)

 	var/list/modifiers = params2list(params)
@@ -280,6 +285,10 @@
 		attack_mod -= 2
 	if(HAS_TRAIT(sacker, TRAIT_GIANT))
 		attack_mod += 2
+	left_paralysis = HAS_TRAIT(sacker, TRAIT_PARALYSIS_L_ARM)
+	right_paralysis = HAS_TRAIT(sacker, TRAIT_PARALYSIS_R_ARM)
+	if(left_paralysis || right_paralysis)
+		attack_mod -= 2

 	if(ishuman(target))
 		var/mob/living/carbon/human/S = sacker