-
Notifications
You must be signed in to change notification settings - Fork 597
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Delta V Species Gasps (#2313) Adds gasps to felinids, harpies, vulpkanins, and rodentia. * https://github.com/DeltaV-Station/Delta-v/pull/2313/files * Add luna moth wings to moths (#2478) * add selene wings * brighten primary and secondary recolorable sprites * correct meta.json whitespace * bruh * hopefully correct for real this time * Moth markings update (#349) * Nyano port of every moth markings * update path * Classic-ify everything * Make sprite 32, update locale, classic * Truly make them uncolorable moth happy +1 * Remove duplicate coloring * nyano moth ftl: consistency with existing names * Missed a comment * Fix Jungle left leg marking ID/FTL mismatch --------- Co-authored-by: Emily <[email protected]> Co-authored-by: boogiebogus <[email protected]> Co-authored-by: Fluffiest Floofers <[email protected]> Co-authored-by: Whatstone <[email protected]>
- Loading branch information
5 people
authored
Dec 28, 2024
1 parent
3102b3f
commit 5f5199f
Showing
139 changed files
with
2,656 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| marking-MothWingsClassicSelene = Wings (Selene, Classic) | ||
| marking-MothWingsSelene-selene_primary = Primary | ||
| marking-MothWingsSelene-selene_secondary = Secondary | ||
| marking-MothWingsSelene-selene_tertiary = Tertiary | ||
| marking-MothWingsSelene = Wings (Selene) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,150 @@ | ||
| marking-MothAntennasClassicAspen = Antennas (Aspen, Classic) | ||
| marking-MothAntennasClassicBrown = Antennas (Brown, Classic) | ||
| # Frontier: Deathshead < Death's-Head | ||
| marking-MothAntennasClassicDeathshead = Antennas (Death's-Head, Classic) | ||
| marking-MothAntennasClassicFeathery = Antennas (Feathery, Classic) | ||
| marking-MothAntennasClassicFirewatch = Antennas (Firewatch, Classic) | ||
| marking-MothAntennasClassicGothic = Antennas (Gothic, Classic) | ||
| marking-MothAntennasClassicJungle = Antennas (Jungle, Classic) | ||
| marking-MothAntennasClassicLovers = Antennas (Lovers, Classic) | ||
| marking-MothAntennasClassicMint = Antennas (Mint, Classic) | ||
| marking-MothAntennasClassicMoffra = Antennas (Moffra, Classic) | ||
| marking-MothAntennasClassicMoonfly = Antennas (Moonfly, Classic) | ||
| # Frontier: Oakworm < Oak Worm | ||
| marking-MothAntennasClassicOakworm = Antennas (Oak Worm, Classic) | ||
| marking-MothAntennasClassicPlain = Antennas (Plain, Classic) | ||
| marking-MothAntennasClassicPlasmafire = Antennas (Plasmafire, Classic) | ||
| marking-MothAntennasClassicPoison = Antennas (Poison, Classic) | ||
| marking-MothAntennasClassicReddish = Antennas (Reddish, Classic) | ||
| marking-MothAntennasClassicRegal = Antennas (Regal, Classic) | ||
| marking-MothAntennasClassicRosy = Antennas (Rosy, Classic) | ||
| marking-MothAntennasClassicRoyal = Antennas (Royal, Classic) | ||
| marking-MothAntennasClassicSnow = Antennas (Snow, Classic) | ||
| # Frontier: Whitefly < White Fly | ||
| marking-MothAntennasClassicWhitefly = Antennas (White Fly, Classic) | ||
| marking-MothAntennasClassicWitchking = Antennas (Witch King, Classic) | ||
| marking-MothWingsClassicAspen = Wings (Aspen, Classic) | ||
| marking-MothWingsClassicAtlas = Wings (Atlas, Classic) | ||
| marking-MothWingsClassicBrown = Wings (Brown, Classic) | ||
| # Frontier: Deathshead < Death's-Head | ||
| marking-MothWingsClassicDeathshead = Wings (Death's-Head, Classic) | ||
| marking-MothWingsClassicFeathery = Wings (Feathery, Classic) | ||
| marking-MothWingsClassicFirewatch = Wings (Firewatch, Classic) | ||
| marking-MothWingsClassicGothic = Wings (Gothic, Classic) | ||
| marking-MothWingsClassicJungle = Wings (Jungle, Classic) | ||
| marking-MothWingsClassicLovers = Wings (Lovers, Classic) | ||
| marking-MothWingsClassicLuna = Wings (Luna, Classic) | ||
| marking-MothWingsClassicMint = Wings (Mint, Classic) | ||
| marking-MothWingsClassicMonarch = Wings (Monarch, Classic) | ||
| marking-MothWingsClassicMoonfly = Wings (Moonfly, Classic) | ||
| marking-MothWingsClassicMoffra = Wings (Moffra, Classic) | ||
| # Frontier: Oakworm < Oak Worm | ||
| marking-MothWingsClassicOakworm = Wings (Oak Worm, Classic) | ||
| marking-MothWingsClassicPlain = Wings (Plain, Classic) | ||
| marking-MothWingsClassicPlasmafire = Wings (Plasmafire, Classic) | ||
| marking-MothWingsClassicPoison = Wings (Poison, Classic) | ||
| marking-MothWingsClassicRagged = Wings (Ragged, Classic) | ||
| marking-MothWingsClassicReddish = Wings (Reddish, Classic) | ||
| marking-MothWingsClassicRosy = Wings (Rosy, Classic) | ||
| marking-MothWingsClassicRoyal = Wings (Royal, Classic) | ||
| marking-MothWingsClassicSnow = Wings (Snow, Classic) | ||
| # Frontier: Whitefly < White Fly | ||
| marking-MothWingsClassicWhitefly = Wings (Whitefly, Classic) | ||
| marking-MothWingsClassicWitchking = Wings (Witch King, Classic) | ||
| # Frontier: Deathshead < Death's-Head | ||
| marking-MothHeadClassicDeathshead = Moth Head (Death's-Head, Classic) | ||
| marking-MothChestClassicDeathshead = Moth Chest (Death's-Head, Classic) | ||
| marking-MothLArmClassicDeathshead = Moth Left Arm (Death's-Head, Classic) | ||
| marking-MothRArmClassicDeathshead = Moth Right Arm (Death's-Head, Classic) | ||
| marking-MothLLegClassicDeathshead = Moth Left Leg (Death's-Head, Classic) | ||
| marking-MothRLegClassicDeathshead = Moth Right Leg (Death's-Head, Classic) | ||
| marking-MothHeadClassicFirewatch = Moth Head (Firewatch, Classic) | ||
| marking-MothChestClassicFirewatch = Moth Chest (Firewatch, Classic) | ||
| marking-MothLArmClassicFirewatch = Moth Left Arm (Firewatch, Classic) | ||
| marking-MothRArmClassicFirewatch = Moth Right Arm (Firewatch, Classic) | ||
| marking-MothLLegClassicFirewatch = Moth Left Leg (Firewatch, Classic) | ||
| marking-MothRLegClassicFirewatch = Moth Right Leg (Firewatch, Classic) | ||
| marking-MothHeadClassicGothic = Moth Head (Gothic, Classic) | ||
| marking-MothChestClassicGothic = Moth Chest (Gothic, Classic) | ||
| marking-MothLArmClassicGothic = Moth Left Arm (Gothic, Classic) | ||
| marking-MothRArmClassicGothic = Moth Right Arm (Gothic, Classic) | ||
| marking-MothLLegClassicGothic = Moth Left Leg (Gothic, Classic) | ||
| marking-MothRLegClassicGothic = Moth Right Leg (Gothic, Classic) | ||
| marking-MothHeadClassicJungle = Moth Head (Jungle, Classic) | ||
| marking-MothChestClassicJungle = Moth Chest (Jungle, Classic) | ||
| marking-MothLArmClassicJungle = Moth Left Arm (Jungle, Classic) | ||
| marking-MothRArmClassicJungle = Moth Right Arm (Jungle, Classic) | ||
| marking-MothLLegClassicJungle = Moth Left Leg (Jungle, Classic) | ||
| marking-MothRLegClassicJungle = Moth Right Leg (Jungle, Classic) | ||
| marking-MothHeadClassicLovers = Moth Head (Lovers, Classic) | ||
| marking-MothChestClassicLovers = Moth Chest (Lovers, Classic) | ||
| marking-MothLArmClassicLovers = Moth Left Arm (Lovers, Classic) | ||
| marking-MothRArmClassicLovers = Moth Right Arm (Lovers, Classic) | ||
| marking-MothLLegClassicLovers = Moth Left Leg (Lovers, Classic) | ||
| marking-MothRLegClassicLovers = Moth Right Leg (Lovers, Classic) | ||
| marking-MothHeadClassicMoonfly = Moth Head (Moonfly, Classic) | ||
| marking-MothChestClassicMoonfly = Moth Chest (Moonfly, Classic) | ||
| marking-MothLArmClassicMoonfly = Moth Left Arm (Moonfly, Classic) | ||
| marking-MothRArmClassicMoonfly = Moth Right Arm (Moonfly, Classic) | ||
| marking-MothLLegClassicMoonfly = Moth Left Leg (Moonfly, Classic) | ||
| marking-MothRLegClassicMoonfly = Moth Right Leg (Moonfly, Classic) | ||
| # Frontier: Oakworm < Oak Worm | ||
| marking-MothHeadClassicOakworm = Moth Head (Oak Worm, Classic) | ||
| marking-MothChestClassicOakworm = Moth Chest (Oak Worm, Classic) | ||
| marking-MothLArmClassicOakworm = Moth Left Arm (Oak Worm, Classic) | ||
| marking-MothRArmClassicOakworm = Moth Right Arm (Oak Worm, Classic) | ||
| marking-MothLLegClassicOakworm = Moth Left Leg (Oak Worm, Classic) | ||
| marking-MothRLegClassicOakworm = Moth Right Leg (Oak Worm, Classic) | ||
| marking-MothHeadClassicPoison = Moth Head (Poison, Classic) | ||
| marking-MothChestClassicPoison = Moth Chest (Poison, Classic) | ||
| marking-MothLArmClassicPoison = Moth Left Arm (Poison, Classic) | ||
| marking-MothRArmClassicPoison = Moth Right Arm (Poison, Classic) | ||
| marking-MothLLegClassicPoison = Moth Left Leg (Poison, Classic) | ||
| marking-MothRLegClassicPoison = Moth Right Leg (Poison, Classic) | ||
| marking-MothHeadClassicRagged = Moth Head (Ragged, Classic) | ||
| marking-MothChestClassicRagged = Moth Chest (Ragged, Classic) | ||
| marking-MothLArmClassicRagged = Moth Left Arm (Ragged, Classic) | ||
| marking-MothRArmClassicRagged = Moth Right Arm (Ragged, Classic) | ||
| marking-MothLLegClassicRagged = Moth Left Leg (Ragged, Classic) | ||
| marking-MothRLegClassicRagged = Moth Right Leg (Ragged, Classic) | ||
| marking-MothHeadClassicReddish = Moth Head (Reddish, Classic) | ||
| marking-MothChestClassicReddish = Moth Chest (Reddish, Classic) | ||
| marking-MothLArmClassicReddish = Moth Left Arm (Reddish, Classic) | ||
| marking-MothRArmClassicReddish = Moth Right Arm (Reddish, Classic) | ||
| marking-MothLLegClassicReddish = Moth Left Leg (Reddish, Classic) | ||
| marking-MothRLegClassicReddish = Moth Right Leg (Reddish, Classic) | ||
| marking-MothHeadClassicRoyal = Moth Head (Royal, Classic) | ||
| marking-MothChestClassicRoyal = Moth Chest (Royal, Classic) | ||
| marking-MothLArmClassicRoyal = Moth Left Arm (Royal, Classic) | ||
| marking-MothRArmClassicRoyal = Moth Right Arm (Royal, Classic) | ||
| marking-MothLLegClassicRoyal = Moth Left Leg (Royal, Classic) | ||
| marking-MothRLegClassicRoyal = Moth Right Leg (Royal, Classic) | ||
| # Frontier: Whitefly < White Fly | ||
| marking-MothHeadClassicWhitefly = Moth Head (White Fly, Classic) | ||
| marking-MothChestClassicWhitefly = Moth Chest (White Fly, Classic) | ||
| marking-MothLArmClassicWhitefly = Moth Left Arm (White Fly, Classic) | ||
| marking-MothRArmClassicWhitefly = Moth Right Arm (White Fly, Classic) | ||
| marking-MothLLegClassicWhitefly = Moth Left Leg (White Fly, Classic) | ||
| marking-MothRLegClassicWhitefly = Moth Right Leg (White Fly, Classic) | ||
| # Frontier: Witchking < Witch King | ||
| marking-MothHeadClassicWitchking = Moth Head (Witch King, Classic) | ||
| marking-MothChestClassicWitchking = Moth Chest (Witch King, Classic) | ||
| marking-MothLArmClassicWitchking = Moth Left Arm (Witch King, Classic) | ||
| marking-MothRArmClassicWitchking = Moth Right Arm (Witch King, Classic) | ||
| marking-MothLLegClassicWitchking = Moth Left Leg (Witch King, Classic) | ||
| marking-MothRLegClassicWitchking = Moth Right Leg (Witch King, Classic) |
27 changes: 27 additions & 0 deletions
27
Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/moth.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| - type: marking | ||
| id: MothWingsClassicSelene | ||
| bodyPart: Tail | ||
| markingCategory: Tail | ||
| forcedColoring: true | ||
| speciesRestriction: [Moth] | ||
| coloring: | ||
| default: | ||
| type: | ||
| !type:SimpleColoring | ||
| color: "#FFFFFF" | ||
| sprites: | ||
| - sprite: DeltaV/Mobs/Customization/Moth/moth_wings.rsi | ||
| state: selene | ||
|
|
||
| - type: marking | ||
| id: MothWingsSelene | ||
| bodyPart: Tail | ||
| markingCategory: Tail | ||
| speciesRestriction: [Moth] | ||
| sprites: | ||
| - sprite: DeltaV/Mobs/Customization/Moth/moth_wings.rsi | ||
| state: selene_primary | ||
| - sprite: DeltaV/Mobs/Customization/Moth/moth_wings.rsi | ||
| state: selene_secondary | ||
| - sprite: DeltaV/Mobs/Customization/Moth/moth_wings.rsi | ||
| state: selene_tertiary |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.