cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes bubblegum / vetus hitting twice during charge (#18837)

Browse Source
This commit is contained in:
Qwertytoforty
2022-08-27 08:05:55 -04:00
committed by GitHub
parent 1c3dc66b79
commit 5fd21ea339
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm
+4 -4
View File
@@ -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("<span class='danger'>[src] slams into [L]!</span>", "<span class='userdanger'>[src] tramples you into the ground!</span>")
@@ -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("<span class='danger'>[src] slams into [L]!</span>", "<span class='userdanger'>[src] tramples you into the ground!</span>")
code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+2 -2
View File
@@ -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()