Revert "revert beards"

This reverts commit a941a41788.

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

@@ -1,14 +1,34 @@
-marking-CP14HumanFacialHair3Clock = 3 O'clock
-marking-CP14HumanFacialHairAbe = Abe
-marking-CP14HumanFacialHairDwarf = Dwarf
-marking-CP14HumanFacialHairGoateeMush = Goatee
-marking-CP14HumanFacialHairBriefs = Briefs
-marking-CP14HumanFacialHairCircle = Circle
-marking-CP14HumanFacialHairEspanol = Espanol
-marking-CP14HumanFacialHairImperial = Imperial
-marking-CP14HumanFacialHairMachete = Machete
-marking-CP14HumanFacialHairMutton = Mutton
-marking-CP14HumanFacialHairPigtail = Pigtail
-marking-CP14HumanFacialHairSage = Sage
-marking-CP14HumanFacialHairWatson = Watson
-marking-CP14HumanFacialHairWhiskers = Whiskers
+marking-CP14HumanFacialHair3Clock = morning stubble
+marking-CP14HumanFacialHair5oclockmoustache =  evening mustache
+marking-CP14HumanFacialHair7oclock = dusk stubble
+marking-CP14HumanFacialHair7oclockmoustache = dusk mustache
+marking-CP14HumanFacialHairAbe = elderborn
+marking-CP14HumanFacialHairChinlessbeard = chinless
+marking-CP14HumanFacialHairDwarf = stone short
+marking-CP14HumanFacialHairDwarf2 = forge battle
+marking-CP14HumanFacialHairElvis = curled courtly
+marking-CP14HumanFacialHairFiveoclock = noon shadow
+marking-CP14HumanFacialHairFullbeard = full war
+marking-CP14HumanFacialHairFumanchu = mustache of desert winds
+marking-CP14HumanFacialHairGoateemush = mossy goat
+marking-CP14HumanFacialHairGt = steel trim
+marking-CP14HumanFacialHairHip = wildgrass
+marking-CP14HumanFacialHairHogan = stormblade
+marking-CP14HumanFacialHairJensen = northern hold
+marking-CP14HumanFacialHairLongbeard = longhang
+marking-CP14HumanFacialHairMartialartist = path of silence
+marking-CP14HumanFacialHairMartialartist2 =  path of the blade
+marking-CP14HumanFacialHairMoonshiner = moon wanderer
+marking-CP14HumanFacialHairMoustache = commoner’s mustache
+marking-CP14HumanFacialHairMutton = road whiskers
+marking-CP14HumanFacialHairMuttonmus = herald’s whiskers
+marking-CP14HumanFacialHairNeckbeard = shadow chin
+marking-CP14HumanFacialHairPencilstache = line of the mustached
+marking-CP14HumanFacialHairSelleck = hunter’s cluster
+marking-CP14HumanFacialHairSideburn = side mark
+marking-CP14HumanFacialHairSmallstache = page’s mustache
+marking-CP14HumanFacialHairVandyke = evening branch
+marking-CP14HumanFacialHairVolaju = steppe fringe
+marking-CP14HumanFacialHairWalrus = walrus storm
+marking-CP14HumanFacialHairWatson = scholarly classic
+marking-CP14HumanFacialHairWise = runebound

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

@@ -6,6 +6,30 @@
     - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
       state: 3oclock
 
+- type: marking
+  id: CP14HumanFacialHair5oclockmoustache
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
+      state: 5oclockmoustache
+
+- type: marking
+  id: CP14HumanFacialHair7oclock
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
+      state: 7oclock
+
+- type: marking
+  id: CP14HumanFacialHair7oclockmoustache
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
+      state: 7oclockmoustache
+
 - type: marking
   id: CP14HumanFacialHairAbe
   bodyPart: FacialHair
@@ -14,6 +38,14 @@
     - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
       state: abe
 
+- type: marking
+  id: CP14HumanFacialHairChinlessbeard
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
+      state: chinlessbeard
+
 - type: marking
   id: CP14HumanFacialHairDwarf
   bodyPart: FacialHair
@@ -23,7 +55,47 @@
       state: dwarf
 
 - type: marking
-  id: CP14HumanFacialHairGoateeMush
+  id: CP14HumanFacialHairDwarf2
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
+      state: dwarf2
+
+- type: marking
+  id: CP14HumanFacialHairElvis
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
+      state: elvis
+
+- type: marking
+  id: CP14HumanFacialHairFiveoclock
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
+      state: fiveoclock
+
+- type: marking
+  id: CP14HumanFacialHairFullbeard
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
+      state: fullbeard
+
+- type: marking
+  id: CP14HumanFacialHairFumanchu
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
+      state: fumanchu
+
+- type: marking
+  id: CP14HumanFacialHairGoateemush
   bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
@@ -31,44 +103,76 @@
       state: goateemush
 
 - type: marking
-  id: CP14HumanFacialHairBriefs
+  id: CP14HumanFacialHairGt
   bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: briefs
+      state: gt
 
 - type: marking
-  id: CP14HumanFacialHairCircle
+  id: CP14HumanFacialHairHip
   bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: circle
+      state: hip
 
 - type: marking
-  id: CP14HumanFacialHairEspanol
+  id: CP14HumanFacialHairHogan
   bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: espanol
