diff --git a/code/game/objects/micro_structures.dm b/code/game/objects/micro_structures.dm index 8b10f31fa5..f47ced1475 100644 --- a/code/game/objects/micro_structures.dm +++ b/code/game/objects/micro_structures.dm @@ -11,6 +11,7 @@ micro_target = TRUE var/static/non_micro_types = list( + /mob/living/simple_mob/vore/squirrel, /mob/living/simple_mob/vore/alienanimals/catslug, /mob/living/simple_mob/vore/hostile/morph, /mob/living/simple_mob/protean_blob, diff --git a/code/game/objects/structures/ghost_pods/event_vr.dm b/code/game/objects/structures/ghost_pods/event_vr.dm index 47d87415b5..98d54513d5 100644 --- a/code/game/objects/structures/ghost_pods/event_vr.dm +++ b/code/game/objects/structures/ghost_pods/event_vr.dm @@ -60,7 +60,8 @@ "Giant Spider Queen" = /mob/living/simple_mob/animal/giant_spider/nurse/queen/eggless, "Weretiger" = /mob/living/simple_mob/vore/weretiger, "Lesser Large Dragon" = /mob/living/simple_mob/vore/bigdragon/friendly/maintpred, //CHOMPStation add. - "Catslug" = /mob/living/simple_mob/vore/alienanimals/catslug + "Catslug" = /mob/living/simple_mob/vore/alienanimals/catslug, + "Squirrel" = /mob/living/simple_mob/vore/squirrel/big ) /obj/structure/ghost_pod/ghost_activated/maintpred/create_occupant(var/mob/M) diff --git a/code/game/turfs/flooring/seasonal.dm b/code/game/turfs/flooring/seasonal.dm index e67d6ba9c5..21ebbccbdc 100644 --- a/code/game/turfs/flooring/seasonal.dm +++ b/code/game/turfs/flooring/seasonal.dm @@ -57,7 +57,8 @@ var/world_time_season /mob/living/simple_mob/vore/horse/big = 5, /mob/living/simple_mob/animal/wolf = 5, /mob/living/simple_mob/animal/wolf/direwolf = 1, - /mob/living/simple_mob/animal/wolf/direwolf/dog = 1 + /mob/living/simple_mob/animal/wolf/direwolf/dog = 1, + /mob/living/simple_mob/vore/squirrel = 20 ) grass_types = list( /obj/structure/flora/ausbushes/sparsegrass, @@ -97,7 +98,8 @@ var/world_time_season /mob/living/simple_mob/vore/pakkun = 2, /mob/living/simple_mob/vore/fennix = 1, /mob/living/simple_mob/animal/wolf/direwolf/dog = 1, - /mob/living/simple_mob/animal/passive/bird/parrot = 1 + /mob/living/simple_mob/animal/passive/bird/parrot = 1, + /mob/living/simple_mob/vore/squirrel = 20 ) grass_types = list( /obj/structure/flora/ausbushes/sparsegrass, @@ -123,7 +125,8 @@ var/world_time_season /mob/living/simple_mob/vore/horse/big = 1, /mob/living/simple_mob/animal/wolf = 1, /mob/living/simple_mob/animal/wolf/direwolf = 1, - /mob/living/simple_mob/animal/wolf/direwolf/dog = 1 + /mob/living/simple_mob/animal/wolf/direwolf/dog = 1, + /mob/living/simple_mob/vore/squirrel = 20 ) grass_types = list( /obj/structure/flora/ausbushes/sparsegrass, @@ -151,7 +154,8 @@ var/world_time_season /mob/living/simple_mob/otie/friendly = 2, /mob/living/simple_mob/otie/friendly/chubby = 1, /mob/living/simple_mob/otie/red/friendly = 1, - /mob/living/simple_mob/otie/red/chubby = 1 + /mob/living/simple_mob/otie/red/chubby = 1, + /mob/living/simple_mob/vore/squirrel = 20 ) if(prob(snow_chance)) chill() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm index 399a2851b3..e8dda60768 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm @@ -26,7 +26,7 @@ faction = "catslug" maxHealth = 50 health = 50 - movement_cooldown = 2 + movement_cooldown = -1 meat_amount = 2 meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat holder_type = /obj/item/weapon/holder/catslug diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm index 18de1c9139..a54ab34854 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm @@ -63,7 +63,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? faction = "teppi" maxHealth = 600 health = 600 - movement_cooldown = 2 + movement_cooldown = -1 meat_amount = 12 meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat @@ -895,7 +895,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? teppi_adult = FALSE maxHealth = 50 health = 50 - movement_cooldown = 4 + movement_cooldown = 1 harm_intent_damage = 5 melee_damage_lower = 1 melee_damage_upper = 5 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm b/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm index bf68db9d07..1fb1af9255 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm @@ -9,7 +9,6 @@ value = CATALOGUER_REWARD_TRIVIAL /mob/living/simple_mob/vore/squirrel - low_priority = FALSE name = "squirrel" desc = "A furry creature with a long fluffy tail, dark eyes, and a cute pink nose." tt_desc = "Sciuridae" @@ -23,7 +22,7 @@ faction = "animal" maxHealth = 40 health = 40 - movement_cooldown = 2 + movement_cooldown = -1 meat_amount = 1 meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat @@ -46,6 +45,9 @@ has_langs = list(LANGUAGE_ANIMAL) say_list_type = /datum/say_list/squirrel + mob_size = MOB_SMALL + softfall = TRUE + var/static/list/overlays_cache = list() var/do_seasons = TRUE picked_color = FALSE //CHOMPedit: removed "var/" since we already have this defined for all simple_mobs. @@ -188,7 +190,7 @@ maxHealth = 200 health = 200 - movement_cooldown = 4 + movement_cooldown = 1 meat_amount = 6 harm_intent_damage = 1 @@ -199,6 +201,7 @@ swallowTime = 1 SECOND vore_capacity = 3 vore_bump_chance = 5 + mob_size = MOB_LARGE update_icon() /mob/living/simple_mob/vore/squirrel/verb/squirrel_color() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm index a77fbd7973..7308bf7f8c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm @@ -11,7 +11,7 @@ icon_dead = "new_morph_dead" icon_rest = null color = "#658a62" - movement_cooldown = 1 + movement_cooldown = -1 status_flags = CANPUSH pass_flags = PASSTABLE mob_bump_flag = SLIME @@ -136,7 +136,7 @@ //Morphed is weaker melee_damage_lower = melee_damage_disguised melee_damage_upper = melee_damage_disguised - movement_cooldown = 5 + movement_cooldown = 1 morph_time = world.time + MORPH_COOLDOWN