Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Slipping and Smashing." #5285

Closed
wants to merge 1 commit into from
Closed

Revert "Slipping and Smashing." #5285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions code/controllers/subsystem/movement/movement_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
18 changes: 0 additions & 18 deletions code/datums/components/force_move.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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))
Expand Down
3 changes: 0 additions & 3 deletions code/modules/recycling/disposal/bin.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..()

Expand Down
Loading