Merge pull request #652 from TheFurryFeline/TFF-Mermaid_Tail_Flippage

Mermaid Tail Flippage
This commit is contained in:
Hiziaan
2019-04-28 18:04:06 -05:00
committed by GitHub
2 changed files with 33 additions and 1 deletions
@@ -143,7 +143,7 @@
/datum/sprite_accessory/tail/taur/roiz_long_lizard // Not ACTUALLY a taur, but it uses 32x64 so it wouldn't fit in tails.dmi, and having it as a tail bugs up the sprite.
name = "Long Lizard Tail (Roiz Lizden)"
icon_state = "roiz_tail_s"
do_colouration = 0
do_colouration = 1 //TFF 25/4/19: Make colourable as per request.
// ckeys_allowed = list("spoopylizz")
/datum/sprite_accessory/tail/taur/wolf
@@ -399,6 +399,38 @@
icon_state = "otie_s"
extra_overlay = "otie_markings"
//TFF 25/4/19: Add Mermaid taur body selection. Requested addition!
/datum/sprite_accessory/tail/taur/mermaid
name = "Mermaid (Taur)"
icon_state = "mermaid_s"
msg_owner_help_walk = "You carefully slide around %prey."
msg_prey_help_walk = "%owner's huge fin slides past beside you!"
msg_owner_help_run = "You carefully slide around %prey."
msg_prey_help_run = "%owner's huge fine slides past beside you!"
msg_owner_disarm_run = "Your fin comes up above %prey, pushing them down to the ground!"
msg_prey_disarm_run = "%owner's fin comes up you, forcing you down to the ground!"
msg_owner_disarm_walk = "You push down on %prey with your fin, pinning them down under you!"
msg_prey_disarm_walk = "%owner pushes down on you with their fin, pinning you down below them!"
msg_owner_harm_run = "While sliding across the ground, you go right over %prey, crushing them!"
msg_prey_harm_run = "%owner slides over your body, carelessly crushing you with their heavy fin!"
msg_owner_harm_walk = "Your heavy fin slowly and methodically slides down upon %prey, crushing against the floor below!"
msg_prey_harm_walk = "%owner's thick, heavy fin slowly and methodically slides down upon your body, mercilessly crushing you into the floor below!"
msg_owner_grab_success = "You slide over %prey with your large, thick fin, smushing them against the ground before bending around them, trapping them between the base of the fin and the end of it!"
msg_prey_grab_success = "%owner slithers over you with their large, thick fin, smushing you against the ground before bending around you, trapping you between the fin's base and the end of it!"
msg_owner_grab_fail = "You squish %prey under your large, thick fin, forcing them onto the ground!"
msg_prey_grab_fail = "%owner pins you under their large, thick fin, forcing you onto the ground!"
msg_prey_stepunder = "You jump over %prey's thick fin."
msg_owner_stepunder = "%owner bounds over your fin."
//wickedtemp: Chakat Tempest
/datum/sprite_accessory/tail/taur/feline/tempest
name = "Feline (wickedtemp) (Taur)"