Merge pull request #215 from Corvax-Frontier/mew

Спонсорские вещи, но бесплатно. Временно
Corvax-Frontier · May 26, 2024 · 8a2acf5 · 8a2acf5
2 parents 5ca4b3a + 3d5f46b
commit 8a2acf5
Show file tree

Hide file tree

Showing 13 changed files with 1,222 additions and 12 deletions.
diff --git a/Resources/Locale/ru-RU/corvax/markings/elf.ftl b/Resources/Locale/ru-RU/corvax/markings/elf.ftl
@@ -0,0 +1,10 @@
+marking-ElfsEars = Эльфийские уши
+marking-ElfsEars-elfs = Уши
+marking-ElfsLongerEars = Эльфийские уши (Длинные)
+marking-ElfsLongerEars-elfs_longer = Уши
+marking-ElfsBroadEars = Эльфийские уши (Широкие)
+marking-ElfsBroadEars-elfs_broad = Уши
+marking-ElfsRibbonsEars = Эльфийские уши (Ленточные)
+marking-ElfsRibbonsEars-elfs_ribbons = Уши
+marking-ElfsWideEars = Эльфийские уши (Большие)
+marking-ElfsWideEars-elfs_wide = Уши
diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/cat_parts.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/cat_parts.yml
@@ -2,7 +2,7 @@
   id: CatEarsStubby
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Human]
+  speciesRestriction: [ Human, Dwarf ]
   #sponsorOnly: true # Corvax-Sponsors
   coloring:
     default:
@@ -26,7 +26,7 @@
   id: CatEarsCurled
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Human]
+  speciesRestriction: [ Human, Dwarf ]
   #sponsorOnly: true # Corvax-Sponsors
   coloring:
     default:
@@ -50,7 +50,7 @@
   id: CatEarsTorn
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Human]
+  speciesRestriction: [ Human, Dwarf ]
   #sponsorOnly: true # Corvax-Sponsors
   coloring:
     default:
@@ -74,7 +74,7 @@
   id: CatTailStripes
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: [Human]
+  speciesRestriction: [ Human, Dwarf ]
   #sponsorOnly: true # Corvax-Sponsors
   coloring:
     default:

diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/elf_parts.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/elf_parts.yml
@@ -0,0 +1,64 @@
+- type: marking
+  id: ElfsEars
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [ Human, Dwarf ]
+  coloring:
+    default:
+      type:
+        !type:SkinColoring
+  sprites:
+  - sprite: Corvax/Mobs/Customization/elfs_markings.rsi
+    state: elfs
+
+- type: marking
+  id: ElfsBroadEars
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [ Human, Dwarf ]
+  coloring:
+    default:
+      type:
+        !type:SkinColoring
+  sprites:
+  - sprite: Corvax/Mobs/Customization/elfs_markings.rsi
+    state: elfs_broad
+
+- type: marking
+  id: ElfsLongerEars
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [ Human, Dwarf ]
+  coloring:
+    default:
+      type:
+        !type:SkinColoring
+  sprites:
+  - sprite: Corvax/Mobs/Customization/elfs_markings.rsi
+    state: elfs_longer
+
+- type: marking
+  id: ElfsRibbonsEars
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [ Human, Dwarf ]
+  coloring:
+    default:
+      type:
+        !type:SkinColoring
+  sprites:
+  - sprite: Corvax/Mobs/Customization/elfs_markings.rsi
+    state: elfs_ribbons
+
+- type: marking
+  id: ElfsWideEars
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [ Human, Dwarf ]
+  coloring:
+    default:
+      type:
+        !type:SkinColoring
+  sprites:
+  - sprite: Corvax/Mobs/Customization/elfs_markings.rsi
+    state: elfs_wide
diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/fox_parts.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/fox_parts.yml
@@ -2,7 +2,7 @@
   id: FoxEars
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Human]
+  speciesRestriction: [ Human, Dwarf ]
   #sponsorOnly: true # Corvax-Sponsors
   sprites:
   - sprite: Corvax/Mobs/Customization/fox_parts.rsi

diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
@@ -2,7 +2,7 @@
   id: CatEars
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: []
+  speciesRestriction: [ Human, Dwarf ]
   coloring:
     default:
       type:
@@ -25,7 +25,7 @@
   id: CatTail
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: []
+  speciesRestriction: [ Human, Dwarf ]
   coloring:
     default:
       type:
@@ -37,4 +37,4 @@
         - !type:SkinColoring
   sprites:
   - sprite: Mobs/Customization/cat_parts.rsi
-    state: tail_cat
+    state: tail_cat_wag # Mew