From 9ee7fa044f6d685c92ec92db7585d146fc857269 Mon Sep 17 00:00:00 2001 From: Adrian16199 <144424013+Adrian16199@users.noreply.github.com> Date: Sun, 17 Dec 2023 22:59:15 +0100 Subject: [PATCH 1/4] Allows non-wizden species to wear the new markings. (#568) I do have to note that I did remember to not put arms and even just incase, legs markings on harpys. Also added notes since well. those were changed on a wizden file and not notin it isnt the way, atleast I think so. --- .../Mobs/Customization/Markings/gauze.yml | 26 +++++++++---------- .../Mobs/Customization/Markings/scars.yml | 4 +-- .../Mobs/Customization/Markings/tattoos.yml | 20 +++++++------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml index 3815b4c9b67..28d8b62e1d7 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: Head - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Harpy, Vulpkanin] # Delta V - Felinid, Oni, Harpy, Vulpkanin coloring: default: type: @@ -16,7 +16,7 @@ id: GauzeLefteyeTape bodyPart: Eyes markingCategory: Head - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Harpy, Vulpkanin] # Delta V - Felinid, Oni, Harpy, Vulpkanin coloring: default: type: @@ -30,7 +30,7 @@ id: GauzeRighteyePatch bodyPart: Eyes markingCategory: Head - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Harpy, Vulpkanin] # Delta V - Felinid, Oni, Harpy, Vulpkanin coloring: default: type: @@ -44,7 +44,7 @@ id: GauzeRighteyeTape bodyPart: Eyes markingCategory: Head - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Harpy, Vulpkanin] # Delta V - Felinid, Oni, Harpy, Vulpkanin coloring: default: type: @@ -58,7 +58,7 @@ id: GauzeShoulder bodyPart: Chest markingCategory: Chest - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Harpy, Vulpkanin] # Delta V - Felinid, Oni, Harpy, Vulpkanin coloring: default: type: @@ -72,7 +72,7 @@ id: GauzeStomach bodyPart: Chest markingCategory: Chest - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Harpy, Vulpkanin] # Delta V - Felinid, Oni, Harpy, Vulpkanin coloring: default: type: @@ -86,7 +86,7 @@ id: GauzeUpperArmRight bodyPart: RArm markingCategory: Arms - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -100,7 +100,7 @@ id: GauzeLowerArmRight bodyPart: RArm, RHand markingCategory: Arms - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -114,7 +114,7 @@ id: GauzeLeftArm bodyPart: LArm, LHand markingCategory: Arms - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -128,7 +128,7 @@ id: GauzeLowerLegLeft bodyPart: LFoot markingCategory: Legs - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -142,7 +142,7 @@ id: GauzeUpperLegLeft bodyPart: LLeg markingCategory: Legs - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -156,7 +156,7 @@ id: GauzeUpperLegRight bodyPart: RLeg markingCategory: Legs - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -170,7 +170,7 @@ id: GauzeLowerLegRight bodyPart: RFoot markingCategory: Legs - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml index 9475216df5d..53ad89c1de7 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] + speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni coloring: default: type: @@ -16,7 +16,7 @@ id: ScarEyeLeft bodyPart: Head markingCategory: Head - speciesRestriction: [Human, Dwarf] + speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni coloring: default: type: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml index 04831fd028c..b17fb5d1f3c 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, Harpy] + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] # Delta V - Felinid, Oni, Harpy coloring: default: type: @@ -16,7 +16,7 @@ id: TattooNightlingChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] # Delta V - Felinid, Oni, Harpy coloring: default: type: @@ -30,7 +30,7 @@ id: TattooSilverburghLeftLeg bodyPart: LLeg markingCategory: Legs - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] # Delta V - Felinid, Oni, Harpy coloring: default: type: @@ -44,7 +44,7 @@ id: TattooSilverburghRightLeg bodyPart: RLeg markingCategory: Legs - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] # Delta V - Felinid, Oni, Harpy coloring: default: type: @@ -58,7 +58,7 @@ id: TattooCampbellLeftArm bodyPart: LArm markingCategory: Arms - speciesRestriction: [Human, Dwarf, Felinid, Oni] + speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni coloring: default: type: @@ -72,7 +72,7 @@ id: TattooCampbellRightArm bodyPart: RArm markingCategory: Arms - speciesRestriction: [Human, Dwarf, Felinid, Oni] + speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni coloring: default: type: @@ -86,7 +86,7 @@ id: TattooCampbellLeftLeg bodyPart: LLeg markingCategory: Legs - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] # Delta V - Felinid, Oni, Harpy coloring: default: type: @@ -100,7 +100,7 @@ id: TattooCampbellRightLeg bodyPart: RLeg markingCategory: Legs - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] # Delta V - Felinid, Oni, Harpy coloring: default: type: @@ -114,7 +114,7 @@ id: TattooEyeRight bodyPart: Eyes markingCategory: Head - speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Oni, Harpy] + speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Oni, Harpy] # Delta V - Felinid, Oni, Harpy coloring: default: type: @@ -128,7 +128,7 @@ id: TattooEyeLeft bodyPart: Eyes markingCategory: Head - speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Oni, Harpy] + speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Oni, Harpy] # Delta V - Felinid, Oni, Harpy coloring: default: type: From f477a296e28355c9bd44dac68ab70c6d07d3d3f5 Mon Sep 17 00:00:00 2001 From: DeltaV-Bot Date: Sun, 17 Dec 2023 21:59:31 +0000 Subject: [PATCH 2/4] Automatic Changelog Update (#568) --- Resources/Changelog/DeltaVChangelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 3a893f8ca24..2d4e50e6bb6 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1138,3 +1138,9 @@ Entries: message: Changed bags of holding cost to be more consistent. id: 170 time: '2023-12-14T09:17:35.0000000+00:00' +- author: Adrian16199 + changes: + - type: Fix + message: Fixed non-wizden species not having markings. + id: 171 + time: '2023-12-17T21:59:15.0000000+00:00' From 9f96ad60397d0f9f54247d31ad7a61570e93d817 Mon Sep 17 00:00:00 2001 From: Adrian16199 <144424013+Adrian16199@users.noreply.github.com> Date: Sun, 17 Dec 2023 23:00:12 +0100 Subject: [PATCH 3/4] Allow vulpkaning to sigh. (#569) Nothing much. Just a small quality of life. --- Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml index 2c44d34297b..ce8fd7a3b53 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml @@ -74,6 +74,8 @@ collection: MaleCry Whistle: collection: Whistles + Sigh: + collection: MaleSigh Growl: collection: VulpkaninGrowls Snarl: @@ -100,6 +102,8 @@ collection: FemaleCry Whistle: collection: Whistles + Sigh: + collection: FemaleSigh Growl: collection: VulpkaninGrowls Snarl: From 9989602711b65d9c5d3d87ba556b6b05a08df1b9 Mon Sep 17 00:00:00 2001 From: DeltaV-Bot Date: Sun, 17 Dec 2023 22:00:26 +0000 Subject: [PATCH 4/4] Automatic Changelog Update (#569) --- Resources/Changelog/DeltaVChangelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 2d4e50e6bb6..cba3c049620 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1144,3 +1144,9 @@ Entries: message: Fixed non-wizden species not having markings. id: 171 time: '2023-12-17T21:59:15.0000000+00:00' +- author: Adrian16199 + changes: + - type: Add + message: Vulpkanins can sigh now. + id: 172 + time: '2023-12-17T22:00:12.0000000+00:00'