Merge pull request #1200 from Citadel-Station-13/upstream-merge-27661

[MIRROR] Fixes ex_act not having waitfor = FALSE
2017-05-30 18:46:40 -05:00
parent abd0e85efa 41065c4e73
commit f6f0523fa9
2 changed files with 13 additions and 3 deletions
@@ -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)
@@ -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)