Added baby and cube hair (awesome) (#39680)

* Added baby and cube hair (awesome)

* added yml and ftl (oops)

* Update cube.png

Made cube smaller

diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl
index 7754d772a51d4210de99f1c55948d00161b88945..50d2b2790e6b4788775e01146ec39604e5f73372 100644 (file)
--- a/Resources/Locale/en-US/accessories/human-hair.ftl
+++ b/Resources/Locale/en-US/accessories/human-hair.ftl
@@ -2,6 +2,7 @@ marking-HumanHairAfro = Afro
 marking-HumanHairAfro2 = Afro 2
 marking-HumanHairBigafro = Afro (Large)
 marking-HumanHairAntenna = Ahoge
+marking-HumanHairBaby = Baby
 marking-HumanHairBalding = Balding Hair
 marking-HumanHairBedhead = Bedhead
 marking-HumanHairBedheadv2 = Bedhead 2
@@ -59,6 +60,7 @@ marking-HumanHairCornrowbraid = Cornrow Braid
 marking-HumanHairCornrowtail = Cornrow Tail
 marking-HumanHairCrewcut = Crewcut
 marking-HumanHairCrewcut2 = Crewcut 2
+marking-HumanHairCube = Cube
 marking-HumanHairCurls = Curls
 marking-HumanHairC = Cut Hair
 marking-HumanHairDandypompadour = Dandy Pompadour

diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
index b67eb7631c1c8e3801b3ab7fcb3f3de59450504e..fb6f8d4fed17f0e4ee45e70b82b4b4f2593b8bf1 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -12,6 +12,13 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: afro2
+- type: marking
+  id: HumanHairBaby
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: baby
 - type: marking
   id: HumanHairBigafro
   bodyPart: Hair
@@ -54,6 +61,13 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: bedheadv3
+- type: marking
+  id: HumanHairCube
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: cube
 - type: marking
   id: HumanHairPulato
   bodyPart: Hair

diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/baby.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/baby.png
new file mode 100644 (file)
index 0000000..9829225
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/baby.png differ

diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/cube.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/cube.png
new file mode 100644 (file)
index 0000000..eabf49a
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/cube.png differ

diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
index 454b6870eb6ed049489bdfa2345f3e20a9390e1d..dcacd1d743c6dbc3527d7c92a1093f9a2029b48a 100644 (file)
--- a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
@@ -4,7 +4,7 @@
       "x": 32,
       "y": 32
     },
-    "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, doublebun_long by Emisse, longbundled and bob5 sprited by github:DreamlyJack(624946166152298517), pulato.png made by DreamlyJack, b.png and b_alt.png modified and sprited by KingFroozy (github), long_with_bangs shaped and longbow by Futuristic (and Pyvik) for SS14",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, doublebun_long by Emisse, longbundled and bob5 sprited by github:DreamlyJack(624946166152298517), pulato.png made by DreamlyJack, b.png and b_alt.png modified and sprited by KingFroozy (github), long_with_bangs shaped and longbow by Futuristic (and Pyvik) for SS14, cube and baby by CoolioDudio",
     "license": "CC-BY-SA-3.0",
     "states": [
       {
@@ -35,6 +35,10 @@
         "name": "b_alt",
         "directions": 4
       },
+      {
+        "name": "baby",
+        "directions": 4
+      },
       {
         "name": "baldfade",
         "directions": 4
@@ -243,6 +247,10 @@
         "name": "crewcut2",
         "directions": 4
       },
+      {
+        "name": "cube",
+        "directions": 4
+      },
       {
         "name": "curls",
         "directions": 4