diff --git a/code/game/atoms.dm b/code/game/atoms.dm index d7422429ff..acb60f77ac 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -104,9 +104,9 @@ return ..() -/atom/proc/handle_ricochet(obj/item/projectile/P) - return - +/atom/proc/handle_ricochet(obj/item/projectile/P) + return + /atom/proc/CanPass(atom/movable/mover, turf/target, height=1.5) return (!density || !height) @@ -277,6 +277,7 @@ return /atom/proc/ex_act(severity, target) + set waitfor = FALSE contents_explosion(severity, target) /atom/proc/blob_act(obj/structure/blob/B) diff --git a/code/game/atoms.dm.rej b/code/game/atoms.dm.rej new file mode 100644 index 0000000000..28b45c99ab --- /dev/null +++ b/code/game/atoms.dm.rej @@ -0,0 +1,9 @@ +diff a/code/game/atoms.dm b/code/game/atoms.dm (rejected hunks) +@@ -274,6 +274,7 @@ + return + + /atom/proc/ex_act(severity, target) ++ set waitfor = FALSE + contents_explosion(severity, target) + + /atom/proc/blob_act(obj/structure/blob/B)