diff --git a/Resources/Locale/en-US/_EinsteinEngines/markings/xelthia.ftl b/Resources/Locale/en-US/_EinsteinEngines/markings/xelthia.ftl index a9e63477c5a..7d2b8b1ea5d 100644 --- a/Resources/Locale/en-US/_EinsteinEngines/markings/xelthia.ftl +++ b/Resources/Locale/en-US/_EinsteinEngines/markings/xelthia.ftl @@ -10,6 +10,7 @@ marking-XelthiaEarsNormal-ears_normal = Ear marking-XelthiaEarsSmall = Short Ears marking-XelthiaEarsSmall-ears_small = Ear + marking-XelthiaBackspikes = Backspikes marking-XelthiaBackspikes-backspikes = Backspike diff --git a/Resources/Locale/en-US/_Omu/markings/xelthia.ftl b/Resources/Locale/en-US/_Omu/markings/xelthia.ftl index 25f6c47673d..ca40ca25d77 100644 --- a/Resources/Locale/en-US/_Omu/markings/xelthia.ftl +++ b/Resources/Locale/en-US/_Omu/markings/xelthia.ftl @@ -1,7 +1,19 @@ marking-XelthiaEarsBigFloppy = Big Ears (Floppy) -marking-XelthiaEarsBigFloppy-ears_bigfloppy = Ear marking-XelthiaTailLongSplit = Split Xelthia Tail (Long) -marking-XelthiaTailLongSplit-tail_longsplit = Tail -marking-XelthiaHairOminous = Ominous Hair Tendrils \ No newline at end of file +marking-XelthiaTailLongStandard = Standard Xelthia Tail (Long) + +marking-XelthiaHairOminous = Ominous Hair Tendrils + +marking-XelthiaHairPonytailSide = Side Ponytail Tendrils + +marking-XelthiaHairPonytailAsym = Asymmetrical Ponytail Tendrils + +marking-XelthiaFangs = Fangs + +marking-XelthiaFreckles = Freckles + +marking-XelthiaRHandPalm = Colored Right Palm + +marking-XelthiaLHandPalm = Colored Left Palm diff --git a/Resources/Prototypes/_EinsteinEngines/Entities/Mobs/Customization/xelthia.yml b/Resources/Prototypes/_EinsteinEngines/Entities/Mobs/Customization/xelthia.yml index 8efea915403..3ad2a9975bb 100644 --- a/Resources/Prototypes/_EinsteinEngines/Entities/Mobs/Customization/xelthia.yml +++ b/Resources/Prototypes/_EinsteinEngines/Entities/Mobs/Customization/xelthia.yml @@ -27,6 +27,7 @@ - sprite: _EinsteinEngines/Mobs/Customization/xelthia_parts.rsi state: ears_small + # Tendril Hair - type: marking id: XelthiaHairStandard diff --git a/Resources/Prototypes/_Omu/Entities/Mobs/Customization/Markings/xelthia.yml b/Resources/Prototypes/_Omu/Entities/Mobs/Customization/Markings/xelthia.yml index df93f7f8289..a5aa952411d 100644 --- a/Resources/Prototypes/_Omu/Entities/Mobs/Customization/Markings/xelthia.yml +++ b/Resources/Prototypes/_Omu/Entities/Mobs/Customization/Markings/xelthia.yml @@ -8,6 +8,15 @@ - sprite: _Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi state: tail_longsplit +- type: marking + id: XelthiaTailLongStandard + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Xelthia] + sprites: + - sprite: _Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi + state: tail_longstandard + # Ears - type: marking id: XelthiaEarsBigFloppy @@ -18,6 +27,32 @@ - sprite: _Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi state: ears_bigfloppy +# Face +- type: marking + id: XelthiaFangs + bodyPart: Face + markingCategory: Face + speciesRestriction: [Xelthia] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi + state: face_fangs + +- type: marking + id: XelthiaFreckles + bodyPart: Face + markingCategory: Face + speciesRestriction: [Xelthia] + sprites: + - sprite: _Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi + state: face_freckles + + + # Hair - type: marking id: XelthiaHairOminous @@ -27,3 +62,42 @@ sprites: - sprite: _Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi state: hair_ominous + +- type: marking + id: XelthiaHairPonytailSide + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [Xelthia] + sprites: + - sprite: _Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi + state: hair_sidepony + +- type: marking + id: XelthiaHairPonytailAsym + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [Xelthia] + sprites: + - sprite: _Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi + state: hair_asympony + +# Hands - Right hand +- type: marking + id: XelthiaRHandPalm + bodyPart: RHand + markingCategory: RightHand + speciesRestriction: [Xelthia] + sprites: + - sprite: _Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi + state: hand_right_palm + +# Left Hand +- type: marking + id: XelthiaLHandPalm + bodyPart: LHand + markingCategory: LeftHand + speciesRestriction: [Xelthia] + sprites: + - sprite: _Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi + state: hand_left_palm + \ No newline at end of file diff --git a/Resources/Textures/_EinsteinEngines/Mobs/Customization/xelthia_parts.rsi/ears_bigfloppy.png b/Resources/Textures/_EinsteinEngines/Mobs/Customization/xelthia_parts.rsi/ears_bigfloppy.png new file mode 100644 index 00000000000..78023278087 Binary files /dev/null and b/Resources/Textures/_EinsteinEngines/Mobs/Customization/xelthia_parts.rsi/ears_bigfloppy.png differ diff --git a/Resources/Textures/_EinsteinEngines/Mobs/Customization/xelthia_parts.rsi/hair_ominous.png b/Resources/Textures/_EinsteinEngines/Mobs/Customization/xelthia_parts.rsi/hair_ominous.png new file mode 100644 index 00000000000..6596332e6f1 Binary files /dev/null and b/Resources/Textures/_EinsteinEngines/Mobs/Customization/xelthia_parts.rsi/hair_ominous.png differ diff --git a/Resources/Textures/_EinsteinEngines/Mobs/Customization/xelthia_parts.rsi/meta.json b/Resources/Textures/_EinsteinEngines/Mobs/Customization/xelthia_parts.rsi/meta.json index 202d5b654f4..273dca56b6d 100644 --- a/Resources/Textures/_EinsteinEngines/Mobs/Customization/xelthia_parts.rsi/meta.json +++ b/Resources/Textures/_EinsteinEngines/Mobs/Customization/xelthia_parts.rsi/meta.json @@ -15,9 +15,17 @@ "name": "tail_normal_behind", "directions": 4 }, + { + "name": "tail_longsplit", + "directions": 4 + }, { "name": "ears_normal", "directions": 4 + }, + { + "name": "ears_bigfloppy", + "directions": 4 }, { "name": "hair_standard", @@ -51,6 +59,10 @@ "name": "hair_downandback", "directions": 4 }, + { + "name": "hair_ominous", + "directions": 4 + }, { "name": "backspikes", "directions": 4 diff --git a/Resources/Textures/_EinsteinEngines/Mobs/Customization/xelthia_parts.rsi/tail_longsplit.png b/Resources/Textures/_EinsteinEngines/Mobs/Customization/xelthia_parts.rsi/tail_longsplit.png new file mode 100644 index 00000000000..c42248ee4ba Binary files /dev/null and b/Resources/Textures/_EinsteinEngines/Mobs/Customization/xelthia_parts.rsi/tail_longsplit.png differ diff --git a/Resources/Textures/_Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi/face_fangs.png b/Resources/Textures/_Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi/face_fangs.png new file mode 100644 index 00000000000..802bd6f781e Binary files /dev/null and b/Resources/Textures/_Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi/face_fangs.png differ diff --git a/Resources/Textures/_Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi/face_freckles.png b/Resources/Textures/_Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi/face_freckles.png new file mode 100644 index 00000000000..c5c288e1a08 Binary files /dev/null and b/Resources/Textures/_Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi/face_freckles.png differ diff --git a/Resources/Textures/_Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi/hair_asympony.png b/Resources/Textures/_Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi/hair_asympony.png new file mode 100644 index 00000000000..583bdbd4b55 Binary files /dev/null and b/Resources/Textures/_Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi/hair_asympony.png differ diff --git a/Resources/Textures/_Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi/hair_sidepony.png b/Resources/Textures/_Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi/hair_sidepony.png new file mode 100644 index 00000000000..6a6974f35ea Binary files /dev/null and b/Resources/Textures/_Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi/hair_sidepony.png differ diff --git a/Resources/Textures/_Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi/hand_left_palm.png b/Resources/Textures/_Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi/hand_left_palm.png new file mode 100644 index 00000000000..9d2757583af Binary files /dev/null and b/Resources/Textures/_Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi/hand_left_palm.png differ diff --git a/Resources/Textures/_Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi/hand_right_palm.png b/Resources/Textures/_Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi/hand_right_palm.png new file mode 100644 index 00000000000..a955774ce03 Binary files /dev/null and b/Resources/Textures/_Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi/hand_right_palm.png differ diff --git a/Resources/Textures/_Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi/meta.json b/Resources/Textures/_Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi/meta.json index 18c358d7c17..95528f7ed4f 100644 --- a/Resources/Textures/_Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi/meta.json +++ b/Resources/Textures/_Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Ominous hair, longsplit tail and bigfloppy ear sprites by https://github.com/angiogen", + "copyright": "Ominous, Asymmetrical Ponytail, and Side Ponytail Hair, Long Split and Standard tails, Big Floppy Ears, Fangs, Freckles, Colored Palms by https://github.com/angiogen", "size": { "x": 32, "y": 32 @@ -10,15 +10,43 @@ { "name": "hair_ominous", "directions": 4 - }, -{ + }, + { + "name": "hair_asympony", + "directions": 4 + }, + { + "name": "hair_sidepony", + "directions": 4 + }, + { "name": "tail_longsplit", "directions": 4 - }, + }, + { + "name": "tail_longstandard", + "directions": 4 + }, -{ + { "name": "ears_bigfloppy", "directions": 4 - } + }, + { + "name": "face_fangs", + "directions": 4 + }, + { + "name": "face_freckles", + "directions": 4 + }, + { + "name": "hand_right_palm", + "directions": 4 + }, + { + "name": "hand_left_palm", + "directions": 4 + } ] } \ No newline at end of file diff --git a/Resources/Textures/_Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi/tail_longstandard.png b/Resources/Textures/_Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi/tail_longstandard.png new file mode 100644 index 00000000000..c96c76dde3c Binary files /dev/null and b/Resources/Textures/_Omu/Mobs/Customization/Xelthia/xelthia_parts.rsi/tail_longstandard.png differ