From 9eb0142bfb563c901f38a9e49c831e2f3608660f Mon Sep 17 00:00:00 2001 From: MarinaGryphon Date: Sun, 16 Jul 2017 07:33:42 -0500 Subject: [PATCH] Fixes #3054 (#3056) This was an incredibly easy fix that removed some stupid code I never should have had to fix. >:( Hoists should be fixed when this is merged (and if this compiles, given my apparent coding skill). --- code/game/objects/structures/lattice.dm | 4 ++-- code/modules/multiz/hoist.dm | 9 +-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index ef4efaeca55..b27c359f76c 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -94,5 +94,5 @@ /obj/structure/lattice/catwalk/hoist_act(turf/dest) for (var/A in loc) var/atom/movable/AM = A - AM.hoist_act(dest) - ..() \ No newline at end of file + AM.forceMove(dest) + ..() diff --git a/code/modules/multiz/hoist.dm b/code/modules/multiz/hoist.dm index 63a37742d14..86e6d753eb0 100644 --- a/code/modules/multiz/hoist.dm +++ b/code/modules/multiz/hoist.dm @@ -260,12 +260,5 @@ return 1 /atom/movable/proc/hoist_act(turf/dest) - if (anchored) - return FALSE - - forceMove(dest) - return TRUE - -/obj/mecha/hoist_act(turf/dest) forceMove(dest) - return TRUE \ No newline at end of file + return TRUE