diff --git a/Resources/Locale/en-US/markings/diona.ftl b/Resources/Locale/en-US/markings/diona.ftl index 55b530decf..e4bb95ae23 100644 --- a/Resources/Locale/en-US/markings/diona.ftl +++ b/Resources/Locale/en-US/markings/diona.ftl @@ -81,3 +81,6 @@ marking-DionaVinesHead = Diona Vines Short (Vines) marking-DionaWildflowerHead-wildflower = Diona Wild Flowers (Flowers) marking-DionaWildflowerHead = Diona Wild Flowers (Flowers) + +marking-DionaVineOverlay-overlay = Diona Body Vines +marking-DionaVineOverlay = Diona Body Vines diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/diona.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/diona.yml index 0db9994eff..569fb5f2b8 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/diona.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/diona.yml @@ -387,3 +387,17 @@ sprites: - sprite: Mobs/Customization/diona.rsi state: wildflower + +- type: marking + id: DionaVineOverlay + bodyPart: LLeg + markingCategory: Overlay + speciesRestriction: [Diona] + coloring: + default: + type: + !type:SimpleColoring + color: "#5f7039" + sprites: + - sprite: Mobs/Customization/diona.rsi + state: overlay diff --git a/Resources/Prototypes/Species/diona.yml b/Resources/Prototypes/Species/diona.yml index 5d91f223f9..a2ef013b05 100644 --- a/Resources/Prototypes/Species/diona.yml +++ b/Resources/Prototypes/Species/diona.yml @@ -6,7 +6,7 @@ sprites: MobDionaSprites markingLimits: MobDionaMarkingLimits dollPrototype: MobDionaDummy - skinColoration: TintedHues + skinColoration: Hues maleFirstNames: DionaFirst femaleFirstNames: DionaFirst lastNames: DionaLast @@ -19,6 +19,7 @@ HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking Chest: MobDionaTorso + Eyes: MobDionaEyes LArm: MobDionaLArm RArm: MobDionaRArm LHand: MobDionaLHand @@ -44,6 +45,16 @@ Chest: points: 1 required: false + Overlay: + points: 1 + required: true + defaultMarkings: [ DionaVineOverlay ] + +- type: humanoidBaseSprite + id: MobDionaEyes + baseSprite: + sprite: Mobs/Customization/eyes.rsi + state: diona - type: humanoidBaseSprite id: MobDionaHead diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/meta.json b/Resources/Textures/Mobs/Customization/diona.rsi/meta.json index 64f27eeb5f..833c940469 100644 --- a/Resources/Textures/Mobs/Customization/diona.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/diona.rsi/meta.json @@ -75,6 +75,10 @@ "name": "oak", "directions": 4 }, + { + "name": "overlay", + "directions": 4 + }, { "name": "palm", "directions": 4 diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/overlay.png b/Resources/Textures/Mobs/Customization/diona.rsi/overlay.png new file mode 100644 index 0000000000..502a5c3fff Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/overlay.png differ diff --git a/Resources/Textures/Mobs/Customization/eyes.rsi/diona.png b/Resources/Textures/Mobs/Customization/eyes.rsi/diona.png new file mode 100644 index 0000000000..2b621dcbc9 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/eyes.rsi/diona.png differ diff --git a/Resources/Textures/Mobs/Customization/eyes.rsi/meta.json b/Resources/Textures/Mobs/Customization/eyes.rsi/meta.json index 0dd18850b6..cb94dfab3e 100644 --- a/Resources/Textures/Mobs/Customization/eyes.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/eyes.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "license": "CC-BY-SA-3.0","copyright": "Vox_eyes Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb and human_eyes taken from https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf", "size": {"x": 32, "y": 32}, "states": [{"name": "eyes", "directions": 4}, {"name":"no_eyes"},{"name": "vox_eyes_s", "directions": 4}]} +{"version": 1, "license": "CC-BY-SA-3.0","copyright": "Vox_eyes Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb and human_eyes taken from https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf", "size": {"x": 32, "y": 32}, "states": [{"name": "diona", "directions": 4}, {"name": "eyes", "directions": 4}, {"name":"no_eyes"},{"name": "vox_eyes_s", "directions": 4}]} diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/head_f.png index 4fa2350ab5..21bf1c4757 100644 Binary files a/Resources/Textures/Mobs/Species/Diona/parts.rsi/head_f.png and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/head_f.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/head_m.png index 4fa2350ab5..21bf1c4757 100644 Binary files a/Resources/Textures/Mobs/Species/Diona/parts.rsi/head_m.png and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/head_m.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_arm.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_arm.png index b6c4da9d41..15a67ac764 100644 Binary files a/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_arm.png and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_arm.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_foot.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_foot.png index 928804dc80..b509340358 100644 Binary files a/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_foot.png and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_foot.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_hand.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_hand.png index f251e8d3f9..c0ab4dbbf0 100644 Binary files a/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_hand.png and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_hand.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_leg.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_leg.png index 9a60a770d9..158ba14407 100644 Binary files a/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_leg.png and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_leg.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_arm.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_arm.png index 36c2665adf..97b7377f90 100644 Binary files a/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_arm.png and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_arm.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_foot.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_foot.png index 9eab9cd52b..76e1a6ec2e 100644 Binary files a/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_foot.png and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_foot.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_hand.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_hand.png index 03652891a0..0c94838ac8 100644 Binary files a/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_hand.png and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_hand.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_leg.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_leg.png index 03389a2282..7929ab6a63 100644 Binary files a/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_leg.png and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_leg.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/torso_f.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/torso_f.png index afba89a1d5..6aaf688a4a 100644 Binary files a/Resources/Textures/Mobs/Species/Diona/parts.rsi/torso_f.png and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/torso_f.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/torso_m.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/torso_m.png index afba89a1d5..6aaf688a4a 100644 Binary files a/Resources/Textures/Mobs/Species/Diona/parts.rsi/torso_m.png and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/torso_m.png differ