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
This commit is contained in:
Qustinnus
2019-07-25 16:24:27 +12:00
committed by oranges
parent 347a52eb52
commit ef7a99dfa6
2 changed files with 4 additions and 6 deletions
+2 -4
View File
@@ -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)
@@ -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)