diff --git a/Resources/Locale/en-US/markings/vox.ftl b/Resources/Locale/en-US/markings/vox.ftl index 3cb14df2aa..83f073e444 100644 --- a/Resources/Locale/en-US/markings/vox.ftl +++ b/Resources/Locale/en-US/markings/vox.ftl @@ -1,14 +1,62 @@ +marking-TattooVoxNightlingHead-tattoo_nightling_head = Vox Head Tattoo (Nightling) +marking-TattooVoxNightlingHead = Vox Head Tattoo (Nightling) + +marking-TattooVoxArrowHead-tattoo_arrow_head = Vox Head Tattoo (Arrow) +marking-TattooVoxArrowHead = Vox Head Tattoo (Arrow) + +marking-VoxTattooEyeliner-eyeliner = Eyeliner +marking-VoxTattooEyeliner = Eyeliner + +marking-VoxVisage-visage = Visage (Full) +marking-VoxVisage = Visage (Full) + +marking-VoxVisageL-visage_l = Visage (Left) +marking-VoxVisageL = Visage (Left) + +marking-VoxVisageR-visage_r = Visage (Right) +marking-VoxVisageR = Visage (Right) + +marking-VoxCheek-cheekblush = Cheeks +marking-VoxCheek = Cheeks + +marking-VoxBeak-beak = Beak (Pointed) +marking-VoxBeak = Beak (Pointed) + +marking-VoxBeakSquareCere-beak_squarecere = Beak (Square Cere) +marking-VoxBeakSquareCere = Beak (Square Cere) + +marking-VoxBeakHooked-beak_hooked = Beak (Hooked) +marking-VoxBeakHooked = Beak (Hooked) + +marking-VoxBeakShaved-beak_shaved = Beak (Shaved) +marking-VoxBeakShaved = Beak (Shaved) + +marking-VoxBeakCoverTip-beakcover_tip = Beak Tip +marking-VoxBeakCoverTip = Beak Tip + +marking-VoxBeakCoverStripe-beakcover_stripe = Beak Stripe +marking-VoxBeakCoverStripe = Beak Stripe + 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-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) +marking-TattooVoxNightlingChest-nightling_s = Vox Chest Tattoo (Nightling) +marking-TattooVoxNightlingChest = Vox Chest Tattoo (Nightling) + +marking-TattooVoxNightbelt-nightbelt = Vox Stomach Tattoo (Nightling) +marking-TattooVoxNightbelt = Vox Stomach Tattoo (Nightling) + +marking-TattooVoxChestV-night_v = Vox Chest Tattoo (V Shape) +marking-TattooVoxChestV = Vox Chest Tattoo (V Shape) + +marking-TattooVoxUnderbelly-underbelly = Underbelly +marking-TattooVoxUnderbelly = Underbelly marking-VoxScarEyeRight-vox_scar_eye_right = Right Eye Scar marking-VoxScarEyeRight = Eye Scar (Right) diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml index 0643c5cbd4..ccf1a687b8 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml @@ -13,6 +13,52 @@ !type:SimpleColoring color: "#937e3d" +- type: marking + # The cere is the base of the top part of the beak, the cere on this beak, is a square. + id: VoxBeakSquareCere + bodyPart: Snout + markingCategory: Snout + forcedColoring: true + speciesRestriction: [Vox] + sprites: + - sprite: Mobs/Customization/vox_parts.rsi + state: beak_squarecere + coloring: + default: + type: + !type:SimpleColoring + color: "#937e3d" + +- type: marking + id: VoxBeakShaved + bodyPart: Snout + markingCategory: Snout + forcedColoring: true + speciesRestriction: [Vox] + sprites: + - sprite: Mobs/Customization/vox_parts.rsi + state: beak_shaved + coloring: + default: + type: + !type:SimpleColoring + color: "#937e3d" + +- type: marking + id: VoxBeakHooked + bodyPart: Snout + markingCategory: Snout + forcedColoring: true + speciesRestriction: [Vox] + sprites: + - sprite: Mobs/Customization/vox_parts.rsi + state: beak_hooked + coloring: + default: + type: + !type:SimpleColoring + color: "#937e3d" + - type: marking id: VoxLArmScales bodyPart: LArm diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml index cf350da60d..75d2503528 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml @@ -54,6 +54,50 @@ - sprite: Mobs/Customization/vox_tattoos.rsi state: nightling_s +- type: marking + id: TattooVoxNightbelt + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Vox] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: nightbelt + +- type: marking + id: TattooVoxChestV + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Vox] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: chest_v_1 + - sprite: Mobs/Customization/vox_tattoos.rsi + state: chest_v_2 + +- type: marking + id: TattooVoxUnderbelly + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Vox] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: underbelly + - 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. @@ -130,4 +174,126 @@ forcedColoring: true sprites: - sprite: Mobs/Customization/vox_tattoos.rsi - state: eyeshadow_large \ No newline at end of file + state: eyeshadow_large + +- type: marking + id: VoxTattooEyeliner + bodyPart: Eyes + markingCategory: Overlay + speciesRestriction: [Vox] + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: eyeliner + +- type: marking + id: VoxBeakCoverStripe + bodyPart: Snout + markingCategory: SnoutCover + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + speciesRestriction: [Vox] + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: beakcover_stripe + +- type: marking + id: VoxBeakCoverTip + bodyPart: Snout + markingCategory: SnoutCover + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + speciesRestriction: [Vox] + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: beakcover_tip + +- type: marking + id: TattooVoxArrowHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Vox] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: tattoo_arrow_head + +- type: marking + id: TattooVoxNightlingHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Vox] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: tattoo_nightling_head + +- type: marking + id: VoxVisage + bodyPart: Head + markingCategory: Head + speciesRestriction: [Vox] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: visage + +- type: marking + id: VoxVisageL + bodyPart: Head + markingCategory: Head + speciesRestriction: [Vox] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: visage_l + +- type: marking + id: VoxVisageR + bodyPart: Head + markingCategory: Head + speciesRestriction: [Vox] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: visage_r + +- type: marking + id: VoxCheek + bodyPart: Head + markingCategory: Head + speciesRestriction: [Vox] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: cheekblush + diff --git a/Resources/Prototypes/Species/vox.yml b/Resources/Prototypes/Species/vox.yml index 1b49ebc776..d01db69e0d 100644 --- a/Resources/Prototypes/Species/vox.yml +++ b/Resources/Prototypes/Species/vox.yml @@ -52,6 +52,9 @@ points: 1 required: true defaultMarkings: [ VoxBeak ] + SnoutCover: + points: 1 + required: false Arms: points: 4 required: true diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak.png index 23744679b6..384717ce24 100644 Binary files a/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak.png and b/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_hooked.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_hooked.png new file mode 100644 index 0000000000..879ceb7bde Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_hooked.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_shaved.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_shaved.png new file mode 100644 index 0000000000..749be9cfb9 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_shaved.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_squarecere.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_squarecere.png new file mode 100644 index 0000000000..53a2430cfb Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_squarecere.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_parts.rsi/meta.json index 143710ad9f..b00bec9bf0 100644 --- 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 tail_short and tail_docked modified from tail by Flareguy, tail_spiked modified from tail by TrixxedHeart", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb, modified by Bhijn, Errant, Flareguy, and TrixxedHeart. tail_big tail_short and tail_docked modified from tail by Flareguy, beak_shaved/squarecere/hooked modified from beak and tail_spiked modified from tail by TrixxedHeart", "size": { "x": 32, "y": 32 @@ -11,6 +11,18 @@ "name": "beak", "directions": 4 }, + { + "name": "beak_squarecere", + "directions": 4 + }, + { + "name": "beak_shaved", + "directions": 4 + }, + { + "name": "beak_hooked", + "directions": 4 + }, { "name": "l_arm", "directions": 4 diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/beakcover_stripe.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/beakcover_stripe.png new file mode 100644 index 0000000000..875018784b Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/beakcover_stripe.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/beakcover_tip.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/beakcover_tip.png new file mode 100644 index 0000000000..ff394df8f8 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/beakcover_tip.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/cheekblush.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/cheekblush.png new file mode 100644 index 0000000000..5db759fe24 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/cheekblush.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/chest_v_1.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/chest_v_1.png new file mode 100644 index 0000000000..e9214818db Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/chest_v_1.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/chest_v_2.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/chest_v_2.png new file mode 100644 index 0000000000..5f8dc43399 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/chest_v_2.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeliner.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeliner.png new file mode 100644 index 0000000000..0130ae02b2 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeliner.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 92dbbff751..5e6df07fe2 100644 --- 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, tail_talisman by TrixxedHeart", + "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. beakcover_stripe, beakcover_tip, cheekblush, chest_v, nightbelt, tail_talisman, tattoo_arrow_head, tattoo_nightling_head (modified from nightling_s), underbelly, visage, visage_l and visage_r by TrixxedHeart", "size": { "x": 32, "y": 32 @@ -23,6 +23,22 @@ "name": "nightling_s", "directions": 4 }, + { + "name": "nightbelt", + "directions": 4 + }, + { + "name": "chest_v_1", + "directions": 4 + }, + { + "name": "chest_v_2", + "directions": 4 + }, + { + "name": "underbelly", + "directions": 4 + }, { "name": "tail_talisman", "directions": 4 @@ -47,9 +63,45 @@ "name": "eyeshadow_large", "directions": 4 }, + { + "name": "eyeliner", + "directions": 4 + }, + { + "name": "cheekblush", + "directions": 4 + }, { "name": "tail_ring", "directions": 4 + }, + { + "name": "beakcover_tip", + "directions": 4 + }, + { + "name": "beakcover_stripe", + "directions": 4 + }, + { + "name": "tattoo_arrow_head", + "directions": 4 + }, + { + "name": "tattoo_nightling_head", + "directions": 4 + }, + { + "name": "visage", + "directions": 4 + }, + { + "name": "visage_l", + "directions": 4 + }, + { + "name": "visage_r", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/nightbelt.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/nightbelt.png new file mode 100644 index 0000000000..7df63a0bc4 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/nightbelt.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_arrow_head.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_arrow_head.png new file mode 100644 index 0000000000..63b097e940 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_arrow_head.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_nightling_head.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_nightling_head.png new file mode 100644 index 0000000000..d48f4346a2 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_nightling_head.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/underbelly.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/underbelly.png new file mode 100644 index 0000000000..19232451de Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/underbelly.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage.png new file mode 100644 index 0000000000..d8190e56f2 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage_l.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage_l.png new file mode 100644 index 0000000000..fd1dc77915 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage_l.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage_r.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage_r.png new file mode 100644 index 0000000000..a2d13dbea6 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage_r.png differ diff --git a/Resources/Textures/Mobs/Species/Vox/parts.rsi/head.png b/Resources/Textures/Mobs/Species/Vox/parts.rsi/head.png index 955e6c7b2a..59379e7d55 100644 Binary files a/Resources/Textures/Mobs/Species/Vox/parts.rsi/head.png and b/Resources/Textures/Mobs/Species/Vox/parts.rsi/head.png differ diff --git a/Resources/Textures/Mobs/Species/Vox/parts.rsi/l_leg.png b/Resources/Textures/Mobs/Species/Vox/parts.rsi/l_leg.png index 918b343f98..b7039d11d5 100644 Binary files a/Resources/Textures/Mobs/Species/Vox/parts.rsi/l_leg.png and b/Resources/Textures/Mobs/Species/Vox/parts.rsi/l_leg.png differ diff --git a/Resources/Textures/Mobs/Species/Vox/parts.rsi/r_leg.png b/Resources/Textures/Mobs/Species/Vox/parts.rsi/r_leg.png index 45b1ae82e7..ed2fe24fc5 100644 Binary files a/Resources/Textures/Mobs/Species/Vox/parts.rsi/r_leg.png and b/Resources/Textures/Mobs/Species/Vox/parts.rsi/r_leg.png differ diff --git a/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png b/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png index 01259ea03d..9896f1e17f 100644 Binary files a/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png and b/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png differ