diff --git a/Content.Shared/Humanoid/HumanoidVisualLayers.cs b/Content.Shared/Humanoid/HumanoidVisualLayers.cs index ca78564bfd..6b5f163000 100644 --- a/Content.Shared/Humanoid/HumanoidVisualLayers.cs +++ b/Content.Shared/Humanoid/HumanoidVisualLayers.cs @@ -15,6 +15,7 @@ namespace Content.Shared.Humanoid Chest, Head, Snout, + SnoutCover, // things layered over snouts (i.e. noses) HeadSide, // side parts (i.e., frills) HeadTop, // top parts (i.e., ears) Eyes, diff --git a/Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs b/Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs index 0f8b940bd6..1365c488d8 100644 --- a/Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs +++ b/Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs @@ -42,6 +42,11 @@ namespace Content.Shared.Humanoid yield return HumanoidVisualLayers.Hair; yield return HumanoidVisualLayers.FacialHair; yield return HumanoidVisualLayers.Snout; + yield return HumanoidVisualLayers.SnoutCover; + break; + case HumanoidVisualLayers.Snout: + yield return HumanoidVisualLayers.Snout; + yield return HumanoidVisualLayers.SnoutCover; break; case HumanoidVisualLayers.LArm: yield return HumanoidVisualLayers.LArm; diff --git a/Content.Shared/Humanoid/Markings/MarkingCategories.cs b/Content.Shared/Humanoid/Markings/MarkingCategories.cs index 2551175096..a49ac7d416 100644 --- a/Content.Shared/Humanoid/Markings/MarkingCategories.cs +++ b/Content.Shared/Humanoid/Markings/MarkingCategories.cs @@ -12,6 +12,7 @@ namespace Content.Shared.Humanoid.Markings HeadTop, HeadSide, Snout, + SnoutCover, Chest, UndergarmentTop, UndergarmentBottom, diff --git a/Resources/Locale/en-US/preferences/ui/markings-picker.ftl b/Resources/Locale/en-US/preferences/ui/markings-picker.ftl index af2e81ce3b..41792cbf9c 100644 --- a/Resources/Locale/en-US/preferences/ui/markings-picker.ftl +++ b/Resources/Locale/en-US/preferences/ui/markings-picker.ftl @@ -21,6 +21,7 @@ markings-category-Head = Head markings-category-HeadTop = Head (Top) markings-category-HeadSide = Head (Side) markings-category-Snout = Snout +markings-category-SnoutCover = Snout (Cover) markings-category-UndergarmentTop = Undergarment (Top) markings-category-UndergarmentBottom = Undergarment (Bottom) markings-category-Chest = Chest diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml index 110e6513da..92d118cb26 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml @@ -95,6 +95,7 @@ - map: [ "enum.HumanoidVisualLayers.Tail" ] # Mentioned in moth code: This needs renaming lol. - map: [ "back" ] - map: [ "neck" ] + - map: [ "enum.HumanoidVisualLayers.SnoutCover" ] - map: [ "enum.HumanoidVisualLayers.FacialHair" ] - map: [ "enum.HumanoidVisualLayers.Hair" ] # Do these need to be here? (arachnid hair arachnid hair) - map: [ "enum.HumanoidVisualLayers.HeadSide" ] @@ -127,7 +128,7 @@ - type: HumanoidAppearance species: Arachnid - type: Inventory - speciesId: arachnid + speciesId: arachnid #>88w88< diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index 3bb43c26cb..d4fecee2ca 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -35,6 +35,7 @@ - map: [ "outerClothing" ] - map: [ "back" ] - map: [ "neck" ] + - map: [ "enum.HumanoidVisualLayers.SnoutCover" ] - map: [ "enum.HumanoidVisualLayers.FacialHair" ] - map: [ "enum.HumanoidVisualLayers.Hair" ] - map: [ "enum.HumanoidVisualLayers.HeadSide" ] @@ -322,6 +323,7 @@ - map: [ "outerClothing" ] - map: [ "back" ] - map: [ "neck" ] + - map: [ "enum.HumanoidVisualLayers.SnoutCover" ] - map: [ "enum.HumanoidVisualLayers.FacialHair" ] - map: [ "enum.HumanoidVisualLayers.Hair" ] - map: [ "enum.HumanoidVisualLayers.HeadSide" ] diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml index 0543f30931..9503c2f56d 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml @@ -105,6 +105,7 @@ - map: [ "enum.HumanoidVisualLayers.Tail" ] #in the utopian future we should probably have a wings enum inserted here so everyhting doesn't break - map: [ "back" ] - map: [ "neck" ] + - map: [ "enum.HumanoidVisualLayers.SnoutCover" ] - map: [ "enum.HumanoidVisualLayers.FacialHair" ] - map: [ "enum.HumanoidVisualLayers.Hair" ] - map: [ "enum.HumanoidVisualLayers.HeadSide" ] diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml index fa22736179..b49d0fb409 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml @@ -86,6 +86,7 @@ - map: [ "back" ] - map: [ "neck" ] - map: [ "suitstorage" ] # This is not in the default order + - map: [ "enum.HumanoidVisualLayers.SnoutCover" ] - map: [ "enum.HumanoidVisualLayers.FacialHair" ] - map: [ "enum.HumanoidVisualLayers.Hair" ] - map: [ "enum.HumanoidVisualLayers.HeadSide" ]