From 312b3250ac6cef418dfa9f2869c614609bf7533e Mon Sep 17 00:00:00 2001 From: SatinIsle Date: Sat, 23 Sep 2023 13:37:04 +0100 Subject: [PATCH 1/2] Fix for specific wolftaur and vampire icon states Wolftaur and vampire mobs that were specifically chosen and not randomly picked did not have sprites chosen for living, rest and dead variables. This has been fixed. --- .../simple_mob/subtypes/vore/vampire.dm | 12 ++++++++ .../simple_mob/subtypes/vore/wolftaur.dm | 30 +++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/vampire.dm b/code/modules/mob/living/simple_mob/subtypes/vore/vampire.dm index 603c27a8ba2..f4d1d974907 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/vampire.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/vampire.dm @@ -71,15 +71,27 @@ /mob/living/simple_mob/vore/vampire/count random_skin = 0 icon_state = "count" + icon_living = "count" + icon_rest = "countasleep" + icon_dead = "count-dead" /mob/living/simple_mob/vore/vampire/countess random_skin = 0 icon_state = "countess" + icon_living = "countess" + icon_rest = "countessasleep" + icon_dead = "countess-dead" /mob/living/simple_mob/vore/vampire/count_nude random_skin = 0 icon_state = "countnude" + icon_living = "countnude" + icon_rest = "countnudeasleep" + icon_dead = "countnude-dead" /mob/living/simple_mob/vore/vampire/countess_nude random_skin = 0 icon_state = "countessnude" + icon_living = "countessnude" + icon_rest = "countessnudeasleep" + icon_dead = "countessnude-dead" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/wolftaur.dm b/code/modules/mob/living/simple_mob/subtypes/vore/wolftaur.dm index 441fd42f198..22949af6dc7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/wolftaur.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/wolftaur.dm @@ -88,40 +88,70 @@ desc = "What the hell is this outfit!?" icon_state = "wolftaurclown" random_skin = 0 + icon_living = "wolftaurclown" + icon_rest = "wolftaurclown_rest" + icon_dead = "wolftaurclown-dead" /mob/living/simple_mob/vore/wolftaur/white icon_state = "wolftaurwhite" random_skin = 0 + icon_living = "wolftaurwhite" + icon_rest = "wolftaurwhite_rest" + icon_dead = "wolftaurwhite-dead" /mob/living/simple_mob/vore/wolftaur/whiteclothed icon_state = "wolftaurwhitec" random_skin = 0 + icon_living = "wolftaurwhitec" + icon_rest = "wolftaurwhitec_rest" + icon_dead = "wolftaurwhitec-dead" /mob/living/simple_mob/vore/wolftaur/brown icon_state = "wolftaurbrown" random_skin = 0 + icon_living = "wolftaurbrown" + icon_rest = "wolftaurbrown_rest" + icon_dead = "wolftaurbrown-dead" /mob/living/simple_mob/vore/wolftaur/brownclothed icon_state = "wolftaurbrownc" random_skin = 0 + icon_living = "wolftaurbrownc" + icon_rest = "wolftaurbrownc_rest" + icon_dead = "wolftaurbrownc-dead" /mob/living/simple_mob/vore/wolftaur/black icon_state = "wolftaurblack" random_skin = 0 + icon_living = "wolftaurblack" + icon_rest = "wolftaurblack_rest" + icon_dead = "wolftaurblack-dead" /mob/living/simple_mob/vore/wolftaur/blackclothed icon_state = "wolftaurblackc" random_skin = 0 + icon_living = "wolftaurblackc" + icon_rest = "wolftaurblackc_rest" + icon_dead = "wolftaurblackc-dead" /mob/living/simple_mob/vore/wolftaur/red icon_state = "wolftaurwood" random_skin = 0 + icon_living = "wolftaurwood" + icon_rest = "wolftaurwood_rest" + icon_dead = "wolftaurwood-dead" /mob/living/simple_mob/vore/wolftaur/redclothed icon_state = "wolftaurwoodc" random_skin = 0 + icon_living = "wolftaurwoodc" + icon_rest = "wolftaurwoodc_rest" + icon_dead = "wolftaurwoodc-dead" /mob/living/simple_mob/vore/wolftaur/dark icon_state = "wolftaurdark" random_skin = 0 + icon_living = "wolftaurdark" + icon_rest = "wolftaurdark_rest" + icon_dead = "wolftaurdark-dead" From c1ab2a008f5d52459d90e7e27e757d52f63b3f4b Mon Sep 17 00:00:00 2001 From: SatinIsle Date: Sat, 23 Sep 2023 18:41:17 +0100 Subject: [PATCH 2/2] Fixes bats too and buffs the health of vampires --- code/modules/mob/living/simple_mob/subtypes/vore/bat.dm | 3 +++ code/modules/mob/living/simple_mob/subtypes/vore/vampire.dm | 2 ++ 2 files changed, 5 insertions(+) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bat.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bat.dm index 23ffa3d1b15..ff24fc61c6f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/bat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/bat.dm @@ -5,6 +5,9 @@ icon_state = "bat" icon = 'icons/mob/vore.dmi' + icon_living = "bat" + icon_rest = "batasleep" + icon_dead = "bat-dead" harm_intent_damage = 5 melee_damage_lower = 2 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/vampire.dm b/code/modules/mob/living/simple_mob/subtypes/vore/vampire.dm index f4d1d974907..6c75e611cc2 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/vampire.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/vampire.dm @@ -8,6 +8,8 @@ harm_intent_damage = 8 melee_damage_lower = 3 melee_damage_upper = 7 + maxHealth = 150 + health = 150 response_help = "caresses" response_disarm = "wafts"