diff --git a/Resources/Locale/en-US/_CP14/markings/human-facial-hair.ftl b/Resources/Locale/en-US/_CP14/markings/human-facial-hair.ftl index ae9f043f7d..babc82bdbe 100644 --- a/Resources/Locale/en-US/_CP14/markings/human-facial-hair.ftl +++ b/Resources/Locale/en-US/_CP14/markings/human-facial-hair.ftl @@ -1,34 +1,14 @@ -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 \ No newline at end of file +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 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_facial_hair.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_facial_hair.yml index 068a900c1c..2a3bf873cc 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_facial_hair.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_facial_hair.yml @@ -6,30 +6,6 @@ - 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 @@ -38,14 +14,6 @@ - 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 @@ -55,47 +23,7 @@ state: dwarf - type: marking - 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 + id: CP14HumanFacialHairGoateeMush bodyPart: FacialHair markingCategory: FacialHair sprites: @@ -103,76 +31,44 @@ state: goateemush - type: marking - id: CP14HumanFacialHairGt + id: CP14HumanFacialHairBriefs bodyPart: FacialHair markingCategory: FacialHair sprites: - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi - state: gt + state: briefs - type: marking - id: CP14HumanFacialHairHip + id: CP14HumanFacialHairCircle bodyPart: FacialHair markingCategory: FacialHair sprites: - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi - state: hip + state: circle - type: marking - id: CP14HumanFacialHairHogan + id: CP14HumanFacialHairEspanol bodyPart: FacialHair markingCategory: FacialHair sprites: - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi - state: hogan + state: espanol - type: marking - id: CP14HumanFacialHairJensen + id: CP14HumanFacialHairImperial bodyPart: FacialHair markingCategory: FacialHair sprites: - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi - state: jensen + state: imperial - type: marking - id: CP14HumanFacialHairLongbeard + id: CP14HumanFacialHairMachete bodyPart: FacialHair markingCategory: FacialHair sprites: - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi - 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 + state: machete - type: marking id: CP14HumanFacialHairMutton @@ -183,76 +79,20 @@ state: mutton - type: marking - id: CP14HumanFacialHairMuttonmus + id: CP14HumanFacialHairPigtail bodyPart: FacialHair markingCategory: FacialHair sprites: - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi - state: muttonmus + state: pigtail - type: marking - id: CP14HumanFacialHairNeckbeard + id: CP14HumanFacialHairSage bodyPart: FacialHair markingCategory: FacialHair sprites: - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi - 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 + state: sage - type: marking id: CP14HumanFacialHairWatson @@ -263,9 +103,9 @@ state: watson - type: marking - id: CP14HumanFacialHairWise + id: CP14HumanFacialHairWhiskers bodyPart: FacialHair markingCategory: FacialHair sprites: - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi - state: wise \ No newline at end of file + state: whiskers \ No newline at end of file diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/3oclock.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/3oclock.png index 703a0b0555..76466f6be2 100644 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/3oclock.png and b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/3oclock.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/5oclockmoustache.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/5oclockmoustache.png deleted file mode 100644 index 7fd5b6e31b..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/5oclockmoustache.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/7oclock.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/7oclock.png deleted file mode 100644 index a1207d7430..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/7oclock.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/7oclockmoustache.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/7oclockmoustache.png deleted file mode 100644 index 1e0b5c62c3..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/7oclockmoustache.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/abe.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/abe.png index a60b0b0693..0dc4bb2c1b 100644 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/abe.png and b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/abe.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/briefs.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/briefs.png new file mode 100644 index 0000000000..5dc24f5aae Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/briefs.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/chinlessbeard.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/chinlessbeard.png deleted file mode 100644 index c53cc08f3a..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/chinlessbeard.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/circle.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/circle.png new file mode 100644 index 0000000000..0a1f542164 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/circle.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/dwarf.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/dwarf.png index d9fd4e574b..7b8fbff728 100644 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/dwarf.png and b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/dwarf.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/dwarf2.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/dwarf2.png deleted file mode 100644 index ef59d4d9c3..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/dwarf2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/elvis.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/elvis.png deleted file mode 100644 index 9734d25c9c..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/elvis.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/espanol.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/espanol.png new file mode 100644 index 0000000000..7da85438e3 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/espanol.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/fiveoclock.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/fiveoclock.png deleted file mode 100644 index 853a14320b..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/fiveoclock.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/fullbeard.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/fullbeard.png deleted file mode 100644 index 04b0f11aaf..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/fullbeard.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/fumanchu.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/fumanchu.png deleted file mode 100644 index 05910303fb..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/fumanchu.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/goateemush.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/goateemush.png index e487e48bff..70ba9f6a55 100644 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/goateemush.png and b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/goateemush.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/gt.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/gt.png deleted file mode 100644 index b529b834b1..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/gt.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/hip.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/hip.png deleted file mode 100644 index 8c21df7cbf..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/hip.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/hogan.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/hogan.png deleted file mode 100644 index c53aa35fd5..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/hogan.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/imperial.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/imperial.png new file mode 100644 index 0000000000..f3b5ee1c12 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/imperial.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/jensen.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/jensen.png deleted file mode 100644 index 22f385e5a3..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/jensen.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/longbeard.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/longbeard.png deleted file mode 100644 index 9c02a5b6ce..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/longbeard.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/machete.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/machete.png new file mode 100644 index 0000000000..a0a4586294 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/machete.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/martialartist.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/martialartist.png deleted file mode 100644 index 398d2e58f2..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/martialartist.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/martialartist2.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/martialartist2.png deleted file mode 100644 index e1fb0984fc..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/martialartist2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/meta.json index b7ab9980c8..5c2688781a 100644 --- a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/meta.json +++ b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/meta.json @@ -1,98 +1,46 @@ { "version": 1, "size": { - "x": 32, - "y": 32 + "x": 48, + "y": 48 }, - "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", + "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", "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": "gt", + "name": "whiskers", "directions": 4 }, { - "name": "hip", + "name": "circle", "directions": 4 }, { - "name": "hogan", + "name": "espanol", "directions": 4 }, { - "name": "jensen", + "name": "imperial", "directions": 4 }, { - "name": "longbeard", - "directions": 4 - }, - { - "name": "martialartist", - "directions": 4 - }, - { - "name": "martialartist2", - "directions": 4 - }, - { - "name": "moonshiner", - "directions": 4 - }, - { - "name": "moustache", + "name": "machete", "directions": 4 }, { @@ -100,39 +48,11 @@ "directions": 4 }, { - "name": "muttonmus", + "name": "pigtail", "directions": 4 }, { - "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", + "name": "sage", "directions": 4 }, { @@ -140,7 +60,7 @@ "directions": 4 }, { - "name": "wise", + "name": "briefs", "directions": 4 } ] diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/moonshiner.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/moonshiner.png deleted file mode 100644 index 8c62fd29b4..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/moonshiner.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/moustache.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/moustache.png deleted file mode 100644 index e401c22501..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/moustache.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/mutton.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/mutton.png index c87bebccba..51c61c2719 100644 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/mutton.png and b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/mutton.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/muttonmus.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/muttonmus.png deleted file mode 100644 index d035eba6c5..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/muttonmus.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/neckbeard.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/neckbeard.png deleted file mode 100644 index bfd4616e4c..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/neckbeard.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/pencilstache.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/pencilstache.png deleted file mode 100644 index 047b77cfb2..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/pencilstache.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/pigtail.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/pigtail.png new file mode 100644 index 0000000000..3857a6e045 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/pigtail.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/sage.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/sage.png new file mode 100644 index 0000000000..7bbac883e3 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/sage.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/selleck.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/selleck.png deleted file mode 100644 index 716852eab5..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/selleck.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/sideburn.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/sideburn.png deleted file mode 100644 index 191e118fef..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/sideburn.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/smallstache.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/smallstache.png deleted file mode 100644 index 2f24ee63c7..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/smallstache.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/vandyke.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/vandyke.png deleted file mode 100644 index 543d1b9c36..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/vandyke.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/volaju.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/volaju.png deleted file mode 100644 index 66c27027f1..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/volaju.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/walrus.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/walrus.png deleted file mode 100644 index 28b6a7fcd6..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/walrus.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/watson.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/watson.png index 7dc2aa3a06..b90fc1a840 100644 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/watson.png and b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/watson.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/whiskers.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/whiskers.png new file mode 100644 index 0000000000..16a63c68bd Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/whiskers.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/wise.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/wise.png deleted file mode 100644 index 7b9a6e08c8..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/wise.png and /dev/null differ