From 84e67f355411f0a758ebbded38c81d8811f6ce7f Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Mon, 5 Sep 2016 15:37:03 -0400 Subject: [PATCH 1/2] SIZABLE FOWL tweaks and fixes --- code/modules/mining/lavaland/necropolis_chests.dm | 2 ++ .../simple_animal/hostile/megafauna/hierophant.dm | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 38978555fbe..75fda0da310 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -862,6 +862,8 @@ for(var/mob/living/L in range(1, source)) addtimer(src, "teleport_mob", 0, FALSE, source, L, T, user) //regardless, take all mobs near us along sleep(6) //at this point the blasts detonate + else + H.timer = world.time teleporting = FALSE if(user) user.update_action_buttons_icon() diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index e34fb5f0df6..ee7e70bdcf2 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -45,8 +45,8 @@ Difficulty: Hard faction = list("boss") //asteroid mobs? get that shit out of my beautiful square house speak_emote = list("preaches") armour_penetration = 50 - melee_damage_lower = 25 - melee_damage_upper = 25 + melee_damage_lower = 10 + melee_damage_upper = 10 speed = 1 move_to_delay = 10 ranged = 1 @@ -87,7 +87,7 @@ Difficulty: Hard did_reset = TRUE //visible_message("\"Vixyvrmrk xs fewi...\"") blink(spawned_rune) - adjustHealth((health - maxHealth) * 0.5) //heal for 50% of our missing health + adjustHealth(max((health - maxHealth) * 0.5, 25)) //heal for 50% of our missing health wander = FALSE /*if(health > maxHealth * 0.9) visible_message("\"Vitemvw gsqtpixi. Stivexmrk ex qebmqyq ijjmgmirgc.\"") @@ -550,7 +550,9 @@ Difficulty: Hard H.rune = null user.update_action_buttons_icon() qdel(src) - else //use this rune instead + else + H.timer = world.time + else user << "You touch the rune with the staff, but nothing happens." else From 2db6c344a6ac7023598e399bb198123f0043da1a Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Mon, 5 Sep 2016 15:41:35 -0400 Subject: [PATCH 2/2] proppa --- code/modules/mining/lavaland/necropolis_chests.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 75fda0da310..1537f20d162 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -810,6 +810,8 @@ user.visible_message("[user] creates a strange rune beneath them!", \ "You create a hierophant rune, which you can teleport yourself and any allies to at any time!\n\ You can remove the rune to place a new one by striking it with the staff.") + else + timer = world.time else user << "You need to be on solid ground to produce a rune!" return @@ -863,7 +865,7 @@ addtimer(src, "teleport_mob", 0, FALSE, source, L, T, user) //regardless, take all mobs near us along sleep(6) //at this point the blasts detonate else - H.timer = world.time + timer = world.time teleporting = FALSE if(user) user.update_action_buttons_icon()