Skip to content

Commit

Permalink
Stops brooms from breaking through the bluespace barrier (#2630)
Browse files Browse the repository at this point in the history
  • Loading branch information
DeltaFire15 authored May 19, 2024
1 parent b710eb8 commit b7113cb
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions code/game/objects/items/broom.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b7113cb

Please sign in to comment.