From ef7a99dfa6004f87cb28d2db5fb959e1f506bf97 Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Thu, 25 Jul 2019 06:24:27 +0200 Subject: [PATCH] Tendrils properly drop loot when hit by extreme explosions. (#45339) cl floyd fix: Tendrils properly drop loot when hit by extreme explosions. /cl also fixes that explosions apply damage weirdly Fixes #44979 --- code/game/objects/obj_defense.dm | 6 ++---- code/game/objects/structures/lavaland/necropolis_tendril.dm | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index 994460f26fc..14fc3f41644 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -54,13 +54,11 @@ return ..() //contents explosion if(target == src) - obj_integrity = 0 - qdel(src) + take_damage(INFINITY, BRUTE, "bomb", 0) return switch(severity) if(1) - obj_integrity = 0 - qdel(src) + take_damage(INFINITY, BRUTE, "bomb", 0) if(2) take_damage(rand(100, 250), BRUTE, "bomb", 0) if(3) diff --git a/code/game/objects/structures/lavaland/necropolis_tendril.dm b/code/game/objects/structures/lavaland/necropolis_tendril.dm index 8d7f2bcc76e..6543bc1909b 100644 --- a/code/game/objects/structures/lavaland/necropolis_tendril.dm +++ b/code/game/objects/structures/lavaland/necropolis_tendril.dm @@ -40,8 +40,8 @@ GLOBAL_LIST_INIT(tendrils, list()) new /obj/effect/collapse(loc) new /obj/structure/closet/crate/necropolis/tendril(loc) return ..() - - + + /obj/structure/spawner/lavaland/Destroy() var/last_tendril = TRUE if(GLOB.tendrils.len>1)