diff --git a/code/modules/mob/living/simple_animal/hostile/pitbull.dm b/code/modules/mob/living/simple_animal/hostile/pitbull.dm index 3ed3ea736f73..12988c71cb77 100644 --- a/code/modules/mob/living/simple_animal/hostile/pitbull.dm +++ b/code/modules/mob/living/simple_animal/hostile/pitbull.dm @@ -91,3 +91,41 @@ qdel(src) else gib() + +/mob/living/simple_animal/hostile/pitbull/smashednslammed + name = "toadline pitbull" + icon_state = "toadlinepitbull" + icon_living = "toadlinepitbull" + icon_dead = "toadlinepitbull_dead" + pass_flags = PASSMOB|PASSDOOR //so smashed and slammed they can squeeze through doors + health = 35 + maxHealth = 35 + speed = 3 //stumpier legs move slower + + melee_damage_lower = 4 + melee_damage_upper = 6 //stumpy but they hit harder + +/mob/living/simple_animal/hostile/pitbull/smashednslammed/New() + ..() + desc = pick( + "SMASHED and SLAMMED", + "Certified Toadline.", + "Help I can't breathe", + "Bloodskull!", + "Two times Pimpy...", + "Three times Bape!", + "Not a family tree, but a family circle.") + +/mob/living/simple_animal/hostile/pitbull/smashednslammed/summoned_pitbull + faction = "wizard" // so they get along with other wizard mobs + meat_type = /obj/item/weapon/ectoplasm //a magical dog + +/mob/living/simple_animal/hostile/pitbull/smashednslammed/summoned_pitbull/death(var/gibbed = FALSE) + ..() + if(!gibbed) + if(prob(90)) + animate(src, alpha = 0, time = 4 SECONDS) + spawn(4 SECONDS) + qdel(src) + else + gib() diff --git a/code/modules/spells/aoe_turf/conjure/pitbulls.dm b/code/modules/spells/aoe_turf/conjure/pitbulls.dm index f473747b5d35..d06ba463a8a1 100644 --- a/code/modules/spells/aoe_turf/conjure/pitbulls.dm +++ b/code/modules/spells/aoe_turf/conjure/pitbulls.dm @@ -8,7 +8,7 @@ summon_amt = 3 price = Sp_BASE_PRICE - level_max = list(Sp_TOTAL = 2, Sp_SPEED = 2) + level_max = list(Sp_TOTAL = 3, Sp_SPEED = 2, Sp_POWER = 1) //empower makes them SMASHED and SLAMMED charge_max = 300 cooldown_reduc = 100 cooldown_min = 100 @@ -18,12 +18,33 @@ hud_state = "pitbull" cast_sound = 'sound/voice/pitbullbark.ogg' quicken_price = Sp_BASE_PRICE + var/empowered + +/spell/aoe_turf/conjure/pitbull/empower_spell() + ..() + empowered += 1 + spell_levels[Sp_POWER]++ + . = "You have perfected the SMASHED and SLAMMED summon." + +/spell/aoe_turf/conjure/pitbull/invocation(mob/user, list/targets) + if(empowered) + invocation = pick("P'MPY S'N 'PP", "P'MPY S'N 'PP", "R'V'R'D' K'NN'LS", "BL'DSK'LL") + ..() var/list/pitbulls_exclude_kinlist = list() //all pitbulls go in here so pitbulls won't attack other pitbulls when feeling treacherous (and instead attack the wizard) +/spell/aoe_turf/conjure/pitbull/perform(mob/user = usr, skipcharge = 0, list/target_override, var/ignore_timeless = FALSE, var/ignore_path = null) + if(empowered) + summon_type = list(/mob/living/simple_animal/hostile/pitbull/smashednslammed/summoned_pitbull) + ..() + /spell/aoe_turf/conjure/pitbull/summon_object(var/type, var/location) - var/mob/living/simple_animal/hostile/pitbull/summoned_pitbull/P = new type(location) - P.friends.Add(holder)//summoner is my friend, but we have a tendency to turn on our friends + if(empowered) + var/mob/living/simple_animal/hostile/pitbull/smashednslammed/summoned_pitbull/P = new type(location) + P.friends.Add(holder) + else + var/mob/living/simple_animal/hostile/pitbull/summoned_pitbull/P = new type(location) + P.friends.Add(holder)//summoner is my friend, but we have a tendency to turn on our friends /spell/aoe_turf/conjure/pitbull/choose_targets(var/mob/user = usr) var/list/turf/locs = new diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi index 9e7ad770ab0e..00edb3a9ba53 100644 Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