diff --git a/Resources/Locale/en-US/species/species.ftl b/Resources/Locale/en-US/species/species.ftl index f492959a4394..59eac9525ba3 100644 --- a/Resources/Locale/en-US/species/species.ftl +++ b/Resources/Locale/en-US/species/species.ftl @@ -11,3 +11,4 @@ species-name-moth = Moth Person species-name-skeleton = Skeleton species-name-vox = Vox species-name-ipc = IPC +species-name-daengati = Daengati \ No newline at end of file diff --git a/Resources/Locale/pt-BR/species/species.ftl b/Resources/Locale/pt-BR/species/species.ftl index bdc72cd97a1a..7d15aa7550f3 100644 --- a/Resources/Locale/pt-BR/species/species.ftl +++ b/Resources/Locale/pt-BR/species/species.ftl @@ -11,3 +11,4 @@ species-name-arachne = Aracne species-name-moth = Pessoa Mariposa species-name-skeleton = Esqueleto species-name-vox = Vox +species-name-daengati = Daengati diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml index fbf78c92e52f..126f7a153b68 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml @@ -3,7 +3,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: DeltaV/Mobs/Customization/Oni/oni_horns.rsi state: shaved @@ -13,7 +13,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: DeltaV/Mobs/Customization/Oni/oni_horns.rsi state: bull diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml index 3ca7a78b398e..5ac5035a722f 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml @@ -2,7 +2,7 @@ id: GauzeLefteyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -16,7 +16,7 @@ id: GauzeLefteyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -30,7 +30,7 @@ id: GauzeRighteyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -44,7 +44,7 @@ id: GauzeRighteyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -58,7 +58,7 @@ id: GauzeBlindfold bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Harpy, Vulpkanin] # Delta V - Felinid, Oni, Harpy, Vulpkanin + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Harpy, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Harpy, Vulpkanin coloring: default: type: @@ -72,7 +72,7 @@ id: GauzeShoulder bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -86,7 +86,7 @@ id: GauzeStomach bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -100,7 +100,7 @@ id: GauzeUpperArmRight bodyPart: RArm markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -114,7 +114,7 @@ id: GauzeLowerArmRight bodyPart: RArm, RHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -128,7 +128,7 @@ id: GauzeLeftArm bodyPart: LArm, LHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -142,7 +142,7 @@ id: GauzeLowerLegLeft bodyPart: LFoot markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -156,7 +156,7 @@ id: GauzeUpperLegLeft bodyPart: LLeg markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -170,7 +170,7 @@ id: GauzeUpperLegRight bodyPart: RLeg markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -184,7 +184,7 @@ id: GauzeLowerLegRight bodyPart: RFoot markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -198,7 +198,7 @@ id: GauzeBoxerWrapRight bodyPart: RHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -212,7 +212,7 @@ id: GauzeBoxerWrapLeft bodyPart: LHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/makeup.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/makeup.yml index 901bf6e75cf4..37abc6a7b575 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/makeup.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/makeup.yml @@ -2,7 +2,7 @@ id: MakeupLips bodyPart: Head markingCategory: Head - speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy] # Delta V - Felinid, Oni, Harpy + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Daengati] # Delta V - Felinid, Oni, Harpy coloring: default: type: @@ -16,7 +16,7 @@ id: MakeupBlush bodyPart: Head markingCategory: Head - speciesRestriction: [Dwarf, Human, Reptilian, SlimePerson, Felinid, Oni, Vulpkanin, Harpy] # Delta V - Felinid, Oni, Vulpkanin, Harpy + speciesRestriction: [Dwarf, Human, Reptilian, SlimePerson, Felinid, Oni, Vulpkanin, Harpy, Daengati] # Delta V - Felinid, Oni, Vulpkanin, Harpy coloring: default: type: @@ -30,7 +30,7 @@ id: MakeupNailPolishRight bodyPart: RHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -44,7 +44,7 @@ id: MakeupNailPolishLeft bodyPart: LHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml index 88d4ee493dbd..4985fa4e0549 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml @@ -3,7 +3,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_curved @@ -12,7 +12,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_curved_3tone_1 @@ -25,7 +25,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_bull @@ -34,7 +34,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_bull_3tone_1 @@ -47,7 +47,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: crowned @@ -57,7 +57,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: serket @@ -67,7 +67,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: serket_3tone_1 @@ -81,7 +81,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: pisces @@ -91,7 +91,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: pisces_2tone_1 @@ -103,7 +103,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: pisces_3tone_1 @@ -117,7 +117,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: virgo @@ -127,7 +127,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: virgo_3tone_1 @@ -141,7 +141,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: sagittarius @@ -151,7 +151,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: sagittarius_3tone_1 @@ -165,7 +165,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: vantas @@ -175,7 +175,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: vantas_3tone_1 @@ -189,7 +189,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: makara @@ -199,7 +199,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: makara_2tone_1 @@ -211,7 +211,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: makara_3tone_1 @@ -225,7 +225,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: nepeta @@ -235,7 +235,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: nepeta_3tone_1 @@ -249,7 +249,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: taurus @@ -259,7 +259,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: taurus_2tone_1 @@ -271,7 +271,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: taurus_3tone_1 @@ -285,7 +285,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: aries @@ -295,7 +295,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: aries_3tone_1 @@ -309,7 +309,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: tavris @@ -319,7 +319,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: tavris_3tone_1 @@ -333,7 +333,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: inclined @@ -343,7 +343,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: inclined_3tone_1 @@ -357,7 +357,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: wavy @@ -367,7 +367,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: wavy_2tone_1 @@ -379,7 +379,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: wavy_3tone_1 @@ -393,7 +393,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: antlers_2tone_1 @@ -405,7 +405,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: antlers_3tone_1 @@ -419,7 +419,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: unicorn @@ -429,7 +429,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: erebia @@ -439,7 +439,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: erebia_3tone_1 @@ -453,7 +453,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: erebia @@ -465,7 +465,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: double_thick @@ -475,7 +475,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: double_thick_2tone_1 @@ -487,7 +487,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: double_thick_3tone_1 @@ -501,7 +501,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: double_curved_3tone_1 @@ -515,7 +515,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: double_curved_outwards_3tone_1 diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml index 10016fb9851c..ab0a8a88918c 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml @@ -3,7 +3,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni] + speciesRestriction: [Daengati] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_standard @@ -13,7 +13,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni] + speciesRestriction: [Daengati] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_wide @@ -23,7 +23,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni] + speciesRestriction: [Daengati] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_small @@ -33,7 +33,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni] + speciesRestriction: [Daengati] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_upwards @@ -43,7 +43,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni] + speciesRestriction: [Daengati] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_tall @@ -53,7 +53,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni] + speciesRestriction: [Daengati] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_slanted @@ -63,7 +63,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni] + speciesRestriction: [Daengati] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_thin @@ -73,7 +73,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni] + speciesRestriction: [Daengati] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_large @@ -83,7 +83,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni] + speciesRestriction: [Daengati] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_none diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml index 79e0a0ff012b..9fb461ae4285 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml @@ -2,7 +2,7 @@ id: ScarEyeRight bodyPart: Head markingCategory: Head - speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni] # Delta V - Felinid, Oni, Harpy + speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni, Daengati] # Delta V - Felinid, Oni, Harpy followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi @@ -12,7 +12,7 @@ id: ScarEyeLeft bodyPart: Head markingCategory: Head - speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni] # Delta V - Felinid, Oni, Harpy + speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni, Daengati] # Delta V - Felinid, Oni, Harpy followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi @@ -22,7 +22,7 @@ id: ScarTopSurgeryShort bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] + speciesRestriction: [Human, Dwarf, Felinid, Oni, Daengati] sexRestriction: [Male] followSkinColor: true sprites: @@ -33,7 +33,7 @@ id: ScarTopSurgeryLong bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] + speciesRestriction: [Human, Dwarf, Felinid, Oni, Daengati] sexRestriction: [Male] followSkinColor: true sprites: @@ -44,7 +44,7 @@ id: ScarChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] + speciesRestriction: [Human, Dwarf, Felinid, Oni, Daengati] followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml index b9ffd9ba0d64..19e8a4bf7988 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml @@ -2,7 +2,7 @@ id: TattooHiveChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Daengati] # Delta V - Felinid, Oni coloring: default: type: @@ -16,7 +16,7 @@ id: TattooNightlingChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Daengati] # Delta V - Felinid, Oni coloring: default: type: @@ -30,7 +30,7 @@ id: TattooSilverburghLeftLeg bodyPart: LLeg markingCategory: Legs - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Daengati] # Delta V - Felinid, Oni coloring: default: type: @@ -44,7 +44,7 @@ id: TattooSilverburghRightLeg bodyPart: RLeg markingCategory: Legs - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Daengati] # Delta V - Felinid, Oni coloring: default: type: @@ -58,7 +58,7 @@ id: TattooCampbellLeftArm bodyPart: LArm markingCategory: Arms - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Daengati] # Delta V - Felinid, Oni coloring: default: type: @@ -72,7 +72,7 @@ id: TattooCampbellRightArm bodyPart: RArm markingCategory: Arms - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Daengati] # Delta V - Felinid, Oni coloring: default: type: @@ -86,7 +86,7 @@ id: TattooCampbellLeftLeg bodyPart: LLeg markingCategory: Legs - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Daengati] # Delta V - Felinid, Oni coloring: default: type: @@ -100,7 +100,7 @@ id: TattooCampbellRightLeg bodyPart: RLeg markingCategory: Legs - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Daengati] # Delta V - Felinid, Oni coloring: default: type: diff --git a/Resources/Prototypes/EstacaoPirata/Damage/modifier_sets.yml b/Resources/Prototypes/EstacaoPirata/Damage/modifier_sets.yml new file mode 100644 index 000000000000..ea9fa70ec236 --- /dev/null +++ b/Resources/Prototypes/EstacaoPirata/Damage/modifier_sets.yml @@ -0,0 +1,6 @@ +- type: damageModifierSet + id: Daengati + coefficients: + Heat: 0.6 + Cold: 1.3 + Piercing: 1.15 \ No newline at end of file diff --git a/Resources/Prototypes/EstacaoPirata/Entities/Mobs/Customization/Markings/Daengati.yml b/Resources/Prototypes/EstacaoPirata/Entities/Mobs/Customization/Markings/Daengati.yml new file mode 100644 index 000000000000..1b82db66e556 --- /dev/null +++ b/Resources/Prototypes/EstacaoPirata/Entities/Mobs/Customization/Markings/Daengati.yml @@ -0,0 +1,57 @@ +- type: marking + id: DaengatiTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Daengati] + sprites: + - sprite: Mobs/Customization/daengati_tail.rsi + state: daengati_tail + +- type: marking + id: DaengatiNightCrawlerTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Daengati] + sprites: + - sprite: Mobs/Customization/daengati_tail.rsi + state: nightcrawler_tail + +- type: marking + id: DaengatiHeartTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Daengati] + sprites: + - sprite: Mobs/Customization/daengati_tail.rsi + state: HeartTail + - sprite: Mobs/Customization/daengati_tail.rsi + state: HeartTail-tip + +- type: marking + id: DaengatiDragonLong + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Daengati] + sprites: + - sprite: Mobs/Customization/daengati_tail.rsi + state: DragonLong + #- sprite: Mobs/Customization/daengati_tail.rsi + # state: DragonLong-tip + +- type: marking + id: DaengatiRaboCortado + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Daengati] + sprites: + - sprite: Mobs/Customization/daengati_tail.rsi + state: RaboCortado + +- type: marking + id: DaengatiRaboEnrolado + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Daengati] + sprites: + - sprite: Mobs/Customization/daengati_tail.rsi + state: RaboEnrolado diff --git a/Resources/Prototypes/EstacaoPirata/Mobs/Player/Daengati.yml b/Resources/Prototypes/EstacaoPirata/Mobs/Player/Daengati.yml new file mode 100644 index 000000000000..847863fe81e1 --- /dev/null +++ b/Resources/Prototypes/EstacaoPirata/Mobs/Player/Daengati.yml @@ -0,0 +1,29 @@ +- type: entity + save: false + name: Urist McTief + parent: MobDaengatiBase + id: MobDaengati + components: + - type: CombatMode + - type: MindContainer + showExamineInfo: true + - type: Input + context: "human" + - type: MobMover + - type: InputMover + - type: Respirator + damage: + types: + Asphyxiation: 1.0 + damageRecovery: + types: + Asphyxiation: -1.0 + - type: Alerts + - type: Actions + - type: Eye + - type: CameraRecoil + - type: Examiner + - type: CanHostGuardian + - type: NpcFactionMember + factions: + - NanoTrasen diff --git a/Resources/Prototypes/EstacaoPirata/Mobs/Species/Daengati.yml b/Resources/Prototypes/EstacaoPirata/Mobs/Species/Daengati.yml new file mode 100644 index 000000000000..830522bf01e8 --- /dev/null +++ b/Resources/Prototypes/EstacaoPirata/Mobs/Species/Daengati.yml @@ -0,0 +1,49 @@ +- type: entity + parent: BaseMobHuman + name: Urist McDemon + id: MobDaengatiBase + abstract: true + components: + - type: HumanoidAppearance + species: Daengati + - type: MeleeWeapon + soundHit: + path: /Audio/Weapons/pierce.ogg + angle: 30 + animation: WeaponArcClaw + damage: + types: + Slash: 3 + Heat: 3 + - type: Body + prototype: Human + - type: TypingIndicator + proto: oni + - type: Temperature + heatDamageThreshold: 535 + coldDamageThreshold: 270 + currentTemperature: 310.15 + specificHeat: 42 + coldDamage: + types: + Cold : 0.75 #o padrão é 0.1 + heatDamage: + types: + Heat : 0.5 #O padrão é 1.5 + - type: Damageable + damageModifierSet: Daengati + - type: LanguageKnowledge + speaks: + - GalacticCommon + - Nekomimetic #Alterar essa linguagem para uma nova + understands: + - GalacticCommon + - Nekomimetic #Alterar essa linguagem para uma nova + +- type: entity + save: false + name: Urist McDemon + parent: MobHumanDummy + id: MobDaengatiDummy + noSpawn: true + description: A dummy Daengati meant to be used in character setup. diff --git a/Resources/Prototypes/EstacaoPirata/Species/Daengati.yml b/Resources/Prototypes/EstacaoPirata/Species/Daengati.yml new file mode 100644 index 000000000000..357c61a627ea --- /dev/null +++ b/Resources/Prototypes/EstacaoPirata/Species/Daengati.yml @@ -0,0 +1,48 @@ +- type: species + id: Daengati + name: species-name-daengati + roundStart: true + prototype: MobDaengati #Alterar + dollPrototype: MobDaengatiDummy #Alterar + markingLimits: MobDaengatiMarkingLimits + sprites: MobHumanSprites + skinColoration: Hues + maleFirstNames: names_oni_male + femaleFirstNames: names_oni_female + lastNames: names_oni_location + naming: LastNoFirst + maxHeight: 1.1 + +- type: markingPoints + id: MobDaengatiMarkingLimits + points: + Hair: + points: 1 + required: false + FacialHair: + points: 1 + required: false + HeadTop: + points: 1 + required: true + defaultMarkings: [ OniHornPisces ] + HeadSide: + points: 1 + required: true + defaultMarkings: [ PointyEarsStandard ] + Snout: + points: 2 + required: false + Chest: + points: 1 + required: false + Legs: + points: 6 + required: false + Arms: + points: 6 + required: false + Tail: + points: 1 + required: true + defaultMarkings: [ DaengatiTail ] diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml index 39dca5ef9ab5..ee755466a5ea 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml @@ -3,7 +3,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: single_curved @@ -13,7 +13,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: single_left_curved @@ -23,7 +23,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: single_right_curved @@ -33,7 +33,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: double_curved_outwards @@ -43,7 +43,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: double_curved @@ -53,7 +53,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: double_left_broke_curved @@ -63,7 +63,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: double_right_broke_curved diff --git a/Resources/Textures/Mobs/Customization/daengati_tail.rsi/DragonLong-tip.png b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/DragonLong-tip.png new file mode 100644 index 000000000000..fb6f81140585 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/DragonLong-tip.png differ diff --git a/Resources/Textures/Mobs/Customization/daengati_tail.rsi/DragonLong.png b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/DragonLong.png new file mode 100644 index 000000000000..6eb287e7ae3c Binary files /dev/null and b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/DragonLong.png differ diff --git a/Resources/Textures/Mobs/Customization/daengati_tail.rsi/HeartTail-tip.png b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/HeartTail-tip.png new file mode 100644 index 000000000000..ac456da16779 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/HeartTail-tip.png differ diff --git a/Resources/Textures/Mobs/Customization/daengati_tail.rsi/HeartTail.png b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/HeartTail.png new file mode 100644 index 000000000000..c9ff74026505 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/HeartTail.png differ diff --git a/Resources/Textures/Mobs/Customization/daengati_tail.rsi/RaboCortado.png b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/RaboCortado.png new file mode 100644 index 000000000000..fa088489daab Binary files /dev/null and b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/RaboCortado.png differ diff --git a/Resources/Textures/Mobs/Customization/daengati_tail.rsi/RaboEnrolado.png b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/RaboEnrolado.png new file mode 100644 index 000000000000..068c95e65c77 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/RaboEnrolado.png differ diff --git a/Resources/Textures/Mobs/Customization/daengati_tail.rsi/daengati_tail.png b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/daengati_tail.png new file mode 100644 index 000000000000..0fe6e85556f5 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/daengati_tail.png differ diff --git a/Resources/Textures/Mobs/Customization/daengati_tail.rsi/meta.json b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/meta.json new file mode 100644 index 000000000000..3de592d5f87c --- /dev/null +++ b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Tails by Wells Chaplon (discord: wellnachapara)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "daengati_tail", + "directions": 4 + }, + { + "name": "nightcrawler_tail", + "directions": 4 + }, + { + "name": "HeartTail", + "directions": 4 + }, + { + "name": "HeartTail-tip", + "directions": 4 + }, + { + "name": "DragonLong", + "directions": 4 + }, + { + "name": "DragonLong-tip", + "directions": 4 + }, + { + "name": "RaboCortado", + "directions": 4 + }, + { + "name": "RaboEnrolado", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Customization/daengati_tail.rsi/nightcrawler_tail.png b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/nightcrawler_tail.png new file mode 100644 index 000000000000..2ace02d38409 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/nightcrawler_tail.png differ