From: Mora <46364955+TrixxedHeart@users.noreply.github.com> Date: Fri, 4 Jul 2025 23:06:55 +0000 (-0500) Subject: Vox scars (#38592) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=edbde7b7b99d0286fc01015a3a2c05491115b371;p=space-station-14.git Vox scars (#38592) * Added vox scars n'stuff, renamed vox_tattoos.ftl to just vox.ftl * Revert "Added vox scars n'stuff, renamed vox_tattoos.ftl to just vox.ftl" This reverts commit c73da55ba3b39ddf93b493aecd85604c54dd8a15. * locale key fix * Changed top surgery scar names to be more generalized * Adjusted face scars * Formatting fixes --------- Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com> --- diff --git a/Resources/Locale/en-US/markings/vox.ftl b/Resources/Locale/en-US/markings/vox.ftl new file mode 100644 index 0000000000..37502bc7e0 --- /dev/null +++ b/Resources/Locale/en-US/markings/vox.ftl @@ -0,0 +1,47 @@ +marking-TattooVoxHeartLeftArm-heart_l_arm = Vox Left Arm Tattoo (Heart) +marking-TattooVoxHeartLeftArm = Vox Left Arm Tattoo (Heart) + +marking-TattooVoxHeartRightArm-heart_r_arm = Vox Right Arm Tattoo (Heart) +marking-TattooVoxHeartRightArm = Vox Right Arm Tattoo (Heart) + +marking-TattooVoxHiveChest-hive_s = Vox Chest Tattoo (hive) +marking-TattooVoxHiveChest = Vox Chest Tattoo (hive) + +marking-TattooVoxNightlingChest-nightling_s = Vox Chest Tattoo (nightling) +marking-TattooVoxNightlingChest = Vox Chest Tattoo (nightling) + +marking-VoxScarEyeRight-vox_scar_eye_right = Right Eye Scar +marking-VoxScarEyeRight = Eye Scar (Right) + +marking-VoxScarEyeLeft-vox_scar_eye_left = Left Eye Scar +marking-VoxScarEyeLeft = Eye Scar (Left) + +marking-VoxScarTopSurgeryShort-vox_scar_top_surgery_short = Thoracotomy Scar +marking-VoxScarTopSurgeryShort = Thoracotomy Scar + +marking-VoxScarTopSurgeryLong-vox_scar_top_surgery_long = Clamshell Scar +marking-VoxScarTopSurgeryLong = Clamshell Scar + +marking-VoxScarChest-vox_scar_chest = Chest Scar +marking-VoxScarChest = Chest Scar + +marking-VoxScarNeck-vox_scar_neck = Neck Scar +marking-VoxScarNeck = Neck Scar + +marking-VoxScarChestBullets-vox_scar_chest_bullets = Bullet Holes Scar +marking-VoxScarChestBullets = Chest Scar (Bullets) + +marking-VoxScarStomachBullets-vox_scar_stomach_bullets = Bullet Holes Scar +marking-VoxScarStomachBullets = Stomach Scar (Bullets) + +marking-VoxScarFace1-vox_scar_face_1 = Face Scar +marking-VoxScarFace1 = Face Scar (Large) + +marking-VoxScarFace2-vox_scar_face_2 = Face Scar +marking-VoxScarFace2 = Face Scar (Small) + +marking-VoxScarEyeRightSmall-vox_scar_eye_right_small = Right Eye Scar (Small) +marking-VoxScarEyeRightSmall = Small Eye Scar (Right) + +marking-VoxScarEyeLeftSmall-vox_scar_eye_left_small = Left Eye Scar (Small) +marking-VoxScarEyeLeftSmall = Small Eye Scar (Left) \ No newline at end of file diff --git a/Resources/Locale/en-US/markings/vox_tattoos.ftl b/Resources/Locale/en-US/markings/vox_tattoos.ftl deleted file mode 100644 index f7f3c7292c..0000000000 --- a/Resources/Locale/en-US/markings/vox_tattoos.ftl +++ /dev/null @@ -1,11 +0,0 @@ -marking-TattooVoxHeartLeftArm-heart_l_arm = Vox Left Arm Tattoo (Heart) -marking-TattooVoxHeartLeftArm = Vox Left Arm Tattoo (Heart) - -marking-TattooVoxHeartRightArm-heart_r_arm = Vox Right Arm Tattoo (Heart) -marking-TattooVoxHeartRightArm = Vox Right Arm Tattoo (Heart) - -marking-TattooVoxHiveChest-hive_s = Vox Chest Tattoo (hive) -marking-TattooVoxHiveChest = Vox Chest Tattoo (hive) - -marking-TattooVoxNightlingChest-nightling_s = Vox Chest Tattoo (nightling) -marking-TattooVoxNightlingChest = Vox Chest Tattoo (nightling) diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_scars.yml new file mode 100644 index 0000000000..5998ddc237 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_scars.yml @@ -0,0 +1,118 @@ +- type: marking + id: VoxScarEyeRight + bodyPart: Head + markingCategory: Head + speciesRestriction: [Vox] + sprites: + - sprite: Mobs/Customization/vox_scars.rsi + state: vox_scar_eye_right + +- type: marking + id: VoxScarEyeLeft + bodyPart: Head + markingCategory: Head + speciesRestriction: [Vox] + followSkinColor: true + sprites: + - sprite: Mobs/Customization/vox_scars.rsi + state: vox_scar_eye_left + +- type: marking + id: VoxScarTopSurgeryShort + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Vox] + followSkinColor: true + sprites: + - sprite: Mobs/Customization/vox_scars.rsi + state: vox_top_surgery_short + +- type: marking + id: VoxScarTopSurgeryLong + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Vox] + followSkinColor: true + sprites: + - sprite: Mobs/Customization/vox_scars.rsi + state: vox_top_surgery_long + +- type: marking + id: VoxScarChest + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Vox] + followSkinColor: true + sprites: + - sprite: Mobs/Customization/vox_scars.rsi + state: vox_scar_chest + +- type: marking + id: VoxScarNeck + bodyPart: Head + markingCategory: Head + speciesRestriction: [Vox] + followSkinColor: true + sprites: + - sprite: Mobs/Customization/vox_scars.rsi + state: vox_scar_neck + +- type: marking + id: VoxScarChestBullets + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Vox] + followSkinColor: true + sprites: + - sprite: Mobs/Customization/vox_scars.rsi + state: vox_scar_chest_bullets + +- type: marking + id: VoxScarStomachBullets + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Vox] + followSkinColor: true + sprites: + - sprite: Mobs/Customization/vox_scars.rsi + state: vox_scar_stomach_bullets + +- type: marking + id: VoxScarFace1 + bodyPart: Head + markingCategory: Head + speciesRestriction: [Vox] + followSkinColor: true + sprites: + - sprite: Mobs/Customization/vox_scars.rsi + state: vox_scar_face_1 + +- type: marking + id: VoxScarFace2 + bodyPart: Head + markingCategory: Head + speciesRestriction: [Vox] + followSkinColor: true + sprites: + - sprite: Mobs/Customization/vox_scars.rsi + state: vox_scar_face_2 + +- type: marking + id: VoxScarEyeRightSmall + bodyPart: Head + markingCategory: Head + speciesRestriction: [Vox] + followSkinColor: true + sprites: + - sprite: Mobs/Customization/vox_scars.rsi + state: vox_scar_eye_right_small + +- type: marking + id: VoxScarEyeLeftSmall + bodyPart: Head + markingCategory: Head + speciesRestriction: [Vox] + followSkinColor: true + sprites: + - sprite: Mobs/Customization/vox_scars.rsi + state: vox_scar_eye_left_small \ No newline at end of file diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_scars.rsi/meta.json new file mode 100644 index 0000000000..7e74ffb8b6 --- /dev/null +++ b/Resources/Textures/Mobs/Customization/vox_scars.rsi/meta.json @@ -0,0 +1,59 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "vox_scar_chest, vox_scar_eye_left, vox_scar_eye_right, vox_scar_top_surgery_long and vox_scar_top_surgery_short drawn by Ubaser, vox_scar_neck, vox_scar_chest_bullets, vox_scar_stomach_bullets, vox_scar_face_1 and vox_scar_face_2 originally drawn by Ktyria(discord) edited by TrixxedHeart, vox_scar_eye_left_small and vox_scar_eye_right_small modified from vox_scar_eye_left and vox_scar_eye_right originally by Boaz1111(github) edited by TrixxedHeart.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "vox_scar_eye_left", + "directions": 4 + }, + { + "name": "vox_scar_eye_right", + "directions": 4 + }, + { + "name": "vox_top_surgery_short", + "directions": 4 + }, + { + "name": "vox_top_surgery_long", + "directions": 4 + }, + { + "name": "vox_scar_chest", + "directions": 4 + }, + { + "name": "vox_scar_neck", + "directions": 4 + }, + { + "name": "vox_scar_chest_bullets", + "directions": 4 + }, + { + "name": "vox_scar_stomach_bullets", + "directions": 4 + }, + { + "name": "vox_scar_face_1", + "directions": 4 + }, + { + "name": "vox_scar_face_2", + "directions": 4 + }, + { + "name": "vox_scar_eye_left_small", + "directions": 4 + }, + { + "name": "vox_scar_eye_right_small", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_chest.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_chest.png new file mode 100644 index 0000000000..59c04641bd Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_chest.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_chest_bullets.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_chest_bullets.png new file mode 100644 index 0000000000..ff9bff2276 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_chest_bullets.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_left.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_left.png new file mode 100644 index 0000000000..b369711f3b Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_left.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_left_small.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_left_small.png new file mode 100644 index 0000000000..5fc01b19b0 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_left_small.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_right.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_right.png new file mode 100644 index 0000000000..ff86c3882c Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_right.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_right_small.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_right_small.png new file mode 100644 index 0000000000..76efe1412f Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_right_small.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_face_1.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_face_1.png new file mode 100644 index 0000000000..c19ce0cf39 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_face_1.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_face_2.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_face_2.png new file mode 100644 index 0000000000..32f7f6a938 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_face_2.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_neck.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_neck.png new file mode 100644 index 0000000000..9feed1955e Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_neck.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_stomach_bullets.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_stomach_bullets.png new file mode 100644 index 0000000000..2eb9538a49 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_stomach_bullets.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_top_surgery_long.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_top_surgery_long.png new file mode 100644 index 0000000000..5624b47c8c Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_top_surgery_long.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_top_surgery_short.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_top_surgery_short.png new file mode 100644 index 0000000000..aaa4e10d17 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_top_surgery_short.png differ