Some more vox customization (#39083)

* Added docked and spiked tails, added talisman for vox

* Tail Talisman ftl

* adjusts talisman to be its own tail to avoid having to deal with other tails at all

* vox tail stuff

* Added amputated tail (courtesy of flareguy) and split tail

* adds TODO regarding marking conditionals

* rsi run check pls stop screaming at me

* Shelving the talisman for later, keeping the sprites around

* Add RSI credits

* Remove unnecessary files

* renamed amputated to vestigial

diff --git a/Resources/Locale/en-US/markings/vox.ftl b/Resources/Locale/en-US/markings/vox.ftl
index 1ae829ebbf1b0979ee75e5fcb179d070467ee175..3cb14df2aa00e8319fa9ef2148a1fb28cd061c88 100644 (file)
--- a/Resources/Locale/en-US/markings/vox.ftl
+++ b/Resources/Locale/en-US/markings/vox.ftl
@@ -53,4 +53,13 @@ marking-VoxTail-vox_tail = Vox Tail (Medium)
 marking-VoxTail = Vox Tail (Medium)
 
 marking-VoxTailBig-vox_tail_big = Vox Tail (Big)
-marking-VoxTailBig = Vox Tail (Big)
\ No newline at end of file
+marking-VoxTailBig = Vox Tail (Big)
+
+marking-VoxTailSpikes-vox_tail_spikes = Vox Tail (Spiked)
+marking-VoxTailSpikes = Vox Tail (Spiked)
+
+marking-VoxTailDocked-vox_tail_docked = Vox Tail (Vestigial)
+marking-VoxTailDocked = Vox Tail (Vestigial)
+
+marking-VoxTailSplit-vox_tail_split = Vox Tail (Split)
+marking-VoxTailSplit = Vox Tail (Split)

diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml
index f3c0e5d204c3dbb2233b0e9ed9ecfc6f3837b214..0643c5cbd45d2c3df15096760f5f2f07b5693b89 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml
@@ -161,4 +161,34 @@
   forcedColoring: true
   sprites:
   - sprite: Mobs/Customization/vox_parts.rsi
-    state: tail_big
\ No newline at end of file
+    state: tail_big
+
+- type: marking
+  id: VoxTailSpikes
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Vox]
+  forcedColoring: true
+  sprites:
+  - sprite: Mobs/Customization/vox_parts.rsi
+    state: tail_spikes
+
+- type: marking
+  id: VoxTailDocked
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Vox]
+  forcedColoring: true
+  sprites:
+  - sprite: Mobs/Customization/vox_parts.rsi
+    state: tail_docked
+
+- type: marking
+  id: VoxTailSplit
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Vox]
+  forcedColoring: true
+  sprites:
+  - sprite: Mobs/Customization/vox_parts.rsi
+    state: tail_split
\ 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
index 567c3b2620374a50ced70d2e884a474ed5c7e226..cf350da60d46ad35f10635cfe5ae4a752da235d6 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml
@@ -56,6 +56,7 @@
 
 - type: marking
   id: TattooVoxTailRing
+  # TODO // Looks off on some tails (i.e docked/amputated), if conditionals for markings ever get implemented this needs to be updated to account for those.
   bodyPart: Tail
   markingCategory: Overlay
   speciesRestriction: [Vox]

diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_parts.rsi/meta.json
index 183e3c03380d715ae89fe776bd4d4a93658941a2..143710ad9ff3de70712f270ed310d8ea61fcf1ec 100644 (file)
--- a/Resources/Textures/Mobs/Customization/vox_parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/vox_parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb, modified by Bhijn, Errant and Flareguy. tail_big and tail_short modified from tail by Flareguy",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb, modified by Bhijn, Errant and Flareguy. tail_big tail_short and tail_docked modified from tail by Flareguy, tail_spiked modified from tail by TrixxedHeart",
   "size": {
     "x": 32,
     "y": 32
@@ -58,6 +58,18 @@
     {
       "name": "tail_big",
       "directions": 4
+    },
+    {
+      "name": "tail_spikes",
+      "directions": 4
+    },
+    {
+      "name": "tail_docked",
+      "directions": 4
+    },
+    {
+      "name": "tail_split",
+      "directions": 4
     }
   ]
 }

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

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

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

diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json
index e1d263c9acba0aeedcb93037fd746606cdb62084..92dbbff751fccd2eca5a821d15a94879123d5406 100644 (file)
--- a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "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. eyeshadow & tail_ring states by Flareguy",
+  "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. eyeshadow & tail_ring states by Flareguy, tail_talisman by TrixxedHeart",
   "size": {
     "x": 32,
     "y": 32
@@ -23,6 +23,10 @@
       "name": "nightling_s",
       "directions": 4
     },
+    {
+      "name": "tail_talisman",
+      "directions": 4
+    },
     {
       "name": "tattoo_eye_vox_r",
       "directions": 4

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