diff --git a/Resources/Locale/en-US/markings/diona.ftl b/Resources/Locale/en-US/markings/diona.ftl index 3cf51c6dd8..55b530decf 100644 --- a/Resources/Locale/en-US/markings/diona.ftl +++ b/Resources/Locale/en-US/markings/diona.ftl @@ -11,4 +11,73 @@ marking-DionaFlowersBody-flowers_body = Diona Chest (Flowers) marking-DionaFlowersBody = Diona Chest (Flowers) marking-DionaLeafCover-leaf_cover = Diona Chest (Leaf) -marking-DionaLeafCover = Diona Chest (Leaf) \ No newline at end of file +marking-DionaLeafCover = Diona Chest (Leaf) + +marking-DionaBloomHead-bloom = Diona Everbloom (Flower) +marking-DionaBloomHead = Diona Everbloom (Flower) + +marking-DionaBracketHead-bracket = Diona Bracket (Mushrooms) +marking-DionaBracketHead = Diona Bracket (Mushrooms) + +marking-DionaBrushHead-brush = Diona Brush (Lians) +marking-DionaBrushHead = Diona Brush (Lians) + +marking-DionaCornflowerHead-cornflower = Diona Cornflowers (Flowers) +marking-DionaCornflowerHead = Diona Cornflowers (Flowers) + +marking-DionaFicusHead-ficus = Diona Ficus (Leafs) +marking-DionaFicusHead = Diona Ficus (Leafs) + +marking-DionaGarlandHead-garland = Diona Garland (Flowers) +marking-DionaGarlandHead = Diona Garland (Flowers) + +marking-DionaKingHead-king = Diona Flowerking (Flower) +marking-DionaKingHead = Diona Flowerking (Flower) + +marking-DionaLaurelHead-laurel = Diona Laurel (Leafs) +marking-DionaLaurelHead = Diona Laurel (Leafs) + +marking-DionaLeafyHeadTop-leafy = Diona Leafy (Leafs) +marking-DionaLeafyHeadTop = Diona Leafy (Leafs) + +marking-DionaLotusHead-lotus = Diona Lotus (Flower) +marking-DionaLotusHead = Diona Lotus (Flower) + +marking-DionaMeadowHeadTop-meadow = Diona Meadow +marking-DionaMeadowHeadTop = Diona Meadow + +marking-DionaOakHead-oak = Diona Oak (Snag) +marking-DionaOakHead = Diona Oak (Snag) + +marking-DionaPalmHead-palm = Diona Palmhead (Leafs) +marking-DionaPalmHead = Diona Palmhead (Leafs) + +marking-DionaRootHead-root = Diona Root (Roots) +marking-DionaRootHead = Diona Root (Roots) + +marking-DionaRoseHead-rose = Diona Rose (Flwoer) +marking-DionaRoseHead = Diona Rose (Flwoer) + +marking-DionaRoseyHead-rosey = Diona Rosey (Flwoers) +marking-DionaRoseyHead = Diona Rosey (Flwoers) + +marking-DionaShrubHeadTop-shrub = Diona Shrub (Thorns) +marking-DionaShrubHeadTop = Diona Shrub (Thorns) + +marking-DionaSpinnerHeadSide-spinner = Diona Spinner +marking-DionaSpinnerHeadSide = Diona Spinner + +marking-DionaSproutHeadSide-sprout = Diona Sprout +marking-DionaSproutHeadSide = Diona Sprout + +marking-DionaVineHeadTop-vine = Diona Vines (Vines) +marking-DionaVineHeadTop = Diona Vines (Vines) + +marking-DionaVinelHead-vinel = Diona Vines Long (Vines) +marking-DionaVinelHead = Diona Vines Long (Vines) + +marking-DionaVinesHead-vines = Diona Vines Short (Vines) +marking-DionaVinesHead = Diona Vines Short (Vines) + +marking-DionaWildflowerHead-wildflower = Diona Wild Flowers (Flowers) +marking-DionaWildflowerHead = Diona Wild Flowers (Flowers) diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/diona.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/diona.yml index f81dc13426..bf417b7569 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/diona.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/diona.yml @@ -41,4 +41,211 @@ speciesRestriction: [Diona] sprites: - sprite: Mobs/Customization/diona.rsi - state: leaf_cover \ No newline at end of file + state: leaf_cover + +- type: marking + id: DionaBloomHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: bloom + +- type: marking + id: DionaBracketHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: bracket + +- type: marking + id: DionaBrushHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: brush + +- type: marking + id: DionaCornflowerHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: cornflower + +- type: marking + id: DionaFicusHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: ficus + +- type: marking + id: DionaGarlandHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: garland + +- type: marking + id: DionaKingHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: king + +- type: marking + id: DionaLaurelHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: laurel + +- type: marking + id: DionaLeafyHeadTop + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: leafy + +- type: marking + id: DionaLotusHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: lotus + +- type: marking + id: DionaMeadowHeadTop + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: meadow + +- type: marking + id: DionaOakHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: oak + +- type: marking + id: DionaPalmHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: palm + +- type: marking + id: DionaRootHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: root + +- type: marking + id: DionaRoseHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: rose + +- type: marking + id: DionaRoseyHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: rosey + +- type: marking + id: DionaShrubHeadTop + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: shrub + +- type: marking + id: DionaSpinnerHeadSide + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: spinner + +- type: marking + id: DionaSproutHeadSide + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: sprout + +- type: marking + id: DionaVineHeadTop + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: vine + +- type: marking + id: DionaVinelHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: vinel + +- type: marking + id: DionaVinesHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: vines + +- type: marking + id: DionaWildflowerHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: wildflower diff --git a/Resources/Prototypes/Species/diona.yml b/Resources/Prototypes/Species/diona.yml index a44e06982a..5d91f223f9 100644 --- a/Resources/Prototypes/Species/diona.yml +++ b/Resources/Prototypes/Species/diona.yml @@ -16,6 +16,8 @@ id: MobDionaSprites sprites: Head: MobDionaHead + HeadTop: MobHumanoidAnyMarking + HeadSide: MobHumanoidAnyMarking Chest: MobDionaTorso LArm: MobDionaLArm RArm: MobDionaRArm @@ -30,9 +32,15 @@ id: MobDionaMarkingLimits onlyWhitelisted: true points: + Head: + points: 2 + required: false HeadTop: points: 1 required: false + HeadSide: + points: 1 + required: false Chest: points: 1 required: false diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/bloom.png b/Resources/Textures/Mobs/Customization/diona.rsi/bloom.png new file mode 100644 index 0000000000..a688a18f85 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/bloom.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/bracket.png b/Resources/Textures/Mobs/Customization/diona.rsi/bracket.png new file mode 100644 index 0000000000..d4dde690be Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/bracket.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/brush.png b/Resources/Textures/Mobs/Customization/diona.rsi/brush.png new file mode 100644 index 0000000000..9319fedcfb Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/brush.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/cornflower.png b/Resources/Textures/Mobs/Customization/diona.rsi/cornflower.png new file mode 100644 index 0000000000..b64099b2e3 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/cornflower.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/ficus.png b/Resources/Textures/Mobs/Customization/diona.rsi/ficus.png new file mode 100644 index 0000000000..8f2138b1d4 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/ficus.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/garland.png b/Resources/Textures/Mobs/Customization/diona.rsi/garland.png new file mode 100644 index 0000000000..2eae064e99 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/garland.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/king.png b/Resources/Textures/Mobs/Customization/diona.rsi/king.png new file mode 100644 index 0000000000..996fb9bd9b Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/king.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/laurel.png b/Resources/Textures/Mobs/Customization/diona.rsi/laurel.png new file mode 100644 index 0000000000..3af39f550a Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/laurel.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/leafy.png b/Resources/Textures/Mobs/Customization/diona.rsi/leafy.png new file mode 100644 index 0000000000..c8c8eac4ef Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/leafy.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/lotus.png b/Resources/Textures/Mobs/Customization/diona.rsi/lotus.png new file mode 100644 index 0000000000..660a29a492 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/lotus.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/meadow.png b/Resources/Textures/Mobs/Customization/diona.rsi/meadow.png new file mode 100644 index 0000000000..5cee81dcf5 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/meadow.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/meta.json b/Resources/Textures/Mobs/Customization/diona.rsi/meta.json index f26dafca19..64f27eeb5f 100644 --- a/Resources/Textures/Mobs/Customization/diona.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/diona.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/commit/38051f45d3b26bd31f6e292239f43adb36ff01fe, modified by EmoGarbage", + "copyright": "flowers_body, flowers_head, leaf_cover, thorns_body, thorns_head from https://github.com/Citadel-Station-13/Citadel-Station-13-RP/commit/38051f45d3b26bd31f6e292239f43adb36ff01fe, modified by EmoGarbage and other from https://github.com/TauCetiStation/TauCetiClassic/blob/a8c097fd0e749dcd6f66f05cf5325e51f6b081dd/icons/mob/human_face.dmi", "size": { "x": 32, "y": 32 @@ -26,6 +26,98 @@ { "name": "thorns_head", "directions": 4 + }, + { + "name": "bloom", + "directions": 4 + }, + { + "name": "bracket", + "directions": 4 + }, + { + "name": "brush", + "directions": 4 + }, + { + "name": "cornflower", + "directions": 4 + }, + { + "name": "ficus", + "directions": 4 + }, + { + "name": "garland", + "directions": 4 + }, + { + "name": "king", + "directions": 4 + }, + { + "name": "laurel", + "directions": 4 + }, + { + "name": "leafy", + "directions": 4 + }, + { + "name": "lotus", + "directions": 4 + }, + { + "name": "meadow", + "directions": 4 + }, + { + "name": "oak", + "directions": 4 + }, + { + "name": "palm", + "directions": 4 + }, + { + "name": "root", + "directions": 4 + }, + { + "name": "rose", + "directions": 4 + }, + { + "name": "rosey", + "directions": 4 + }, + { + "name": "shrub", + "directions": 4 + }, + { + "name": "spinner", + "directions": 4 + }, + { + "name": "sprout", + "directions": 4 + }, + { + "name": "vine", + "directions": 4 + }, + { + "name": "vinel", + "directions": 4 + }, + { + "name": "vines", + "directions": 4 + }, + { + "name": "wildflower", + "directions": 4 } ] } diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/oak.png b/Resources/Textures/Mobs/Customization/diona.rsi/oak.png new file mode 100644 index 0000000000..db96010601 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/oak.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/palm.png b/Resources/Textures/Mobs/Customization/diona.rsi/palm.png new file mode 100644 index 0000000000..95755371de Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/palm.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/root.png b/Resources/Textures/Mobs/Customization/diona.rsi/root.png new file mode 100644 index 0000000000..2c5766edf4 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/root.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/rose.png b/Resources/Textures/Mobs/Customization/diona.rsi/rose.png new file mode 100644 index 0000000000..093425cdb4 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/rose.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/rosey.png b/Resources/Textures/Mobs/Customization/diona.rsi/rosey.png new file mode 100644 index 0000000000..edb2ff7dc5 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/rosey.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/shrub.png b/Resources/Textures/Mobs/Customization/diona.rsi/shrub.png new file mode 100644 index 0000000000..a880719b9d Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/shrub.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/spinner.png b/Resources/Textures/Mobs/Customization/diona.rsi/spinner.png new file mode 100644 index 0000000000..ebf4ee544a Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/spinner.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/sprout.png b/Resources/Textures/Mobs/Customization/diona.rsi/sprout.png new file mode 100644 index 0000000000..07211bda0b Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/sprout.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/vine.png b/Resources/Textures/Mobs/Customization/diona.rsi/vine.png new file mode 100644 index 0000000000..4db7f40032 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/vine.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/vinel.png b/Resources/Textures/Mobs/Customization/diona.rsi/vinel.png new file mode 100644 index 0000000000..b6bf53d193 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/vinel.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/vines.png b/Resources/Textures/Mobs/Customization/diona.rsi/vines.png new file mode 100644 index 0000000000..03861dc200 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/vines.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/wildflower.png b/Resources/Textures/Mobs/Customization/diona.rsi/wildflower.png new file mode 100644 index 0000000000..1b4c353788 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/wildflower.png differ