From ef269b31866f4fb446ae75c49fa30b5939401646 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Mon, 13 Mar 2023 14:37:22 -0400 Subject: [PATCH] Mob tweaks and fixes The mob cooldown thing from upstream made everything with a positive number in the variable be ultra slow. I'm not sure how it was that the variable was broken previously considering that the higher the number was the slower things went, but now it's ultra slow or nothing! cringe. Adjusts some of the mobs I've made that are supposed to not be slow to still not be slow, as well as touches up a couple of things with squirrels --- code/game/objects/micro_structures.dm | 1 + code/game/objects/structures/ghost_pods/event_vr.dm | 3 ++- code/game/turfs/flooring/seasonal.dm | 12 ++++++++---- .../subtypes/animal/alien animals/catslug.dm | 2 +- .../subtypes/animal/alien animals/teppi.dm | 4 ++-- .../living/simple_mob/subtypes/animal/squirrel.dm | 9 ++++++--- 6 files changed, 20 insertions(+), 11 deletions(-) diff --git a/code/game/objects/micro_structures.dm b/code/game/objects/micro_structures.dm index 7f911d249d4..062c5767028 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 1bcf5dd147a..1842fe7a1a8 100644 --- a/code/game/objects/structures/ghost_pods/event_vr.dm +++ b/code/game/objects/structures/ghost_pods/event_vr.dm @@ -47,7 +47,8 @@ "Nurse Giant Spider" = /mob/living/simple_mob/animal/giant_spider/nurse/eggless, "Giant Spider Queen" = /mob/living/simple_mob/animal/giant_spider/nurse/queen/eggless, "Weretiger" = /mob/living/simple_mob/vore/weretiger, - "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 9095abc85c5..6ebc258ebe8 100644 --- a/code/game/turfs/flooring/seasonal.dm +++ b/code/game/turfs/flooring/seasonal.dm @@ -54,7 +54,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, @@ -91,7 +92,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, @@ -115,7 +117,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, @@ -141,7 +144,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 35ec7175fe3..59177f3659b 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 55dd2657054..d1613829e32 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 @@ -887,7 +887,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 c7d057cb70f..456f3d166fc 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 var/picked_color = FALSE @@ -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()