From 3c861646bc19df2d488609e96399a73ebbb328a7 Mon Sep 17 00:00:00 2001 From: TheGreatKitsune Date: Mon, 30 Jan 2023 10:37:39 -0600 Subject: [PATCH] Fixes for sprites and cleaning up code things --- .../new_player/sprite_accessories_taur_ch.dm | 111 ------------------ icons/mob/vore/taurs_ch.dmi | Bin 123085 -> 123554 bytes .../mob/new_player/sprite_accessories_taur.dm | 27 +++++ 3 files changed, 27 insertions(+), 111 deletions(-) delete mode 100644 code/modules/mob/new_player/sprite_accessories_taur_ch.dm diff --git a/code/modules/mob/new_player/sprite_accessories_taur_ch.dm b/code/modules/mob/new_player/sprite_accessories_taur_ch.dm deleted file mode 100644 index b2e95a8ae0..0000000000 --- a/code/modules/mob/new_player/sprite_accessories_taur_ch.dm +++ /dev/null @@ -1,111 +0,0 @@ -/datum/sprite_accessory/tail/taur/ch - icon = 'icons/mob/vore/taurs_ch.dmi'//Parent which allows us to not need to set icon every time. - -/datum/sprite_accessory/tail/taur/ch/zorgoia - name = "Zorgoia (Taur)" - icon_state = "zorgoia" - extra_overlay = "zorgoia_fluff" - -/datum/sprite_accessory/tail/taur/ch/zorgoia/fat - name = "Zorgoia (Fat Taur)" - extra_overlay = "zorgoia_fat" - -/datum/sprite_accessory/tail/taur/ch/redpanda - name = "Red Panda (Taur)" - icon_state = "redpanda" - -/datum/sprite_accessory/tail/taur/ch/redpandadc - name = "Red Panda (Taur dual-color)" - icon_state = "redpanda_dc" - extra_overlay = "redpanda_dc_markings" - -/datum/sprite_accessory/tail/taur/ch/wolf/fatwolf_2c/fatwolfalt - name = "Fat Wolf 3-color-alt (Taur)" - icon_state = "fatwolfalt_s" - extra_overlay = "fatwolfalt_markings1" - extra_overlay2 = "fatwolfalt_markings2" - icon_sprite_tag = "wolf" - -/datum/sprite_accessory/tail/taur/ch/naga/alt - name = "Naga alt (Taur)" - icon_state = "naga_alt_s" - suit_sprites = 'modular_chomp/icons/mob/taursuits_naga_ch.dmi' - - msg_owner_help_walk = "You carefully slither around %prey." - msg_prey_help_walk = "%owner's huge tail slithers past beside you!" - - msg_owner_help_run = "You carefully slither around %prey." - msg_prey_help_run = "%owner's huge tail slithers past beside you!" - - msg_owner_disarm_run = "Your tail slides over %prey, pushing them down to the ground!" - msg_prey_disarm_run = "%owner's tail slides over you, forcing you down to the ground!" - - msg_owner_disarm_walk = "You push down on %prey with your tail, pinning them down under you!" - msg_prey_disarm_walk = "%owner pushes down on you with their tail, pinning you down below them!" - - msg_owner_harm_run = "Your heavy tail carelessly slides past %prey, crushing them!" - msg_prey_harm_run = "%owner quickly goes over your body, carelessly crushing you with their heavy tail!" - - msg_owner_harm_walk = "Your heavy tail slowly and methodically slides down upon %prey, crushing against the floor below!" - msg_prey_harm_walk = "%owner's thick, heavy tail slowly and methodically slides down upon your body, mercilessly crushing you into the floor below!" - - msg_owner_grab_success = "You slither over %prey with your large, thick tail, smushing them against the ground before coiling up around them, trapping them within the tight confines of your tail!" - msg_prey_grab_success = "%owner slithers over you with their large, thick tail, smushing you against the ground before coiling up around you, trapping you within the tight confines of their tail!" - - msg_owner_grab_fail = "You squish %prey under your large, thick tail, forcing them onto the ground!" - msg_prey_grab_fail = "%owner pins you under their large, thick tail, forcing you onto the ground!" - - msg_prey_stepunder = "You jump over %prey's thick tail." - msg_owner_stepunder = "%owner bounds over your tail." - - -/datum/sprite_accessory/tail/taur/ch/naga/alt_2c - name = "Naga dual-color alt (Taur)" - icon_state = "naga_alt_s" - extra_overlay = "naga_alt_markings" - suit_sprites = 'modular_chomp/icons/mob/taursuits_naga_ch.dmi' - - msg_owner_help_walk = "You carefully slither around %prey." - msg_prey_help_walk = "%owner's huge tail slithers past beside you!" - - msg_owner_help_run = "You carefully slither around %prey." - msg_prey_help_run = "%owner's huge tail slithers past beside you!" - - msg_owner_disarm_run = "Your tail slides over %prey, pushing them down to the ground!" - msg_prey_disarm_run = "%owner's tail slides over you, forcing you down to the ground!" - - msg_owner_disarm_walk = "You push down on %prey with your tail, pinning them down under you!" - msg_prey_disarm_walk = "%owner pushes down on you with their tail, pinning you down below them!" - - msg_owner_harm_run = "Your heavy tail carelessly slides past %prey, crushing them!" - msg_prey_harm_run = "%owner quickly goes over your body, carelessly crushing you with their heavy tail!" - - msg_owner_harm_walk = "Your heavy tail slowly and methodically slides down upon %prey, crushing against the floor below!" - msg_prey_harm_walk = "%owner's thick, heavy tail slowly and methodically slides down upon your body, mercilessly crushing you into the floor below!" - - msg_owner_grab_success = "You slither over %prey with your large, thick tail, smushing them against the ground before coiling up around them, trapping them within the tight confines of your tail!" - msg_prey_grab_success = "%owner slithers over you with their large, thick tail, smushing you against the ground before coiling up around you, trapping you within the tight confines of their tail!" - - msg_owner_grab_fail = "You squish %prey under your large, thick tail, forcing them onto the ground!" - msg_prey_grab_fail = "%owner pins you under their large, thick tail, forcing you onto the ground!" - - msg_prey_stepunder = "You jump over %prey's thick tail." - msg_owner_stepunder = "%owner bounds over your tail." - - -/datum/sprite_accessory/tail/taur/ch/horse/scoli - name = "Scolipede (Taur)" - icon_state = "scoli_s" - extra_overlay = "scoli_markings1" - extra_overlay2 = "scoli_markings2" - -/datum/sprite_accessory/tail/taur/ch/sergal/wheaties - name = "Sergal (Taur)" - icon_state = "sergwheat" - icon_sprite_tag = "wolf" - -/datum/sprite_accessory/tail/taur/ch/sergal/wheaties_2c - name = "Sergal (Taur, dual-color)" - icon_state = "sergwheat" - extra_overlay = "sergwheat_markings" - icon_sprite_tag = "wolf" diff --git a/icons/mob/vore/taurs_ch.dmi b/icons/mob/vore/taurs_ch.dmi index 0d8a62706bd0f835b12e68df88c46ce80b1fdff8..c27a0fd2b72d6bac5e99dbba368645eceb1dad60 100644 GIT binary patch delta 3870 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