diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm b/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm index 9ffda05bb6..c61200206e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm @@ -29,8 +29,8 @@ movement_sound = 'sound/effects/houndstep.ogg' see_in_dark = 8 - melee_damage_lower = 5 - melee_damage_upper = 10 //makes it so 4 max dmg hits don't instakill you. + melee_damage_lower = 10 + melee_damage_upper = 20 grab_resist = 100 response_help = "pets" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm index e529d7be8d..7ea01cddee 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm @@ -37,6 +37,12 @@ default_pixel_x = -16 pixel_x = -16 pixel_y = 0 + mount_offset_y = 15 + mount_offset_x = -12 + max_buckled_mobs = 1 + can_buckle = TRUE + buckle_movable = TRUE + buckle_lying = FALSE ai_holder_type = /datum/ai_holder/simple_mob/melee say_list_type = /datum/say_list/dragonboss @@ -57,9 +63,15 @@ vore_icons = SA_ICON_LIVING /mob/living/simple_mob/vore/aggressive/dragon/virgo3b - maxHealth = 200 - health = 200 + maxHealth = 300 + health = 300 faction = "virgo3b" + icon_dead = "phoron_dragon_dead" + icon_living = "phoron_dragon" + icon_state = "phoron_dragon" + mount_offset_y = 24 + mount_offset_x = -9 + has_eye_glow = TRUE /mob/living/simple_mob/vore/aggressive/dragon/Login() . = ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm b/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm index b7ab97d562..97313f4db1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm @@ -19,8 +19,8 @@ maxHealth = 150 health = 150 minbodytemp = 200 - melee_damage_lower = 2 - melee_damage_upper = 7 //Don't break my bones bro + melee_damage_lower = 10 + melee_damage_upper = 20 //Don't break my bones bro see_in_dark = 8 response_help = "pets" response_disarm = "bops" @@ -110,6 +110,13 @@ faction = "neutral" tamed = 1 +/mob/living/simple_mob/otie/friendly/chubby + name = "chubby otie" + desc = "The classic bioengineered longdog. This one might even tolerate you! What an absolute unit" + icon_state = "fotie" + icon_living = "fotie" + icon_rest = "fotie_rest" + /mob/living/simple_mob/otie/cotie //same as above but has a little collar :v name = "tamed otie" desc = "The classic bioengineered longdog. This one has a nice little collar on its neck. However a proper domesticated otie is an oxymoron and the collar is likely just a decoration." @@ -119,6 +126,13 @@ faction = "neutral" tamed = 1 +/mob/living/simple_mob/otie/cotie/chubby + name = "chubby tamed otie" + desc = "The classic bioengineered longdog. This one has a nice little collar on its neck. What an absolute unit." + icon_state = "fcotie" + icon_living = "fcotie" + icon_rest = "fcotie_rest" + /mob/living/simple_mob/otie/cotie/phoron //friendly phoron pup with collar name = "mutated otie" desc = "Looks like someone did manage to domesticate one of those wild phoron mutants. What a badass." @@ -155,6 +169,14 @@ var/check_records = 0 // If true, arrests people without a record. var/check_arrest = 1 // If true, arrests people who are set to arrest. +/mob/living/simple_mob/otie/security/chubby + name = "chubby guard otie" + desc = "The VARMAcorp bioengineering division flagship product on trained optimal snowflake guard dogs. What an absolute unit." + icon_state = "fsotie" + icon_living = "fsotie" + icon_rest = "fsotie_rest" + icon_dead = "fsotie-dead" + /mob/living/simple_mob/otie/security/phoron name = "mutated guard otie" desc = "An extra rare phoron resistant version of the VARMAcorp trained snowflake guard dogs for infernal environments." diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm b/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm index db9dc59f58..352c840112 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm @@ -20,8 +20,8 @@ maxHealth = 150 health = 150 - melee_damage_lower = 2 - melee_damage_upper = 7 + melee_damage_lower = 8 + melee_damage_upper = 16 grab_resist = 100 see_in_dark = 8 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm b/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm index d0e9d6d8f8..a8bc70ac0c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm @@ -60,4 +60,45 @@ maxbodytemp = 700 /mob/living/simple_mob/animal/wolf/space/Process_Spacemove(var/check_drift = 0) - return TRUE \ No newline at end of file + return TRUE + +/mob/living/simple_mob/animal/wolf/direwolf + name = "dire wolf" + desc = "The biggest and baddest wolf around." + tt_desc = "Canis maxdirus" + + icon = 'icons/mob/vore64x32.dmi' + icon_dead = "direwolf-dead" + icon_living = "direwolf" + icon_state = "direwolf" + icon_rest = "direwolf_rest" + old_x = -16 + old_y = 0 + default_pixel_x = -16 + pixel_x = -16 + pixel_y = 0 + + harm_intent_damage = 10 + melee_damage_lower = 10 + melee_damage_upper = 20 + maxHealth = 200 + + minbodytemp = 0 + + max_buckled_mobs = 1 + mount_offset_y = 14 + mount_offset_x = 2 + can_buckle = TRUE + buckle_movable = TRUE + buckle_lying = FALSE + +/mob/living/simple_mob/animal/wolf/direwolf/Login() + . = ..() + if(!riding_datum) + riding_datum = new /datum/riding/simple_mob(src) + verbs |= /mob/living/simple_mob/proc/animal_mount + verbs |= /mob/living/proc/toggle_rider_reins + movement_cooldown = 0 + +/mob/living/simple_mob/animal/wolf/direwolf/MouseDrop_T(mob/living/M, mob/living/user) + return diff --git a/icons/mob/vore64x32.dmi b/icons/mob/vore64x32.dmi index 7a96aa40ca..492c0ae6f4 100644 Binary files a/icons/mob/vore64x32.dmi and b/icons/mob/vore64x32.dmi differ diff --git a/icons/mob/vore64x64.dmi b/icons/mob/vore64x64.dmi index 76c5830021..50251e22cc 100644 Binary files a/icons/mob/vore64x64.dmi and b/icons/mob/vore64x64.dmi differ