shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Something I broke in a previous PR that I didn't see

Browse Source
This commit is contained in:
LetterJay
2017-05-23 10:11:19 -05:00
parent 6ae72fded4
commit febefa0c78
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/lavaland/necropolis_chests.dm
+3 -1
View File
@@ -821,7 +821,9 @@
timer = world.time + cooldown_time timer = world.time + cooldown_time
if(isliving(target) && chaser_timer <= world.time) //living and chasers off cooldown? fire one! if(isliving(target) && chaser_timer <= world.time) //living and chasers off cooldown? fire one!
chaser_timer = world.time + chaser_cooldown chaser_timer = world.time + chaser_cooldown
new /obj/effect/temp_visual/hierophant/chaser(get_turf(user), user, target, chaser_speed, friendly_fire_check) var/obj/effect/temp_visual/hierophant/chaser/C = new(get_turf(user), user, target, chaser_speed, friendly_fire_check)
C.damage = 30
C.monster_damage_boost = FALSE
add_logs(user, target, "fired a chaser at", src) add_logs(user, target, "fired a chaser at", src)
else else
INVOKE_ASYNC(src, .proc/cardinal_blasts, T, user) //otherwise, just do cardinal blast INVOKE_ASYNC(src, .proc/cardinal_blasts, T, user) //otherwise, just do cardinal blast
code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+3 -1
View File
@@ -525,7 +525,9 @@ Difficulty: Hard
targetturf = get_turf(target) targetturf = get_turf(target)
/obj/effect/temp_visual/hierophant/chaser/proc/make_blast() /obj/effect/temp_visual/hierophant/chaser/proc/make_blast()
new /obj/effect/temp_visual/hierophant/blast(loc, caster, friendly_fire_check) var/obj/effect/temp_visual/hierophant/blast/B = new(loc, caster, friendly_fire_check)
B.damage = damage
B.monster_damage_boost = monster_damage_boost
/obj/effect/temp_visual/hierophant/telegraph /obj/effect/temp_visual/hierophant/telegraph
icon = 'icons/effects/96x96.dmi' icon = 'icons/effects/96x96.dmi'