From e5e7ea27ec3a39d757cc9c0a68880a6737da37a5 Mon Sep 17 00:00:00 2001 From: KasparoVy <12377767+KasparoVy@users.noreply.github.com> Date: Tue, 27 Aug 2019 13:28:16 -0400 Subject: [PATCH] Turn Wingler Tail into a Tail Marking Allows Tajara to use tail markings and turns the wingler tail body accessory into a marking you can colour properly. Keeps some of the original naming to pay homage. --- .../living/carbon/human/body_accessories.dm | 7 ------- .../living/carbon/human/species/tajaran.dm | 2 +- .../tajaran/tajaran_tail_markings.dm | 7 +++++++ icons/mob/body_accessory.dmi | Bin 4567 -> 3548 bytes .../tajaran/tajaran_tail_markings.dmi | Bin 0 -> 791 bytes paradise.dme | 1 + 6 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_tail_markings.dm create mode 100644 icons/mob/sprite_accessories/tajaran/tajaran_tail_markings.dmi diff --git a/code/modules/mob/living/carbon/human/body_accessories.dm b/code/modules/mob/living/carbon/human/body_accessories.dm index f44ec079067..d1c2900cc8d 100644 --- a/code/modules/mob/living/carbon/human/body_accessories.dm +++ b/code/modules/mob/living/carbon/human/body_accessories.dm @@ -100,13 +100,6 @@ var/global/list/body_accessory_by_species = list("None" = null) 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" 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/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/icons/mob/body_accessory.dmi b/icons/mob/body_accessory.dmi index 4a9c56c8280da46c68cbc31fdd5fbefa492c6ede..5d304441f6713b5abcd51f2f3579589ec33a13ce 100644 GIT binary patch literal 3548 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 WQA5piWJBz~`RZvKYn9)3iuf0bThl`T 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 0000000000000000000000000000000000000000..f8fe1e1c7edb17d10a29dadd9e375b8a5bad778e GIT binary patch literal 791 zcmV+y1L*vTP)fFDZ*Bkp zc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LY zR3K9+B{eOvG^ZrKJTosnC$%WPSc!`>C9|j)WB?auT2W$dDu``}Q%5;2E#^Sc)SSdh zkZv6$$i-Qd3e=kdHdR@{)z1a&Z~!F%H;}pg0$2b50vJg|K~#90?VDjz#4rejo9qRm zCqPfINAUiqvUR4m5CSA^)EVFR$IUiCg4>x#OO^!y0001>mm)rw)FWY z>}v|&6CLBmKZMT4_2nu>MEZDD@#;@1opgVwzz}Iq`?y^y?Mnz27;;PdI4^4Xu$5tZ zfQto2^PWrMZ`=|90000W%vD9<*^5WB+7weYx%C56y1F=&TD5Jja#(LK0#tEKEzQa8 zb&ds4R{eiPpk^lg5-aac$r86sKYoh77u`_*&LuZRZjI&`s}%=ByaTzPi#J-HEd8hN z9{>OV0RNCph3oR%dZ^2FlUYB|iYAlN)?X7-&rbc&6yX%xfLlMbHTZtTtYyaP2S!%3 z_|bnfRzL6n^|X`r9IPL>yV`OtW&TU9kLeKr00000f}J}T9!r*peUG$~3bCxRnm_q{ zscpmp?A{ltBuU6|DZiC+#12qh6{=cF&9ZKif79DPB$Fl+E^Del|B#K`BHv-8f2fnf zJo^1Z7xDXtuHyC&0RR910D!+k|M`PH?m0j3tISSO?EJwn_aAVU0VW)9W=uVQ@Co8r V6O|LORMG$d002ovPDHLkV1hcgSz-VH literal 0 HcmV?d00001 diff --git a/paradise.dme b/paradise.dme index efb27499c47..31faf0f0469 100644 --- a/paradise.dme +++ b/paradise.dme @@ -2029,6 +2029,7 @@ #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"