From 8c8be2b92e8a64c705cb8f5c0dfb00804ba4669f Mon Sep 17 00:00:00 2001
From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Fri, 25 Dec 2020 21:45:07 +0000
Subject: [PATCH 1/3] tackle and puddle

---
 code/datums/components/tackle.dm                         | 9 +++++++++
 .../mob/living/carbon/human/innate_abilities/blobform.dm | 2 --
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm
index a5f9271f4b..e88945b6e2 100644
--- a/code/datums/components/tackle.dm
+++ b/code/datums/components/tackle.dm
@@ -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
diff --git a/code/modules/mob/living/carbon/human/innate_abilities/blobform.dm b/code/modules/mob/living/carbon/human/innate_abilities/blobform.dm
index 5d2693915d..ed3c7e21d4 100644
--- a/code/modules/mob/living/carbon/human/innate_abilities/blobform.dm
+++ b/code/modules/mob/living/carbon/human/innate_abilities/blobform.dm
@@ -62,7 +62,6 @@
 
 				H.add_movespeed_modifier(/datum/movespeed_modifier/slime_puddle)
 
-				H.layer -= 1 //go one layer down so people go over you
 				ENABLE_BITFIELD(H.pass_flags, PASSMOB) //this actually lets people pass over you
 				squeak = H.AddComponent(/datum/component/squeak, custom_sounds = list('sound/effects/blobattack.ogg')) //blorble noise when people step on you
 
@@ -103,7 +102,6 @@
 	REMOVE_TRAIT(H, TRAIT_HUMAN_NO_RENDER, SLIMEPUDDLE_TRAIT)
 	H.update_disabled_bodyparts(silent = TRUE)
 	H.remove_movespeed_modifier(/datum/movespeed_modifier/slime_puddle)
-	H.layer += 1 //go one layer back above!
 	DISABLE_BITFIELD(H.pass_flags, PASSMOB)
 	is_puddle = FALSE
 	if(squeak)

From 05e5c80dce093acca97d8ecabd863bd04db50896 Mon Sep 17 00:00:00 2001
From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Sat, 26 Dec 2020 00:17:29 +0000
Subject: [PATCH 2/3] runtime

---
 code/datums/components/tackle.dm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm
index e88945b6e2..5f55e5463a 100644
--- a/code/datums/components/tackle.dm
+++ b/code/datums/components/tackle.dm
@@ -89,8 +89,8 @@
 		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)
+	var/left_paralysis = HAS_TRAIT(sacker, TRAIT_PARALYSIS_L_ARM)
+	var/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>")
 
@@ -285,8 +285,8 @@
 		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)
+	var/left_paralysis = HAS_TRAIT(sacker, TRAIT_PARALYSIS_L_ARM)
+	var/right_paralysis = HAS_TRAIT(sacker, TRAIT_PARALYSIS_R_ARM)
 	if(left_paralysis || right_paralysis)
 		attack_mod -= 2
 

From b1e5888ce04faac65097f5bdd47fce8dcbaabe5e Mon Sep 17 00:00:00 2001
From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Mon, 28 Dec 2020 17:40:04 +0000
Subject: [PATCH 3/3] Update tackle.dm

---
 code/datums/components/tackle.dm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm
index 5f55e5463a..c69df4f5e3 100644
--- a/code/datums/components/tackle.dm
+++ b/code/datums/components/tackle.dm
@@ -89,9 +89,9 @@
 		to_chat(user, "<span class='warning'>You can't tackle while tased!</span>")
 		return
 
-	var/left_paralysis = HAS_TRAIT(sacker, TRAIT_PARALYSIS_L_ARM)
-	var/right_paralysis = HAS_TRAIT(sacker, TRAIT_PARALYSIS_R_ARM)
-	if(left && right_paralysis)
+	var/left_paralysis = HAS_TRAIT(user, TRAIT_PARALYSIS_L_ARM)
+	var/right_paralysis = HAS_TRAIT(user, TRAIT_PARALYSIS_R_ARM)
+	if(left_paralysis && right_paralysis)
 		to_chat(user, "<span class='warning'>You can't tackle without the use of your arms!</span>")
 
 	user.face_atom(A)