diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 47fa9ab58bd..bd36278d5d0 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -1039,8 +1039,9 @@ /datum/status_effect/bubblegum_curse/tick() var/mob/living/simple_animal/hostile/megafauna/bubblegum/attacker = locateUID(source_UID) - if(!attacker || attacker.loc == null) + if(!attacker || attacker.loc == null || attacker.stat == DEAD) qdel(src) + return if(attacker.health <= attacker.maxHealth / 2) owner.clear_fullscreen("Bubblegum") owner.overlay_fullscreen("Bubblegum", /atom/movable/screen/fullscreen/stretch/fog, 2) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index ab6d1aad75e..e03743aa5b8 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -675,7 +675,7 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/bubblegum/round_2/Life(seconds, times_fired) . = ..() - if(!istype(get_area(src), /area/ruin/space/bubblegum_arena)) + if(stat != DEAD && !istype(get_area(src), /area/ruin/space/bubblegum_arena)) for(var/obj/effect/landmark/spawner/bubblegum/B in GLOB.landmarks_list) forceMove(get_turf(B)) break