Skip to content

Commit

Permalink
bugfix: fixed disposal qdel loop (ss220-space#4025)
Browse files Browse the repository at this point in the history
  • Loading branch information
Vladisvell authored Dec 9, 2023
1 parent ecc4e9d commit 6f9f880
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion code/modules/recycling/disposal.dm
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@
/obj/machinery/disposal/deliveryChute/Bumped(atom/movable/moving_atom) //Go straight into the chute
..()

if(istype(moving_atom, /obj/item/projectile)) return
if(istype(moving_atom, /obj/item/projectile) || istype(moving_atom, /obj/effect)) return
switch(dir)
if(NORTH)
if(moving_atom.loc.y != src.loc.y+1) return
Expand Down Expand Up @@ -1469,6 +1469,8 @@
//When the disposalsoutlet is forcefully moved. Due to meteorshot or the recall item spell for instance
/obj/structure/disposaloutlet/Moved(atom/OldLoc, Dir)
. = ..()
if(!loc)
return
var/turf/T = OldLoc
if(T.intact)
var/turf/simulated/floor/F = T
Expand Down

0 comments on commit 6f9f880

Please sign in to comment.