diff --git a/code/modules/mob/living/carbon/human/body_accessories.dm b/code/modules/mob/living/carbon/human/body_accessories.dm index 071ad99cd95..9c677444eb5 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,47 +94,45 @@ 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 name = "Striped Tail" - icon_state = "winglertail" 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/living/carbon/human/species/tajaran.dm b/code/modules/mob/living/carbon/human/species/tajaran.dm index 6c8c2312e17..f441d4fab4d 100644 --- a/code/modules/mob/living/carbon/human/species/tajaran.dm +++ b/code/modules/mob/living/carbon/human/species/tajaran.dm @@ -26,7 +26,7 @@ species_traits = list(LIPS, CAN_BE_FAT) clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS - bodyflags = HAS_TAIL | HAS_HEAD_ACCESSORY | HAS_HEAD_MARKINGS | HAS_BODY_MARKINGS | HAS_SKIN_COLOR | TAIL_WAGGING + bodyflags = HAS_TAIL | HAS_HEAD_ACCESSORY | HAS_MARKINGS | HAS_SKIN_COLOR | TAIL_WAGGING dietflags = DIET_OMNI taste_sensitivity = TASTE_SENSITIVITY_SHARP reagent_tag = PROCESS_ORG diff --git a/code/modules/mob/new_player/sprite_accessories/shared/shared_tail_markings.dm b/code/modules/mob/new_player/sprite_accessories/shared/shared_tail_markings.dm new file mode 100644 index 00000000000..ea1176ff738 --- /dev/null +++ b/code/modules/mob/new_player/sprite_accessories/shared/shared_tail_markings.dm @@ -0,0 +1,8 @@ +/datum/sprite_accessory/body_markings/tail/shared + icon = 'icons/mob/sprite_accessories/shared/shared_tail_markings.dmi' + +/datum/sprite_accessory/body_markings/tail/shared/short_tip //Species-ambiguous, generic short tail. + name = "Short Tail Tip" + species_allowed = list("Vulpkanin", "Tajaran") + tails_allowed = list("Short Tail") + icon_state = "short" diff --git a/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_tail_markings.dm b/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_tail_markings.dm new file mode 100644 index 00000000000..971fe1ce7c5 --- /dev/null +++ b/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_tail_markings.dm @@ -0,0 +1,7 @@ +/datum/sprite_accessory/body_markings/tail/tajara + icon = 'icons/mob/sprite_accessories/tajaran/tajaran_tail_markings.dmi' + species_allowed = list("Tajaran") + +/datum/sprite_accessory/body_markings/tail/tajara/taj_wingler_stripes //Tiger stripes. + name = "Tajaran Tail Stripes" + icon_state = "default_wingler" 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..05060d3c676 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,20 @@ /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)") - 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 48198ff0901..4a9c56c8280 100644 Binary files a/icons/mob/body_accessory.dmi and b/icons/mob/body_accessory.dmi differ diff --git a/icons/mob/sprite_accessories/shared/shared_tail_markings.dmi b/icons/mob/sprite_accessories/shared/shared_tail_markings.dmi new file mode 100644 index 00000000000..3cbc5cb0e12 Binary files /dev/null and b/icons/mob/sprite_accessories/shared/shared_tail_markings.dmi differ diff --git a/icons/mob/sprite_accessories/tajaran/tajaran_tail_markings.dmi b/icons/mob/sprite_accessories/tajaran/tajaran_tail_markings.dmi new file mode 100644 index 00000000000..6aca092d6dd Binary files /dev/null and b/icons/mob/sprite_accessories/tajaran/tajaran_tail_markings.dmi differ diff --git a/icons/mob/sprite_accessories/vulpkanin/vulpkanin_tail_markings.dmi b/icons/mob/sprite_accessories/vulpkanin/vulpkanin_tail_markings.dmi index 28a247c39fe..ee1dc729876 100644 Binary files a/icons/mob/sprite_accessories/vulpkanin/vulpkanin_tail_markings.dmi and b/icons/mob/sprite_accessories/vulpkanin/vulpkanin_tail_markings.dmi differ diff --git a/paradise.dme b/paradise.dme index 237ef95349a..cda0cebff3e 100644 --- a/paradise.dme +++ b/paradise.dme @@ -2035,12 +2035,14 @@ #include "code\modules\mob\new_player\sprite_accessories\kidan\kidan_head_accessories.dm" #include "code\modules\mob\new_player\sprite_accessories\kidan\kidan_head_markings.dm" #include "code\modules\mob\new_player\sprite_accessories\nucleation\nucleation_face.dm" +#include "code\modules\mob\new_player\sprite_accessories\shared\shared_tail_markings.dm" #include "code\modules\mob\new_player\sprite_accessories\skrell\skrell_face.dm" #include "code\modules\mob\new_player\sprite_accessories\tajaran\tajaran_body_markings.dm" #include "code\modules\mob\new_player\sprite_accessories\tajaran\tajaran_facial_hair.dm" #include "code\modules\mob\new_player\sprite_accessories\tajaran\tajaran_hair.dm" #include "code\modules\mob\new_player\sprite_accessories\tajaran\tajaran_head_accessories.dm" #include "code\modules\mob\new_player\sprite_accessories\tajaran\tajaran_head_markings.dm" +#include "code\modules\mob\new_player\sprite_accessories\tajaran\tajaran_tail_markings.dm" #include "code\modules\mob\new_player\sprite_accessories\unathi\unathi_alt_heads.dm" #include "code\modules\mob\new_player\sprite_accessories\unathi\unathi_body_markings.dm" #include "code\modules\mob\new_player\sprite_accessories\unathi\unathi_facial_hair.dm"