From b7113cb2ced6a77af0afe0311144e856855b8615 Mon Sep 17 00:00:00 2001 From: DeltaFire <46569814+DeltaFire15@users.noreply.github.com> Date: Sun, 19 May 2024 15:26:07 +0200 Subject: [PATCH] Stops brooms from breaking through the bluespace barrier (#2630) --- code/game/objects/items/broom.dm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/broom.dm b/code/game/objects/items/broom.dm index 05c4b3589e5..48c3de04a8a 100644 --- a/code/game/objects/items/broom.dm +++ b/code/game/objects/items/broom.dm @@ -62,14 +62,19 @@ if (locate(/obj/structure/table) in target.contents) return var/i = 0 - var/turf/target_turf = get_step(target, user.dir) + //NSV13 - Illegal movement through space and time. + var/movedir = user.dir + movedir &= ~UP + movedir &= ~DOWN + var/turf/target_turf = get_step(target, movedir) + //NSV13 endish var/obj/machinery/disposal/bin/target_bin = locate(/obj/machinery/disposal/bin) in target_turf.contents for(var/obj/item/garbage in target.contents) if(!garbage.anchored) if (target_bin) garbage.forceMove(target_bin) else - garbage.Move(target_turf, user.dir) + garbage.Move(target_turf, movedir) //NSV13 - mild arg adjustment i++ if(i > 19) break