From a03078729deb62fe8714d2165ca906442eb13586 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Tue, 19 Mar 2019 23:37:20 +0100 Subject: [PATCH] Plant gang rising --- .../living/simple_animal/animals/tomato.dm | 22 +++++++++--------- icons/mob/plantmobs32x32.dmi | Bin 0 -> 2808 bytes 2 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 icons/mob/plantmobs32x32.dmi diff --git a/code/modules/mob/living/simple_animal/animals/tomato.dm b/code/modules/mob/living/simple_animal/animals/tomato.dm index 880288d726..9216e2d8c3 100644 --- a/code/modules/mob/living/simple_animal/animals/tomato.dm +++ b/code/modules/mob/living/simple_animal/animals/tomato.dm @@ -31,25 +31,25 @@ name = "Piranha Plant" desc = "It's a plant, that eats people!" tt_desc = "Packun Flower" - + //remove this thing once we got our own sprites to use. icon_state = "tomato" icon_living = "tomato" icon_dead = "tomato_dead" - + faction = "plants" intelligence_level = SA_PLANT - + maxHealth = 100 health = 100 meat_type = null //Mob icon/appearance settings - //icon = overridefile to be made - //icon_living = "piranha" //to be made - //icon_dead = "piranha_dead" //to be made + icon = 'icons/mob/plantmobs32x32.dmi' //Thanks to vorebound mod and Estelle + icon_living = "piranha-plant" + icon_dead = "piranha-plant_dead" icon_gib = "generic_gib" // The iconstate for being gibbed, optional. Defaults to a generic gib animation. - icon_rest = null // The iconstate for resting, optional + //icon_rest = null // The iconstate for resting, optional attack_icon = 'icons/effects/effects.dmi' //Just the default, played like the weapon attack anim attack_icon_state = "slash" //Just the default //gonna have to make teeth chomping version @@ -58,12 +58,12 @@ vore_capacity = 1 vore_pounce_chance = 80 vore_standing_too = 1 - vore_ignores_undigestable = 0 + vore_ignores_undigestable = 0 vore_default_mode = DM_DIGEST - vore_digest_chance = 99 + vore_digest_chance = 99 vore_absorb_chance = 0 vore_escape_chance = 5 - vore_icons = 0 //no vore icons + vore_icons = SA_ICON_LIVING swallowTime = 10 SECONDS //CHOMPED //Movement Stuff @@ -147,7 +147,7 @@ flash_strength = 0 agony = 10 combustion = FALSE - + /obj/item/weapon/reagent_containers/food/snacks/soylentgreen/piranha name = "Soylent" desc = "This was spat out by a strange plant that eats people." diff --git a/icons/mob/plantmobs32x32.dmi b/icons/mob/plantmobs32x32.dmi new file mode 100644 index 0000000000000000000000000000000000000000..a000b245d644218596671488c184d5003ebc83f4 GIT binary patch literal 2808 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 aC2BISF3#+vf;)H{g