From c5986aac5524b25ad270da63213e9b9a975a3647 Mon Sep 17 00:00:00 2001 From: Aikakakah <145503852+Aikakakah@users.noreply.github.com> Date: Sat, 21 Sep 2024 15:05:28 -0400 Subject: [PATCH 01/14] Update tattoos.yml Fixes chest tattoos showing through clothes on females. Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com> --- .../Mobs/Customization/Markings/tattoos.yml | 40 +++++++++++++++++-- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml index 345115bf5aa..f508ffac72b 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml @@ -1,8 +1,9 @@ - type: marking - id: TattooHiveChest + id: TattooHiveChestMale bodyPart: Chest markingCategory: Chest speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + sexRestriction: [Male] coloring: default: type: @@ -10,13 +11,14 @@ fallbackColor: "#666666" sprites: - sprite: Mobs/Customization/tattoos.rsi - state: tattoo_hive_chest + state: tattoo_hive_chest_male - type: marking - id: TattooNightlingChest + id: TattooHiveChestFemale bodyPart: Chest markingCategory: Chest speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + sexRestriction: [Female] coloring: default: type: @@ -24,7 +26,37 @@ fallbackColor: "#666666" sprites: - sprite: Mobs/Customization/tattoos.rsi - state: tattoo_nightling + state: tattoo_hive_chest_female + +- type: marking + id: TattooNightlingChestMale + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + sexRestriction: [Male] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/tattoos.rsi + state: tattoo_nightling_male + +- type: marking + id: TattooNightlingChestFemale + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + sexRestriction: [Female] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/tattoos.rsi + state: tattoo_nightling_female - type: marking id: TattooSilverburghLeftLeg From 49a69243b09ab3ab3cb34c5fb8cacfbb17fc9a4d Mon Sep 17 00:00:00 2001 From: Aikakakah <145503852+Aikakakah@users.noreply.github.com> Date: Sat, 21 Sep 2024 15:07:52 -0400 Subject: [PATCH 02/14] Update scars.yml Fixes the chest scar showing through clothes on females. Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com> --- .../Mobs/Customization/Markings/scars.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml index 13c09f99089..f560f155b4c 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml @@ -41,11 +41,23 @@ state: scar_top_surgery_long - type: marking - id: ScarChest + id: ScarChestMale bodyPart: Chest markingCategory: Chest speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni + sexRestriction: [Male] + followSkinColor: true + sprites: + - sprite: Mobs/Customization/scars.rsi + state: scar_chest_male + +- type: marking + id: ScarChestFemale + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni + sexRestriction: [Female] followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi - state: scar_chest + state: scar_chest_female From 4f3b3eeca985644a9ee17447b210114dc24607b1 Mon Sep 17 00:00:00 2001 From: Aikakakah <145503852+Aikakakah@users.noreply.github.com> Date: Sat, 21 Sep 2024 15:09:38 -0400 Subject: [PATCH 03/14] Add files via upload Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com> --- .../scars.rsi/scar_chest_female.png | Bin 0 -> 297 bytes .../Customization/scars.rsi/scar_chest_male.png | Bin 0 -> 1410 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Resources/Textures/Mobs/Customization/scars.rsi/scar_chest_female.png create mode 100644 Resources/Textures/Mobs/Customization/scars.rsi/scar_chest_male.png diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest_female.png b/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest_female.png new file mode 100644 index 0000000000000000000000000000000000000000..b6009e3b66291fe84b37b4acb470c95f5a8bc862 GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@31>6XFV_7o??aZf;&vQL(e9XGeGU!iC8BCT3HFj8zhH*{V6e1) z*>9lGEKe85kcv6UDGCe{?xGV`Gz31doutvk9KJxOKy0By#Ju+mvzXKl*FP8JlF{S7 z=NNuqc>&|iq+|6NTr(sq>=*2KYd?#L{n+0hwTT}dGS;y&@yLJBO8C_tE47Z{o!XqR z2P})Z+(dg6SkJvb_c-*xr*_8&%yz5?vp+^3TvRW%pQ*k7`A6-90t*KR$3sj^Tr741 h0SxSmx!C%d7z&tW9kp+;g#um4;OXk;vd$@?2>?SPW%U36 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest_male.png b/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest_male.png new file mode 100644 index 0000000000000000000000000000000000000000..9a1cc56c5eaaefd41a959e81287b35d6c1f8ebe4 GIT binary patch literal 1410 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F;KxA5N2eb5`33|fjK8LB%&n3*T*V3KUXg?B|j-uuOhbq ztjngt3dqb&ElE_U$j!+swyLmI0;{kBvO&W7N(x{lCE2!05xxNm&iO^D3TAo+dIm~% zTnY*bHbp6ERzWUqQ0+jTtx`rwNr9EVetCJhUb(Seeo?xG?W zUP)qwZeFo6#1NP{E~&-IMVSR9nfZANAafIw@=Hr>m6Sjh!2!gbDamkq3QCJ|z_z3$ z>!;?V=BDPA6zd!68R}!xSCW~AaA96CG&q0(qYsh+YBRv9&9k5+*#sC;t`$J{K>Y`F zXfoK|;*u17BnA3L1_l&2TID3>rQ0f1=%%EmC6?xtDA{@Xy2l%uT3XuZLsX&ahKQmXYNL{p zmyJF=C)sg{E@QCayJOdMOgS5JQx87CEVT&?u8^1_I&x6i*@e*BcgW6vVsz`zJ18uPfm zBrW-CA{RaPdEwSBqvhwG#|IzT`H8t@OMIGf_1*WWkIm z`d61Z947s@kh^=Q{qDJ~$>#6els_BH|E|(@ITaB$H`z zs&%3NpL{pT-1%zJB=)aNTLdq+UM~+=w^r}ST8%Y=HEeIT-!@vbr(4ti--a!(`nlLH zFt5Ln^UD3VzHPL9jgk|aE#urfUprp-v@$SpC^TRr9K4xM+NJFXu?w1g#b|EG>LR_% ze{cD4Z~1p%4)@kNx%AuXyIZe*`g8M~sBDv0vgqg7C)3{iS*Wq-$SFRDN&DyfoZ9TI zeZ^O06LUrU`qMS}Y|R?%ab*nG>gvUo2>6!Szuq|4^6ln(s$%`fme+?p;I_Em!PqUO R@eNe|dAj Date: Sat, 21 Sep 2024 15:10:09 -0400 Subject: [PATCH 04/14] Delete Resources/Textures/Mobs/Customization/scars.rsi/scar_chest.png Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com> --- .../Mobs/Customization/scars.rsi/scar_chest.png | Bin 1410 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/Mobs/Customization/scars.rsi/scar_chest.png diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest.png b/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest.png deleted file mode 100644 index 9a1cc56c5eaaefd41a959e81287b35d6c1f8ebe4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1410 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F;KxA5N2eb5`33|fjK8LB%&n3*T*V3KUXg?B|j-uuOhbq ztjngt3dqb&ElE_U$j!+swyLmI0;{kBvO&W7N(x{lCE2!05xxNm&iO^D3TAo+dIm~% zTnY*bHbp6ERzWUqQ0+jTtx`rwNr9EVetCJhUb(Seeo?xG?W zUP)qwZeFo6#1NP{E~&-IMVSR9nfZANAafIw@=Hr>m6Sjh!2!gbDamkq3QCJ|z_z3$ z>!;?V=BDPA6zd!68R}!xSCW~AaA96CG&q0(qYsh+YBRv9&9k5+*#sC;t`$J{K>Y`F zXfoK|;*u17BnA3L1_l&2TID3>rQ0f1=%%EmC6?xtDA{@Xy2l%uT3XuZLsX&ahKQmXYNL{p zmyJF=C)sg{E@QCayJOdMOgS5JQx87CEVT&?u8^1_I&x6i*@e*BcgW6vVsz`zJ18uPfm zBrW-CA{RaPdEwSBqvhwG#|IzT`H8t@OMIGf_1*WWkIm z`d61Z947s@kh^=Q{qDJ~$>#6els_BH|E|(@ITaB$H`z zs&%3NpL{pT-1%zJB=)aNTLdq+UM~+=w^r}ST8%Y=HEeIT-!@vbr(4ti--a!(`nlLH zFt5Ln^UD3VzHPL9jgk|aE#urfUprp-v@$SpC^TRr9K4xM+NJFXu?w1g#b|EG>LR_% ze{cD4Z~1p%4)@kNx%AuXyIZe*`g8M~sBDv0vgqg7C)3{iS*Wq-$SFRDN&DyfoZ9TI zeZ^O06LUrU`qMS}Y|R?%ab*nG>gvUo2>6!Szuq|4^6ln(s$%`fme+?p;I_Em!PqUO R@eNe|dAj Date: Sat, 21 Sep 2024 15:10:40 -0400 Subject: [PATCH 05/14] Update meta.json Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com> --- Resources/Textures/Mobs/Customization/scars.rsi/meta.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/meta.json b/Resources/Textures/Mobs/Customization/scars.rsi/meta.json index 0a323f7f65d..09b7089af2f 100644 --- a/Resources/Textures/Mobs/Customization/scars.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/scars.rsi/meta.json @@ -24,7 +24,11 @@ "directions": 4 }, { - "name": "scar_chest", + "name": "scar_chest_male", + "directions": 4 + }, + { + "name": "scar_chest_female", "directions": 4 } ] From ce35f7ce35d15e045c7dca4f278151616cbd6b75 Mon Sep 17 00:00:00 2001 From: Aikakakah <145503852+Aikakakah@users.noreply.github.com> Date: Sat, 21 Sep 2024 15:11:07 -0400 Subject: [PATCH 06/14] Delete Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling.png Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com> --- .../tattoos.rsi/tattoo_nightling.png | Bin 412 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling.png diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling.png deleted file mode 100644 index 824a9921df65b88d97c59fe6c7e9a3d6ccf2872c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 412 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|TR< zr;B4q#hkaZ0{NN@1YC|EsXm}?-l%*y_kqd_DRV=YE4sN(b1Ur^9o_bOSFYy^(I*}Z zCnhpXP-awcXL9IcamkB&f8+U6za={A*UrUBf3{hld%Nw{|HuQ`4Y&P%eE;gH$tm{0 z#CLb9@8y=)JgEnEKiIy1_X?pKFQOK_XG@5jw&cz4$cFHJ*H3K!6mvtPT3YY+rbX|6 zFZs19n#K0CPR8zSJui0YMb?xu@$lEk96!Ei`xpP%>Qy2MKbp!*PK9b8*r+4XrWolo zl_~D>-F5vQD}oM~y?tqP;KbJ_k!u@b&P!kAI?>9~Aj8REDa25u!hq&_phU;Ng->3; zU%cdtuFiotuVpeW8fTYpW}eS6U%>M9i{A|{za{Jx8Yc(WaQ%@6nV?Ygd1g7|@)vp^ h`ZJ_i&<%agwq)g^{!1Swdjo@;!PC{xWt~$(696Cat^oi5 From 5d1da1c41b3768ee1bb97b6aae4f4cc41ffd810c Mon Sep 17 00:00:00 2001 From: Aikakakah <145503852+Aikakakah@users.noreply.github.com> Date: Sat, 21 Sep 2024 15:11:23 -0400 Subject: [PATCH 07/14] Delete Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_chest.png Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com> --- .../tattoos.rsi/tattoo_hive_chest.png | Bin 380 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_chest.png diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_chest.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_chest.png deleted file mode 100644 index 7baf398bc27c76360505ee2e8cd80ae1c9b308bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 380 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|TR; zr;B4q#hkaZE^@Xw@VL0|;M&5Gec|6lDIKTi4`-Yl{+upSmrlEPKIy>GJ!?KH*E#gD zG{|r=SPC%|sW3e8U^wBansER7=J(Yl;?Iv3+x9UZHYk~BdzoXylkK^OZO*ISERFR( z6E=N=&gsmJ9W5qI?>r+n)kz&I)VVHZZh5ixGDpE5l^Fu7cc|vB?(C4OSDwqTdRKVW ztYt!zopr0E8Nq^Z)<= From 5ddecfdec59d7663f4b9713a897fdc16a214d766 Mon Sep 17 00:00:00 2001 From: Aikakakah <145503852+Aikakakah@users.noreply.github.com> Date: Sat, 21 Sep 2024 15:11:44 -0400 Subject: [PATCH 08/14] Add files via upload Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com> --- .../tattoos.rsi/tattoo_hive_chest_female.png | Bin 0 -> 224 bytes .../tattoos.rsi/tattoo_hive_chest_male.png | Bin 0 -> 380 bytes .../tattoos.rsi/tattoo_nightling_female.png | Bin 0 -> 248 bytes .../tattoos.rsi/tattoo_nightling_male.png | Bin 0 -> 250 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_chest_female.png create mode 100644 Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_chest_male.png create mode 100644 Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling_female.png create mode 100644 Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling_male.png diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_chest_female.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_chest_female.png new file mode 100644 index 0000000000000000000000000000000000000000..835ae506555f50169c927f54ab83b285639dc157 GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP>?6UC&U#)oYbivBE?5h~uU71%ge2#x*T^rIc zjfs`77i6**{7P7r-SEj#XTkyd9bIj0j!&mMYBDe+HV8RJvbaP6En@I= L^>bP0l+XkKJM~9g literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_chest_male.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_chest_male.png new file mode 100644 index 0000000000000000000000000000000000000000..7baf398bc27c76360505ee2e8cd80ae1c9b308bf GIT binary patch literal 380 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|TR; zr;B4q#hkaZE^@Xw@VL0|;M&5Gec|6lDIKTi4`-Yl{+upSmrlEPKIy>GJ!?KH*E#gD zG{|r=SPC%|sW3e8U^wBansER7=J(Yl;?Iv3+x9UZHYk~BdzoXylkK^OZO*ISERFR( z6E=N=&gsmJ9W5qI?>r+n)kz&I)VVHZZh5ixGDpE5l^Fu7cc|vB?(C4OSDwqTdRKVW ztYt!zopr0E8Nq^Z)<= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling_female.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling_female.png new file mode 100644 index 0000000000000000000000000000000000000000..06b4f37ae7d2e99cddf0a2f6acb0ffa5cc2482fd GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP>?6UC&U#<|NsC0!Gi}ocI;rfA9VuAXDJEt3kHd9)^+Fr@=HBk978JR zB&Rqq_cTW|T>SSU-{AJc3-%irw9Oa)V^o-*IsbY228Qmlg3=Qh4!87)uSm0y`o4hc z#1@qWTm|mu97Pj;w?5fIhR}wu<~R4riY|zG(8x69@L$nMP5%xr lZ8UV<-(qcW?UEw{!(vBC$J&$IOMnhw@O1TaS?83{1OQlfSl<8u literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling_male.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling_male.png new file mode 100644 index 0000000000000000000000000000000000000000..ab92c759219f900fa022f2a375dee007d031e8ac GIT binary patch literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP>?6UC&U#<|NsC0!Gi}ocI;rfA9VuAXDJEt3kHd9)^+Fr^2SSU-{AJc3-%irw9Oa)V^o-*IsbY228Qmlg3=Qh4!87)uSm0y`o4hc z#1@qWTm|mu97Pj;w?5fIhR}wu<~R4riY|zG(8x69@L$nMP5%xr mZ8UVgOMR;fwZGh(MOQ`89ZJ6T-G@yGywqjH&~DW literal 0 HcmV?d00001 From 17d83c2b2ee471f3b9effc3cedbe8f3b8006598f Mon Sep 17 00:00:00 2001 From: Aikakakah <145503852+Aikakakah@users.noreply.github.com> Date: Sat, 21 Sep 2024 15:12:36 -0400 Subject: [PATCH 09/14] Update meta.json Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com> --- .../Mobs/Customization/tattoos.rsi/meta.json | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json b/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json index 38dfe7ea718..d4b476ed259 100644 --- a/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json @@ -8,11 +8,19 @@ }, "states": [ { - "name": "tattoo_hive_chest", + "name": "tattoo_hive_chest_male", "directions": 4 }, { - "name": "tattoo_nightling", + "name": "tattoo_hive_chest_female", + "directions": 4 + }, + { + "name": "tattoo_nightling_male", + "directions": 4 + }, + { + "name": "tattoo_nightling_female", "directions": 4 }, { From 8dd3c65fafe6f5069b6997498478571264cfe919 Mon Sep 17 00:00:00 2001 From: Aikakakah <145503852+Aikakakah@users.noreply.github.com> Date: Sat, 21 Sep 2024 15:25:47 -0400 Subject: [PATCH 10/14] Update tattoos.ftl Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com> --- Resources/Locale/en-US/markings/tattoos.ftl | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/markings/tattoos.ftl b/Resources/Locale/en-US/markings/tattoos.ftl index a3d1d1ef686..1a793eedb19 100644 --- a/Resources/Locale/en-US/markings/tattoos.ftl +++ b/Resources/Locale/en-US/markings/tattoos.ftl @@ -1,8 +1,14 @@ -marking-TattooHiveChest-tattoo_hive_chest = Back Tattoo (Hive) -marking-TattooHiveChest = Back Tattoo (Hive) +marking-TattooHiveChestMale-tattoo_hive_chest_male = Back Tattoo (Hive) +marking-TattooHiveChestMale = Back Tattoo (Hive) -marking-TattooNightlingChest-tattoo_nightling = Chest Tattoo (nightling) -marking-TattooNightlingChest = Chest Tattoo (Nightling) +marking-TattooHiveChestFemale-tattoo_hive_chest_female = Back Tattoo (Hive) +marking-TattooHiveChestFemale = Back Tattoo (Hive) + +marking-TattooNightlingChestMale-tattoo_nightling_male = Chest Tattoo (Nightling) +marking-TattooNightlingChestMale = Chest Tattoo (Nightling) + +marking-TattooNightlingChestFemale-tattoo_nightling_female = Chest Tattoo (Nightling) +marking-TattooNightlingChestFemale = Chest Tattoo (Nightling) marking-TattooSilverburghLeftLeg-tattoo_silverburgh_l_leg = Left Leg Tattoo (Silverburg) marking-TattooSilverburghLeftLeg = Left Leg Tattoo (Silverburg) From 2cf51740c35e81fb485f0256e223b4f9f95bf004 Mon Sep 17 00:00:00 2001 From: Aikakakah <145503852+Aikakakah@users.noreply.github.com> Date: Sat, 21 Sep 2024 15:26:08 -0400 Subject: [PATCH 11/14] Update scars.ftl Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com> --- Resources/Locale/en-US/markings/scars.ftl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/markings/scars.ftl b/Resources/Locale/en-US/markings/scars.ftl index fae2ffe8873..f4492b892a1 100644 --- a/Resources/Locale/en-US/markings/scars.ftl +++ b/Resources/Locale/en-US/markings/scars.ftl @@ -10,5 +10,8 @@ marking-ScarTopSurgeryShort = Top Surgery Scar (Short) marking-ScarTopSurgeryLong-scar_top_surgery_long = Top Surgery Scar marking-ScarTopSurgeryLong = Top Surgery Scar (Long) -marking-ScarChest-scar_chest = Chest Scar -marking-ScarChest = Chest Scar +marking-ScarChestMale-scar_chest_male = Chest Scar +marking-ScarChestMale = Chest Scar + +marking-ScarChestFemale-scar_chest_female = Chest Scar +marking-ScarChestFemale = Chest Scar From 36fb02144aa87f8e6a661160a4796e94740b3f47 Mon Sep 17 00:00:00 2001 From: Aikakakah <145503852+Aikakakah@users.noreply.github.com> Date: Tue, 24 Sep 2024 13:22:31 -0400 Subject: [PATCH 12/14] Commented changes to denote DeltaV --- .../Mobs/Customization/Markings/scars.yml | 12 ++++----- .../Mobs/Customization/Markings/tattoos.yml | 24 +++++++++--------- .../Mobs/Customization/scars.rsi/meta.json | 16 ++++++++++++ .../scars.rsi/scar_chest_female.png | Bin .../Mobs/Customization/tattoos.rsi/meta.json | 24 ++++++++++++++++++ .../tattoos.rsi/tattoo_hive_chest_female.png | Bin .../tattoos.rsi/tattoo_nightling_female.png | Bin .../tattoos.rsi/tattoo_nightling_male.png | Bin .../Mobs/Customization/scars.rsi/meta.json | 6 +---- .../{scar_chest_male.png => scar_chest.png} | Bin .../Mobs/Customization/tattoos.rsi/meta.json | 12 ++------- ...e_chest_male.png => tattoo_hive_chest.png} | Bin .../tattoos.rsi/tattoo_nightling.png | Bin 0 -> 412 bytes 13 files changed, 61 insertions(+), 33 deletions(-) create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/scars.rsi/meta.json rename Resources/Textures/{ => DeltaV}/Mobs/Customization/scars.rsi/scar_chest_female.png (100%) create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/meta.json rename Resources/Textures/{ => DeltaV}/Mobs/Customization/tattoos.rsi/tattoo_hive_chest_female.png (100%) rename Resources/Textures/{ => DeltaV}/Mobs/Customization/tattoos.rsi/tattoo_nightling_female.png (100%) rename Resources/Textures/{ => DeltaV}/Mobs/Customization/tattoos.rsi/tattoo_nightling_male.png (100%) rename Resources/Textures/Mobs/Customization/scars.rsi/{scar_chest_male.png => scar_chest.png} (100%) rename Resources/Textures/Mobs/Customization/tattoos.rsi/{tattoo_hive_chest_male.png => tattoo_hive_chest.png} (100%) create mode 100644 Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling.png diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml index f560f155b4c..649c0e70a19 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml @@ -41,23 +41,23 @@ state: scar_top_surgery_long - type: marking - id: ScarChestMale + id: ScarChest bodyPart: Chest markingCategory: Chest speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni - sexRestriction: [Male] + sexRestriction: [Male] #DeltaV: Splitting the scars and tattoos followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi - state: scar_chest_male + state: scar_chest - type: marking - id: ScarChestFemale + id: ScarChestFemale #DeltaV: Splitting the scars and tattoos bodyPart: Chest markingCategory: Chest speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni - sexRestriction: [Female] + sexRestriction: [Female] #DeltaV: Splitting the scars and tattoos followSkinColor: true sprites: - - sprite: Mobs/Customization/scars.rsi + - sprite: DeltaV/Mobs/Customization/scars.rsi state: scar_chest_female diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml index f508ffac72b..62e8363baa3 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml @@ -1,9 +1,9 @@ - type: marking - id: TattooHiveChestMale + id: TattooHiveChest bodyPart: Chest markingCategory: Chest speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni - sexRestriction: [Male] + sexRestriction: [Male] #DeltaV: Splitting the scars and tattoos coloring: default: type: @@ -11,51 +11,51 @@ fallbackColor: "#666666" sprites: - sprite: Mobs/Customization/tattoos.rsi - state: tattoo_hive_chest_male + state: tattoo_hive_chest - type: marking - id: TattooHiveChestFemale + id: TattooHiveChestFemale #DeltaV: Splitting the scars and tattoos bodyPart: Chest markingCategory: Chest speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni - sexRestriction: [Female] + sexRestriction: [Female] #DeltaV: Splitting the scars and tattoos coloring: default: type: !type:TattooColoring fallbackColor: "#666666" sprites: - - sprite: Mobs/Customization/tattoos.rsi + - sprite: DeltaV/Mobs/Customization/tattoos.rsi state: tattoo_hive_chest_female - type: marking - id: TattooNightlingChestMale + id: TattooNightlingChestMale #DeltaV: Splitting the scars and tattoos bodyPart: Chest markingCategory: Chest speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni - sexRestriction: [Male] + sexRestriction: [Male] #DeltaV: Splitting the scars and tattoos coloring: default: type: !type:TattooColoring fallbackColor: "#666666" sprites: - - sprite: Mobs/Customization/tattoos.rsi + - sprite: DeltaV/Mobs/Customization/tattoos.rsi state: tattoo_nightling_male - type: marking - id: TattooNightlingChestFemale + id: TattooNightlingChestFemale #DeltaV: Splitting the scars and tattoos bodyPart: Chest markingCategory: Chest speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni - sexRestriction: [Female] + sexRestriction: [Female] #DeltaV: Splitting the scars and tattoos coloring: default: type: !type:TattooColoring fallbackColor: "#666666" sprites: - - sprite: Mobs/Customization/tattoos.rsi + - sprite: DeltaV/Mobs/Customization/tattoos.rsi state: tattoo_nightling_female - type: marking diff --git a/Resources/Textures/DeltaV/Mobs/Customization/scars.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/scars.rsi/meta.json new file mode 100644 index 00000000000..bcdb3ffbf2e --- /dev/null +++ b/Resources/Textures/DeltaV/Mobs/Customization/scars.rsi/meta.json @@ -0,0 +1,16 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Drawn by Ubaser, modified by Aikakakah", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "scar_chest_female", + "directions": 4 + } + ] + } + \ No newline at end of file diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest_female.png b/Resources/Textures/DeltaV/Mobs/Customization/scars.rsi/scar_chest_female.png similarity index 100% rename from Resources/Textures/Mobs/Customization/scars.rsi/scar_chest_female.png rename to Resources/Textures/DeltaV/Mobs/Customization/scars.rsi/scar_chest_female.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/meta.json new file mode 100644 index 00000000000..c607884f6f9 --- /dev/null +++ b/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297/modular_skyrat/master_files/icons/mob/body_markings/tattoo_markings.dmi, modified by Aikakakah", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "tattoo_hive_chest_female", + "directions": 4 + }, + { + "name": "tattoo_nightling_male", + "directions": 4 + }, + { + "name": "tattoo_nightling_female", + "directions": 4 + } + ] + } + \ No newline at end of file diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_chest_female.png b/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_hive_chest_female.png similarity index 100% rename from Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_chest_female.png rename to Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_hive_chest_female.png diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling_female.png b/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_nightling_female.png similarity index 100% rename from Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling_female.png rename to Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_nightling_female.png diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling_male.png b/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_nightling_male.png similarity index 100% rename from Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling_male.png rename to Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_nightling_male.png diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/meta.json b/Resources/Textures/Mobs/Customization/scars.rsi/meta.json index 09b7089af2f..0a323f7f65d 100644 --- a/Resources/Textures/Mobs/Customization/scars.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/scars.rsi/meta.json @@ -24,11 +24,7 @@ "directions": 4 }, { - "name": "scar_chest_male", - "directions": 4 - }, - { - "name": "scar_chest_female", + "name": "scar_chest", "directions": 4 } ] diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest_male.png b/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest.png similarity index 100% rename from Resources/Textures/Mobs/Customization/scars.rsi/scar_chest_male.png rename to Resources/Textures/Mobs/Customization/scars.rsi/scar_chest.png diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json b/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json index d4b476ed259..38dfe7ea718 100644 --- a/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json @@ -8,19 +8,11 @@ }, "states": [ { - "name": "tattoo_hive_chest_male", + "name": "tattoo_hive_chest", "directions": 4 }, { - "name": "tattoo_hive_chest_female", - "directions": 4 - }, - { - "name": "tattoo_nightling_male", - "directions": 4 - }, - { - "name": "tattoo_nightling_female", + "name": "tattoo_nightling", "directions": 4 }, { diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_chest_male.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_chest.png similarity index 100% rename from Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_chest_male.png rename to Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_chest.png diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling.png new file mode 100644 index 0000000000000000000000000000000000000000..824a9921df65b88d97c59fe6c7e9a3d6ccf2872c GIT binary patch literal 412 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|TR< zr;B4q#hkaZ0{NN@1YC|EsXm}?-l%*y_kqd_DRV=YE4sN(b1Ur^9o_bOSFYy^(I*}Z zCnhpXP-awcXL9IcamkB&f8+U6za={A*UrUBf3{hld%Nw{|HuQ`4Y&P%eE;gH$tm{0 z#CLb9@8y=)JgEnEKiIy1_X?pKFQOK_XG@5jw&cz4$cFHJ*H3K!6mvtPT3YY+rbX|6 zFZs19n#K0CPR8zSJui0YMb?xu@$lEk96!Ei`xpP%>Qy2MKbp!*PK9b8*r+4XrWolo zl_~D>-F5vQD}oM~y?tqP;KbJ_k!u@b&P!kAI?>9~Aj8REDa25u!hq&_phU;Ng->3; zU%cdtuFiotuVpeW8fTYpW}eS6U%>M9i{A|{za{Jx8Yc(WaQ%@6nV?Ygd1g7|@)vp^ h`ZJ_i&<%agwq)g^{!1Swdjo@;!PC{xWt~$(696Cat^oi5 literal 0 HcmV?d00001 From c00df002ebaa9128d1e8ca03fc173d0d44efcc5d Mon Sep 17 00:00:00 2001 From: Aikakakah <145503852+Aikakakah@users.noreply.github.com> Date: Tue, 24 Sep 2024 13:33:03 -0400 Subject: [PATCH 13/14] Edited scars and tattoo.ftl --- Resources/Locale/en-US/markings/scars.ftl | 4 ++-- Resources/Locale/en-US/markings/tattoos.ftl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/markings/scars.ftl b/Resources/Locale/en-US/markings/scars.ftl index f4492b892a1..bd0fa2e8f32 100644 --- a/Resources/Locale/en-US/markings/scars.ftl +++ b/Resources/Locale/en-US/markings/scars.ftl @@ -10,8 +10,8 @@ marking-ScarTopSurgeryShort = Top Surgery Scar (Short) marking-ScarTopSurgeryLong-scar_top_surgery_long = Top Surgery Scar marking-ScarTopSurgeryLong = Top Surgery Scar (Long) -marking-ScarChestMale-scar_chest_male = Chest Scar -marking-ScarChestMale = Chest Scar +marking-ScarChest-scar_chest = Chest Scar +marking-ScarChest = Chest Scar marking-ScarChestFemale-scar_chest_female = Chest Scar marking-ScarChestFemale = Chest Scar diff --git a/Resources/Locale/en-US/markings/tattoos.ftl b/Resources/Locale/en-US/markings/tattoos.ftl index 1a793eedb19..ff228f0f3a9 100644 --- a/Resources/Locale/en-US/markings/tattoos.ftl +++ b/Resources/Locale/en-US/markings/tattoos.ftl @@ -1,5 +1,5 @@ -marking-TattooHiveChestMale-tattoo_hive_chest_male = Back Tattoo (Hive) -marking-TattooHiveChestMale = Back Tattoo (Hive) +marking-TattooHiveChest-tattoo_hive_chest = Back Tattoo (Hive) +marking-TattooHiveChest = Back Tattoo (Hive) marking-TattooHiveChestFemale-tattoo_hive_chest_female = Back Tattoo (Hive) marking-TattooHiveChestFemale = Back Tattoo (Hive) From 37ff78f6315224e28b85b65e88cf2f1dffe049ce Mon Sep 17 00:00:00 2001 From: Aikakakah <145503852+Aikakakah@users.noreply.github.com> Date: Fri, 27 Sep 2024 13:24:42 -0400 Subject: [PATCH 14/14] Moved female variants to DeltaV namespace, fixed comments on others. --- .../Locale/en-US/deltav/markings/scars.ftl | 2 + .../Locale/en-US/deltav/markings/tattoos.ftl | 8 ++++ Resources/Locale/en-US/markings/scars.ftl | 3 -- Resources/Locale/en-US/markings/tattoos.ftl | 10 +---- .../Mobs/Customization/Markings/scars.yml | 10 +++++ .../Mobs/Customization/Markings/tattoos.yml | 29 ++++++++++++++ .../Mobs/Customization/Markings/scars.yml | 10 ----- .../Mobs/Customization/Markings/tattoos.yml | 36 ++---------------- .../Mobs/Customization/tattoos.rsi/meta.json | 3 +- ...ightling_male.png => tattoo_nightling.png} | Bin 10 files changed, 55 insertions(+), 56 deletions(-) create mode 100644 Resources/Locale/en-US/deltav/markings/scars.ftl create mode 100644 Resources/Locale/en-US/deltav/markings/tattoos.ftl create mode 100644 Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/scars.yml create mode 100644 Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/tattoos.yml rename Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/{tattoo_nightling_male.png => tattoo_nightling.png} (100%) diff --git a/Resources/Locale/en-US/deltav/markings/scars.ftl b/Resources/Locale/en-US/deltav/markings/scars.ftl new file mode 100644 index 00000000000..151dcbf28b4 --- /dev/null +++ b/Resources/Locale/en-US/deltav/markings/scars.ftl @@ -0,0 +1,2 @@ +marking-ScarChestFemale-scar_chest_female = Chest Scar +marking-ScarChestFemale = Chest Scar diff --git a/Resources/Locale/en-US/deltav/markings/tattoos.ftl b/Resources/Locale/en-US/deltav/markings/tattoos.ftl new file mode 100644 index 00000000000..d62a118a890 --- /dev/null +++ b/Resources/Locale/en-US/deltav/markings/tattoos.ftl @@ -0,0 +1,8 @@ +marking-TattooHiveChestFemale-tattoo_hive_chest_female = Back Tattoo (Hive) +marking-TattooHiveChestFemale = Back Tattoo (Hive) + +marking-TattooNightlingChestMale-tattoo_nightling_male = Chest Tattoo (Nightling) +marking-TattooNightlingChestMale = Chest Tattoo (Nightling) + +marking-TattooNightlingChestFemale-tattoo_nightling_female = Chest Tattoo (Nightling) +marking-TattooNightlingChestFemale = Chest Tattoo (Nightling) diff --git a/Resources/Locale/en-US/markings/scars.ftl b/Resources/Locale/en-US/markings/scars.ftl index bd0fa2e8f32..fae2ffe8873 100644 --- a/Resources/Locale/en-US/markings/scars.ftl +++ b/Resources/Locale/en-US/markings/scars.ftl @@ -12,6 +12,3 @@ marking-ScarTopSurgeryLong = Top Surgery Scar (Long) marking-ScarChest-scar_chest = Chest Scar marking-ScarChest = Chest Scar - -marking-ScarChestFemale-scar_chest_female = Chest Scar -marking-ScarChestFemale = Chest Scar diff --git a/Resources/Locale/en-US/markings/tattoos.ftl b/Resources/Locale/en-US/markings/tattoos.ftl index ff228f0f3a9..84a53561878 100644 --- a/Resources/Locale/en-US/markings/tattoos.ftl +++ b/Resources/Locale/en-US/markings/tattoos.ftl @@ -1,14 +1,8 @@ marking-TattooHiveChest-tattoo_hive_chest = Back Tattoo (Hive) marking-TattooHiveChest = Back Tattoo (Hive) -marking-TattooHiveChestFemale-tattoo_hive_chest_female = Back Tattoo (Hive) -marking-TattooHiveChestFemale = Back Tattoo (Hive) - -marking-TattooNightlingChestMale-tattoo_nightling_male = Chest Tattoo (Nightling) -marking-TattooNightlingChestMale = Chest Tattoo (Nightling) - -marking-TattooNightlingChestFemale-tattoo_nightling_female = Chest Tattoo (Nightling) -marking-TattooNightlingChestFemale = Chest Tattoo (Nightling) +marking-TattooNightlingChest-tattoo_nightling = Chest Tattoo (Nightling) +marking-TattooNightlingChest = Chest Tattoo (Nightling) marking-TattooSilverburghLeftLeg-tattoo_silverburgh_l_leg = Left Leg Tattoo (Silverburg) marking-TattooSilverburghLeftLeg = Left Leg Tattoo (Silverburg) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/scars.yml new file mode 100644 index 00000000000..0b27c239baa --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/scars.yml @@ -0,0 +1,10 @@ +- type: marking + id: ScarChestFemale #DeltaV: Splitting the scars and tattoos + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni + sexRestriction: [Female] #DeltaV: Splitting the scars and tattoos + followSkinColor: true + sprites: + - sprite: DeltaV/Mobs/Customization/scars.rsi + state: scar_chest_female diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/tattoos.yml new file mode 100644 index 00000000000..e8174f74b48 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/tattoos.yml @@ -0,0 +1,29 @@ +- type: marking + id: TattooHiveChestFemale #DeltaV: Splitting the scars and tattoos + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + sexRestriction: [Female] #DeltaV: Splitting the scars and tattoos + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: DeltaV/Mobs/Customization/tattoos.rsi + state: tattoo_hive_chest_female + +- type: marking + id: TattooNightlingChestFemale #DeltaV: Splitting the scars and tattoos + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + sexRestriction: [Female] #DeltaV: Splitting the scars and tattoos + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: DeltaV/Mobs/Customization/tattoos.rsi + state: tattoo_nightling_female diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml index 649c0e70a19..687fe1ca4c3 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml @@ -51,13 +51,3 @@ - sprite: Mobs/Customization/scars.rsi state: scar_chest -- type: marking - id: ScarChestFemale #DeltaV: Splitting the scars and tattoos - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni - sexRestriction: [Female] #DeltaV: Splitting the scars and tattoos - followSkinColor: true - sprites: - - sprite: DeltaV/Mobs/Customization/scars.rsi - state: scar_chest_female diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml index 62e8363baa3..1e284c813b4 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml @@ -14,22 +14,7 @@ state: tattoo_hive_chest - type: marking - id: TattooHiveChestFemale #DeltaV: Splitting the scars and tattoos - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni - sexRestriction: [Female] #DeltaV: Splitting the scars and tattoos - coloring: - default: - type: - !type:TattooColoring - fallbackColor: "#666666" - sprites: - - sprite: DeltaV/Mobs/Customization/tattoos.rsi - state: tattoo_hive_chest_female - -- type: marking - id: TattooNightlingChestMale #DeltaV: Splitting the scars and tattoos + id: TattooNightlingChest bodyPart: Chest markingCategory: Chest speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni @@ -40,23 +25,8 @@ !type:TattooColoring fallbackColor: "#666666" sprites: - - sprite: DeltaV/Mobs/Customization/tattoos.rsi - state: tattoo_nightling_male - -- type: marking - id: TattooNightlingChestFemale #DeltaV: Splitting the scars and tattoos - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni - sexRestriction: [Female] #DeltaV: Splitting the scars and tattoos - coloring: - default: - type: - !type:TattooColoring - fallbackColor: "#666666" - sprites: - - sprite: DeltaV/Mobs/Customization/tattoos.rsi - state: tattoo_nightling_female + - sprite: DeltaV/Mobs/Customization/tattoos.rsi #DeltaV: Splitting the scars and tattoos + state: tattoo_nightling - type: marking id: TattooSilverburghLeftLeg diff --git a/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/meta.json index c607884f6f9..5693064c0f5 100644 --- a/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/meta.json +++ b/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/meta.json @@ -12,7 +12,7 @@ "directions": 4 }, { - "name": "tattoo_nightling_male", + "name": "tattoo_nightling", "directions": 4 }, { @@ -21,4 +21,3 @@ } ] } - \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_nightling_male.png b/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_nightling.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_nightling_male.png rename to Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_nightling.png