From 9e5f3628c9b714183d04c7dd4fb8dc499e0331e9 Mon Sep 17 00:00:00 2001 From: NullFag Date: Thu, 30 Mar 2023 14:58:02 +0200 Subject: [PATCH 1/5] h --- code/__DEFINES/~~bubber_defines/species.dm | 1 + config/game_options.txt | 1 + .../customization/sprite_accessories/ears.dm | 5 ++++ .../customization/sprite_accessories/tails.dm | 23 ++++++++++++++++ .../customization/sprite_accessories/taurs.dm | 15 +++++++++++ .../modules/mob/living/carbon/human/human.dm | 2 ++ .../carbon/human/species_types/shadekin.dm | 25 ++++++++++++++++++ .../bodyparts/species_parts/misc_bodyparts.dm | 25 ++++++++++++++++++ modular_zubbers/icons/customization/ears.dmi | Bin 0 -> 864 bytes modular_zubbers/icons/customization/tails.dmi | Bin 0 -> 2756 bytes modular_zubbers/icons/customization/taur.dmi | Bin 0 -> 2076 bytes .../mob/species/human_parts_greyscale.dmi | Bin 0 -> 2405 bytes tgstation.dme | 7 +++++ 13 files changed, 104 insertions(+) create mode 100644 code/__DEFINES/~~bubber_defines/species.dm create mode 100644 modular_zubbers/code/modules/customization/sprite_accessories/ears.dm create mode 100644 modular_zubbers/code/modules/customization/sprite_accessories/tails.dm create mode 100644 modular_zubbers/code/modules/customization/sprite_accessories/taurs.dm create mode 100644 modular_zubbers/code/modules/mob/living/carbon/human/human.dm create mode 100644 modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm create mode 100644 modular_zubbers/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm create mode 100644 modular_zubbers/icons/customization/ears.dmi create mode 100644 modular_zubbers/icons/customization/tails.dmi create mode 100644 modular_zubbers/icons/customization/taur.dmi create mode 100644 modular_zubbers/icons/mob/species/human_parts_greyscale.dmi diff --git a/code/__DEFINES/~~bubber_defines/species.dm b/code/__DEFINES/~~bubber_defines/species.dm new file mode 100644 index 00000000000..62a3858d872 --- /dev/null +++ b/code/__DEFINES/~~bubber_defines/species.dm @@ -0,0 +1 @@ +#define SPECIES_SHADEKIN "shadekin" diff --git a/config/game_options.txt b/config/game_options.txt index 16d4b92f611..e72fc3af8c4 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -419,6 +419,7 @@ ROUNDSTART_RACES aquatic ROUNDSTART_RACES insect ROUNDSTART_RACES synth ROUNDSTART_RACES ghoul +ROUNDSTART_RACES shadekin ##------------------------------------------------------------------------------------------- diff --git a/modular_zubbers/code/modules/customization/sprite_accessories/ears.dm b/modular_zubbers/code/modules/customization/sprite_accessories/ears.dm new file mode 100644 index 00000000000..9f97d3a51d2 --- /dev/null +++ b/modular_zubbers/code/modules/customization/sprite_accessories/ears.dm @@ -0,0 +1,5 @@ +/datum/sprite_accessory/ears/shadekin + name = "Shadekin" + icon_state = "shadekin" + color_src = MUTCOLORS + icon = 'modular_zubbers/icons/customization/ears.dmi' diff --git a/modular_zubbers/code/modules/customization/sprite_accessories/tails.dm b/modular_zubbers/code/modules/customization/sprite_accessories/tails.dm new file mode 100644 index 00000000000..6a16de96bc2 --- /dev/null +++ b/modular_zubbers/code/modules/customization/sprite_accessories/tails.dm @@ -0,0 +1,23 @@ +/datum/sprite_accessory/tails/mammal/shadekin + name = "Shadekin" + icon_state = "shadekin" + icon = 'modular_zubbers/icons/customization/tails.dmi' + color_src = MUTCOLORS + +/datum/sprite_accessory/tails/mammal/wagging/shadekin + name = "Shadekin" + icon_state = "shadekin" + icon = 'modular_zubbers/icons/customization/tails.dmi' + color_src = MUTCOLORS + +/datum/sprite_accessory/tails/mammal/wagging/shadekinshort + name = "Shadekin Short" + icon_state = "shadekinshort" + icon = 'modular_zubbers/icons/customization/tails.dmi' + color_src = MUTCOLORS + +/datum/sprite_accessory/tails/mammal/wagging/shadekinshort + name = "Shadekin Short" + icon_state = "shadekinshort" + icon = 'modular_zubbers/icons/customization/tails.dmi' + color_src = MUTCOLORS diff --git a/modular_zubbers/code/modules/customization/sprite_accessories/taurs.dm b/modular_zubbers/code/modules/customization/sprite_accessories/taurs.dm new file mode 100644 index 00000000000..f436c1557d4 --- /dev/null +++ b/modular_zubbers/code/modules/customization/sprite_accessories/taurs.dm @@ -0,0 +1,15 @@ +/datum/sprite_accessory/taur/shadekin + name = "Shadekin Long Tail" + icon_state = "shadekinlong" + icon = 'modular_zubbers/icons/customization/taur.dmi' + taur_mode = STYLE_TAUR_PAW + color_src = MUTCOLORS + extra = FALSE + +/datum/sprite_accessory/taur/shadekin_long + name = "Shadekin Big Tail" + icon_state = "shadekinbig" + icon = 'modular_zubbers/icons/customization/taur.dmi' + taur_mode = STYLE_TAUR_PAW + color_src = MUTCOLORS + extra = FALSE diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/human.dm b/modular_zubbers/code/modules/mob/living/carbon/human/human.dm new file mode 100644 index 00000000000..4ae38094df0 --- /dev/null +++ b/modular_zubbers/code/modules/mob/living/carbon/human/human.dm @@ -0,0 +1,2 @@ +/mob/living/carbon/human/species/mammal/shadekin + race = /datum/species/mammal/shadekin diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm new file mode 100644 index 00000000000..f65d46571e4 --- /dev/null +++ b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm @@ -0,0 +1,25 @@ +/datum/species/mammal/shadekin + name = "Shadekin" + id = SPECIES_SHADEKIN + say_mod = "mars" + default_mutant_bodyparts = list( + "mcolor" = "FFFFFF", + "mcolor2" = "FFFFFF", + "mcolor3" = "FFFFFF", + "mam_tail" = "Shadekin", + "mam_ears" = "Shadekin", + "deco_wings" = "None", + "taur" = "None", + "horns" = "None", + "legs" = "Plantigrade", + "meat_type" = "Mammalian" + ) + + bodypart_overrides = list( + BODY_ZONE_HEAD = /obj/item/bodypart/head/shadekin, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/shadekin, + BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/shadekin, + BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/shadekin, + BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/shadekin, + BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/shadekin + ) diff --git a/modular_zubbers/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm b/modular_zubbers/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm new file mode 100644 index 00000000000..8cdb96465f9 --- /dev/null +++ b/modular_zubbers/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm @@ -0,0 +1,25 @@ +/obj/item/bodypart/head/shadekin + icon_greyscale = 'modular_zubbers/icons/mob/species/human_parts_greyscale.dmi' + limb_id = SPECIES_SHADEKIN + is_dimorphic = TRUE + +/obj/item/bodypart/chest/shadekin + icon_greyscale = 'modular_zubbers/icons/mob/species/human_parts_greyscale.dmi' + limb_id = SPECIES_SHADEKIN + is_dimorphic = TRUE + +/obj/item/bodypart/arm/left/shadekin + icon_greyscale = 'modular_zubbers/icons/mob/species/human_parts_greyscale.dmi' + limb_id = SPECIES_SHADEKIN + +/obj/item/bodypart/arm/right/shadekin + icon_greyscale = 'modular_zubbers/icons/mob/species/human_parts_greyscale.dmi' + limb_id = SPECIES_SHADEKIN + +/obj/item/bodypart/leg/left/shadekin + icon_greyscale = 'modular_zubbers/icons/mob/species/human_parts_greyscale.dmi' + limb_id = SPECIES_SHADEKIN + +/obj/item/bodypart/leg/right/shadekin + icon_greyscale = 'modular_zubbers/icons/mob/species/human_parts_greyscale.dmi' + limb_id = SPECIES_SHADEKIN diff --git a/modular_zubbers/icons/customization/ears.dmi b/modular_zubbers/icons/customization/ears.dmi new file mode 100644 index 0000000000000000000000000000000000000000..97620ad1077dfad79045adf297c641268424a338 GIT binary patch literal 864 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 R94t!#ds`=)niKx1e*wqL06_o% literal 0 HcmV?d00001 diff --git a/modular_zubbers/icons/customization/taur.dmi b/modular_zubbers/icons/customization/taur.dmi new file mode 100644 index 0000000000000000000000000000000000000000..b1f531d8b5bf922d7991dd3a01278c8592805050 GIT binary patch literal 2076 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 Date: Thu, 30 Mar 2023 15:05:05 +0200 Subject: [PATCH 2/5] gs --- .../mob/species/human_parts_greyscale.dmi | Bin 2405 -> 2355 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/modular_zubbers/icons/mob/species/human_parts_greyscale.dmi b/modular_zubbers/icons/mob/species/human_parts_greyscale.dmi index 9f84ec00193981c85608aa01c4a644648924ab3f..00694463c3c9158ad0dc4ef7fd349f824910759d 100644 GIT binary patch delta 2042 zcmV1YjM94K!_ ze==lTWFZ6rA2E4C2!1N836W)uThlX4xaz|1PolENm2W)vxj z)tX9xBG5!ziY~!7w9;By)a{$wUEBZve;?TN?CCjmn|mkeK*6*3_rVW5llx>sh&g#? zCXz%DH;Gt0CZs3g$rPrilJUeO{by!x-JU`9IaE*ImT%7?4yif6L3(ojcjhu#dGa7g-l*5>O-OC}Vgvb!j@#d- z^tgm=&!!M1VIo4e?brgK@bE%5CrjmgO}gkba?sQjfa!p-FP_p-HnHr z-`#k)`JIo$sUfQK8i>{B=68Mp7nNOH-*ovMbT`N6FLCm_Vti|BtFZ;^jo6dY8mvpw zQdcnq zjLr1mZ^4ySb6ejwvoiE8xvsOla|g+AOLum*9q3CI_s4Oa3e$If-`QrB;1k`c*k(&_ znGF1)B^|$qiqe5BI*Q`=&qf&oEJcE+_rRFOqq9 z6w1rCowwV_D2~%kJlA>!>#th5c;|F{{yaL&EDsp?6Ovwg{Y2h-4HtMbv@``9tfy$! z@Xh%Ac`O);eqV!cRnLxksa^rO5n7Kit&DZBtg#rpy|6!r^F&2sf9*=_0i@Rp?Sfi( z1?edx-N^Mc>=e~{xklOm4uPmY7uP*vjP<~qkp#tcCu)~G5*7pp< z9FIR2|3+^<5l61UuG2^&cY~f+>-XFQauH}I++M%tdE@ct)-<5sY?leX;y*s5L%>^#5?A4TC-}tgwB7e`ttXUo5{f`yWH^!N*$Q z!}$&U=tbxnKT%&2$?u9rKf)gLjiA9ss{`#MLXpVzC6WAYOGTc@|3Fm@8tc)?YWoq2 zM6NH1dA)FYbTO+TXf-Sjh( z{Ei?9f*=Tje;^2gAP9m8PxyQfr`{V;p%D`y-$QA=d%HH8N+V{Vj--r{Q{GSIbJGa< z9!hhctrSL4Xw*c>_fTFO=^LY|G*Y7Fdl)C$03F9LA)@7b82eflp5Zq+gyu9|uapby zpScu%1&N|%2IhO695B5%3?mz&^Wk7YYByRZV*WiYMM|h!PWHOS1w8S6t)t z(uUu+a6G@#pWdIK|Npmk#cgwSiTyurvJHWCf5gX5(Sk3K-*|)GaJ*#U2dhkgqW78G z=Cg-%@TsLu^%=@6{v~kJV{i{Y%U^zeA^5RVWURnH!4CTj?qSoMsSGE7CkRk1-aQQ* z!F7#?2Ma~`D{P+MJA_~7KoA5$5ClOG1VIo4K};=a@X@(82$S$ll4io|^=o(=I}1G= zf8ShY*o&qmets9mUx;eSH0JSnvL&?)ty5hc6!15NbMw0p{(@|ptvJ4Z=($mbBI*l0 z&dIL0`5oV1kb|XJ4`1v0${s-ZTvyF=I>^oM`2K=4`z!OuXp7TI8@kAB*?CUB$Ib8f z{(`*TV4Qdc%jfv{9xuP+`-^hOUg8a~WPFaF?{V`xuD>Wv&B9*^g5`7Ee2<^sas5SE z|03f%iR5$qe2<^sas9>U3@bAxevILKE=0b^%kM(?i*b5*@0?Q~&ga79dz}0(gnv~2 Y0aW`vAg(oHG5`Po07*qoM6N<$f`>2&#sB~S delta 2093 zcmYLLc{J3E7az(}_IlRxkeGxhMcMO^T|{co6rzP0Yr_olwJV9z*w@J#Z=Qr9+mLPS zTSJyHro|x3cnldc=GE`L^Xs2`@8@&xIrrRi?){uwbL8uh=aPr#`450VAob1c@oEJF zE}*oul*wdbvDmh@wz0}pryn`4U`M-aAmfFP-ah~i>2xF5^lp%6;C=t#`*0Wt6q=it z+9DjIDHu!pqH^M6F*uXwx#baTlPpy#3^9g4{O*?hkX)Ph8iqr2 zfwNz|%iM%jk#fSjr*e}a3RhFYE&wV`f;DPKbVckFCECOEBp_j*YCG!=ubAK1qDso) zH$`GGN(UYqziFGOE(D%aeMikSUT19h@-6z!t9ajE6t;LfzMmW3e8<5ySq+X{KiKYHFmYU^8_nxmfiWlR>@fG)M$FNHSp#%WE=wd zu$nVNo>=GbXh&?9!h*cHj|w)>5TgQi=MvB?_HFa*ro+CsFcmQb>5qe|lWrhu=Cl6P?EGcJd&|EB{iw}#mHCpjIv^N%t z2YWgr8}Mt;TTs*~oDA~v({h5m{KJsHT}dehLjsc4HAfVvU6hfr-fNZ&5mJXhiQ-~Ec z;s4LumlY20RxK`O2PxbGi=?v~FbW=IKP*s?TgO@q>oO zC{!Su#~fYuL{CqTA=_{(#XuF-7IHZhrj;M*XH>?h_sgj?%6owysIV*+bb{k#!aOes zk$3=VoJUvYd`6OtU{&iIWg}V_i{6x97b|gR;CjWU)tgvGHrKZ z$tZHCug5jZtyH`QD{KJIaRL+gLO%8b2* zAy&=vR(a7vm-xdIHnx3q0}5L0zEGR4&eh_YNu{%00n_3^xO#uKpDOr~J$SO9#5!p# zGEz=~n)kVTb4V{Va_5h0y<@P6{?iL|_7`T2+R{x1mK$1;FUxqz=KgAOPYW=|99acf zAAZul7qsJZF(pHM>`c$^ml+VO`*Q&}7U^hD3W|u^mT+diLt63O;-1^L!AF?#FU3eI zTH|fqJZ46$eHR-)!!jlP69j@fLW0SeHh}WF3HiLwk<}e@^87BgONEP;`Br#P>t9 z8wIO`4XURqUCJ|QIEx~LDP*hPo!@KNRLL2S5jGj$mMZ`>2**w{hPn0tL&tb@isS^* z@XGnl;{_T7tyztzg7%Dx^^8r|<*bG0(*Mb> z5;5>EfWr&+8e`EL!xrO}4hxS06DpH1VIaypBItN~FJmKua#(+t{P;xzXTm+-Yf*+1 z5V{F8z3$1O*c$y9hZ&bj`E>)>`Dhv{xDIV`AkH^7Jf(uM(P4g3G0s;$;apOFKRUZ_ z-S!G`r(9;w3n$ubeCL=Fr3e{O42#opEI04pxo3yrVi?9hPD)=NT~U<|jfVy|ESz_j zQ=y^4yRGQrC(n=52X`7T-3E|wQ7rk@T^+VCz3pUsM!+R44bB#-8I{GocILYaMxZO) zU|jeBygA$(%|JDeesfrV56X~gI0W67x$~J2rG->XYO?utxc`e_nfSl^S#J~X#MhdH z4;vXZJH)b5hh;MtZjO*&pCxOCNVB=lJOpzFX{|uEPt>Nt1Dl?{@344#LmkJ~D_Xrt zRmBwTpqALFS>t;@0Y-wkBFb=CL1Z30~g0hMOS-o ztUO!3erR9JKHYqFsfkpLpoKU%emqL-dViZmqN|$y0sWF$*1vR9Whe99Xj-}B#K_$# zZHPzkw~Xx%AnJ^>bC@>zX-rxexVR4A^QI`X^<`1jrIy-mPD?PB`j`6eDFi(Y9I|V6 zVL6qC&PKSN>65p3FI6JHo0k@)Jn37NsvAKe(l|WC^~AtKOdxNjuTXxhCk4GPr$^A6v>y3w zQoz}(6Fxf3@uVSKCP00BsKESy$bWI!SMA``sp`Lz!p|~yffZJAy2#tju0?4};X zkT@h+RKV#OSiiR`uLaGG-US9&$*Dgp{%trPu4&vVwaX%ac4c!#czY!~3M4r@A{}K0 VC#qw+e!c}DOEWvuzf5jN{{zJ4I;#Kx From ac4250e2ddfce445bc13795ba5d618cd381af7e3 Mon Sep 17 00:00:00 2001 From: NullFag Date: Thu, 30 Mar 2023 16:17:09 +0200 Subject: [PATCH 3/5] gbvndbvnch --- .../living/carbon/human/species_types/shadekin.dm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm index f65d46571e4..1d1f87eb2ae 100644 --- a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm +++ b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm @@ -23,3 +23,16 @@ BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/shadekin, BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/shadekin ) + + +/datum/species/mammal/shadekin/prepare_human_for_preview(mob/living/carbon/human/human) + var/main_color = "#222222" + var/secondary_color = "#b8b8b8" + human.dna.features["mcolor"] = main_color + human.dna.features["mcolor2"] = secondary_color + human.dna.features["mcolor3"] = secondary_color + human.dna.species.mutant_bodyparts["ears"] = list(MUTANT_INDEX_NAME = "Shadekin", MUTANT_INDEX_COLOR_LIST = list(main_color, secondary_color, "#464646")) + human.dna.species.mutant_bodyparts["snout"] = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_COLOR_LIST = list(main_color, secondary_color, secondary_color)) + human.dna.species.mutant_bodyparts["tail"] = list(MUTANT_INDEX_NAME = "Shadekin", MUTANT_INDEX_COLOR_LIST = list(main_color, "#4D4D4D", secondary_color)) + human.update_mutant_bodyparts(TRUE) + human.update_body(TRUE) From e3b0ca4ceb4bbe6e2fa1f97542e01e8dd1ac1c3e Mon Sep 17 00:00:00 2001 From: NullFag Date: Thu, 30 Mar 2023 16:20:41 +0200 Subject: [PATCH 4/5] work you stupid --- .../carbon/human/species_types/shadekin.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm index 1d1f87eb2ae..e1cb18767c1 100644 --- a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm +++ b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm @@ -3,16 +3,16 @@ id = SPECIES_SHADEKIN say_mod = "mars" default_mutant_bodyparts = list( - "mcolor" = "FFFFFF", - "mcolor2" = "FFFFFF", - "mcolor3" = "FFFFFF", - "mam_tail" = "Shadekin", - "mam_ears" = "Shadekin", - "deco_wings" = "None", - "taur" = "None", + "tail" = "Shadekin", + "snout" = ACC_RANDOM, "horns" = "None", + "ears" = "Shadekin", "legs" = "Plantigrade", - "meat_type" = "Mammalian" + "taur" = "None", + "fluff" = "None", + "wings" = "None", + "head_acc" = "None", + "neck_acc" = "None" ) bodypart_overrides = list( From 2ff588c14a24faa53bb1262ba6aca536d9db2079 Mon Sep 17 00:00:00 2001 From: NullFag Date: Thu, 30 Mar 2023 18:00:31 +0200 Subject: [PATCH 5/5] WORK --- .../modules/mob/living/carbon/human/species_types/shadekin.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm index e1cb18767c1..bb0f459c361 100644 --- a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm +++ b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm @@ -4,10 +4,9 @@ say_mod = "mars" default_mutant_bodyparts = list( "tail" = "Shadekin", - "snout" = ACC_RANDOM, + "snout" = "None", "horns" = "None", "ears" = "Shadekin", - "legs" = "Plantigrade", "taur" = "None", "fluff" = "None", "wings" = "None",