cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 00:29:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix adjustHealth runtimes (#40453)

Browse Source
This commit is contained in:
ShizCalev
2018-09-24 13:25:59 -07:00
committed by Tad Hardesty
parent 29881dab1c
commit cafb7d171e
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/holiday/halloween.dm
+2 -2
View File
@@ -168,7 +168,7 @@
step(I,direction)
return
/mob/living/simple_animal/shade/howling_ghost/adjustHealth()
/mob/living/simple_animal/shade/howling_ghost/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
. = 0
/mob/living/simple_animal/shade/howling_ghost/CanPass(atom/movable/mover, turf/target)
@@ -228,7 +228,7 @@
/mob/living/simple_animal/hostile/retaliate/clown/insane/AttackingTarget()
return
/mob/living/simple_animal/hostile/retaliate/clown/insane/adjustHealth()
/mob/living/simple_animal/hostile/retaliate/clown/insane/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
. = 0
if(prob(5))
playsound(loc, 'sound/spookoween/insane_low_laugh.ogg', 300, 1)
code/modules/mining/minebot.dm
+1 -1
View File
@@ -191,7 +191,7 @@
for(var/obj/item/stack/ore/O in contents)
O.forceMove(drop_location())
/mob/living/simple_animal/hostile/mining_drone/adjustHealth(amount)
/mob/living/simple_animal/hostile/mining_drone/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
if(mode != MINEDRONE_ATTACK && amount > 0)
SetOffenseBehavior()
. = ..()
code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm
+1 -1
View File
@@ -201,7 +201,7 @@
update_icons()
Goto(target, move_to_delay, minimum_distance)
/mob/living/simple_animal/hostile/jungle/seedling/adjustHealth()
/mob/living/simple_animal/hostile/jungle/seedling/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
. = ..()
if(combatant_state == SEEDLING_STATE_ACTIVE && beam_debuff_target)
beam_debuff_target.remove_status_effect(/datum/status_effect/seedling_beam_indicator)