diff --git a/modular_dripstation/code/datums/component/tackle.dm b/modular_dripstation/code/datums/component/tackle.dm
index 88f419271c9d..ef950d418df5 100644
--- a/modular_dripstation/code/datums/component/tackle.dm
+++ b/modular_dripstation/code/datums/component/tackle.dm
@@ -69,7 +69,6 @@
 
 ///See if we can tackle or not. If we can, leap!
 /datum/component/tackler/proc/checkTackle(mob/living/carbon/user, atom/clicked_atom, list/modifiers)
-	set waitfor = FALSE
 	SIGNAL_HANDLER
 
 	if(modifiers["middle"] && modifiers["alt"] && modifiers["shift"] && modifiers["ctrl"])
@@ -117,12 +116,15 @@
 		var/tackle_angle = get_angle(user, clicked_atom)
 		clicked_atom = get_turf_in_angle(tackle_angle, get_turf(user), min_distance)
 
-	user.Knockdown(base_knockdown, ignore_canstun = TRUE)
-	user.adjustStaminaLoss(stamina_cost)
+	userEffect(user, stamina_cost)
 	user.throw_at(clicked_atom, range, speed, user, FALSE)
 	addtimer(CALLBACK(src, PROC_REF(resetTackle)), base_knockdown, TIMER_STOPPABLE)
 	return(COMSIG_MOB_CANCEL_CLICKON)
 
+/datum/component/tackler/proc/userEffect(mob/living/carbon/user, stamina_cost)
+	user.Knockdown(base_knockdown, ignore_canstun = TRUE)
+	user.adjustStaminaLoss(stamina_cost)
+
 /**
  * sack() is called when you actually smack into something, assuming we're mid-tackle. First it deals with smacking into non-carbons, in two cases:
  * * If it's a non-carbon mob, we don't care, get out of here and do normal thrown-into-mob stuff
diff --git a/yogstation/code/modules/mob/living/carbon/human/human_defense.dm b/yogstation/code/modules/mob/living/carbon/human/human_defense.dm
index 41c6aac7a43b..58c0ba9386cb 100644
--- a/yogstation/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/yogstation/code/modules/mob/living/carbon/human/human_defense.dm
@@ -4,8 +4,10 @@
 			return ..(user, TRUE)
 	.=..()
 
+/* I swear to god, I hate you for this.
 /mob/living/carbon/human/grabbedby(mob/living/carbon/user, supress_message = 0)	
 	if(user == src && pulling && !pulling.anchored && grab_state >= GRAB_AGGRESSIVE && (HAS_TRAIT(src, TRAIT_FAT)) && ismonkey(pulling))	
 		devour_mob(pulling)	
 	else	
 		.=..()
+*/