Vox customization fixes & updating (#27663)

vox customization

diff --git a/Resources/Locale/en-US/accessories/vox-facial-hair.ftl b/Resources/Locale/en-US/accessories/vox-facial-hair.ftl
index 48b19ca74b1adb339f6b04f8dc200667a6037768..a63b0b5a3980b9f0c50482784960af30cd520e85 100644 (file)
--- a/Resources/Locale/en-US/accessories/vox-facial-hair.ftl
+++ b/Resources/Locale/en-US/accessories/vox-facial-hair.ftl
@@ -1,5 +1,5 @@
-marking-VoxFacialHairColonel = Vox Colonel
-marking-VoxFacialHairFu = Quill Fu
-marking-VoxFacialHairNeck = Neck Quills
-marking-VoxFacialHairBeard = Quill Beard
-marking-VoxFacialHairRuffBeard = Ruff Beard
+marking-VoxFacialHairBeard = Vox Beard (Quills)
+marking-VoxFacialHairColonel = Vox Moustache (Colonel)
+marking-VoxFacialHairFu = Vox Moustache (Quill Fu)
+marking-VoxFacialHairNeck = Vox Beard (Neck Quills)
+marking-VoxFacialHairMane = Vox Beard (Mane)

diff --git a/Resources/Locale/en-US/accessories/vox-hair.ftl b/Resources/Locale/en-US/accessories/vox-hair.ftl
index cf98d0b4f982ca1a18ada9c99350239c3a4d7aec..94483fd6a6c9be3771807ba73d8d73ac1a90c985 100644 (file)
--- a/Resources/Locale/en-US/accessories/vox-hair.ftl
+++ b/Resources/Locale/en-US/accessories/vox-hair.ftl
@@ -1,13 +1,22 @@
-marking-VoxHairShortQuills = Short Vox Quills
-marking-VoxHairKingly = Vox Kingly
 marking-VoxHairAfro = Vox Afro
-marking-VoxHairMohawk = Vox Mohawk
-marking-VoxHairYasuhiro = Vox Yasuhiro
+marking-VoxHairBraids = Vox Braids
+marking-VoxHairCrestedQuills = Vox Crested Quills
+marking-VoxHairEmperorQuills = Vox Emperor Quills
+marking-VoxHairFlowing = Vox Flowing
+marking-VoxHairHawk = Vox Hawk
 marking-VoxHairHorns = Vox Horns
-marking-VoxHairNights = Vox Nights
-marking-VoxHairSurf = Vox Surf
-marking-VoxHairCropped = Vox Cropped
-marking-VoxHairRuffhawk = Vox Ruffhawk
-marking-VoxHairRows = Vox Rows
+marking-VoxHairKeelQuills = Vox Keel Quills 
+marking-VoxHairKeetQuills = Vox Keet Quills
+marking-VoxHairKingly = Vox Kingly
+marking-VoxHairLongBraid = Vox Long Braid
 marking-VoxHairMange = Vox Mange
+marking-VoxHairMohawk = Vox Mohawk
+marking-VoxHairNights = Vox Nights
 marking-VoxHairPony = Vox Pony
+marking-VoxHairRazorClipped = Vox Razor (Clipped)
+marking-VoxHairRazor = Vox Razor
+marking-VoxHairSortBraid = Vox Short Braid
+marking-VoxHairShortQuills = Vox Short Quills
+marking-VoxHairSurf = Vox Surf
+marking-VoxHairTielQuills = Vox Tiel Quills
+marking-VoxHairYasu = Vox Yasuhiro

diff --git a/Resources/Locale/en-US/markings/vox_tattoos.ftl b/Resources/Locale/en-US/markings/vox_tattoos.ftl
new file mode 100644 (file)
index 0000000..f7f3c72
--- /dev/null
+++ b/Resources/Locale/en-US/markings/vox_tattoos.ftl
@@ -0,0 +1,11 @@
+marking-TattooVoxHeartLeftArm-heart_l_arm = Vox Left Arm Tattoo (Heart)
+marking-TattooVoxHeartLeftArm = Vox Left Arm Tattoo (Heart)
+
+marking-TattooVoxHeartRightArm-heart_r_arm = Vox Right Arm Tattoo (Heart)
+marking-TattooVoxHeartRightArm = Vox Right Arm Tattoo (Heart)
+
+marking-TattooVoxHiveChest-hive_s = Vox Chest Tattoo (hive)
+marking-TattooVoxHiveChest = Vox Chest Tattoo (hive)
+
+marking-TattooVoxNightlingChest-nightling_s = Vox Chest Tattoo (nightling)
+marking-TattooVoxNightlingChest = Vox Chest Tattoo (nightling)

diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_facial_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_facial_hair.yml
index d4cc4b00e310312c71fa5014d9b7436e1abf86fa..6ec5f8999a1109fba97d7f37cb2cacdd0c7f74d3 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_facial_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_facial_hair.yml
@@ -1,40 +1,44 @@
 - type: marking
-  id: VoxFacialHairColonel
+  id: VoxFacialHairBeard
   bodyPart: FacialHair
   markingCategory: FacialHair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_facial_hair.rsi
-      state: vox_colonel_s
+      state: beard_s
+
 - type: marking
-  id: VoxFacialHairFu
+  id: VoxFacialHairColonel
   bodyPart: FacialHair
   markingCategory: FacialHair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_facial_hair.rsi
-      state: vox_fu_s
+      state: colonel_s
+
 - type: marking
-  id: VoxFacialHairNeck
+  id: VoxFacialHairFu
   bodyPart: FacialHair
   markingCategory: FacialHair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_facial_hair.rsi
-      state: vox_neck_s
+      state: fu_s
+
 - type: marking
-  id: VoxFacialHairBeard
+  id: VoxFacialHairMane
   bodyPart: FacialHair
   markingCategory: FacialHair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_facial_hair.rsi
-      state: vox_beard_s
+      state: mane_s
+
 - type: marking
-  id: VoxFacialHairRuffBeard
+  id: VoxFacialHairNeck
   bodyPart: FacialHair
   markingCategory: FacialHair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_facial_hair.rsi
-      state: vox_ruff_beard_s
+      state: neck_s

diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
index 975de63204db2fe3baddd1a07bca9d1c7a191d8b..9a847b40a99f549e842547953bcd32dfa3fa7a8c 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
@@ -1,91 +1,102 @@
 - type: marking
-  id: VoxHairShortQuills
+  id: VoxHairAfro
   bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_shortquills_s
+      state: afro_s
+
 - type: marking
-  id: VoxHairKingly
+  id: VoxHairBraids
   bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_kingly_s
+      state: braid_s
+
 - type: marking
-  id: VoxHairAfro
+  id: VoxHairCrestedQuills
   bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_afro_s
+      state: crestedquills_s
+
 - type: marking
-  id: VoxHairMohawk
+  id: VoxHairEmperorQuills
   bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_mohawk_s
+      state: emperorquills_s
+
 - type: marking
-  id: VoxHairYasuhiro
+  id: VoxHairFlowing
   bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_yasu_s
+      state: flowing_s
+
 - type: marking
-  id: VoxHairHorns
+  id: VoxHairHawk
   bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_horns_s
+      state: hawk_s
+
 - type: marking
-  id: VoxHairNights
+  id: VoxHairHorns
   bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_nights_s
+      state: horns_s
+
 - type: marking
-  id: VoxHairSurf
+  id: VoxHairKeelQuills
   bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_surf_s
+      state: keelquills_s
+
 - type: marking
-  id: VoxHairCropped
+  id: VoxHairKeetQuills
   bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_cropped_s
+      state: keetquills_s
+
 - type: marking
-  id: VoxHairRuffhawk
+  id: VoxHairKingly
   bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_ruff_hawk_s
+      state: kingly_s
+
 - type: marking
-  id: VoxHairRows
+  id: VoxHairLongBraid
   bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_rows_s
+      state: afro_s
+
 - type: marking
   id: VoxHairMange
   bodyPart: Hair
@@ -93,7 +104,26 @@
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_mange_s
+      state: mange_s
+      
+- type: marking
+  id: VoxHairMohawk
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: mohawk_s
+
+- type: marking
+  id: VoxHairNights
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: nights_s
+
 - type: marking
   id: VoxHairPony
   bodyPart: Hair
@@ -101,4 +131,67 @@
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_pony_s
+      state: ponytail_s
+
+- type: marking
+  id: VoxHairRazorClipped
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: razor_clipped_s
+
+- type: marking
+  id: VoxHairRazor
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: razor_s
+
+- type: marking
+  id: VoxHairSortBraid
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: short_braid_s
+
+- type: marking
+  id: VoxHairShortQuills
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: shortquills_s
+
+- type: marking
+  id: VoxHairSurf
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: surf_s
+
+- type: marking
+  id: VoxHairTielQuills
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: tielquills_s
+
+- type: marking
+  id: VoxHairYasu
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: yasu_s
\ No newline at end of file

diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml
new file mode 100644 (file)
index 0000000..c61cfea
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml
@@ -0,0 +1,55 @@
+- type: marking
+  id: TattooVoxHeartLeftArm
+  bodyPart: LArm
+  markingCategory: Arms
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: heart_l_arm
+
+- type: marking
+  id: TattooVoxHeartRightArm
+  bodyPart: RArm
+  markingCategory: Arms
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: heart_r_arm
+
+- type: marking
+  id: TattooVoxHiveChest
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: hive_s
+
+- type: marking
+  id: TattooVoxNightlingChest
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: nightling_s

diff --git a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/beard_s.png b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/beard_s.png
new file mode 100644 (file)
index 0000000..92aeea8
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/beard_s.png differ

diff --git a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/colonel_s.png b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/colonel_s.png
new file mode 100644 (file)
index 0000000..2e657d6
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/colonel_s.png differ

diff --git a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/fu_s.png b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/fu_s.png
new file mode 100644 (file)
index 0000000..87f97ee
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/fu_s.png differ

diff --git a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/mane_s.png b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/mane_s.png
new file mode 100644 (file)
index 0000000..08b120f
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/mane_s.png differ

diff --git a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/meta.json
index c52ad8a2a2ed30f793d31418a93910c71e2d04d3..64eebb888306020e224131101ee81fce584759af 100644 (file)
--- a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/meta.json
@@ -1 +1,31 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/blob/02ff588d59b3c560c685d9ca75e882d32a72d8cb/icons/mob/human_face.dmi", "states": [{"name": "vox_beard_s", "directions": 4}, {"name": "vox_colonel_s", "directions": 4}, {"name": "vox_fu_s", "directions": 4}, {"name": "vox_neck_s", "directions": 4}, {"name": "vox_ruff_beard_s", "directions": 4}, {"name": "vox_ruff_beard_s2", "directions": 4}]}
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/0f9ef5962f4422836c0a42f289fb24d018918cbc/icons/mob/sprite_accessories/vox/vox_facial_hair.dmi and greyscaled",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "colonel_s",
+      "directions": 4
+    },
+    {
+      "name": "fu_s",
+      "directions": 4
+    },
+    {
+      "name": "neck_s",
+      "directions": 4
+    },
+    {
+      "name": "beard_s",
+      "directions": 4
+    },
+    {
+      "name": "mane_s",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file

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

diff --git a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/vox_beard_s.png b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/vox_beard_s.png
deleted file mode 100644 (file)
index 8e922e5..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/vox_beard_s.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/vox_colonel_s.png b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/vox_colonel_s.png
deleted file mode 100644 (file)
index 8de4dd6..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/vox_colonel_s.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/vox_fu_s.png b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/vox_fu_s.png
deleted file mode 100644 (file)
index e49e84b..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/vox_fu_s.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/vox_neck_s.png b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/vox_neck_s.png
deleted file mode 100644 (file)
index 9009717..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/vox_neck_s.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/vox_ruff_beard_s.png b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/vox_ruff_beard_s.png
deleted file mode 100644 (file)
index 365f134..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/vox_ruff_beard_s.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/vox_ruff_beard_s2.png b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/vox_ruff_beard_s2.png
deleted file mode 100644 (file)
index 0858c19..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/vox_ruff_beard_s2.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/afro_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/afro_s.png
new file mode 100644 (file)
index 0000000..74b09a0
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_hair.rsi/afro_s.png differ

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

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

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/emperorquills_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/emperorquills_s.png
new file mode 100644 (file)
index 0000000..899918e
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_hair.rsi/emperorquills_s.png differ

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

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

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

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

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/keetquills_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/keetquills_s.png
new file mode 100644 (file)
index 0000000..910542d
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_hair.rsi/keetquills_s.png differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/kingly_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/kingly_s.png
new file mode 100644 (file)
index 0000000..1d0a1d8
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_hair.rsi/kingly_s.png differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/long_braid_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/long_braid_s.png
new file mode 100644 (file)
index 0000000..3df3105
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_hair.rsi/long_braid_s.png differ

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

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json
index 2f141784244650e1da1f1255a36b5df2e5a570a3..9b08260bd6449ce755c6e5a6cbbe0f5cc5a4432c 100644 (file)
--- a/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json
@@ -1 +1,99 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/blob/02ff588d59b3c560c685d9ca75e882d32a72d8cb/icons/mob/human_face.dmi", "states": [{"name": "vox_afro_s", "directions": 4}, {"name": "vox_afro_s2", "directions": 4}, {"name": "vox_bald_s", "directions": 4}, {"name": "vox_cropped_s", "directions": 4}, {"name": "vox_cropped_s2", "directions": 4}, {"name": "vox_horns_s", "directions": 4}, {"name": "vox_horns_s2", "directions": 4}, {"name": "vox_kingly_s", "directions": 4}, {"name": "vox_kingly_s2", "directions": 4}, {"name": "vox_mange_s", "directions": 4}, {"name": "vox_mange_s2", "directions": 4}, {"name": "vox_mohawk_s", "directions": 4}, {"name": "vox_mohawk_s2", "directions": 4}, {"name": "vox_nights_s", "directions": 4}, {"name": "vox_nights_s2", "directions": 4}, {"name": "vox_pony_s", "directions": 4}, {"name": "vox_pony_s2", "directions": 4}, {"name": "vox_rows_s", "directions": 4}, {"name": "vox_rows_s2", "directions": 4}, {"name": "vox_ruff_hawk_s", "directions": 4}, {"name": "vox_ruff_hawk_s2", "directions": 4}, {"name": "vox_shortquills_s", "directions": 4}, {"name": "vox_shortquills_s2", "directions": 4}, {"name": "vox_surf_s", "directions": 4}, {"name": "vox_surf_s2", "directions": 4}, {"name": "vox_yasu_s", "directions": 4}, {"name": "vox_yasu_s2", "directions": 4}]}
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/dcd1f5d88a8c5ba9634fc3fce67a76ada45f71dc/icons/mob/sprite_accessories/vox/vox_hair.dmi and greyscaled",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "crestedquills_s",
+      "directions": 4
+    },
+    {
+      "name": "emperorquills_s",
+      "directions": 4
+    },
+    {
+      "name": "keelquills_s",
+      "directions": 4
+    },
+    {
+      "name": "keetquills_s",
+      "directions": 4
+    },
+    {
+      "name": "shortquills_s",
+      "directions": 4
+    },
+    {
+      "name": "tielquills_s",
+      "directions": 4
+    },
+    {
+      "name": "kingly_s",
+      "directions": 4
+    },
+    {
+      "name": "afro_s",
+      "directions": 4
+    },
+    {
+      "name": "yasu_s",
+      "directions": 4
+    },
+    {
+      "name": "razor_s",
+      "directions": 4
+    },
+    {
+      "name": "razor_clipped_s",
+      "directions": 4
+    },
+    {
+      "name": "mohawk_s",
+      "directions": 4
+    },
+    {
+      "name": "horns_s",
+      "directions": 4
+    },
+    {
+      "name": "nights_s",
+      "directions": 4
+    },
+    {
+      "name": "hawk_s",
+      "directions": 4
+    },
+    {
+      "name": "long_braid_s",
+      "directions": 4
+    },
+    {
+      "name": "short_braid_s",
+      "directions": 4
+    },
+    {
+      "name": "mange_s",
+      "directions": 4
+    },
+    {
+      "name": "ponytail_s",
+      "directions": 4
+    },
+    {
+      "name": "braid_s",
+      "directions": 4
+    },
+    {
+      "name": "surf_s",
+      "directions": 4
+    },
+    {
+      "name": "flowing_s",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file

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

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/nights_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/nights_s.png
new file mode 100644 (file)
index 0000000..68d2654
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_hair.rsi/nights_s.png differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/ponytail_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/ponytail_s.png
new file mode 100644 (file)
index 0000000..316f08f
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_hair.rsi/ponytail_s.png differ

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

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/razor_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/razor_s.png
new file mode 100644 (file)
index 0000000..0b57cec
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_hair.rsi/razor_s.png differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/short_braid_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/short_braid_s.png
new file mode 100644 (file)
index 0000000..6f7a1e8
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_hair.rsi/short_braid_s.png differ

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

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/surf_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/surf_s.png
new file mode 100644 (file)
index 0000000..712ccb5
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_hair.rsi/surf_s.png differ

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

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_afro_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_afro_s.png
deleted file mode 100644 (file)
index 60b9b18..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_afro_s.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_afro_s2.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_afro_s2.png
deleted file mode 100644 (file)
index 0858c19..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_afro_s2.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_bald_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_bald_s.png
deleted file mode 100644 (file)
index 0858c19..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_bald_s.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_cropped_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_cropped_s.png
deleted file mode 100644 (file)
index 6757435..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_cropped_s.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_cropped_s2.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_cropped_s2.png
deleted file mode 100644 (file)
index 0858c19..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_cropped_s2.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_horns_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_horns_s.png
deleted file mode 100644 (file)
index dbb4ae8..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_horns_s.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_horns_s2.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_horns_s2.png
deleted file mode 100644 (file)
index 0858c19..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_horns_s2.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_kingly_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_kingly_s.png
deleted file mode 100644 (file)
index 3f35429..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_kingly_s.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_kingly_s2.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_kingly_s2.png
deleted file mode 100644 (file)
index 0858c19..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_kingly_s2.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_mange_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_mange_s.png
deleted file mode 100644 (file)
index 138c58e..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_mange_s.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_mange_s2.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_mange_s2.png
deleted file mode 100644 (file)
index 0858c19..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_mange_s2.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_mohawk_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_mohawk_s.png
deleted file mode 100644 (file)
index 0a5589b..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_mohawk_s.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_mohawk_s2.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_mohawk_s2.png
deleted file mode 100644 (file)
index 0858c19..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_mohawk_s2.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_nights_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_nights_s.png
deleted file mode 100644 (file)
index 0a587ea..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_nights_s.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_nights_s2.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_nights_s2.png
deleted file mode 100644 (file)
index 0858c19..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_nights_s2.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_pony_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_pony_s.png
deleted file mode 100644 (file)
index a9ff211..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_pony_s.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_pony_s2.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_pony_s2.png
deleted file mode 100644 (file)
index 0858c19..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_pony_s2.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_rows_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_rows_s.png
deleted file mode 100644 (file)
index cee8b9a..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_rows_s.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_rows_s2.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_rows_s2.png
deleted file mode 100644 (file)
index 0858c19..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_rows_s2.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_ruff_hawk_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_ruff_hawk_s.png
deleted file mode 100644 (file)
index 41c3cb6..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_ruff_hawk_s.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_ruff_hawk_s2.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_ruff_hawk_s2.png
deleted file mode 100644 (file)
index 0858c19..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_ruff_hawk_s2.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_shortquills_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_shortquills_s.png
deleted file mode 100644 (file)
index c83ef67..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_shortquills_s.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_shortquills_s2.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_shortquills_s2.png
deleted file mode 100644 (file)
index 0858c19..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_shortquills_s2.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_surf_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_surf_s.png
deleted file mode 100644 (file)
index df2191c..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_surf_s.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_surf_s2.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_surf_s2.png
deleted file mode 100644 (file)
index 0858c19..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_surf_s2.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_yasu_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_yasu_s.png
deleted file mode 100644 (file)
index 6461305..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_yasu_s.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_yasu_s2.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_yasu_s2.png
deleted file mode 100644 (file)
index 0858c19..0000000
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/vox_yasu_s2.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/yasu_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/yasu_s.png
new file mode 100644 (file)
index 0000000..6ee3de1
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_hair.rsi/yasu_s.png differ

diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/heart_l_arm.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/heart_l_arm.png
new file mode 100644 (file)
index 0000000..0ff82bb
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/heart_l_arm.png differ

diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/heart_r_arm.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/heart_r_arm.png
new file mode 100644 (file)
index 0000000..774c966
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/heart_r_arm.png differ

diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/hive_s.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/hive_s.png
new file mode 100644 (file)
index 0000000..8361f55
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/hive_s.png differ

diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json
new file mode 100644 (file)
index 0000000..725fbb6
--- /dev/null
+++ b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/ef7a4d962915cb36b138eeb59663f0053d4906fe/icons/mob/sprite_accessories/vox/vox_body_markings.dmi and modified by Flareguy",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "heart_l_arm",
+      "directions": 4
+    },
+    {
+      "name": "heart_r_arm",
+      "directions": 4
+    },
+    {
+      "name": "hive_s",
+      "directions": 4
+    },
+    {
+      "name": "nightling_s",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file

diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/nightling_s.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/nightling_s.png
new file mode 100644 (file)
index 0000000..72b0b30
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/nightling_s.png differ