From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Sat, 17 Feb 2024 20:50:39 +0000 (+1100) Subject: Clean up scars.yml and add a new chest scar (#25215) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=f72a1a0edb5f28bc9c83e5fe484b77cce0b7d8a0;p=space-station-14.git Clean up scars.yml and add a new chest scar (#25215) add --- diff --git a/Resources/Locale/en-US/markings/scars.ftl b/Resources/Locale/en-US/markings/scars.ftl index 57047731d1..fae2ffe887 100644 --- a/Resources/Locale/en-US/markings/scars.ftl +++ b/Resources/Locale/en-US/markings/scars.ftl @@ -9,3 +9,6 @@ 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 diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml index 097675efa7..37d6ebe279 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml @@ -3,11 +3,7 @@ bodyPart: Head markingCategory: Head speciesRestriction: [Human, Dwarf] - coloring: - default: - type: - !type:TattooColoring - fallbackColor: "#FFFFFF" + followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi state: scar_eye_right @@ -17,11 +13,7 @@ bodyPart: Head markingCategory: Head speciesRestriction: [Human, Dwarf] - coloring: - default: - type: - !type:TattooColoring - fallbackColor: "#FFFFFF" + followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi state: scar_eye_left @@ -30,7 +22,7 @@ id: ScarTopSurgeryShort bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human] + speciesRestriction: [Human, Dwarf] sexRestriction: [Male] followSkinColor: true sprites: @@ -41,9 +33,19 @@ id: ScarTopSurgeryLong bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human] + speciesRestriction: [Human, Dwarf] sexRestriction: [Male] followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi state: scar_top_surgery_long + +- type: marking + id: ScarChest + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Human, Dwarf] + followSkinColor: true + sprites: + - sprite: Mobs/Customization/scars.rsi + state: scar_chest diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/meta.json b/Resources/Textures/Mobs/Customization/scars.rsi/meta.json index c3bfd498d6..0a323f7f65 100644 --- a/Resources/Textures/Mobs/Customization/scars.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/scars.rsi/meta.json @@ -22,6 +22,10 @@ { "name": "scar_top_surgery_long", "directions": 4 + }, + { + "name": "scar_chest", + "directions": 4 } ] } diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest.png b/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest.png new file mode 100644 index 0000000000..9a1cc56c5e Binary files /dev/null and b/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest.png differ