From: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Date: Wed, 5 Mar 2025 10:26:31 +0000 (+0100)
Subject: More scars! (#35644)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=3bf38a4d464633d84b6fa05c4df46d7ff750f398;p=space-station-14.git

More scars! (#35644)

* :3

* whitespace, stomach scar
---

diff --git a/Resources/Locale/en-US/markings/scars.ftl b/Resources/Locale/en-US/markings/scars.ftl
index fae2ffe887..f31f054911 100644
--- a/Resources/Locale/en-US/markings/scars.ftl
+++ b/Resources/Locale/en-US/markings/scars.ftl
@@ -12,3 +12,18 @@ marking-ScarTopSurgeryLong = Top Surgery Scar (Long)
 
 marking-ScarChest-scar_chest = Chest Scar
 marking-ScarChest = Chest Scar
+
+marking-ScarNeck-scar_neck = Neck Scar
+marking-ScarNeck = Neck Scar
+
+marking-ScarChestBullets-scar_chest_bullets = Bullet Holes Scar
+marking-ScarChestBullets = Chest Scar (Bullets)
+
+marking-ScarStomachBullets-scar_stomach_bullets = Bullet Holes Scar
+marking-ScarStomachBullets = Stomach Scar (Bullets)
+
+marking-ScarFace1-scar_face_1 = Face Scar
+marking-ScarFace1 = Face Scar (Large)
+
+marking-ScarFace2-scar_face_2 = Face Scar
+marking-ScarFace2 = Face Scar (Small)
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml
index 37d6ebe279..4de3b59182 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml
@@ -49,3 +49,53 @@
   sprites:
   - sprite: Mobs/Customization/scars.rsi
     state: scar_chest
+
+- type: marking
+  id: ScarNeck
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Human, Dwarf]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/scars.rsi
+    state: scar_neck
+
+- type: marking
+  id: ScarChestBullets
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Human, Dwarf]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/scars.rsi
+    state: scar_chest_bullets
+
+- type: marking
+  id: ScarStomachBullets
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Human, Dwarf]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/scars.rsi
+    state: scar_stomach_bullets
+
+- type: marking
+  id: ScarFace1
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Human, Dwarf]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/scars.rsi
+    state: scar_face_1
+
+- type: marking
+  id: ScarFace2
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Human, Dwarf]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/scars.rsi
+    state: scar_face_2
\ No newline at end of file
diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/meta.json b/Resources/Textures/Mobs/Customization/scars.rsi/meta.json
index 0a323f7f65..9bc0d3263e 100644
--- a/Resources/Textures/Mobs/Customization/scars.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/scars.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Drawn by Ubaser",
+  "copyright": "scar_chest, scar_eye_left, scar_eye_right, scar_top_surgery_long and scar_top_surgery_short drawn by Ubaser, scar_neck, scar_chest_bullets, scar_stomach_bullets, scar_face_1 and scar_face_2 drawn by Ktyria(discord)",
   "size": {
     "x": 32,
     "y": 32
@@ -26,6 +26,26 @@
     {
         "name": "scar_chest",
         "directions": 4
+    },
+    {
+        "name": "scar_neck",
+        "directions": 4
+    },
+    {
+        "name": "scar_chest_bullets",
+        "directions": 4
+    },
+    {
+      "name": "scar_stomach_bullets",
+      "directions": 4
+    },
+    {
+        "name": "scar_face_1",
+        "directions": 4
+    },
+    {
+        "name": "scar_face_2",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest_bullets.png b/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest_bullets.png
new file mode 100644
index 0000000000..975e5cf6e7
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest_bullets.png differ
diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/scar_face_1.png b/Resources/Textures/Mobs/Customization/scars.rsi/scar_face_1.png
new file mode 100644
index 0000000000..66cff8c547
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/scars.rsi/scar_face_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/scar_face_2.png b/Resources/Textures/Mobs/Customization/scars.rsi/scar_face_2.png
new file mode 100644
index 0000000000..f9ae64a08d
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/scars.rsi/scar_face_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/scar_neck.png b/Resources/Textures/Mobs/Customization/scars.rsi/scar_neck.png
new file mode 100644
index 0000000000..e5b6f95b78
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/scars.rsi/scar_neck.png differ
diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/scar_stomach_bullets.png b/Resources/Textures/Mobs/Customization/scars.rsi/scar_stomach_bullets.png
new file mode 100644
index 0000000000..e6553c2543
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/scars.rsi/scar_stomach_bullets.png differ