diff --git a/Resources/Locale/en-US/accessories/vox-facial-hair.ftl b/Resources/Locale/en-US/accessories/vox-facial-hair.ftl index a63b0b5a39..884edbb202 100644 --- a/Resources/Locale/en-US/accessories/vox-facial-hair.ftl +++ b/Resources/Locale/en-US/accessories/vox-facial-hair.ftl @@ -3,3 +3,5 @@ marking-VoxFacialHairColonel = Vox Moustache (Colonel) marking-VoxFacialHairFu = Vox Moustache (Quill Fu) marking-VoxFacialHairNeck = Vox Beard (Neck Quills) marking-VoxFacialHairMane = Vox Beard (Mane) +marking-VoxFacialHairManeSmall = Vox Beard (Small Mane) +marking-VoxFacialHairTufts = Vox Sideburns (Tufts) diff --git a/Resources/Locale/en-US/accessories/vox-hair.ftl b/Resources/Locale/en-US/accessories/vox-hair.ftl index 94483fd6a6..0e11e1a9b8 100644 --- a/Resources/Locale/en-US/accessories/vox-hair.ftl +++ b/Resources/Locale/en-US/accessories/vox-hair.ftl @@ -20,3 +20,5 @@ marking-VoxHairShortQuills = Vox Short Quills marking-VoxHairSurf = Vox Surf marking-VoxHairTielQuills = Vox Tiel Quills marking-VoxHairYasu = Vox Yasuhiro +marking-VoxHairWiseBraid = Vox Wise Braids +marking-VoxHairSpotty = Vox Spotty Hair \ No newline at end of file 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 6ec5f8999a..066d197223 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_facial_hair.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_facial_hair.yml @@ -34,6 +34,15 @@ - sprite: Mobs/Customization/vox_facial_hair.rsi state: mane_s +- type: marking + id: VoxFacialHairManeSmall + bodyPart: FacialHair + markingCategory: FacialHair + speciesRestriction: [Vox] + sprites: + - sprite: Mobs/Customization/vox_facial_hair.rsi + state: manesmall_s + - type: marking id: VoxFacialHairNeck bodyPart: FacialHair @@ -42,3 +51,13 @@ sprites: - sprite: Mobs/Customization/vox_facial_hair.rsi state: neck_s + +- type: marking + id: VoxFacialHairTufts + bodyPart: FacialHair + markingCategory: FacialHair + speciesRestriction: [Vox] + sprites: + - sprite: Mobs/Customization/vox_facial_hair.rsi + state: tuft_s + diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml index 9a847b40a9..8748b3a093 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml @@ -95,7 +95,7 @@ speciesRestriction: [Vox] sprites: - sprite: Mobs/Customization/vox_hair.rsi - state: afro_s + state: long_braid_s - type: marking id: VoxHairMange @@ -169,6 +169,15 @@ - sprite: Mobs/Customization/vox_hair.rsi state: shortquills_s +- type: marking + id: VoxHairSpotty + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [Vox] + sprites: + - sprite: Mobs/Customization/vox_hair.rsi + state: spotty_s + - type: marking id: VoxHairSurf bodyPart: Hair @@ -187,6 +196,15 @@ - sprite: Mobs/Customization/vox_hair.rsi state: tielquills_s +- type: marking + id: VoxHairWiseBraid + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [Vox] + sprites: + - sprite: Mobs/Customization/vox_hair.rsi + state: wise_braid_s + - type: marking id: VoxHairYasu bodyPart: Hair diff --git a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/manesmall_s.png b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/manesmall_s.png new file mode 100644 index 0000000000..7c1756e96b Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/manesmall_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 64eebb8883..3516e2cbe6 100644 --- a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/vox_facial_hair.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/0f9ef5962f4422836c0a42f289fb24d018918cbc/icons/mob/sprite_accessories/vox/vox_facial_hair.dmi and greyscaled", + "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/0f9ef5962f4422836c0a42f289fb24d018918cbc/icons/mob/sprite_accessories/vox/vox_facial_hair.dmi and greyscaled. manesmall_s modified by Flareguy from mane_s, tuft_s made by Flareguy", "size": { "x": 32, "y": 32 @@ -26,6 +26,14 @@ { "name": "mane_s", "directions": 4 + }, + { + "name": "manesmall_s", + "directions": 4 + }, + { + "name": "tuft_s", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/tuft_s.png b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/tuft_s.png new file mode 100644 index 0000000000..c0a2760d29 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/tuft_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 9b08260bd6..99004ffaf8 100644 --- a/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/vox_hair.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/dcd1f5d88a8c5ba9634fc3fce67a76ada45f71dc/icons/mob/sprite_accessories/vox/vox_hair.dmi and greyscaled", + "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/dcd1f5d88a8c5ba9634fc3fce67a76ada45f71dc/icons/mob/sprite_accessories/vox/vox_hair.dmi and greyscaled. wise_braid_s modified from braid_s by Flareguy, spotty by Flareguy", "size": { "x": 32, "y": 32 @@ -75,6 +75,10 @@ "name": "short_braid_s", "directions": 4 }, + { + "name": "wise_braid_s", + "directions": 4 + }, { "name": "mange_s", "directions": 4 @@ -91,6 +95,10 @@ "name": "surf_s", "directions": 4 }, + { + "name": "spotty_s", + "directions": 4 + }, { "name": "flowing_s", "directions": 4 diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/spotty_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/spotty_s.png new file mode 100644 index 0000000000..f483e90475 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_hair.rsi/spotty_s.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/wise_braid_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/wise_braid_s.png new file mode 100644 index 0000000000..d35ddc4842 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_hair.rsi/wise_braid_s.png differ