From f6e700b6eb79541f8298f794eca6cb31af3e877b Mon Sep 17 00:00:00 2001
From: Coll6 <ortegataj@hotmail.com>
Date: Tue, 4 Feb 2025 11:05:08 -0700
Subject: [PATCH] Revert "Slipping and Smashing. (#4776)"

This reverts commit 86e955a56ca92101f9dfd0da27a77a1b3f7eb68c.
---
 .../subsystem/movement/movement_types.dm       |  4 ----
 code/datums/components/force_move.dm           | 18 ------------------
 code/modules/recycling/disposal/bin.dm         |  3 ---
 3 files changed, 25 deletions(-)

diff --git a/code/controllers/subsystem/movement/movement_types.dm b/code/controllers/subsystem/movement/movement_types.dm
index 3b0ae454df26..e9919f79b3b6 100644
--- a/code/controllers/subsystem/movement/movement_types.dm
+++ b/code/controllers/subsystem/movement/movement_types.dm
@@ -129,10 +129,6 @@
 
 	SEND_SIGNAL(src, COMSIG_MOVELOOP_POSTPROCESS, result, delay * visual_delay)
 
-	if(result == MOVELOOP_FAILURE && ishuman(src.moving) && istype(src, /datum/move_loop/has_target/move_towards)) // Tell the mob we slipped and what happened
-		var/datum/move_loop/has_target/move_towards/collide_move = src
-		SEND_SIGNAL(src.moving, COMSIG_MOVELOOP_POSTPROCESS, result, delay * visual_delay, collide_move.moving_towards, src)
-
 	if(QDELETED(src) || result != MOVELOOP_SUCCESS) //Can happen
 		return
 
diff --git a/code/datums/components/force_move.dm b/code/datums/components/force_move.dm
index ed93dcedf3e6..b8c368186216 100644
--- a/code/datums/components/force_move.dm
+++ b/code/datums/components/force_move.dm
@@ -12,7 +12,6 @@
 	var/datum/move_loop/loop = SSmove_manager.move_towards(mob_parent, target, delay = 1, timeout = dist)
 	RegisterSignal(mob_parent, COMSIG_MOB_CLIENT_PRE_LIVING_MOVE, PROC_REF(stop_move))
 	RegisterSignal(mob_parent, COMSIG_ATOM_PRE_PRESSURE_PUSH, PROC_REF(stop_pressure))
-	RegisterSignal(mob_parent, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(slip_crash))
 	if(spin)
 		RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(slip_spin))
 	RegisterSignal(loop, COMSIG_QDELETING, PROC_REF(loop_ended))
@@ -30,23 +29,6 @@
 	var/mob/mob_parent = parent
 	mob_parent.spin(1, 1)
 
-/datum/component/force_move/proc/slip_crash(datum/source, result, delay, turf/target_turf, datum/blocked)
-	SIGNAL_HANDLER
-	if(!result && ishuman(parent) && istype(blocked, /datum/move_loop/has_target/move_towards)) // Something prevented us from moving into the space.
-		var/obj/machinery/heavy_weight = (locate(/obj/machinery/vending) in target_turf)
-		var/datum/move_loop/has_target/move_towards/blocked_move = blocked
-		if(istype(heavy_weight, /obj/machinery/vending)) // When a stoppable force hits immovable capitalism.
-			blocked_move.lifetime = -1
-			INVOKE_ASYNC(heavy_weight, /obj/machinery/vending/proc/tilt, parent) // We hit the machine so let them hit back.
-
-		else
-			// We hit a structure and we need to keep going.
-			var/mob/living/mob_parent = parent
-			mob_parent.Immobilize(0.8 SECONDS) // Prevent them from throw bending around objects.
-			// We don't exactly know what stopped us. So throw us at the turf and let physics handle it.
-			blocked_move.lifetime = -1
-			INVOKE_ASYNC(mob_parent, /atom/movable/proc/throw_at, target_turf, 1, 1)
-
 /datum/component/force_move/proc/loop_ended(datum/source)
 	SIGNAL_HANDLER
 	if(QDELETED(src))
diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm
index dcfb5ddfbe02..371b7c994983 100644
--- a/code/modules/recycling/disposal/bin.dm
+++ b/code/modules/recycling/disposal/bin.dm
@@ -408,9 +408,6 @@
 		else
 			visible_message(span_notice("[AM] bounces off of [src]'s rim!"))
 			return ..()
-	if(ishuman(AM) && AM.CanEnterDisposals())
-		AM.forceMove(src)
-		flush() // Might need to use do_flush if this causes problems.
 	else
 		return ..()