From 56a0d9b761a8cbc13d2ad4e7842a89c01d3f1384 Mon Sep 17 00:00:00 2001 From: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Date: Tue, 2 Apr 2024 21:16:01 +1000 Subject: [PATCH 1/6] =?UTF-8?q?=D0=91=D0=BE=D0=BB=D1=8C=D1=88=D0=B8=D0=BD?= =?UTF-8?q?=D1=81=D1=82=D0=B2=D0=BE=20=D1=80=D0=B0=D1=81=20=D0=BD=D0=B5=20?= =?UTF-8?q?=D0=B4=D0=BE=D1=81=D1=82=D1=83=D0=BF=D0=BD=D1=8B=20=D0=B2=20?= =?UTF-8?q?=D0=BD=D0=B0=D1=87=D0=B0=D0=BB=D0=B5=20=D1=80=D0=B0=D1=83=D0=BD?= =?UTF-8?q?=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Species/arachnid.yml | 2 +- Resources/Prototypes/Species/diona.yml | 2 +- Resources/Prototypes/Species/moth.yml | 2 +- Resources/Prototypes/Species/reptilian.yml | 2 +- Resources/Prototypes/Species/slime.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Species/arachnid.yml b/Resources/Prototypes/Species/arachnid.yml index 07a72cda17..d7182128ca 100644 --- a/Resources/Prototypes/Species/arachnid.yml +++ b/Resources/Prototypes/Species/arachnid.yml @@ -1,7 +1,7 @@ - type: species id: Arachnid name: species-name-arachnid - roundStart: true + roundStart: false prototype: MobArachnid sprites: MobArachnidSprites defaultSkinTone: "#385878" diff --git a/Resources/Prototypes/Species/diona.yml b/Resources/Prototypes/Species/diona.yml index 19fafaa3e1..4dd2cc1143 100644 --- a/Resources/Prototypes/Species/diona.yml +++ b/Resources/Prototypes/Species/diona.yml @@ -1,7 +1,7 @@ - type: species id: Diona name: species-name-diona - roundStart: true + roundStart: false prototype: MobDiona sprites: MobDionaSprites defaultSkinTone: "#cdb369" diff --git a/Resources/Prototypes/Species/moth.yml b/Resources/Prototypes/Species/moth.yml index 4f587eb40e..1479420b15 100644 --- a/Resources/Prototypes/Species/moth.yml +++ b/Resources/Prototypes/Species/moth.yml @@ -1,7 +1,7 @@ - type: species id: Moth name: species-name-moth - roundStart: true + roundStart: false prototype: MobMoth sprites: MobMothSprites defaultSkinTone: "#ffda93" diff --git a/Resources/Prototypes/Species/reptilian.yml b/Resources/Prototypes/Species/reptilian.yml index f5cf1fa6eb..738895bcdf 100644 --- a/Resources/Prototypes/Species/reptilian.yml +++ b/Resources/Prototypes/Species/reptilian.yml @@ -1,7 +1,7 @@ - type: species id: Reptilian name: species-name-reptilian - roundStart: true + roundStart: false prototype: MobReptilian sprites: MobReptilianSprites defaultSkinTone: "#34a223" diff --git a/Resources/Prototypes/Species/slime.yml b/Resources/Prototypes/Species/slime.yml index ef49e9b7cf..f4e4057e54 100644 --- a/Resources/Prototypes/Species/slime.yml +++ b/Resources/Prototypes/Species/slime.yml @@ -1,7 +1,7 @@ - type: species id: SlimePerson name: species-name-slime - roundStart: true + roundStart: false prototype: MobSlimePerson sprites: MobSlimeSprites defaultSkinTone: "#b8b8b8" From 3f765f36fdff9dbaa0e25d95d14b90cb6d085fa0 Mon Sep 17 00:00:00 2001 From: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Date: Tue, 2 Apr 2024 23:05:58 +1000 Subject: [PATCH 2/6] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D1=81=D1=8B=D1=80=D0=BE=D0=B9=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D1=82=D0=BE=D1=82=D0=B8=D0=BF=20=D1=82=D0=B8=D1=84=D0=BB=D0=B8?= =?UTF-8?q?=D0=BD=D0=B3=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/en-US/species/species.ftl | 1 + Resources/Locale/ru-RU/species/species.ftl | 10 ++ .../Mobs/Customization/Markings/tiefling.yml | 8 + .../Entities/Mobs/Player/tiefling.yml | 5 + .../Entities/Mobs/Species/tiefling.yml | 19 +++ Resources/Prototypes/Species/tiefling.yml | 159 ++++++++++++++++++ .../Mobs/Species/Tiefling/parts.rsi/full.png | Bin 0 -> 486 bytes .../Species/Tiefling/parts.rsi/head_f.png | Bin 0 -> 442 bytes .../Species/Tiefling/parts.rsi/head_m.png | Bin 0 -> 435 bytes .../Mobs/Species/Tiefling/parts.rsi/l_arm.png | Bin 0 -> 266 bytes .../Species/Tiefling/parts.rsi/l_foot.png | Bin 0 -> 398 bytes .../Species/Tiefling/parts.rsi/l_hand.png | Bin 0 -> 257 bytes .../Mobs/Species/Tiefling/parts.rsi/l_leg.png | Bin 0 -> 6361 bytes .../Mobs/Species/Tiefling/parts.rsi/meta.json | 62 +++++++ .../Mobs/Species/Tiefling/parts.rsi/r_arm.png | Bin 0 -> 276 bytes .../Species/Tiefling/parts.rsi/r_foot.png | Bin 0 -> 398 bytes .../Species/Tiefling/parts.rsi/r_hand.png | Bin 0 -> 261 bytes .../Mobs/Species/Tiefling/parts.rsi/r_leg.png | Bin 0 -> 6343 bytes .../Species/Tiefling/parts.rsi/torso_f.png | Bin 0 -> 785 bytes .../Species/Tiefling/parts.rsi/torso_m.png | Bin 0 -> 682 bytes 20 files changed, 264 insertions(+) create mode 100644 Resources/Locale/ru-RU/species/species.ftl create mode 100644 Resources/Prototypes/Entities/Mobs/Customization/Markings/tiefling.yml create mode 100644 Resources/Prototypes/Entities/Mobs/Player/tiefling.yml create mode 100644 Resources/Prototypes/Entities/Mobs/Species/tiefling.yml create mode 100644 Resources/Prototypes/Species/tiefling.yml create mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/full.png create mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/head_f.png create mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/head_m.png create mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_arm.png create mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_foot.png create mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_hand.png create mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_leg.png create mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/meta.json create mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_arm.png create mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_foot.png create mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_hand.png create mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_leg.png create mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/torso_f.png create mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/torso_m.png diff --git a/Resources/Locale/en-US/species/species.ftl b/Resources/Locale/en-US/species/species.ftl index f31b1fa0f0..dd5f8cde50 100644 --- a/Resources/Locale/en-US/species/species.ftl +++ b/Resources/Locale/en-US/species/species.ftl @@ -8,4 +8,5 @@ species-name-diona = Diona species-name-arachnid = Arachnid species-name-moth = Moth Person species-name-skeleton = Skeleton +species-name-tiefling = Tiefling species-name-vox = Vox diff --git a/Resources/Locale/ru-RU/species/species.ftl b/Resources/Locale/ru-RU/species/species.ftl new file mode 100644 index 0000000000..a6e9ce4d39 --- /dev/null +++ b/Resources/Locale/ru-RU/species/species.ftl @@ -0,0 +1,10 @@ +species-name-human = Человек +species-name-dwarf = Дворф +species-name-reptilian = Унатх +species-name-slime = Слаймолюд +species-name-diona = Диона +species-name-arachnid = Арахнид +species-name-moth = Ниан +species-name-skeleton = Скелет +species-name-tiefling = Тифлинг +species-name-vox = Вокс diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tiefling.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tiefling.yml new file mode 100644 index 0000000000..ea728d5de1 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tiefling.yml @@ -0,0 +1,8 @@ +- type: marking + id: TieflingTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Tiefling] + sprites: + - sprite: Mobs/Customization/cat_parts.rsi + state: tail_cat diff --git a/Resources/Prototypes/Entities/Mobs/Player/tiefling.yml b/Resources/Prototypes/Entities/Mobs/Player/tiefling.yml new file mode 100644 index 0000000000..6fb9fc36c7 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Player/tiefling.yml @@ -0,0 +1,5 @@ +- type: entity + parent: BaseMobTiefling + id: MobTiefling + name: Mr. Tiefling + save: false diff --git a/Resources/Prototypes/Entities/Mobs/Species/tiefling.yml b/Resources/Prototypes/Entities/Mobs/Species/tiefling.yml new file mode 100644 index 0000000000..0fc74fb205 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Species/tiefling.yml @@ -0,0 +1,19 @@ +- type: entity + parent: BaseMobSpeciesOrganic + id: BaseMobTiefling + name: Mr. Tiefling + abstract: true + components: + - type: Hunger + - type: Icon + sprite: Mobs/Species/Tiefling/parts.rsi + state: full + - type: Thirst + +- type: entity + parent: BaseSpeciesDummy + id: MobTieflingDummy + noSpawn: true + components: + - type: HumanoidAppearance + species: Tiefling diff --git a/Resources/Prototypes/Species/tiefling.yml b/Resources/Prototypes/Species/tiefling.yml new file mode 100644 index 0000000000..d672e55a00 --- /dev/null +++ b/Resources/Prototypes/Species/tiefling.yml @@ -0,0 +1,159 @@ +- type: species + id: Tiefling + name: species-name-tiefling + roundStart: true + prototype: MobTiefling + sprites: MobTieflingSprites + markingLimits: MobTieflingMarkingLimits + dollPrototype: MobTieflingDummy + skinColoration: Hues + +# The lack of a layer means that +# this person cannot have round-start anything +# applied to that layer. It has to instead +# be defined as a 'custom base layer' +# in either the mob's starting marking prototype, +# or it has to be added in C#. +- type: speciesBaseSprites + id: MobTieflingSprites + sprites: + Head: MobTieflingHead + Hair: MobTieflingAnyMarking + FacialHair: MobTieflingAnyMarking + Snout: MobTieflingAnyMarking + Chest: MobTieflingTorso + Eyes: MobTieflingEyes + LArm: MobTieflingLArm + RArm: MobTieflingRArm + LHand: MobTieflingLHand + RHand: MobTieflingRHand + LLeg: MobTieflingLLeg + RLeg: MobTieflingRLeg + LFoot: MobTieflingLFoot + RFoot: MobTieflingRFoot + +- type: markingPoints + id: MobTieflingMarkingLimits + points: + Hair: + points: 1 + required: false + FacialHair: + points: 1 + required: false + Snout: + points: 1 + required: false + Tail: + points: 1 + required: true + defaultMarkings: [TieflingTail] + HeadTop: + points: 0 + required: false + Chest: + points: 1 + required: false + Legs: + points: 2 + required: false + Arms: + points: 2 + required: false + +- type: humanoidBaseSprite + id: MobTieflingEyes + baseSprite: + sprite: Mobs/Customization/eyes.rsi + state: eyes + +- type: humanoidBaseSprite + id: MobTieflingAnyMarking + +- type: humanoidBaseSprite + id: MobTieflingMarkingMatchSkin + markingsMatchSkin: true + +- type: humanoidBaseSprite + id: MobTieflingHead + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobTieflingHeadMale + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobTieflingHeadFemale + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: head_f + +- type: humanoidBaseSprite + id: MobTieflingTorso + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobTieflingTorsoMale + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobTieflingTorsoFemale + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: torso_f + +- type: humanoidBaseSprite + id: MobTieflingLLeg + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: l_leg + +- type: humanoidBaseSprite + id: MobTieflingLArm + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: l_arm + +- type: humanoidBaseSprite + id: MobTieflingLHand + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: l_hand + +- type: humanoidBaseSprite + id: MobTieflingLFoot + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: l_foot + +- type: humanoidBaseSprite + id: MobTieflingRLeg + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: r_leg + +- type: humanoidBaseSprite + id: MobTieflingRArm + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: r_arm + +- type: humanoidBaseSprite + id: MobTieflingRHand + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: r_hand + +- type: humanoidBaseSprite + id: MobTieflingRFoot + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: r_foot diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/full.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/full.png new file mode 100644 index 0000000000000000000000000000000000000000..39d9a69915014156aaf0d6de2126f433af24277f GIT binary patch literal 486 zcmV@P)>NoU180lZ+1G*u(QdXu;L>X~}BB6vXy$A;y z&JIykDQ^LrcO8sU$v_(3F8dx)EWTr@%W})Y2FmZy5-TVx_^4XVY`8=zEJoNaJ&Fzy0j`rtHL1? z1l!=o1W04b0D&?9n71U`__X@#nveX+@m|T;hy=^9t@X~qghXc-)Pr|bIz2aONp>45 z86S1e<-1PuXMEUhpk&N-37|s)`uZYUVV_9=z%UeWyg<`^r`9-ZH=2zbPFYg0GO*92 z=BOV0bUa=p10uqK@k-b?Si9jc6v!j6iYkw0)i4xn0;~);UVt{IMYd|pQH``cvm&rl zYmEE}+H`fpX=9G;951+>z<7}i%5jnl<5*B c*U<^S0a7d0V2~Fu%m4rY07*qoM6N<$f+Z>5NdN!< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/head_f.png new file mode 100644 index 0000000000000000000000000000000000000000..b705d2d50e810da8f25b598e20c8cc8d879c8906 GIT binary patch literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~KesaSW-L^Y+%+uBHGH_79iO z+;Ho1scO35y8hDfVmI%PlDAxLpSXQ|%_47CFC$*g!!tt@<-7Mhj>&xXzgdIzyrtaN zZ5Bd|f3j7tGPl0}_;UO0cUs3QPyIRc-9k6^%>489b7RT{Tc7!>$Mdy`-?!=#*mpeW z)NbAhL0V7iPgfmyzI(~_S)OgVf`Sthqo=eO*1F0^I@_v0tlq;>Jg% z2A6+v#N20H75?AdRi^y+=j9!)A9ma}HWr^G5A+HQJkWglsg7adKgrsKKm9)+T$J|Z zx^mIn%_n!OuP=6+K9Bp^#g^$dU0#P~Y@4jmAHaXpkICzh#qo}S?#>B4 zu|c;eYVPcGWB)_nZ)BDNxmwXvKmY5U5o{u>eKaJ?;cVtTl{LG0rM_10-zBm0ZC>V; z_knkFW8U;HOI~H^yL84(=?B|(FRkXBY_M!qrk3bL*Q+M^dH*l7Ui|03pqkO=xu1SZ gg(DNp#S9M|@2}~*sLTGs!W$&!>FVdQ&MBb@08Z1!#{d8T literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/head_m.png new file mode 100644 index 0000000000000000000000000000000000000000..e555d030beac914816bddf07bb4242dd747b2584 GIT binary patch literal 435 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV65_VaSW-L^Y+&HRZR{eY#$!S zZsF#tVb!ggdZt}ee!*1TELqFHjbckfA|zP1S(X=Su8E0xeol7fKKT|^i~AK3?jYr{f@V zJm_b9D*ui*{Vpyk+oH>Fzy7yfy{3P&%G1wEk3tQe07)Ist#(ZP<&AHy{=clUNo8;C zstA_NDyeDfROEqfhk*yGnw9nq9`*hEF4a7&-ou$b_3I1y=qIxamg(<*@uc+Ii%+$V zqOKZu<@Aeg%4eE$hVp#X-tD<*m<}N=Fwb}3W!58u3%C`%9zb2HFe{!)GUy@k54ZLn`LHy=BYShIb790IRu#c1Ub8k%Y&qhVs4;Di|Ni*0{cplHD*-h#=x# z<*KOsYoa?>t+Hp0m}VeTx01>1TI1E9DYBZimvtv;Z*pK%Qrf!POJe!v`)jp}cprzz zeLb6%9e;+qW0FqB>Pse@*LrnM(lOxu8}S6>G$=4wuDt$tu>SGG@ywC$)0-b}{5eH) z(|1-EPq8yUtsm4fHt&0>wl>se{Yv!%KM@P4zopr E0Ba^|OaK4? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_foot.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_foot.png new file mode 100644 index 0000000000000000000000000000000000000000..c448837af238a4f9dcce79ddc7fb56b1b59efd93 GIT binary patch literal 398 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)2IAwlHkEYZvhvD8gCb z5n0T@pr;JNj1^1m%YcIHC7!;n>`yp&xQ&f#Jl}LNFfdAcx;TbZ+vKC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_hand.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_hand.png new file mode 100644 index 0000000000000000000000000000000000000000..7bf47c949a5eb9776fd0d9c4b9089c1099acfda2 GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Cp=voLn`LHy=BPVV{rjq>;A$-^~d2!zxo1x}H8?m^YQF#g literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_leg.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..b3ce27ba862cd732dd30ee70688b6ab071e3a10d GIT binary patch literal 6361 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/meta.json new file mode 100644 index 0000000000..ce03292c8a --- /dev/null +++ b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/meta.json @@ -0,0 +1,62 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "head_f", + "directions": 4 + }, + { + "name": "head_m", + "directions": 4 + }, + { + "name": "l_arm", + "directions": 4 + }, + { + "name": "l_foot", + "directions": 4 + }, + { + "name": "l_hand", + "directions": 4 + }, + { + "name": "l_leg", + "directions": 4 + }, + { + "name": "r_arm", + "directions": 4 + }, + { + "name": "r_foot", + "directions": 4 + }, + { + "name": "r_hand", + "directions": 4 + }, + { + "name": "r_leg", + "directions": 4 + }, + { + "name": "torso_f", + "directions": 4 + }, + { + "name": "torso_m", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_arm.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_arm.png new file mode 100644 index 0000000000000000000000000000000000000000..8887c30fa276f2206949f7f513bb9cf9fae764e6 GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=w>@1PLn`LHy=BeU9l-$~K{$Z@v0)I~F%j~ahw)&eY&t3kiv|8f*dz}Smge+Mmt~!1C zK|*oXYcJWR6EEr$zOb3>3aFE)KD^lXJb&`~i>)8)9{U5$hJuKRpI>U6e;r$=J2!L1 zz0C)=t=pF!?)EHpP5WXi|G6_I$~S5)IM3QrpB{RkY`?Vi@uVH{V4V>Q%^hx}y#JW; QcrS?W>FVdQ&MBb@0KzSDT>t<8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_foot.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_foot.png new file mode 100644 index 0000000000000000000000000000000000000000..8d51a591a454f47a7336b4d8457b511d9a242d57 GIT binary patch literal 398 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)2IAwlHkEYZvhvD8gCb z5n0T@pr;JNj1^1m%YcIHC7!;n>`yp&xJ}qnckjz%U|^K?ba4!+xb^n-#;ijDBF8?y z_j;lBLcl7G!+b&i1kLIbr>EIDsJn01a+8%g>X^A*Z@IVC6s04#C%Jw4zl~>l@sGRC zMt7vc?d>y9NM=4@1loZg)E!Zosjuz*>Cmj_c1I@dF^CU~x4nBM{K~ct{nc^rpWH56 zemqCb)9PCG%s%&eVQc4n?Q=o3bMBW$>|wdiKd<5Gv(QN*=__aLW{!=W0dz>$<}cCm l3kw_fpa1{7w$Xm=Urzs9=9On}eUJy)=jrO_vd$@?2>`*Fj9LHy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_hand.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_hand.png new file mode 100644 index 0000000000000000000000000000000000000000..a4810281263915bb23ce4ef1f65903fa8951af07 GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=XFOdTLn`LHy|t0M$wB1!M|T%z z#j63`!OhC&fJS=#+JIuC!(lz;zs$L_atIe-QL!H1+t z5uu^4_k>J7^6RyYnU7HRtYxcKh0R=U<~x0M?*A0#m16ULT#cNyGde%s;s(;Psv@_xA6e_jXtM^Qu3SLpPL9 zJ?yocd(QVizZj&7W&WIRDA!_}`#nso_04@o1_py7{%dzbxhC_z2lmeQ73Ts5sjyAUCY{ZkHD8yZ6`)(FH*v5uL5{b^Dq=O=gJ4HDa zx^atgD3Xpsr6`9eO3L%ysPy~wyPsdL*Yo_>Ua#4%>w16QpU?OGeSfZNU-7Qat6)$~ zCx3VJm_Z&N@9RgAE4s-Vut)+?Kd;yQi4g}z$P(A<$By1)GB6-l~ z>7D${aLzbueu09@5`~-AQH@8m>W2(s9((OQU-BunsnDp!IdLY%0lJ1g@#4wx&pUKY zIcIkkJ_sn|Cv6PVE@rnyJn|^L@xfwMsCMUQ+{oLoeYdNNhdvebXH8gLxmtFzNrj>F z@L=P0=kVFLZw``(_Io~NZ3>?qRQ|B%!?Cg9_GJUf!&`>7)LYb8PN1Ne1_owU^dtEbfEVOzJ5|4)*aOoS@ z)Q>!@Rf#AiVYtG%X?rJoA zAS@(59Width~2+1ou#iKpYr5HPfpDf(x%u)Rl)J+M=GJiH#%Dm+hZ0!c{$UjR>$di zM|k7gM&5aGHBKW*URX8bI#4uAJ!}|hVP-s5x2{>eG2;~$vJ+G2i>vnSI9F|R2-V;f zA4Qk9ls9hj$=@b7w=Utp_C?)L!G=8--|T7bIlA;og98$7Q=A{2+9=OBgc#I8!YuGH znR;qxPc>)U%=TG*XhY83+BLRb3A@&><2(q)b2A-tYUzKxGYRWYoTpzFLM?mOe*M}> z`7=uG+Ap!O0NqG`J@pT-B5bEcfzy%T-oS#Ui$h&I1~&z>H*nq&OgP2ODDRNRr4ReV ziCY@(CnR`y@Y*A;dWL&`s@06}>p$UjI_|P>Zrawd8qL&o6-Q1w7|c!EcF{*UF#w}l zx14xI^U#6qB^|GOf3sflTkd`ZQbIHq<7ol}g$0e)JhB{0&KRG|`w)pui7uT`5-!gU zKm74{5!%!H=`yHJGy*E$lAsk2(+XKsvfCk{B7z#Zxg#&VBDNgQ2wCzeO!pm3P1I5g zcN=xjo7vd!ttx)(GaB-8)~N$^2TI{O_bv;5&uO`1mtV%ZTCDM=vV7Q6ShZs8uLPBJ z(=3-m5%J+h_eUv1*L5?ri_QfQ$sOW61$AL?JrmZiZkzWgcX_vw`jXJRldfvxcK7vr z9yT;>Y~AH+mEmpV`CF{rsSBkomCad~p?bahnu7@K4$9=d9!1P}J$?*JxOx$Cd=3Nq z>Y8uWmIK|@*xQdj?q%t%%r%b6xr%vfZg4P=T^Ok1u<>w9+UD}MU2&|fErz5gXr{rsG)1wvNJ<+WyexgTt>RA!%dgo!_~Z0>feU= zkb5RQb_;jw$c;tu^9?(5O{?rV_wz4N4Hx(45}qi(?-%sNda*3suFtr&`|`W@m!Dh7 zRquZ``Z|Xau=#XoICJx@?K<|``$7^Ugz_EE8b79%}DCs5xi{O%k>MMYsRKVTMqEGEE3X&q1uDh0llkX zDvysGQ(L}h+aS@W4T~oK_jl&8{kfZl%(vt;&hP@)wSrxo6=VvdC!6su|0A1 z8mDV5I0wacy%%112uh%p<6;*V4z2(hqw^kE2a9IAVxXNB5R`u3C2JG$U zeYmhO938F^>)jY0D393Lm0v%vb7qr)cedHxv{0vhLov=8=J-kcCN%Pkf3{Zcvr0k8 zQ+gubrK_|ZGg|q1ML@R4cw96q^=5h(wB)Hnxkd7vJDsXU(e>Mv?Yk)F`8t2J_vYIt zRV*vtZ-Ii<-7&{^?#`ZbPF$_$c(rUzo^5gMLrTm_z1X%wFPlpx6g>-LZiV|@t0h;R zHfhDHwtn;}`n<=r%U~w0$WndnP@UE35M|gu$F$k=KgxG(ciM`PWOeeOpB*b&h`Y-2 zj(H^67lqw+d2u}@CaXzPyLooZ$-)oG%*vP}Bgh8LaOIO;xmF_U8bvjK%<9>`dG#qb zaC!wZFyqd2;u%{mb47D$OMPNoPP$FB_MPrk{icN*?pZJGKdsFHA6cu~vmpM27FU`I*r zx@s#`+^WtepT=BN$;`90KTL3c&}pcu#0oQx!dlOR6~*$%Pn4-nm*)R-hFIE6p+90FlK)C zF|2(OuHdnEEIAeS8ol1Cc{q8-KFjdA(Ib*(J;{<@Ma7HHDrdI5T=B*wyLn(-H?zBG zhiN_hOmn1M^p#AG(^029@U->);W5kRi|Ep0);#`CSd^=>?SNCKvQ z6R^-&5{ZPy;Ltc65=0<{p4209BuBA99%CX6Pb8WWku(#$DH4w}VIchgIs?fxC19`wBF=

