diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/succlet.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/succlet.dm index 7fa998d5e6e..f3c91ea4f81 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/succlet.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/succlet.dm @@ -12,7 +12,7 @@ icon_state = "succlet" icon_living = "succlet" - icon_dead = "succlet" + icon_dead = "succlet_dead" icon_rest = "succlet" icon = 'icons/mob/alienanimals_x32.dmi' @@ -61,7 +61,8 @@ vore_smell = "some kind of snack from a distant unseen universe" var/succlet_move_chance = 2 - var/succlet_weaken_rate = 5 + var/succlet_eat_chance = 50 + var/succlet_weaken_rate = 2 var/succlet_last_health = 10 /datum/say_list/succlet @@ -83,7 +84,7 @@ B.digest_oxy = 12 B.digestchance = 0 B.absorbchance = 0 - B.escapechance = 10 + B.escapechance = 35 B.selective_preference = DM_ABSORB /mob/living/simple_mob/vore/alienanimals/succlet/checkMoveCooldown() @@ -123,9 +124,12 @@ succlet_move(pick(mylist)) succlet_last_health = health //The succlet will try to move if it has taken damage -/mob/living/simple_mob/vore/alienanimals/succlet/death() +/mob/living/simple_mob/vore/alienanimals/succlet/death(gibbed, deathmessage = "shrieks in agony as it is eradicated from reality.") . = ..() - spawn(10) + if(isbelly(loc)) + return + playsound(src,'sound/voice/succlet_shriek.ogg', 100, 1) + spawn(25) qdel(src) /mob/living/simple_mob/vore/alienanimals/succlet/attackby(var/obj/item/O, var/mob/user) @@ -170,7 +174,7 @@ for(var/atom/M in view(world.view, my_turf)) //Is anyone who is not us or our target around where we are? if(isliving(M) && M != src && M != target && !istype(M, /mob/observer) && !M.invisibility && !istype(M,/mob/living/simple_mob/vore/alienanimals/succlet)) var/mob/living/check = M - if(check.stat) + if(check.stat == CONSCIOUS) to_chat(src, "You can't move, [check] is watching...") return else if (!check.eye_blind) @@ -179,7 +183,7 @@ for(var/atom/T in view(world.view, target_turf)) //Is anyone at our target? if(isliving(T) && T != src && T != target && !istype(T, /mob/observer) && !T.invisibility && !istype(T,/mob/living/simple_mob/vore/alienanimals/succlet)) var/mob/living/check = T - if(check.stat) + if(check.stat == CONSCIOUS) to_chat(src, "You can't move, [check] is watching...") return else if (!check.eye_blind) @@ -188,29 +192,27 @@ forceMove(target_turf) if(l) l.Weaken(succlet_weaken_rate) - animal_nom(l) - l.stop_pulling() + if(client || prob(succlet_eat_chance)) + animal_nom(l) + l.stop_pulling() /mob/living/simple_mob/vore/alienanimals/succlet/big desc = "A big soft, fuzzy, innocent looking star shaped creature." icon_state = "big_succlet" icon_living = "big_succlet" - icon_dead = "big_succlet" icon_rest = "big_succlet" succlet_weaken_rate = 30 //Big /mob/living/simple_mob/vore/alienanimals/succlet/dark icon_state = "dark_succlet" icon_living = "dark_succlet" - icon_dead = "dark_succlet" icon_rest = "dark_succlet" /mob/living/simple_mob/vore/alienanimals/succlet/poison desc = "A soft, fuzzy, innocent looking star shaped creature. It looks like it could be poisonous." icon_state = "poison_succlet" icon_living = "poison_succlet" - icon_dead = "poison_succlet" icon_rest = "poison_succlet" /mob/living/simple_mob/vore/alienanimals/succlet/poison/attack_hand(mob/user) @@ -226,7 +228,6 @@ /mob/living/simple_mob/vore/alienanimals/succlet/moss icon_state = "moss_succlet" icon_living = "moss_succlet" - icon_dead = "moss_succlet" icon_rest = "moss_succlet" vore_taste = "moss" vore_smell = "moss" @@ -235,8 +236,10 @@ desc = "A big soft, fuzzy, innocent looking star shaped creature. It looks regal with its crown!" icon_state = "king_succlet" icon_living = "king_succlet" - icon_dead = "king_succlet" icon_rest = "king_succlet" succlet_weaken_rate = 60 //The weight of authority is heavy! vore_taste = "the king of snacks from a distant unseen universe" vore_smell = "the king of snacks from a distant unseen universe" + + maxHealth = 10000 + health = 10000 diff --git a/icons/mob/alienanimals_x32.dmi b/icons/mob/alienanimals_x32.dmi index de9fc66ab29..dd4c726e439 100644 Binary files a/icons/mob/alienanimals_x32.dmi and b/icons/mob/alienanimals_x32.dmi differ diff --git a/sound/voice/succlet_shriek.ogg b/sound/voice/succlet_shriek.ogg new file mode 100644 index 00000000000..25e9ba3c03f Binary files /dev/null and b/sound/voice/succlet_shriek.ogg differ