+      state: hogan
 
 - type: marking
-  id: CP14HumanFacialHairImperial
+  id: CP14HumanFacialHairJensen
   bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: imperial
+      state: jensen
 
 - type: marking
-  id: CP14HumanFacialHairMachete
+  id: CP14HumanFacialHairLongbeard
   bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: machete
+      state: longbeard
+
+- type: marking
+  id: CP14HumanFacialHairMartialartist
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
+      state: martialartist
+
+- type: marking
+  id: CP14HumanFacialHairMartialartist2
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
+      state: martialartist2
+  
+- type: marking
+  id: CP14HumanFacialHairMoonshiner
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
+      state: moonshiner
+
+- type: marking
+  id: CP14HumanFacialHairMoustache
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
+      state: moustache
 
 - type: marking
   id: CP14HumanFacialHairMutton
@@ -79,20 +183,76 @@
       state: mutton
 
 - type: marking
-  id: CP14HumanFacialHairPigtail
+  id: CP14HumanFacialHairMuttonmus
   bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: pigtail
+      state: muttonmus
 
 - type: marking
-  id: CP14HumanFacialHairSage
+  id: CP14HumanFacialHairNeckbeard
   bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: sage
+      state: neckbeard
+
+- type: marking
+  id: CP14HumanFacialHairPencilstache
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
+      state: pencilstache
+
+- type: marking
+  id: CP14HumanFacialHairSelleck
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
+      state: selleck
+
+- type: marking
+  id: CP14HumanFacialHairSideburn
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
+      state: sideburn
+
+- type: marking
+  id: CP14HumanFacialHairSmallstache
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
+      state: smallstache
+
+- type: marking
+  id: CP14HumanFacialHairVandyke
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
+      state: vandyke
+
+- type: marking
+  id: CP14HumanFacialHairVolaju
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
+      state: volaju
+
+- type: marking
+  id: CP14HumanFacialHairWalrus
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
+      state: walrus
 
 - type: marking
   id: CP14HumanFacialHairWatson
@@ -103,9 +263,9 @@
       state: watson
 
 - type: marking
-  id: CP14HumanFacialHairWhiskers
+  id: CP14HumanFacialHairWise
   bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: whiskers
+      state: wise

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

@@ -1,46 +1,98 @@
 {
   "version": 1,
   "size": {
-    "x": 48,
-    "y": 48
+    "x": 32,
+    "y": 32
   },
-  "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi, adapted by TheShuEd. goateemush by TheShuEd",
-  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi, adapted by Dinazewwr. goateemush by TheShuEd",
+  "license": "All right reserved",
   "states": [
     {
       "name": "3oclock",
       "directions": 4
     },
+    {
+      "name": "5oclockmoustache",
+      "directions": 4
+    },
+    {
+      "name": "7oclock",
+      "directions": 4
+    },
+    {
+      "name": "7oclockmoustache",
+      "directions": 4
+    },
     {
       "name": "abe",
       "directions": 4
     },
+    {
+      "name": "chinlessbeard",
+      "directions": 4
+    },
     {
       "name": "dwarf",
       "directions": 4
     },
+    {
+      "name": "dwarf2",
+      "directions": 4
+    },
+    {
+      "name": "elvis",
+      "directions": 4
+    },
+    {
+      "name": "fiveoclock",
+      "directions": 4
+    },
+    {
+      "name": "fullbeard",
+      "directions": 4
+    },
+    {
+      "name": "fumanchu",
+      "directions": 4
+    },
     {
       "name": "goateemush",
       "directions": 4
     },
     {
-      "name": "whiskers",
+      "name": "gt",
       "directions": 4
     },
     {
-      "name": "circle",
+      "name": "hip",
       "directions": 4
     },
     {
-      "name": "espanol",
+      "name": "hogan",
       "directions": 4
     },
     {
-      "name": "imperial",
+      "name": "jensen",
       "directions": 4
     },
     {
-      "name": "machete",
+      "name": "longbeard",
+      "directions": 4
+    },
+    {
+      "name": "martialartist",
+      "directions": 4
+    },
+    {
+      "name": "martialartist2",
+      "directions": 4
+    },
+    {
+      "name": "moonshiner",
+      "directions": 4
+    },
+    {
+      "name": "moustache",
       "directions": 4
     },
     {
@@ -48,11 +100,39 @@
       "directions": 4
     },
     {
-      "name": "pigtail",
+      "name": "muttonmus",
       "directions": 4
     },
     {
-      "name": "sage",
+      "name": "neckbeard",
+      "directions": 4
+    },
+    {
+      "name": "pencilstache",
+      "directions": 4
+    },
+    {
+      "name": "selleck",
+      "directions": 4
+    },
+    {
+      "name": "sideburn",
+      "directions": 4
+    },
+    {
+      "name": "smallstache",
+      "directions": 4
+    },
+    {
+      "name": "vandyke",
+      "directions": 4
+    },
+    {
+      "name": "volaju",
+      "directions": 4
+    },
+    {
+      "name": "walrus",
       "directions": 4
     },
     {
@@ -60,7 +140,7 @@
       "directions": 4
     },
     {
-      "name": "briefs",
+      "name": "wise",
       "directions": 4
     }
   ]