NkzTMZgBFO$(e}m6VDBQh{MaCKe|pAOc9d2@!)N5kaq!Fiflo#*YZrij`4Gg(X|N zI+`PJD9pDR*Fc(x$rEtEeqnPNJhAZGk~^CNxQS>|*{}qXDbCm!hsR@$NjM_m8)!Ws z5Q4syvSKkPqHKXdC)J=Lr3oRR(q5ls2znI+od1CJWkLMfoD~q*2B<2YMTm&wD zn*qA$?|FU%{>ro#+@*vfL8#-uxv2kvGn@3K0~pH_gig!v1_VuxCbyD6woEEGT-Ls1 z8eOWQIYLMa0T{Ad0O~loME9q0Spc|CPBqDwdG-(dN;35`F=jA9t784IpkEm{BoPmg zkW2=XfX9JD8j1cryO75eiD?4Bngw2$-ma*4E&{)?|E_x%?$fYiT|{FJ`G@y6cfXBad^idg$aYuOA#a^=ZuwVAhGNmFN5$+PkGyGuR4`XyU+T6adk}OZu`S;W9A41w=w4*FR0SGWi#VO*p@V>37>8gIo6IKzzMV9oYq={ zNxHju+bZ*uEZJ+=Z#*;Jl{Etp1VIo4K@cC4lFX0&ZaV>h`uPQBQJ9Wb+!~%9?g0Sa z^^Me=D*9i&ANbt-j(EC&?UXSOhWPFOELPv|wv%m^lljgVH?k=GciTxg7$#yg#0ZG@i`3_@ zL6RiNa=FZ0tLRH-!0F``7-I-}9RNVk>wqza)5|N_sib)c`j`hp*iIP$aCCG80O>;b z67&nV0e-igMtikdrCu*8@_G6^;+xGT%>X0%;)8D=MW(-~FYY|s=PLTruYhw_hh;&lrPcS=z?@3D3b8>-8Gz^%?-u^XFi!G@p{y)A3Vg%c(Y7#N==l<9`9~*nE7OkA&#R*2uT z?LD+AL%c-(H_^30tDIA9wh;LvRNNW>7^%;{1pQQR7KNxbTUzsJWdJv37KNBap^?Ib zcYRahdaBhR5iJMQ&o2O|m!(t@vw+)RjD78Lrn)rvHhicSJ*f=vyX_?JowJ>?(h97~ zEDCdXfoijb!keUc>TP4PS74vkKHJ_x+5t}w_dAUV@pOTp*Du;SJbPZ#NtmyShaJLQZGJo>UhP>NXIduF;e|1a1;5ClOG#Q)7JF25Lq2uJx6 P00000NkvXXu0mjf^Fncn literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/torso_m.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/torso_m.png new file mode 100644 index 0000000000000000000000000000000000000000..3097763a95efd0b32ce02b6b696790597a3bc3c8 GIT binary patch literal 682 zcmV;b0#*HqP) zPS>mBf(od8dZL^3acf<*J`m3>7PI+Izt5tiSj^_i`hQh_Mf_5?Iu@*m&!x|F2T~+nvNHrL7=TPrgnTCB?(tEt3z-pT+m3pxaE6?9<{&k4wo7=5Y!k3BVlO$S`*h zb8rJ838WQcNC|-6?}1_2u=J-g%pGLuPr Date: Thu, 4 Apr 2024 17:53:16 +1000 Subject: [PATCH 3/6] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D0=B5=D0=BC=D1=83=20?= =?UTF-8?q?=D0=BE=D0=BD=D0=BE=20=D0=B1=D0=BB=D1=8F=D1=82=D1=8C=20=D0=BD?= =?UTF-8?q?=D0=B5=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Mobs/Customization/Markings/tiefling.yml | 4 +- .../_CP14/Body/Prototypes/tiefling.yml | 49 ++++++++++++++++++ .../Mobs/Customization/Markings/tiefling.yml | 10 ++++ .../Entities/Mobs/Player/tiefling.yml | 4 +- .../Entities/Mobs/Species/tiefling.yml | 13 +++-- Resources/Prototypes/_CP14/Species/human.yml | 2 - .../{ => _CP14}/Species/tiefling.yml | 47 +++++++++-------- .../Mobs/Species/Tiefling/parts.rsi/full.png | Bin 0 -> 639 bytes .../Species/Tiefling/parts.rsi/head_f.png | Bin 0 -> 511 bytes .../Species/Tiefling/parts.rsi/head_m.png | Bin 0 -> 508 bytes .../Mobs/Species/Tiefling/parts.rsi/l_arm.png | Bin 0 -> 468 bytes .../Species/Tiefling/parts.rsi/l_foot.png | Bin 0 -> 404 bytes .../Species/Tiefling/parts.rsi/l_hand.png | Bin 0 -> 321 bytes .../Mobs/Species/Tiefling/parts.rsi/l_leg.png | Bin 0 -> 382 bytes .../Mobs/Species/Tiefling/parts.rsi/meta.json | 2 +- .../Mobs/Species/Tiefling/parts.rsi/r_arm.png | Bin 0 -> 366 bytes .../Species/Tiefling/parts.rsi/r_foot.png | Bin 0 -> 365 bytes .../Species/Tiefling/parts.rsi/r_hand.png | Bin 0 -> 346 bytes .../Mobs/Species/Tiefling/parts.rsi/r_leg.png | Bin 0 -> 396 bytes .../Species/Tiefling/parts.rsi/torso_f.png | Bin 0 -> 769 bytes .../Species/Tiefling/parts.rsi/torso_m.png | Bin 0 -> 660 bytes .../Mobs/Species/Tiefling/parts.rsi/full.png | Bin 486 -> 0 bytes .../Species/Tiefling/parts.rsi/head_f.png | Bin 442 -> 0 bytes .../Species/Tiefling/parts.rsi/head_m.png | Bin 435 -> 0 bytes .../Mobs/Species/Tiefling/parts.rsi/l_arm.png | Bin 266 -> 0 bytes .../Species/Tiefling/parts.rsi/l_foot.png | Bin 398 -> 0 bytes .../Species/Tiefling/parts.rsi/l_hand.png | Bin 257 -> 0 bytes .../Mobs/Species/Tiefling/parts.rsi/l_leg.png | Bin 6361 -> 0 bytes .../Mobs/Species/Tiefling/parts.rsi/r_arm.png | Bin 276 -> 0 bytes .../Species/Tiefling/parts.rsi/r_foot.png | Bin 398 -> 0 bytes .../Species/Tiefling/parts.rsi/r_hand.png | Bin 261 -> 0 bytes .../Mobs/Species/Tiefling/parts.rsi/r_leg.png | Bin 6343 -> 0 bytes .../Species/Tiefling/parts.rsi/torso_f.png | Bin 785 -> 0 bytes .../Species/Tiefling/parts.rsi/torso_m.png | Bin 682 -> 0 bytes 34 files changed, 97 insertions(+), 34 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Body/Prototypes/tiefling.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling.yml rename Resources/Prototypes/{ => _CP14}/Entities/Mobs/Player/tiefling.yml (51%) rename Resources/Prototypes/{ => _CP14}/Entities/Mobs/Species/tiefling.yml (51%) rename Resources/Prototypes/{ => _CP14}/Species/tiefling.yml (70%) create mode 100644 Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/full.png create mode 100644 Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/head_f.png create mode 100644 Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/head_m.png create mode 100644 Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_arm.png create mode 100644 Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_foot.png create mode 100644 Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_hand.png create mode 100644 Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_leg.png rename Resources/Textures/{ => CrystallPunk}/Mobs/Species/Tiefling/parts.rsi/meta.json (83%) create mode 100644 Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_arm.png create mode 100644 Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_foot.png create mode 100644 Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_hand.png create mode 100644 Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_leg.png create mode 100644 Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/torso_f.png create mode 100644 Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/torso_m.png delete mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/full.png delete mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/head_f.png delete mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/head_m.png delete mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_arm.png delete mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_foot.png delete mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_hand.png delete mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_leg.png delete mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_arm.png delete mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_foot.png delete mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_hand.png delete mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_leg.png delete mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/torso_f.png delete mode 100644 Resources/Textures/Mobs/Species/Tiefling/parts.rsi/torso_m.png diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tiefling.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tiefling.yml index ea728d5de1..7b0ce520a1 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tiefling.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tiefling.yml @@ -1,8 +1,8 @@ - type: marking - id: TieflingTail + id: CPTieflingTail bodyPart: Tail markingCategory: Tail - speciesRestriction: [Tiefling] + speciesRestriction: [CPTiefling] sprites: - sprite: Mobs/Customization/cat_parts.rsi state: tail_cat diff --git a/Resources/Prototypes/_CP14/Body/Prototypes/tiefling.yml b/Resources/Prototypes/_CP14/Body/Prototypes/tiefling.yml new file mode 100644 index 0000000000..169521eeaa --- /dev/null +++ b/Resources/Prototypes/_CP14/Body/Prototypes/tiefling.yml @@ -0,0 +1,49 @@ +- type: body + id: CPTiefling + name: tiefling + root: torso + slots: + head: + part: CPHeadHuman + connections: + - torso + organs: + brain: OrganHumanBrain + eyes: OrganHumanEyes + torso: + part: TorsoHuman + connections: + - right_arm + - left_arm + - right_leg + - left_leg + organs: + heart: OrganHumanHeart + lungs: OrganHumanLungs + stomach: OrganHumanStomach + liver: OrganHumanLiver + kidneys: OrganHumanKidneys + right_arm: + part: CPRightArmHuman + connections: + - right_hand + left_arm: + part: CPLeftArmHuman + connections: + - left_hand + right_hand: + part: CPRightHandHuman + left_hand: + part: CPLeftHandHuman + right_leg: + part: CPRightLegHuman + connections: + - right_foot + left_leg: + part: CPLeftLegHuman + connections: + - left_foot + right_foot: + part: CPRightFootHuman + left_foot: + part: CPLeftFootHuman diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling.yml new file mode 100644 index 0000000000..c16df27f9c --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling.yml @@ -0,0 +1,10 @@ +- type: marking + id: CPTieflingTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ CPTiefling ] + sprites: + - sprite: Mobs/Customization/reptilian_parts.rsi + state: tail_smooth_primary + - sprite: Mobs/Customization/reptilian_parts.rsi + state: tail_smooth_secondary diff --git a/Resources/Prototypes/Entities/Mobs/Player/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/tiefling.yml similarity index 51% rename from Resources/Prototypes/Entities/Mobs/Player/tiefling.yml rename to Resources/Prototypes/_CP14/Entities/Mobs/Player/tiefling.yml index 6fb9fc36c7..5b36f836a1 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/tiefling.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/tiefling.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseMobTiefling - id: MobTiefling + parent: CPBaseMobTiefling + id: CPMobTiefling name: Mr. Tiefling save: false diff --git a/Resources/Prototypes/Entities/Mobs/Species/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml similarity index 51% rename from Resources/Prototypes/Entities/Mobs/Species/tiefling.yml rename to Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml index 0fc74fb205..80caf96b62 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/tiefling.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml @@ -1,19 +1,24 @@ - type: entity parent: BaseMobSpeciesOrganic - id: BaseMobTiefling + id: CPBaseMobTiefling name: Mr. Tiefling abstract: true components: + - type: HumanoidAppearance + species: CPTiefling + - type: Body + prototype: CPTiefling + requiredLegs: 2 - type: Hunger - type: Icon - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: full - type: Thirst - type: entity parent: BaseSpeciesDummy - id: MobTieflingDummy + id: CPMobTieflingDummy noSpawn: true components: - type: HumanoidAppearance - species: Tiefling + species: CPTiefling diff --git a/Resources/Prototypes/_CP14/Species/human.yml b/Resources/Prototypes/_CP14/Species/human.yml index dee0257d23..40174fad3f 100644 --- a/Resources/Prototypes/_CP14/Species/human.yml +++ b/Resources/Prototypes/_CP14/Species/human.yml @@ -26,8 +26,6 @@ LFoot: CPMobHumanLFoot RFoot: CPMobHumanRFoot - - - type: humanoidBaseSprite id: CPMobHumanoidEyes baseSprite: diff --git a/Resources/Prototypes/Species/tiefling.yml b/Resources/Prototypes/_CP14/Species/tiefling.yml similarity index 70% rename from Resources/Prototypes/Species/tiefling.yml rename to Resources/Prototypes/_CP14/Species/tiefling.yml index d672e55a00..b5c2a2942b 100644 --- a/Resources/Prototypes/Species/tiefling.yml +++ b/Resources/Prototypes/_CP14/Species/tiefling.yml @@ -1,11 +1,11 @@ - type: species - id: Tiefling + id: CPTiefling name: species-name-tiefling roundStart: true - prototype: MobTiefling - sprites: MobTieflingSprites - markingLimits: MobTieflingMarkingLimits - dollPrototype: MobTieflingDummy + prototype: CPMobTiefling + sprites: CPMobTieflingSprites + markingLimits: CPMobTieflingMarkingLimits + dollPrototype: CPMobTieflingDummy skinColoration: Hues # The lack of a layer means that @@ -15,7 +15,7 @@ # in either the mob's starting marking prototype, # or it has to be added in C#. - type: speciesBaseSprites - id: MobTieflingSprites + id: CPMobTieflingSprites sprites: Head: MobTieflingHead Hair: MobTieflingAnyMarking @@ -33,7 +33,8 @@ RFoot: MobTieflingRFoot - type: markingPoints - id: MobTieflingMarkingLimits + id: CPMobTieflingMarkingLimits + onlyWhitelisted: true points: Hair: points: 1 @@ -47,9 +48,9 @@ Tail: points: 1 required: true - defaultMarkings: [TieflingTail] + defaultMarkings: [ CPTieflingTail ] HeadTop: - points: 0 + points: 1 required: false Chest: points: 1 @@ -77,83 +78,83 @@ - type: humanoidBaseSprite id: MobTieflingHead baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: head_m - type: humanoidBaseSprite id: MobTieflingHeadMale baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: head_m - type: humanoidBaseSprite id: MobTieflingHeadFemale baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: head_f - type: humanoidBaseSprite id: MobTieflingTorso baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: torso_m - type: humanoidBaseSprite id: MobTieflingTorsoMale baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: torso_m - type: humanoidBaseSprite id: MobTieflingTorsoFemale baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: torso_f - type: humanoidBaseSprite id: MobTieflingLLeg baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: l_leg - type: humanoidBaseSprite id: MobTieflingLArm baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: l_arm - type: humanoidBaseSprite id: MobTieflingLHand baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: l_hand - type: humanoidBaseSprite id: MobTieflingLFoot baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: l_foot - type: humanoidBaseSprite id: MobTieflingRLeg baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: r_leg - type: humanoidBaseSprite id: MobTieflingRArm baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: r_arm - type: humanoidBaseSprite id: MobTieflingRHand baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: r_hand - type: humanoidBaseSprite id: MobTieflingRFoot baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: r_foot diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/full.png b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/full.png new file mode 100644 index 0000000000000000000000000000000000000000..a0e572d045c74397a1a720af8b5b8a634cd3d2a7 GIT binary patch literal 639 zcmV-_0)YLAP)Px%IY~r8R9J=0S21YYKoosW1Emx}D8+4-NI`?a?qq186gp(hpwP*fu9>nG51XK&YW5qXm`7r z8!XQ*gYp2^aagrd#=wv8^~?LIV|d!R2HAClEUS_eX?;SLhG+-CR7K=EiR6TEOp<^s zBPt@4GC-4uK@7__W}f*xy9}9|kfJB_`a@2XCKm0$cu8ExnYuHy1OWHZcg{Tw{3y|v z_8IsQI_I9$r?3Dbry4I?f3d%Lcv2z}3ll(*t3t9ew^~NK+bwych>w{|K-MHgCOhjY#Dv1{fki=EKwceq zZ~>3{CY(i9lpIhjL?UFVE}DKoBLiZE6K_57+uhwzx&gHXh~$=Spk6b1k?}?m#6K&# zB9xY(S}7w8V!T*h!W;7?TE`dstWR3@^G5@JhyQSM`ybUxS(RV?QM&cvBacc}X!7h& Z7I)sn5#@p7R9pZ6002ovPDHLkV1gc`B-a1{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/head_f.png b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/head_f.png new file mode 100644 index 0000000000000000000000000000000000000000..2a8798ce1b0ad0f6de8e152e913c1dc76df56b9c GIT binary patch literal 511 zcmVPx$xk*GpRCt{2+D%HsKoke?R}UdVQMwWQ+z5J(E}Bj0CEN%?aUli4jdv(%H|fF) z6xwYI-S`!7Go*}^dV%i7)rW<&PUPe0Jqr+f7h=r7xv5NZRmG< zG?sFuv&CdeV=1ZM?P<5E{kr}%3~ayttnGEw+4;r7)7~u>X*3)dO@-P+z-_i7pMdSB z&#F$PFd7c%^FxN4>CF=vE`;j0cPrCP4hFW zHk)ud~M{3uk=+k83QOzMQ_` zdSiveccyz&JkPn`WzpOeyZpbrM04-od8wS7UpoHnoOI4PcDeer^;g%LLvS;-eu z=P7voix6vZaXIyIYIVbvnwlt!^n=f97XS8~BDLV|t0TI1ckGO_*sQRmZ1v(f4PA-# z4tCEA`GmNgK3OhLtY7fQ@9Dc=w+%dY|MmvDMNeUoffBx3w;$g=)F zn_&1{_35_0Am%G;qck(C|L9MM{<71zHBh8;RqAp(?hxJEFL;*RjWSvwGkLv!{+Bmf vj3aqMb))CZoiB7T$0KF005i-b3>r%`=Z0@O5x$}K4@k_@)z4*}Q$iB}(JA1G literal 0 HcmV?d00001 diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_arm.png b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_arm.png new file mode 100644 index 0000000000000000000000000000000000000000..3e367da72ba63af4f00e91b78bc611c6d4e33641 GIT binary patch literal 468 zcmV;_0W1EAP)Px$j!8s8RCt{2+P!K5K@htp@34j2m?iHKkQ5TMNRwv>W(#)- zLeixSA)v%`x?r;y1kpUebdx3nnnG|rGn*yn>phHjW@p8Fg&-m#A|i}>qoqvb`ax(U z7cPn?3S9(02vrnMvQYpjr9u`#e|agTkpk?P2rU-!e>%@7DWyW4g5}*e^$5UEz{BH{ z5CXSr#X?@hv$+`bdyu@};036;)toK@%Ans9HMg3BhW;>e2kh-1K=X#9F*I)(ya3Oy zZ>mx*K{LM=3*oq4Htv8*xg_G*9FnDX{`RH`$+M!~Xes?BKk(}dDD*cuBnCDvTYYS^N+yG`$yVKSd~Uc z$PYr5bT9*c0@ApMhNE%fhAg}Q$47_gNTc8d=yba1$hEeeLxLBe8?=p#vaI7>oQu!t zG|^`>{}#~nU`G4yUR+;YTHl0JIj*Pl52AlNm%yP6A|fIp+RQgyjn7Mmz@qE`0000< KMNUMnLSTXpO3!-$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_foot.png b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_foot.png new file mode 100644 index 0000000000000000000000000000000000000000..de5511c6a465d23e9783a8616b28a9180e459a41 GIT binary patch literal 404 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z{XAV9Ln`LH zy|vNnaDWKggZ+<`O}3ec+_}0?Y_3l3OYR*jn%Bizm5Mew3w&bP*BBhTi`}tZz(c`1 z`h*0NS7uE^&T&UxD-o&Ug)IN_Z4TE@s`g(d+|Ypx%o1lzYYEgz6zP7uBWcF8oZmA) z-3S#F`XRTat&D2s+mXTJ-hF`|a=V)4PL*+ZZ96>qq{xBmejCEpuk2XjE3r&<+hea;%Y@uE z^0+^~b9wm_;Tvp+w=A)Kv2f+<$hY>F!*4M&G%Q<}ynkPN#!jaP)ichE?KJk8W_wBp00i_>zopr0B%yTu>b%7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_hand.png b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_hand.png new file mode 100644 index 0000000000000000000000000000000000000000..1c015eaba72961f1748e6f96a07ad068db37145a GIT binary patch literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|etWt&hE&XX zduw6dp#YI%AC2#^8YVRPyqC>dm9fmwI76g~>&(1FMizxv%Q^EId<}f3t8x1m+?lCx zCU?n8&6W@Uf7b2%`>ynP2hc1aSTO7S*JB}9L$0~!tm(AWEUbvPD#Mb>9l zusfK&18M|E{$^Kk_`TX+8yj4-VIKDGYdiv#{_2)S+wyMXw zDk>dUI#u&J?!eYLV#dqlH)qQ~{nTWz$>g-|*-yXkdM9Wy1Fd-ahr#(m^83UuXQzWK N^mO%eS?83{1OUSthOz(v literal 0 HcmV?d00001 diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_leg.png b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..7e045922af8422e63d72bda74cc6411694d9ff5a GIT binary patch literal 382 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zEj(QuLn`LH zy|vNnaDd3MkHLi}n7?dWxbVVJNAp6V!Y_d_b7HtJIda*BJfCoJt?Vw2htsZoVLT_s z&MvO&`Oa|Rum5jjeNKy)H{71HR^YaOcP1#qhHdBoiDDLW``dG#AtTiw1jPuL({>;hRINhu0eRMQ8!~qNp zHS4=C{!lvGblqeo&&n+I_e@>A{BhP5Mk=37H{{$d+A3yVB^s)`SmTxHNsCn%MF)V_wSdI0lA) ZQ~BQ%CPxUmy7PnV^mO%eS?83{1OV*QtYh7tMO8 z>6eiE<0Jpq`#qRF-8}PNFv!a3yl#^<-t!1uzPbJHoaT!vTqQ4D7@1_g^!g8C&<9T>svS{Yd4~*n+LhkFw5*dvkw$m%lqwyVj<2w?hf* zv+kv@e%`(0ds1%6^K$RoXQTe?S-~*%d;ginPaAH_f9eC;2?1RT9)F)ZL(r>J&DnG9 zx8+5t;Rkj-*o>#V7ROp1Vn@E3kl9dBl5O+=9k)>_ku}=qNKwM8(KbLh* G2~7aCewzgV literal 0 HcmV?d00001 diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_foot.png b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_foot.png new file mode 100644 index 0000000000000000000000000000000000000000..947a8d91f8f4c0e0715a590151b4fe4ff9454bdc GIT binary patch literal 365 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z)jeGtLn`LH zy|vNnaDc?okBfhBxVebOFPv7U&9$$Y@0_0BE{oJtlf+jx7rwl=uz6b3B0f)rWR5Kz zFPT$z^UYf1*QvI#^?&}JJJNjeHJ3YCfaXKM1MS;|XA5i$1Lw@p@auWIZQY84Mq*};noFWn4Td~xrkl641j>({>c{dJM}t@alb3zYPfuMIv%N-^**<1f49seVAKbSK zeMQvMEars-ofFe?pY9shVrOp`^6l(YsRotG>*l|11~2mb$(I(n?Z(m2f02v6aIw_= z*w{RG-M4MqU!AzJ;u756w literal 0 HcmV?d00001 diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_hand.png b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_hand.png new file mode 100644 index 0000000000000000000000000000000000000000..192a4b09e57f929b820600464576a7bf38103baf GIT binary patch literal 346 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zMLb;`Ln`LH zy|veiIZ&YOq5nszBbU@#>suqL`EToR=v^~2ySB1P!k{&-*`@o4(%!8VjQ@0R=x8&3 zAZgO#>OFg zviXa0@oy^fwf(UMUBdm3Qq<n;b(KU o$ba*n|L=G<7%(z0H2nO)x%5nIyq?a}=OBALUHx3vIVCg!0B1swwEzGB literal 0 HcmV?d00001 diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_leg.png b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..1414e70d15e09a0b2019854fb90e2b7d54a16e7d GIT binary patch literal 396 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z-8@|!Ln`LH zy|vNnaDd3MkHQ}Xi*6?f?y`8H=BLzW*VR2aTOmcG)h5JUbMBF~vb#jQRC0eYl<)S7 zY~lOhVEFbF`U&W`jU_%H~6n*>{t67S)~?IyH6Mhrf@D3lxEZ)oP^- zk5ks@@@mZ%&D$7bnZ5Q^;|gYpMZvMv*DF{*6x6Hle)Zz+67RFV+0Q?5CG5R<%0%+y z+muCF*II8#RMu8asg3l?=_%j)O5ecOZPq5gO!-q=&-XvClsfx4Y}q^Kjws;4$NM=y8d^hN5=Mp|5q|^xVCHkd-=%xZHmu6h-G=cmUSrh zQt|lC7_gVo_gC%Se@a3*;xA+mEVN?DymQRPfARL|&oz#0-NU@%^<~%Gr081KGiM9< lyfP};6MSq|2rDsMI41v7ATw6i_0K1e-JY&~F6*2UngIP?sapU5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/torso_f.png b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/torso_f.png new file mode 100644 index 0000000000000000000000000000000000000000..d252de33c8f6e0c41aa4dd37cbbb0165f03ea932 GIT binary patch literal 769 zcmV+c1OEJpP)Px%yGcYrRCt{2+COU|K^O+`C&v}}0NF$mIBbN|Cdq}AA%V0CL6Q^~Nu9%%l|z<%@JQ7(Rbxc61> zm$!ZIWXR-`CZN%5!{`r@KQB15?Y`e=w#glk$+vmSVdnz?E-tS`u~ZiI+dE-dmZ;y} ziDIcNE-tS^{RFV7nl3EM5|(9&meFy_s-{cjlU4u#49sVwQ%P*DtpWfx*H)2EB{49c zW%7M_X+M}2X#(~RG9$b2OZ7oJ$>v1n_-Jfh=J*IF*&I2ayaE#Om@{zu6)^fkB;qk@ zQ&J|q>aweW^f3qk%JK>xAMWvcdBu6m>~*2I?uV)V^B1-@*2k7*kS5@!^kWWy0D!~8 zJzQVkIJd6)P?^0h>J!Q`Lho?UPO>?%pePvh2QbYiD9QqsB1?EOO?s@uYj$MbyTV~B;v7|{6V47Y$Fkmp;E0m z=YoDn?*VT1e$Z$Zf@p5)ydaQPK&4s>EI2IGK2E&??A^UsDhuyXxcxSml}fdSbSgQr z2bjGsJ|FDQ{($smqEhwr00000NkvXXu0mjfn4@SC literal 0 HcmV?d00001 diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/torso_m.png b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/torso_m.png new file mode 100644 index 0000000000000000000000000000000000000000..da0175612629f7db05f7c67b6cf331b61bad2de7 GIT binary patch literal 660 zcmV;F0&D$=P)Px%PDw;TRCt{2+OclhKo|$`f2s~VK%5|~R4kR+ZfVppZxEykwHex~bC(Y35UG;Y z0afzWrAr^6VhAXTl)OPUP|1)4kXS4tBf{|jY}e`B<6=_2i)}#qehY`s_<#P+V8j71 z#u#IavHz>q>hdA|N#u8fer!fJ=u4aYHOkJD$wUUj5uO#F+<9F$=*wb$1G!v|bWCc# zY6rtnw7r<$h}zVAaskY6a}Ze-K#fB`d7J#ll$}+e8LIcEDeiBR=C=c+#~?M`p1_-5NCpHu)dbe`?Yj$D96y9vXntzU`yb_!Af zt}d^q-e>x(x0(%HU0z!aVqRk*u;se3eOs=Ju@K~AT3rF^#MKOBdHK(}3*2{ixDV+z z2mnsOMXTAsP2t~6h(QRa5I-|XJO6Wm-JR{&whdANPHMl`07wAX-+zsxqm$@S>ra&! zggBqkwvqaPllJNJ7rE{@xEz9h>=0jD^6jpFdXad>CVlF~%5Uj4{R-V@uAf z_*Q>JNL#g5mtMsukBjuPxL5I|cX$v5>V54_58uCi&E!{Euj0!W&!0|hE0^|AE&%`} zWgO&%5j{}%^3{kOZo{ki^25jX)+<4##1==B8c^0*a~D9r{7s8k8lRQv9Ug%4S&+yT zkmc+row;)V4@erR0LQ0iX^kT>)G^L|7f_$>)mmMeOX0ga+nE;U`1B0r(%zjVaWM$- u?(LiG7f2WJ#b_D7j4{R-V~jDzR>xmbVFZW9&$KK60000@P)>NoU180lZ+1G*u(QdXu;L>X~}BB6vXy$A;y z&JIykDQ^LrcO8sU$v_(3F8dx)EWTr@%W})Y2FmZy5-TVx_^4XVY`8=zEJoNaJ&Fzy0j`rtHL1? z1l!=o1W04b0D&?9n71U`__X@#nveX+@m|T;hy=^9t@X~qghXc-)Pr|bIz2aONp>45 z86S1e<-1PuXMEUhpk&N-37|s)`uZYUVV_9=z%UeWyg<`^r`9-ZH=2zbPFYg0GO*92 z=BOV0bUa=p10uqK@k-b?Si9jc6v!j6iYkw0)i4xn0;~);UVt{IMYd|pQH``cvm&rl zYmEE}+H`fpX=9G;951+>z<7}i%5jnl<5*B c*U<^S0a7d0V2~Fu%m4rY07*qoM6N<$f+Z>5NdN!< diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/head_f.png deleted file mode 100644 index b705d2d50e810da8f25b598e20c8cc8d879c8906..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~KesaSW-L^Y+%+uBHGH_79iO z+;Ho1scO35y8hDfVmI%PlDAxLpSXQ|%_47CFC$*g!!tt@<-7Mhj>&xXzgdIzyrtaN zZ5Bd|f3j7tGPl0}_;UO0cUs3QPyIRc-9k6^%>489b7RT{Tc7!>$Mdy`-?!=#*mpeW z)NbAhL0V7iPgfmyzI(~_S)OgVf`Sthqo=eO*1F0^I@_v0tlq;>Jg% z2A6+v#N20H75?AdRi^y+=j9!)A9ma}HWr^G5A+HQJkWglsg7adKgrsKKm9)+T$J|Z zx^mIn%_n!OuP=6+K9Bp^#g^$dU0#P~Y@4jmAHaXpkICzh#qo}S?#>B4 zu|c;eYVPcGWB)_nZ)BDNxmwXvKmY5U5o{u>eKaJ?;cVtTl{LG0rM_10-zBm0ZC>V; z_knkFW8U;HOI~H^yL84(=?B|(FRkXBY_M!qrk3bL*Q+M^dH*l7Ui|03pqkO=xu1SZ gg(DNp#S9M|@2}~*sLTGs!W$&!>FVdQ&MBb@08Z1!#{d8T diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/head_m.png deleted file mode 100644 index e555d030beac914816bddf07bb4242dd747b2584..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 435 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV65_VaSW-L^Y+&HRZR{eY#$!S zZsF#tVb!ggdZt}ee!*1TELqFHjbckfA|zP1S(X=Su8E0xeol7fKKT|^i~AK3?jYr{f@V zJm_b9D*ui*{Vpyk+oH>Fzy7yfy{3P&%G1wEk3tQe07)Ist#(ZP<&AHy{=clUNo8;C zstA_NDyeDfROEqfhk*yGnw9nq9`*hEF4a7&-ou$b_3I1y=qIxamg(<*@uc+Ii%+$V zqOKZu<@Aeg%4eE$hVp#X-tD<*m<}N=Fwb}3W!58u3%C`%9zb2HFe{!)GUy@k54ZLn`LHy=BYShIb790IRu#c1Ub8k%Y&qhVs4;Di|Ni*0{cplHD*-h#=x# z<*KOsYoa?>t+Hp0m}VeTx01>1TI1E9DYBZimvtv;Z*pK%Qrf!POJe!v`)jp}cprzz zeLb6%9e;+qW0FqB>Pse@*LrnM(lOxu8}S6>G$=4wuDt$tu>SGG@ywC$)0-b}{5eH) z(|1-EPq8yUtsm4fHt&0>wl>se{Yv!%KM@P4zopr E0Ba^|OaK4? diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_foot.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_foot.png deleted file mode 100644 index c448837af238a4f9dcce79ddc7fb56b1b59efd93..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 398 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)2IAwlHkEYZvhvD8gCb z5n0T@pr;JNj1^1m%YcIHC7!;n>`yp&xQ&f#Jl}LNFfdAcx;TbZ+vKC diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_hand.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_hand.png deleted file mode 100644 index 7bf47c949a5eb9776fd0d9c4b9089c1099acfda2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Cp=voLn`LHy=BPVV{rjq>;A$-^~d2!zxo1x}H8?m^YQF#g diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_leg.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_leg.png deleted file mode 100644 index b3ce27ba862cd732dd30ee70688b6ab071e3a10d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6361 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 diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_arm.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_arm.png deleted file mode 100644 index 8887c30fa276f2206949f7f513bb9cf9fae764e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=w>@1PLn`LHy=BeU9l-$~K{$Z@v0)I~F%j~ahw)&eY&t3kiv|8f*dz}Smge+Mmt~!1C zK|*oXYcJWR6EEr$zOb3>3aFE)KD^lXJb&`~i>)8)9{U5$hJuKRpI>U6e;r$=J2!L1 zz0C)=t=pF!?)EHpP5WXi|G6_I$~S5)IM3QrpB{RkY`?Vi@uVH{V4V>Q%^hx}y#JW; QcrS?W>FVdQ&MBb@0KzSDT>t<8 diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_foot.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_foot.png deleted file mode 100644 index 8d51a591a454f47a7336b4d8457b511d9a242d57..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 398 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)2IAwlHkEYZvhvD8gCb z5n0T@pr;JNj1^1m%YcIHC7!;n>`yp&xJ}qnckjz%U|^K?ba4!+xb^n-#;ijDBF8?y z_j;lBLcl7G!+b&i1kLIbr>EIDsJn01a+8%g>X^A*Z@IVC6s04#C%Jw4zl~>l@sGRC zMt7vc?d>y9NM=4@1loZg)E!Zosjuz*>Cmj_c1I@dF^CU~x4nBM{K~ct{nc^rpWH56 zemqCb)9PCG%s%&eVQc4n?Q=o3bMBW$>|wdiKd<5Gv(QN*=__aLW{!=W0dz>$<}cCm l3kw_fpa1{7w$Xm=Urzs9=9On}eUJy)=jrO_vd$@?2>`*Fj9LHy diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_hand.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_hand.png deleted file mode 100644 index a4810281263915bb23ce4ef1f65903fa8951af07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 261 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 P00000NkvXXu0mjf^Fncn diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/torso_m.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/torso_m.png deleted file mode 100644 index 3097763a95efd0b32ce02b6b696790597a3bc3c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 682 zcmV;b0#*HqP) zPS>mBf(od8dZL^3acf<*J`m3>7PI+Izt5tiSj^_i`hQh_Mf_5?Iu@*m&!x|F2T~+nvNHrL7=TPrgnTCB?(tEt3z-pT+m3pxaE6?9<{&k4wo7=5Y!k3BVlO$S`*h zb8rJ838WQcNC|-6?}1_2u=J-g%pGLuPr Date: Thu, 4 Apr 2024 18:13:03 +1000 Subject: [PATCH 4/6] Delete tiefling.yml --- .../Entities/Mobs/Customization/Markings/tiefling.yml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 Resources/Prototypes/Entities/Mobs/Customization/Markings/tiefling.yml diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tiefling.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tiefling.yml deleted file mode 100644 index 7b0ce520a1..0000000000 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tiefling.yml +++ /dev/null @@ -1,8 +0,0 @@ -- type: marking - id: CPTieflingTail - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [CPTiefling] - sprites: - - sprite: Mobs/Customization/cat_parts.rsi - state: tail_cat From f07d2658f2aa00d69a5d289012d61e22284826d2 Mon Sep 17 00:00:00 2001 From: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Date: Thu, 4 Apr 2024 18:49:48 +1000 Subject: [PATCH 5/6] =?UTF-8?q?=D0=9F=D0=9E=D0=91=D0=95=D0=94=D0=90!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_CP14/Entities/Mobs/Customization/Markings/tiefling.yml | 6 ++---- Resources/Prototypes/_CP14/Species/tiefling.yml | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling.yml index c16df27f9c..b4e6de974f 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling.yml @@ -4,7 +4,5 @@ markingCategory: Tail speciesRestriction: [ CPTiefling ] sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi - state: tail_smooth_primary - - sprite: Mobs/Customization/reptilian_parts.rsi - state: tail_smooth_secondary + - sprite: Mobs/Customization/cat_parts.rsi + state: tail_cat \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Species/tiefling.yml b/Resources/Prototypes/_CP14/Species/tiefling.yml index b5c2a2942b..6c578e521d 100644 --- a/Resources/Prototypes/_CP14/Species/tiefling.yml +++ b/Resources/Prototypes/_CP14/Species/tiefling.yml @@ -21,6 +21,7 @@ Hair: MobTieflingAnyMarking FacialHair: MobTieflingAnyMarking Snout: MobTieflingAnyMarking + Tail: MobTieflingAnyMarking Chest: MobTieflingTorso Eyes: MobTieflingEyes LArm: MobTieflingLArm From 4e47d31f4ee27be1fb8c17423b8d1bfe25e891bf Mon Sep 17 00:00:00 2001 From: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Date: Wed, 10 Apr 2024 21:24:25 +1000 Subject: [PATCH 6/6] =?UTF-8?q?=D0=A2=D0=B8=D1=84=D0=BB=D0=B8=D0=BD=D0=B3?= =?UTF-8?q?=D0=B8=20=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Mobs/Customization/Markings/tiefling.yml | 8 -- .../Customization/Markings/tiefling_horns.yml | 85 ++++++++++++++++++ .../Customization/Markings/tiefling_tails.yml | 21 +++++ .../_CP14/Entities/Mobs/Species/tiefling.yml | 1 + Resources/Prototypes/_CP14/Species/human.yml | 6 +- .../Prototypes/_CP14/Species/tiefling.yml | 69 +++++++------- .../tiefling_tails.rsi/meta.json | 2 +- .../{tail2.png => tail_spades.png} | Bin 8 files changed, 146 insertions(+), 46 deletions(-) delete mode 100644 Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_tails.yml rename Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/{tail2.png => tail_spades.png} (100%) diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling.yml deleted file mode 100644 index b4e6de974f..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling.yml +++ /dev/null @@ -1,8 +0,0 @@ -- type: marking - id: CPTieflingTail - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [ CPTiefling ] - sprites: - - sprite: Mobs/Customization/cat_parts.rsi - state: tail_cat \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml new file mode 100644 index 0000000000..8600761f49 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml @@ -0,0 +1,85 @@ + +- type: marking + id: CPTieflingHorns + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ CPTiefling ] + sprites: + - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi + state: horn1 + +- type: marking + id: CPTieflingHorns2 + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ CPTiefling ] + sprites: + - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi + state: horn2 + +- type: marking + id: CPTieflingHorns3 + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ CPTiefling ] + followSkinColor: true + forcedColoring: true + sprites: + - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi + state: horn3 + +- type: marking + id: CPTieflingHorns3Broken + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ CPTiefling ] + followSkinColor: true + forcedColoring: true + sprites: + - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi + state: horn3_broken + +- type: marking + id: CPTieflingHorns4 + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ CPTiefling ] + followSkinColor: true + forcedColoring: true + sprites: + - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi + state: horn4 + +- type: marking + id: CPTieflingHorns5 + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ CPTiefling ] + followSkinColor: true + forcedColoring: true + sprites: + - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi + state: horn5 + +- type: marking + id: CPTieflingHorns5Broken + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ CPTiefling ] + followSkinColor: true + forcedColoring: true + sprites: + - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi + state: horn5_broken + +- type: marking + id: CPTieflingHorns6 + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ CPTiefling ] + followSkinColor: true + forcedColoring: true + sprites: + - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi + state: horn6 + diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_tails.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_tails.yml new file mode 100644 index 0000000000..fbc4e4b9ee --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_tails.yml @@ -0,0 +1,21 @@ +- type: marking + id: CPTieflingTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ CPTiefling ] + followSkinColor: true + forcedColoring: true + sprites: + - sprite: _CP14/Mobs/Customization/tiefling_tails.rsi + state: tail1 + +- type: marking + id: CPTieflingTailSpades + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ CPTiefling ] + followSkinColor: true + forcedColoring: true + sprites: + - sprite: _CP14/Mobs/Customization/tiefling_tails.rsi + state: tail_spades \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml index 80caf96b62..c6cb9a0fc1 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml @@ -14,6 +14,7 @@ sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: full - type: Thirst + - type: Wagging - type: entity parent: BaseSpeciesDummy diff --git a/Resources/Prototypes/_CP14/Species/human.yml b/Resources/Prototypes/_CP14/Species/human.yml index 9ff3f43bea..c4e8de6cbf 100644 --- a/Resources/Prototypes/_CP14/Species/human.yml +++ b/Resources/Prototypes/_CP14/Species/human.yml @@ -12,9 +12,9 @@ id: CPMobHumanSprites sprites: Head: CPMobHumanHead - Hair: MobHumanoidAnyMarking - FacialHair: MobHumanoidAnyMarking - Snout: MobHumanoidAnyMarking + Hair: CPMobHumanoidAnyMarking + FacialHair: CPMobHumanoidAnyMarking + Snout: CPMobHumanoidAnyMarking Chest: CPMobHumanTorso Eyes: CPMobHumanoidEyes LArm: CPMobHumanLArm diff --git a/Resources/Prototypes/_CP14/Species/tiefling.yml b/Resources/Prototypes/_CP14/Species/tiefling.yml index 6c578e521d..b83afcbd91 100644 --- a/Resources/Prototypes/_CP14/Species/tiefling.yml +++ b/Resources/Prototypes/_CP14/Species/tiefling.yml @@ -17,25 +17,25 @@ - type: speciesBaseSprites id: CPMobTieflingSprites sprites: - Head: MobTieflingHead - Hair: MobTieflingAnyMarking - FacialHair: MobTieflingAnyMarking - Snout: MobTieflingAnyMarking - Tail: MobTieflingAnyMarking - Chest: MobTieflingTorso - Eyes: MobTieflingEyes - LArm: MobTieflingLArm - RArm: MobTieflingRArm - LHand: MobTieflingLHand - RHand: MobTieflingRHand - LLeg: MobTieflingLLeg - RLeg: MobTieflingRLeg - LFoot: MobTieflingLFoot - RFoot: MobTieflingRFoot + Head: CPMobTieflingHead + HeadTop: CPMobTieflingMarkingMatchSkin + Hair: CPMobTieflingAnyMarking + FacialHair: CPMobTieflingAnyMarking + Snout: CPMobTieflingMarkingMatchSkin + Tail: CPMobTieflingMarkingMatchSkin + Chest: CPMobTieflingTorso + Eyes: CPMobTieflingEyes + LArm: CPMobTieflingLArm + RArm: CPMobTieflingRArm + LHand: CPMobTieflingLHand + RHand: CPMobTieflingRHand + LLeg: CPMobTieflingLLeg + RLeg: CPMobTieflingRLeg + LFoot: CPMobTieflingLFoot + RFoot: CPMobTieflingRFoot - type: markingPoints id: CPMobTieflingMarkingLimits - onlyWhitelisted: true points: Hair: points: 1 @@ -52,7 +52,8 @@ defaultMarkings: [ CPTieflingTail ] HeadTop: points: 1 - required: false + required: true + defaultMarkings: [ CPTieflingHorns ] Chest: points: 1 required: false @@ -64,98 +65,98 @@ required: false - type: humanoidBaseSprite - id: MobTieflingEyes + id: CPMobTieflingEyes baseSprite: sprite: Mobs/Customization/eyes.rsi state: eyes - type: humanoidBaseSprite - id: MobTieflingAnyMarking + id: CPMobTieflingAnyMarking - type: humanoidBaseSprite - id: MobTieflingMarkingMatchSkin + id: CPMobTieflingMarkingMatchSkin markingsMatchSkin: true - type: humanoidBaseSprite - id: MobTieflingHead + id: CPMobTieflingHead baseSprite: sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: head_m - type: humanoidBaseSprite - id: MobTieflingHeadMale + id: CPMobTieflingHeadMale baseSprite: sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: head_m - type: humanoidBaseSprite - id: MobTieflingHeadFemale + id: CPMobTieflingHeadFemale baseSprite: sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: head_f - type: humanoidBaseSprite - id: MobTieflingTorso + id: CPMobTieflingTorso baseSprite: sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: torso_m - type: humanoidBaseSprite - id: MobTieflingTorsoMale + id: CPMobTieflingTorsoMale baseSprite: sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: torso_m - type: humanoidBaseSprite - id: MobTieflingTorsoFemale + id: CPMobTieflingTorsoFemale baseSprite: sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: torso_f - type: humanoidBaseSprite - id: MobTieflingLLeg + id: CPMobTieflingLLeg baseSprite: sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: l_leg - type: humanoidBaseSprite - id: MobTieflingLArm + id: CPMobTieflingLArm baseSprite: sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: l_arm - type: humanoidBaseSprite - id: MobTieflingLHand + id: CPMobTieflingLHand baseSprite: sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: l_hand - type: humanoidBaseSprite - id: MobTieflingLFoot + id: CPMobTieflingLFoot baseSprite: sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: l_foot - type: humanoidBaseSprite - id: MobTieflingRLeg + id: CPMobTieflingRLeg baseSprite: sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: r_leg - type: humanoidBaseSprite - id: MobTieflingRArm + id: CPMobTieflingRArm baseSprite: sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: r_arm - type: humanoidBaseSprite - id: MobTieflingRHand + id: CPMobTieflingRHand baseSprite: sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: r_hand - type: humanoidBaseSprite - id: MobTieflingRFoot + id: CPMobTieflingRFoot baseSprite: sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: r_foot diff --git a/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/meta.json index dcaa9703e4..d952a90435 100644 --- a/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/meta.json +++ b/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/meta.json @@ -54,7 +54,7 @@ ] }, { - "name": "tail2", + "name": "tail_spades", "directions": 4, "delays": [ [ diff --git a/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail2.png b/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail_spades.png similarity index 100% rename from Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail2.png rename to Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail_spades.png