]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
scar availability for more species (#35645)
authorBoaz1111 <149967078+Boaz1111@users.noreply.github.com>
Wed, 11 Jun 2025 21:56:57 +0000 (23:56 +0200)
committerGitHub <noreply@github.com>
Wed, 11 Jun 2025 21:56:57 +0000 (23:56 +0200)
* :D

* updated for new scars

* small eye scar

Resources/Locale/en-US/markings/scars.ftl
Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml
Resources/Textures/Mobs/Customization/scars.rsi/meta.json
Resources/Textures/Mobs/Customization/scars.rsi/scar_eye_left_small.png [new file with mode: 0644]
Resources/Textures/Mobs/Customization/scars.rsi/scar_eye_right_small.png [new file with mode: 0644]

index f31f054911b41b97d150d80adb6dd82742c7914f..75eedf0cd228786698637c42ef68738c0b301d45 100644 (file)
@@ -26,4 +26,10 @@ 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
+marking-ScarFace2 = Face Scar (Small)
+
+marking-ScarEyeRightSmall-scar_eye_right_small = Right Eye Scar (Small)
+marking-ScarEyeRightSmall = Small Eye Scar (Right)
+
+marking-ScarEyeLeftSmall-scar_eye_left_small = Left Eye Scar (Small)
+marking-ScarEyeLeftSmall = Small Eye Scar (Left)
\ No newline at end of file
index 4de3b5918266e2153eb023f6c02e21dbbef08686..5dd1cd560ea327e1bb45cfdf8a6d1e2bd839fd8e 100644 (file)
@@ -2,7 +2,7 @@
   id: ScarEyeRight
   bodyPart: Head
   markingCategory: Head
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, SlimePerson]
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
@@ -12,7 +12,7 @@
   id: ScarEyeLeft
   bodyPart: Head
   markingCategory: Head
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, SlimePerson]
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
@@ -22,7 +22,7 @@
   id: ScarTopSurgeryShort
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid, Diona]
   sexRestriction: [Male]
   followSkinColor: true
   sprites:
@@ -33,7 +33,7 @@
   id: ScarTopSurgeryLong
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid, Diona]
   sexRestriction: [Male]
   followSkinColor: true
   sprites:
@@ -44,7 +44,7 @@
   id: ScarChest
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid, Diona]
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
@@ -54,7 +54,7 @@
   id: ScarNeck
   bodyPart: Head
   markingCategory: Head
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson]
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
@@ -64,7 +64,7 @@
   id: ScarChestBullets
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid]
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
@@ -74,7 +74,7 @@
   id: ScarStomachBullets
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid]
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
@@ -84,7 +84,7 @@
   id: ScarFace1
   bodyPart: Head
   markingCategory: Head
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth]
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
   id: ScarFace2
   bodyPart: Head
   markingCategory: Head
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth]
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
-    state: scar_face_2
\ No newline at end of file
+    state: scar_face_2
+
+- type: marking
+  id: ScarEyeRightSmall
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/scars.rsi
+    state: scar_eye_right_small
+
+- type: marking
+  id: ScarEyeLeftSmall
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/scars.rsi
+    state: scar_eye_left_small
index 9bc0d3263e5aba648b996920f8d629fa1ce186ff..4794e3270a41d7bb78359256eb578ba297d3ad77 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "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)",
+  "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), scar_eye_left_small and scar_eye_right_small modified from scar_eye_left and scar_eye_right by Boaz1111(github).",
   "size": {
     "x": 32,
     "y": 32
     {
         "name": "scar_face_2",
         "directions": 4
+    }, 
+    {
+        "name": "scar_eye_left_small",
+        "directions": 4
+    }, 
+    {
+        "name": "scar_eye_right_small",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/scar_eye_left_small.png b/Resources/Textures/Mobs/Customization/scars.rsi/scar_eye_left_small.png
new file mode 100644 (file)
index 0000000..3188e28
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/scars.rsi/scar_eye_left_small.png differ
diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/scar_eye_right_small.png b/Resources/Textures/Mobs/Customization/scars.rsi/scar_eye_right_small.png
new file mode 100644 (file)
index 0000000..46f241b
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/scars.rsi/scar_eye_right_small.png differ