marking update (#254)

* new horny horns

* fuck this horns

* horns and hairs

* glasses resprite

* наращивание волос

* больше наращивания

* Update braid.png

Resources/Locale/en-US/_CP14/markings/human-hair.ftl

@@ -11,6 +11,9 @@ marking-CP14HumanHairBigBraid = Full Braid
 marking-CP14HumanHairCrazyBald = CrazyBald
 marking-CP14HumanHairBigDoubleBun = Double Bun
 marking-CP14HumanHairPonyTail7 = Ponytail
+marking-CP14HumanHairSideTail4 = Side tail
+marking-CP14HumanHairSwept2 = Swept
+marking-CP14HumanHairUpdo = Updo
 marking-CP14HumanHairVLongFringe = Straight bangs
 marking-CP14HumanHairVolaju = Volaju
-marking-CP14HumanHairWisp = Wisp
+marking-CP14HumanHairWisp = Wisp

Resources/Locale/en-US/_CP14/markings/tiefling-horns.ftl

@@ -6,3 +6,4 @@ marking-CP14TieflingHorns4 = Change
 marking-CP14TieflingHorns5 = The Devil
 marking-CP14TieflingHorns5Broken = Broken Devil
 marking-CP14TieflingHorns6 = Lamb
+marking-CP14TieflingHorns7 = Horny horns

Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl

@@ -11,6 +11,9 @@ marking-CP14HumanHairBigBraid = Хвост во весь рост
 marking-CP14HumanHairCrazyBald = Безумная проплешина
 marking-CP14HumanHairBigDoubleBun = Два пунпона
 marking-CP14HumanHairPonyTail7 = Конский хвост
+marking-CP14HumanHairSideTail4 = Хвост сбоку
+marking-CP14HumanHairSwept2 = Суровый взгляд
+marking-CP14HumanHairUpdo = Пучок
 marking-CP14HumanHairVLongFringe = Прямая челка
 marking-CP14HumanHairVolaju = Вояж
 marking-CP14HumanHairWisp = Огонек

Resources/Locale/ru-RU/_CP14/markings/tiefling-horns.ftl

@@ -5,4 +5,5 @@ marking-CP14TieflingHorns3Broken = Сломанная вертикаль
 marking-CP14TieflingHorns4 = Мелочь
 marking-CP14TieflingHorns5 = Дьявол
 marking-CP14TieflingHorns5Broken = Сломленный дьявол
-marking-CP14TieflingHorns6 = Барашек
+marking-CP14TieflingHorns6 = Барашек
+marking-CP14TieflingHorns7 = Облегающие

Resources/Prototypes/_CP14/Entities/Clothing/Eyes/eyes.yml

@@ -16,7 +16,7 @@
   parent: CP14ClothingEyesBase
   id: CP14ClothingEyesMonocle
   name: monocle
-  description: Aristocratic, fancy, gold-plated.
+  description: Aristocratic, fancy.
   components:
   - type: Sprite
     sprite: _CP14/Clothing/Eyes/monocle.rsi
@@ -27,7 +27,7 @@
   parent: CP14ClothingEyesBase
   id: CP14ClothingEyesGoldGlasses
   name: gold glasses
-  description: Aristocratic, fancy, gold-plated.
+  description: Aristocratic, fancy.
   components:
   - type: Foldable
     canFoldInsideContainer: true
@@ -37,9 +37,9 @@
     foldedEquippedPrefix: flipped
     foldedHeldPrefix: flipped
   - type: Sprite
-    sprite: _CP14/Clothing/Eyes/gold_glasses.rsi
+    sprite: _CP14/Clothing/Eyes/glasses.rsi
   - type: Clothing
-    sprite: _CP14/Clothing/Eyes/gold_glasses.rsi
+    sprite: _CP14/Clothing/Eyes/glasses.rsi
 
 - type: entity
   parent: CP14ClothingEyesBase

Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml

@@ -102,6 +102,30 @@
     - sprite: _CP14/Mobs/Customization/human_hair.rsi
       state: ponytail7
       
+- type: marking
+  id: CP14HumanHairSideTail4
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_hair.rsi
+      state: sidetail4
+      
+- type: marking
+  id: CP14HumanHairSwept2
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_hair.rsi
+      state: swept2
+      
+- type: marking
+  id: CP14HumanHairUpdo
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_hair.rsi
+      state: updo
+      
 - type: marking
   id: CP14HumanHairVLongFringe
   bodyPart: Hair

Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml

@@ -3,82 +3,79 @@
   bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [ CP14Tiefling ]
+  followSkinColor: true
   sprites:
-    - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi
-      state: horn1
+  - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi
+    state: horn1
 
 - type: marking
   id: CP14TieflingHorns2
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [ CP14Tiefling ]
+  followSkinColor: true
   sprites:
-    - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi
-      state: horn2
+  - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi
+    state: horn2
 
 - type: marking
   id: CP14TieflingHorns3
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [ CP14Tiefling ]
   followSkinColor: true
-  forcedColoring: true
   sprites:
-    - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi
-      state: horn3
+  - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi
+    state: horn3
 
 - type: marking
   id: CP14TieflingHorns3Broken
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [ CP14Tiefling ]
   followSkinColor: true
-  forcedColoring: true
   sprites:
-    - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi
-      state: horn3_broken
+  - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi
+    state: horn3_broken
 
 - type: marking
   id: CP14TieflingHorns4
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [ CP14Tiefling ]
   followSkinColor: true
-  forcedColoring: true
   sprites:
-    - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi
-      state: horn4
+  - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi
+    state: horn4
 
 - type: marking
   id: CP14TieflingHorns5
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [ CP14Tiefling ]
   followSkinColor: true
-  forcedColoring: true
   sprites:
-    - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi
-      state: horn5
+  - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi
+    state: horn5
 
 - type: marking
   id: CP14TieflingHorns5Broken
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [ CP14Tiefling ]
   followSkinColor: true
-  forcedColoring: true
   sprites:
-    - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi
-      state: horn5_broken
+  - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi
+    state: horn5_broken
 
 - type: marking
   id: CP14TieflingHorns6
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [ CP14Tiefling ]
   followSkinColor: true
-  forcedColoring: true
   sprites:
-    - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi
-      state: horn6
+  - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi
+    state: horn6
 
+- type: marking
+  id: CP14TieflingHorns7
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  followSkinColor: true
+  sprites:
+  - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi
+    state: horn7

Resources/Prototypes/_CP14/Species/tiefling.yml

@@ -21,7 +21,7 @@
   id: CP14MobTieflingSprites
   sprites:
     Head: CP14MobTieflingHead
-    HeadTop: CP14MobTieflingMarkingMatchSkin
+    HeadTop: CP14MobTieflingAnyMarking
     Hair: CP14MobTieflingAnyMarking
     FacialHair: CP14MobTieflingAnyMarking
     Snout: CP14MobTieflingMarkingMatchSkin

Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json

@@ -59,6 +59,18 @@
         "name": "ponytail7",
         "directions": 4
       },
+      {
+        "name": "sidetail4",
+        "directions": 4
+      },
+      {
+        "name": "swept2",
+        "directions": 4
+      },
+      {
+        "name": "updo",
+        "directions": 4
+      },
       {
         "name": "vlongfringe",
         "directions": 4

Resources/Textures/_CP14/Mobs/Customization/tiefling_horns.rsi/meta.json

@@ -38,6 +38,10 @@
     {
       "name": "horn6",
       "directions": 4
+    },
+    {
+      "name": "horn7",
+      "directions": 4
     }
   ]
 }