From 1ddda2f85223601ce25c12c61a50cfb8d0633dc8 Mon Sep 17 00:00:00 2001 From: KasparoVy <12377767+KasparoVy@users.noreply.github.com> Date: Mon, 26 Aug 2019 22:05:03 -0400 Subject: [PATCH] Allow Tajara to use Tiny/Short Tails + Its Marking & Mild Cleanup Tajara can now use the species-ambiguous tiny tail, short tail + marking and cleans up body accessory code. --- .../living/carbon/human/body_accessories.dm | 73 +++++++++--------- .../vulpkanin/vulpkanin_tail_markings.dm | 15 ++-- icons/mob/body_accessory.dmi | Bin 4543 -> 4567 bytes 3 files changed, 43 insertions(+), 45 deletions(-) diff --git a/code/modules/mob/living/carbon/human/body_accessories.dm b/code/modules/mob/living/carbon/human/body_accessories.dm index 071ad99cd95..f44ec079067 100644 --- a/code/modules/mob/living/carbon/human/body_accessories.dm +++ b/code/modules/mob/living/carbon/human/body_accessories.dm @@ -8,9 +8,9 @@ var/global/list/body_accessory_by_name = list("None" = null) if(body_accessory_by_name.len) if(initialize_body_accessory_by_species()) - return 1 + return TRUE - return 0 //fail if no bodies are found + return FALSE //fail if no bodies are found var/global/list/body_accessory_by_species = list("None" = null) @@ -24,10 +24,10 @@ var/global/list/body_accessory_by_species = list("None" = null) body_accessory_by_species["[species]"] += accessory if(body_accessory_by_species.len) - return 1 - return 0 + return TRUE + return FALSE -/proc/__init_body_accessory(var/ba_path) +/proc/__init_body_accessory(ba_path) if(ispath(ba_path)) var/_added_counter = 0 @@ -38,9 +38,8 @@ var/global/list/body_accessory_by_species = list("None" = null) ++_added_counter if(_added_counter) - return 1 - return 0 - + return TRUE + return FALSE /datum/body_accessory var/name = "default" @@ -58,8 +57,8 @@ var/global/list/body_accessory_by_species = list("None" = null) var/list/allowed_species = list() -/datum/body_accessory/proc/try_restrictions(var/mob/living/carbon/human/H) - return 1 +/datum/body_accessory/proc/try_restrictions(mob/living/carbon/human/H) + return TRUE /datum/body_accessory/proc/get_animated_icon() //return animated if it has it, return static if it does not. if(animated_icon) @@ -87,7 +86,6 @@ var/global/list/body_accessory_by_species = list("None" = null) pixel_x_offset = -16 - //Tails /datum/body_accessory/tail icon = 'icons/mob/body_accessory.dmi' @@ -96,10 +94,10 @@ var/global/list/body_accessory_by_species = list("None" = null) icon_state = "null" animated_icon_state = "null" -/datum/body_accessory/tail/try_restrictions(var/mob/living/carbon/human/H) +/datum/body_accessory/tail/try_restrictions(mob/living/carbon/human/H) if(!H.wear_suit || !(H.wear_suit.flags_inv & HIDETAIL)) - return 1 - return 0 + return TRUE + return FALSE /datum/body_accessory/tail/wingler_tail // Jay wingler fluff tail @@ -109,34 +107,33 @@ var/global/list/body_accessory_by_species = list("None" = null) animated_icon_state = "winglertail_a" allowed_species = list("Tajaran") +/datum/body_accessory/tail/tiny //Pretty ambiguous as to what species it belongs to, tail could've been injured or docked. + name = "Tiny Tail" + icon_state = "tiny" + animated_icon_state = "tiny_a" + allowed_species = list("Vulpkanin", "Tajaran") + +/datum/body_accessory/tail/short //Same as above. + name = "Short Tail" + icon_state = "short" + animated_icon_state = "short_a" + allowed_species = list("Vulpkanin", "Tajaran") //Vulpkanin -/datum/body_accessory/tail/vulpkanin_2 - name = "Vulpkanin Alt 1 (Bushy)" - icon_state = "vulptail2" - animated_icon_state = "vulptail2_a" +/datum/body_accessory/tail/bushy + name = "Bushy Tail" + icon_state = "bushy" + animated_icon_state = "bushy_a" allowed_species = list("Vulpkanin") -/datum/body_accessory/tail/vulpkanin_3 - name = "Vulpkanin Alt 2 (Straight)" - icon_state = "vulptail3" - animated_icon_state = "vulptail3_a" +/datum/body_accessory/tail/straight + name = "Straight Tail" + icon_state = "straight" + animated_icon_state = "straight_a" allowed_species = list("Vulpkanin") -/datum/body_accessory/tail/vulpkanin_4 - name = "Vulpkanin Alt 3 (Tiny)" - icon_state = "vulptail4" - animated_icon_state = "vulptail4_a" - allowed_species = list("Vulpkanin") - -/datum/body_accessory/tail/vulpkanin_5 - name = "Vulpkanin Alt 4 (Short)" - icon_state = "vulptail5" - animated_icon_state = "vulptail5_a" - allowed_species = list("Vulpkanin") - -/datum/body_accessory/tail/vulpkanin_6 - name = "Vulpkanin Alt 5 (Straight Bushy)" - icon_state = "vulptail6" - animated_icon_state = "vulptail6_a" +/datum/body_accessory/tail/straight_bushy + name = "Straight Bushy Tail" + icon_state = "straightbushy" + animated_icon_state = "straightbushy_a" allowed_species = list("Vulpkanin") diff --git a/code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_tail_markings.dm b/code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_tail_markings.dm index 85b93ad3f19..ae6953f7f44 100644 --- a/code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_tail_markings.dm +++ b/code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_tail_markings.dm @@ -12,25 +12,26 @@ /datum/sprite_accessory/body_markings/tail/vulpkanin/vulp_bushy_fluff name = "Vulpkanin Bushy Tail Fluff" - tails_allowed = list("Vulpkanin Alt 1 (Bushy)") + tails_allowed = list("Bushy Tail") icon_state = "bushfluff" -/datum/sprite_accessory/body_markings/tail/vulpkanin/vulp_short_tip - name = "Vulpkanin Short Tail Tip" - tails_allowed = list("Vulpkanin Alt 4 (Short)") +/datum/sprite_accessory/body_markings/tail/vulpkanin/short_tip //Species-ambiguous, generic short tail. + name = "Short Tail Tip" + species_allowed = list("Vulpkanin", "Tajaran") + tails_allowed = list("Short Tail") icon_state = "short" /datum/sprite_accessory/body_markings/tail/vulpkanin/vulp_hybrid_tip name = "Vulpkanin Bushy Straight Tail Tip" - tails_allowed = list("Vulpkanin Alt 5 (Straight Bushy)") + tails_allowed = list("Straight Bushy Tail") icon_state = "sbtip" /datum/sprite_accessory/body_markings/tail/vulpkanin/vulp_hybrid_fade name = "Vulpkanin Bushy Straight Tail Fade" - tails_allowed = list("Vulpkanin Alt 5 (Straight Bushy)") + tails_allowed = list("Straight Bushy Tail") icon_state = "sbfade" /datum/sprite_accessory/body_markings/tail/vulpkanin/vulp_hybrid_silverf name = "Vulpkanin Bushy Straight Tail Black Fade White Tip" - tails_allowed = list("Vulpkanin Alt 5 (Straight Bushy)") + tails_allowed = list("Straight Bushy Tail") icon_state = "sbsilverfade" \ No newline at end of file diff --git a/icons/mob/body_accessory.dmi b/icons/mob/body_accessory.dmi index 48198ff09014d7d7b71af3117277f352d1e154b1..4a9c56c8280da46c68cbc31fdd5fbefa492c6ede 100644 GIT binary patch delta 4305 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
  • dPV3`^dL-g0X zK=U1Ew0p~`XIj7{?P&2&Knf(Q=2goo`yTe4R@1^^^L{uzAmqPGi&jPb zP9Z6(zn0ezRJ~#bNj{fpRfNN4p)751Q2=bN7K$IOCeWpuRd1efnxvVvz;B$k)BI=6 zT$Q+*e2}7A&?D8G*DG7iFzt{Y+?W4RM${Up!X4C^d7%Ebuwen=v@~Btam|g zk{ZlYA<2>wLSc>rRa{+M*|g$b)b|F)UK)+IdWwfekrJr#PM8ER^}15dIu4Qcz%p_u zX4`uq?BlJ_LbIx0V!ytrKfedldCOA4nFjt44<*kn=l3~61Z1m%<0xRQ0xKcOH1}Mg zRyId7ZYcx7#FHX1%9rYXonGE0VEc_{_bKXP716)guVo9nMRG9ieR{l4j+*7{F zg@q)R)dfDC)7(~9^^c;0>pQuQBmELb?1;Gz@UP&wXG7Cyc&D6TgBmy2glNoL6I_m8EIc}hQ zE`Z-?Iya;lU{KbrER!B_OLYTRpa+L{+O%fV%N)Km@qJ|~{E55!gTIC{_5RV(GZ}kW z>8-{+W@7}h^~!EizT4BpzU#g>O&P-vc%}HWTpWG`QOGs9t9N#sIREdfeVk$verc3f z_+y>snZC9NAm@hMz02*4l5M1ATi+vx5oyKkQ>x z^X?tiqbwqSmdu;2|A589jI|Nxee`%dR5j=Ia(6|}i$=3JS7dK$g~e>blz^rhw{+w| z4Zu?RPR+^EMps)Hg|OXwSB#)YXdat`RifbqGWbXbrR_~mJP-0ZPpi78I?0BtgWb}W z!wnwFbea_Y(VPiOj9SCNrUby`TH eRVsw_LI#ILabxXNbYuK~DK^wI)vdVg67?U*Aj``D delta 4322 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