From 72aaab9c843c5445a4e74e9a82240a0ede12878c Mon Sep 17 00:00:00 2001 From: Greenjoe12345 <33647525+Greenjoe12345@users.noreply.github.com> Date: Sat, 7 Sep 2024 17:00:34 +0100 Subject: [PATCH] Tajara prosthetic tails (#19862) Adds three prosthetic tails for tajara to select from the loadout. ![image](https://github.com/user-attachments/assets/b89e60ad-1302-4d91-b55f-d8ae2594a305) ![image](https://github.com/user-attachments/assets/85ec5345-a7a7-4fcb-823a-93bc2301ea98) ![image](https://github.com/user-attachments/assets/42ae38b9-6abc-4904-b6a5-a4cab910d4b7) --- .../loadout/items/xeno/tajara.dm | 22 +++++++ code/modules/clothing/tail_accessory.dm | 20 ++++++ html/changelogs/greenjoe12345-tails.yml | 58 ++++++++++++++++++ .../clothing/tail/taj_flexible_prosthetic.dmi | Bin 0 -> 424 bytes icons/clothing/tail/taj_solid_prosthetic.dmi | Bin 0 -> 410 bytes icons/clothing/tail/taj_tesla_prosthetic.dmi | Bin 0 -> 548 bytes 6 files changed, 100 insertions(+) create mode 100644 html/changelogs/greenjoe12345-tails.yml create mode 100644 icons/clothing/tail/taj_flexible_prosthetic.dmi create mode 100644 icons/clothing/tail/taj_solid_prosthetic.dmi create mode 100644 icons/clothing/tail/taj_tesla_prosthetic.dmi diff --git a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm index d9a5f221b05..cafa5cf5be0 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm @@ -696,3 +696,25 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara) sort_category = "Xenowear - Tajara" path = /obj/item/typewriter_case flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/prosthetic_tail + display_name = "prosthetic tail selection" + description = "A selection of colourable prosthetics tails for tajara. Only useable with the Hakh'jar tail." + path = /obj/item/clothing/tail_accessory/prosthetic + sort_category = "Xenowear - Tajara" + whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/prosthetic_tail/tajara/New() + ..() + var/list/tail_pros = list() + tail_pros["solid prosthetic"] = /obj/item/clothing/tail_accessory/prosthetic + tail_pros["flexible prosthetic"] = /obj/item/clothing/tail_accessory/prosthetic/flexible + gear_tweaks += new /datum/gear_tweak/path(tail_pros) + +/datum/gear/tesla_prosthetic_tail + display_name = "tesla prosthetic tail" + path = /obj/item/clothing/tail_accessory/prosthetic/tesla + sort_category = "Xenowear - Tajara" + whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION diff --git a/code/modules/clothing/tail_accessory.dm b/code/modules/clothing/tail_accessory.dm index 71070f0922f..7844b562cac 100644 --- a/code/modules/clothing/tail_accessory.dm +++ b/code/modules/clothing/tail_accessory.dm @@ -27,3 +27,23 @@ compatible_species_type = list(/datum/species/tajaran) compatible_tail_type = list("Tail") compatible_animated_tail = list("Tail") + +/obj/item/clothing/tail_accessory/prosthetic + name = "solid prosthetic tail" + desc = "A simple prosthetic tail made to help tajara with a stunted tail to balance." + icon = 'icons/clothing/tail/taj_solid_prosthetic.dmi' + icon_state = "tail_prosthetic" + + compatible_species_type = list(/datum/species/tajaran) + compatible_tail_type = list("Hakh'jar Tail") + compatible_animated_tail = list("Hakh'jar Tail") + +/obj/item/clothing/tail_accessory/prosthetic/flexible + name = "flexible prosthetic tail" + desc = "A flexible prosthetic tail for a tajara. Still rather stiff." + icon = 'icons/clothing/tail/taj_flexible_prosthetic.dmi' + +/obj/item/clothing/tail_accessory/prosthetic/tesla + name = "tesla prosthetic tail" + desc = "A prosthetic tail made for Republican citizens born with Hakh'jar." + icon = 'icons/clothing/tail/taj_tesla_prosthetic.dmi' diff --git a/html/changelogs/greenjoe12345-tails.yml b/html/changelogs/greenjoe12345-tails.yml new file mode 100644 index 00000000000..ea1292fb34b --- /dev/null +++ b/html/changelogs/greenjoe12345-tails.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Greenjoe12345 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds several prosthetic tails for tajara." diff --git a/icons/clothing/tail/taj_flexible_prosthetic.dmi b/icons/clothing/tail/taj_flexible_prosthetic.dmi new file mode 100644 index 0000000000000000000000000000000000000000..81747b1def54449b72e20a011d695d95bdd1b018 GIT binary patch literal 424 zcmV;Z0ayNsP)004jl0{{R3eocQU0000FP)t-sz`($c zj*i{k-N3-Wz`(%0H)p^A0004WQchCV=-0C=2J zR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5 zsU$HoC%&L4zqlkLwInlHiHkEOv#1y-W5~ssR+N~V3Sq<5dn9IOsAnY>DTIJDf`l`Z z<4f`p`b>z?m!FrMO1iGhlpHd2<>coV;L)Y5;OgfB4mto+2Vo9*MM=N_005jxL_t(& zf$iDN34kyRhGDA^{bh%g004jj0{{R3@ePWI0000CP)t-sz`($c zj*i{k-N3-WMxI7400001bW%=J06^y0W&i*HpL$eSbVOxyV{&P5bZKvH004NLQ&wi2| zGbg^FD8INQBef(mS&54?C9|j)C}YUQnO2mTn+jpW)q5mnXQ*c-7Ab^)G=hXPljBSB z5&BGs(U+f>oJzW`%#<85bmipd7vRyQtl;YB0uDL=QwL!Vc|}RU0001yNklJA5JfGtx1n(wMqmw`#vvTk1Ti^?;jR!v@m@u^A0WA(A8wie{$VxhmS_}ir}e~O z6ha@oE=etNxue1=b1h68`;petD)F_+?!H=DrD+>!6>I|l{qVX(%f(P^G;*;FQgRUh z#>5-zS}s0yH5YST&qY@~ja&qPF=@@w5`B)&eEna%0M~pOhWzcZEC2ui07*qoM6N<$ Eg32+f`2YX_ literal 0 HcmV?d00001 diff --git a/icons/clothing/tail/taj_tesla_prosthetic.dmi b/icons/clothing/tail/taj_tesla_prosthetic.dmi new file mode 100644 index 0000000000000000000000000000000000000000..0773bcf71b7b5dc2c04ad57a884043d0b5ffee6e GIT binary patch literal 548 zcmV+<0^9wGP)004jl0{{R3eocQU0000IP)t-sz`(#= z`SYZrn7z8NZ*642z`#I_F}eT%00DGTPE!Ct=GbNc005tQR9JLGWpiV4X>fFDZ*Bkp zc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LY zR3KBSBr!85zMv?-xFjRBBr{owi!&v&s2C_?$i6Ux~`o3`~uQ-Wv1ldvrAdQ)z1YSbO2cIVGag_M#2C90ToF^ zK~!jg?U`W?f-nq)QFj1;cmT~ffZ+racK@HtalP?wTF%8=FfBOwUdU){0vCgjL7U*jls~rJG^&v8v9`x*udq^n zrcEKu9^^9xk~U?j$&_TDO(?60INng2MXp zi@L&kcDo-;Pt*FrWWUxAW@B)zAI!$!T0ba_!Qlr1004jn45n`sgXtS({|fc