From: Mora <46364955+TrixxedHeart@users.noreply.github.com> Date: Tue, 8 Jul 2025 23:22:13 +0000 (-0500) Subject: Added Vox Heterochromia (#38595) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=d15b74d56baefaea0f09689cb186c5fd155c8471;p=space-station-14.git Added Vox Heterochromia (#38595) * Added Vox Heterochromia * Forgot to change moth to vox * minor formatting fix --------- Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com> --- diff --git a/Resources/Locale/en-US/markings/tattoos.ftl b/Resources/Locale/en-US/markings/tattoos.ftl index c16b105467..51d3e3c45f 100644 --- a/Resources/Locale/en-US/markings/tattoos.ftl +++ b/Resources/Locale/en-US/markings/tattoos.ftl @@ -33,3 +33,9 @@ marking-TattooEyeMothRight = Right Eye marking-TattooEyeMothLeft-tattoo_eye_moth_l = Left Eye marking-TattooEyeMothLeft = Left Eye + +marking-TattooEyeVoxRight-tattoo_eye_vox_r = Right Eye +marking-TattooEyeVoxRight = Right Eye + +marking-TattooEyeVoxLeft-tattoo_eye_vox_l = Left Eye +marking-TattooEyeVoxLeft = Left Eye \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml index c61cfea0c6..8b25271fca 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml @@ -53,3 +53,31 @@ sprites: - sprite: Mobs/Customization/vox_tattoos.rsi state: nightling_s + +- type: marking + id: TattooEyeVoxRight + bodyPart: Eyes + markingCategory: Overlay + speciesRestriction: [Vox] + coloring: + default: + type: + !type:EyeColoring + negative: true + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: tattoo_eye_vox_r + +- type: marking + id: TattooEyeVoxLeft + bodyPart: Eyes + markingCategory: Overlay + speciesRestriction: [Vox] + coloring: + default: + type: + !type:EyeColoring + negative: true + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: tattoo_eye_vox_l diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json index 725fbb6a0d..d0c0edbbba 100644 --- a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json @@ -22,6 +22,14 @@ { "name": "nightling_s", "directions": 4 + }, + { + "name": "tattoo_eye_vox_r", + "directions": 4 + }, + { + "name": "tattoo_eye_vox_l", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_eye_vox_l.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_eye_vox_l.png new file mode 100644 index 0000000000..b0351eeb2b Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_eye_vox_l.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_eye_vox_r.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_eye_vox_r.png new file mode 100644 index 0000000000..f748cef2d4 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_eye_vox_r.png differ