From 12c7e22c2826e66f72ae462beb6cf9acafdf27f0 Mon Sep 17 00:00:00 2001 From: dzahlus Date: Fri, 26 Feb 2021 15:57:27 +0100 Subject: [PATCH 1/3] ugh lavaland --- .../living/simple_animal/hostile/megafauna/drake.dm | 11 ++++++++++- code/modules/spells/spell_types/shapeshift.dm | 4 +++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm index 477483862b..cd7f2fe328 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm @@ -398,6 +398,14 @@ Difficulty: Medium crusher_loot = list() butcher_results = list(/obj/item/stack/ore/diamond = 5, /obj/item/stack/sheet/sinew = 5, /obj/item/stack/sheet/bone = 30) +/mob/living/simple_animal/hostile/megafauna/dragon/lesser/transformed //ash drake balanced around player control + name = "transformed ash drake" + desc = "A sentient being transformed into an ash drake" + mob_size = MOB_SIZE_HUMAN //prevents crusher vulnerability + move_force = MOVE_FORCE_NORMAL //stops them from destroying and unanchoring shit by walking into it + environment_smash = ENVIRONMENT_SMASH_STRUCTURES //no we dont want sentient megafauna be able to delete the entire station in a minute flat + damage_coeff = list(BRUTE = 0.7, BURN = 0.5, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1) //200 health but not locked to standard movespeed, needs armor befitting of a dragon + /mob/living/simple_animal/hostile/megafauna/dragon/lesser/grant_achievement(medaltype,scoretype) return @@ -413,7 +421,8 @@ Difficulty: Medium if(L in hit_list || L == source) continue hit_list += L - L.adjustFireLoss(20) + L.adjustFireLoss(5) + L.adjust_fire_stacks(6) to_chat(L, "You're hit by [source]'s fire breath!") // deals damage to mechs diff --git a/code/modules/spells/spell_types/shapeshift.dm b/code/modules/spells/spell_types/shapeshift.dm index e513865246..c376845451 100644 --- a/code/modules/spells/spell_types/shapeshift.dm +++ b/code/modules/spells/spell_types/shapeshift.dm @@ -77,8 +77,10 @@ name = "Dragon Form" desc = "Take on the shape a lesser ash drake." invocation = "RAAAAAAAAWR!" + cooldown_min = 450 + charge_max = 1800 - shapeshift_type = /mob/living/simple_animal/hostile/megafauna/dragon/lesser + shapeshift_type = /mob/living/simple_animal/hostile/megafauna/dragon/lesser/transformed /obj/shapeshift_holder From f20621360321c7bfdf53d16f3482ed493f752af7 Mon Sep 17 00:00:00 2001 From: dzahlus Date: Mon, 1 Mar 2021 22:16:23 +0100 Subject: [PATCH 2/3] 60 second cooldown instead of 3 minutes --- code/modules/spells/spell_types/shapeshift.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/spells/spell_types/shapeshift.dm b/code/modules/spells/spell_types/shapeshift.dm index c376845451..de305cf183 100644 --- a/code/modules/spells/spell_types/shapeshift.dm +++ b/code/modules/spells/spell_types/shapeshift.dm @@ -77,8 +77,8 @@ name = "Dragon Form" desc = "Take on the shape a lesser ash drake." invocation = "RAAAAAAAAWR!" - cooldown_min = 450 - charge_max = 1800 + cooldown_min = 150 + charge_max = 600 shapeshift_type = /mob/living/simple_animal/hostile/megafauna/dragon/lesser/transformed From ca1fe9d6c0bdc9eb2d8207322b1b11559fbceab2 Mon Sep 17 00:00:00 2001 From: dzahlus Date: Tue, 2 Mar 2021 02:40:23 +0100 Subject: [PATCH 3/3] Update shapeshift.dm for keb --- code/modules/spells/spell_types/shapeshift.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/spells/spell_types/shapeshift.dm b/code/modules/spells/spell_types/shapeshift.dm index de305cf183..67c2e3e941 100644 --- a/code/modules/spells/spell_types/shapeshift.dm +++ b/code/modules/spells/spell_types/shapeshift.dm @@ -77,8 +77,6 @@ name = "Dragon Form" desc = "Take on the shape a lesser ash drake." invocation = "RAAAAAAAAWR!" - cooldown_min = 150 - charge_max = 600 shapeshift_type = /mob/living/simple_animal/hostile/megafauna/dragon/lesser/transformed