diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm index 691a6d484c5..9a2f40660c1 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm @@ -238,10 +238,10 @@ Difficulty: Hard return return ..() -/mob/living/simple_animal/hostile/megafauna/ancient_robot/Bump(atom/A) +/mob/living/simple_animal/hostile/megafauna/ancient_robot/Bump(atom/A, yes) if(charging) DestroySurroundings() - if(isliving(A)) + if(isliving(A) && yes) var/mob/living/L = A if(!istype(A, /mob/living/simple_animal/hostile/ancient_robot_leg)) L.visible_message("[src] slams into [L]!", "[src] tramples you into the ground!") @@ -621,10 +621,10 @@ Difficulty: Hard walk_towards(src, T, movespeed) DestroySurroundings() -/mob/living/simple_animal/hostile/ancient_robot_leg/Bump(atom/A) +/mob/living/simple_animal/hostile/ancient_robot_leg/Bump(atom/A, yes) if(!core.charging) return - if(isliving(A)) + if(isliving(A) && yes) if(!istype(A, /mob/living/simple_animal/hostile/megafauna/ancient_robot)) var/mob/living/L = A L.visible_message("[src] slams into [L]!", "[src] tramples you into the ground!") 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 26115269fb1..57cad951ec1 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -461,8 +461,8 @@ Difficulty: Hard playsound(src, 'sound/effects/meteorimpact.ogg', 200, TRUE, 2, TRUE) return ..() -/mob/living/simple_animal/hostile/megafauna/bubblegum/Bump(atom/A) - if(charging) +/mob/living/simple_animal/hostile/megafauna/bubblegum/Bump(atom/A, yes) + if(charging && yes) if(isturf(A) || isobj(A) && A.density) A.ex_act(EXPLODE_HEAVY) DestroySurroundings()