From 32017be265baeca42f331402fef65bb565fa351b Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sun, 26 Mar 2017 19:55:47 -0400 Subject: [PATCH] Fix unsupported tail spam For vwag stuff. --- code/modules/mob/living/carbon/human/emote_vr.dm | 6 ++++-- code/modules/mob/living/carbon/human/update_icons.dm | 2 +- code/modules/vore/appearance/sprite_accessories_vr.dm | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index 666bb5f355..ece67acbbd 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -2,7 +2,9 @@ switch(act) if ("vwag") - toggle_tail() + toggle_tail_vr() + m_type = 1 + message = "[wagging ? "starts" : "stops"] wagging their tail." if ("mlem") message = "mlems [get_visible_gender() == MALE ? "his" : get_visible_gender() == FEMALE ? "her" : "their"] tongue up over [get_visible_gender() == MALE ? "his" : get_visible_gender() == FEMALE ? "her" : "their"] nose. Mlem." m_type = 1 @@ -53,7 +55,7 @@ return 0 -/mob/living/carbon/human/proc/toggle_tail(var/setting) +/mob/living/carbon/human/proc/toggle_tail_vr(var/setting) if(!tail_style || !tail_style.ani_state) src << "You don't have a tail that supports this." return diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index d0f71400f2..db348f8b01 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -1120,7 +1120,7 @@ var/global/list/damage_icon_parts = list() set_tail_state("[species.get_tail(src)]_idle[rand(0,9)]") else set_tail_state("[species.get_tail(src)]_static") - toggle_tail(0) //VOREStation Add - So tails stop when someone dies. + toggle_tail_vr(0) //VOREStation Add - So tails stop when someone dies. if(update_icons) update_icons() diff --git a/code/modules/vore/appearance/sprite_accessories_vr.dm b/code/modules/vore/appearance/sprite_accessories_vr.dm index 911c1966c4..88dc6cdc7c 100644 --- a/code/modules/vore/appearance/sprite_accessories_vr.dm +++ b/code/modules/vore/appearance/sprite_accessories_vr.dm @@ -551,28 +551,28 @@ do_colouration = 1 /datum/sprite_accessory/tail/curltail - name = "curltail (*vwag)" + name = "curltail (vwag)" desc = "" icon_state = "curltail" ani_state = "curltail_w" do_colouration = 1 /datum/sprite_accessory/tail/shorttail - name = "shorttail (*vwag)" + name = "shorttail (vwag)" desc = "" icon_state = "straighttail" ani_state = "straighttail_w" do_colouration = 1 /datum/sprite_accessory/tail/tiger_new - name = "tiger tail (*vwag)" + name = "tiger tail (vwag)" desc = "" icon_state = "tigertail" ani_state = "tigertail_w" do_colouration = 1 /datum/sprite_accessory/tail/vulp_new - name = "new vulp tail (*vwag)" + name = "new vulp tail (vwag)" desc = "" icon_state = "vulptail" ani_state = "vulptail_w"