Merge pull request #33699 from QualityVan/safedestruction

Makes vault safe slightly less explosion-proof
2018-01-13 23:16:13 +13:00
parent ef1c99ba92
commit e164b0cf25
2 changed files with 14 additions and 3 deletions
@@ -55,6 +55,7 @@
 		if(!QDELETED(target))
 			location = get_turf(target)
 			target.cut_overlay(plastic_overlay, TRUE)
+			target.ex_act(2, target)
 	else
 		location = get_turf(src)
 	if(location)
@@ -63,7 +64,6 @@
 			explosion(get_step(T, aim_dir), boom_sizes[1], boom_sizes[2], boom_sizes[3])
 		else
 			explosion(location, boom_sizes[1], boom_sizes[2], boom_sizes[3])
-		location.ex_act(2, target)
 	if(ismob(target))
 		var/mob/M = target
 		M.gib()
@@ -247,10 +247,10 @@
 		if(!QDELETED(target))
 			location = get_turf(target)
 			target.cut_overlay(plastic_overlay, TRUE)
+			target.ex_act(2, target)
 	else
 		location = get_turf(src)
 	if(location)
-		location.ex_act(2, target)
 		explosion(location,0,0,3)
 	qdel(src)