Merge pull request #1178 from Citadel-Station-13/upstream-merge-27624

[MIRROR] INDESTRUCTIBLE objects are no longer affected by explosions
This commit is contained in:
LetterJay
2017-05-25 09:30:27 -05:00
committed by GitHub
+3 -1
View File
@@ -48,6 +48,8 @@
take_damage(tforce, BRUTE, "melee", 1, get_dir(src, AM))
/obj/ex_act(severity, target)
if(resistance_flags & INDESTRUCTIBLE)
return
..() //contents explosion
if(target == src)
qdel(src)
@@ -256,4 +258,4 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
if(can_break && integrity_failure && current_integrity <= integrity_failure)
obj_break(damage_type)
return TRUE
return FALSE
return FALSE