diff --git a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs index 0416f4b8139..e701f752ad8 100644 --- a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs +++ b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs @@ -298,7 +298,13 @@ private void ApplyMarking(MarkingPrototype markingPrototype, sprite.LayerMapSet(layerId, layer); sprite.LayerSetSprite(layerId, rsi); } - + // impstation edit begin - check if there's a shader defined in the markingPrototype's shader datafield, and if there is... + if (markingPrototype.Shader != null) + { + // use spriteComponent's layersetshader function to set the layer's shader to that which is specified. + sprite.LayerSetShader(layerId, markingPrototype.Shader); + } + // impstation edit end sprite.LayerSetVisible(layerId, visible); if (!visible || setting == null) // this is kinda implied diff --git a/Content.Shared/Humanoid/Markings/MarkingPrototype.cs b/Content.Shared/Humanoid/Markings/MarkingPrototype.cs index dfb594db5f9..dc59d216fda 100644 --- a/Content.Shared/Humanoid/Markings/MarkingPrototype.cs +++ b/Content.Shared/Humanoid/Markings/MarkingPrototype.cs @@ -35,6 +35,11 @@ public sealed partial class MarkingPrototype : IPrototype [DataField("sprites", required: true)] public List Sprites { get; private set; } = default!; + // impstation edit - allow markings to support shaders + [DataField("shader")] + public string? Shader { get; private set; } = null; + // end impstation edit + public Marking AsMarking() { return new Marking(ID, Sprites.Count); diff --git a/Resources/Locale/en-US/_Impstation/markings/arachnid.ftl b/Resources/Locale/en-US/_Impstation/markings/arachnid.ftl new file mode 100644 index 00000000000..34af0e08a03 --- /dev/null +++ b/Resources/Locale/en-US/_Impstation/markings/arachnid.ftl @@ -0,0 +1,5 @@ +marking-SpiderMirror = Mirror +marking-SpiderMirror-spidermirror = Mirror + +marking-SpiderGlowEyes = Glowing Eyes +marking-SpiderGlowEyes-spidergloweyes = Glowing Eyes diff --git a/Resources/Locale/en-US/_Impstation/markings/diona.ftl b/Resources/Locale/en-US/_Impstation/markings/diona.ftl new file mode 100644 index 00000000000..7f32e7f1d6a --- /dev/null +++ b/Resources/Locale/en-US/_Impstation/markings/diona.ftl @@ -0,0 +1,8 @@ +marking-DionaMoonBloom = Diona Flower (Moon Bloom) +marking-DionaMoonBloom-dionamoonbloom = Diona Flower (Moon Bloom) + +marking-DionaBigFirefly = Big Fireflies +marking-DionaBigFirefly-dionabigfirefly = Big Fireflies + +marking-DionaFirefly = Fireflies +marking-DionaFirefly-dionafirefly = Fireflies diff --git a/Resources/Locale/en-US/_Impstation/markings/moth.ftl b/Resources/Locale/en-US/_Impstation/markings/moth.ftl new file mode 100644 index 00000000000..8e26300010c --- /dev/null +++ b/Resources/Locale/en-US/_Impstation/markings/moth.ftl @@ -0,0 +1,8 @@ +marking-MothGlowAntenna = Antennae (Glowing) +marking-MothGlowAntenna-mothglowantenna = Antennae (Glowing) + +marking-MothFireflyOverlay = Firefly Overlay +marking-MothFireflyOverlay-mothfirefly1 = Firefly Overlay + +marking-MothFirefly = Wings (Firefly) +marking-MothFirefly-mothfirefly2 = Wings (Firefly) diff --git a/Resources/Locale/en-US/_Impstation/markings/slimeperson.ftl b/Resources/Locale/en-US/_Impstation/markings/slimeperson.ftl new file mode 100644 index 00000000000..345af7e87d4 --- /dev/null +++ b/Resources/Locale/en-US/_Impstation/markings/slimeperson.ftl @@ -0,0 +1,6 @@ +marking-SlimeEyeglow = Glowing Eyes +marking-SlimeEyeglow-eyeglow = Glowing Eyes +marking-FadingStars = Fading Starlight +marking-FadingStars-fadingstars1 = Brightest +marking-FadingStars-fadingstars2 = Middling +marking-FadingStars-fadingstars3 = Darkest diff --git a/Resources/Locale/en-US/_Impstation/markings/vox.ftl b/Resources/Locale/en-US/_Impstation/markings/vox.ftl new file mode 100644 index 00000000000..fdfcbc65c2c --- /dev/null +++ b/Resources/Locale/en-US/_Impstation/markings/vox.ftl @@ -0,0 +1,2 @@ +marking-VoxTailLantern = Lantern +marking-VoxTailLantern-voxtaillantern = Lantern diff --git a/Resources/Locale/en-US/einstein-engines/markings/harpy.ftl b/Resources/Locale/en-US/einstein-engines/markings/harpy.ftl index 29d2e0ffed7..686a6474dee 100644 --- a/Resources/Locale/en-US/einstein-engines/markings/harpy.ftl +++ b/Resources/Locale/en-US/einstein-engines/markings/harpy.ftl @@ -46,7 +46,9 @@ marking-HarpyWingBat-bat_wings_tone_2 = Membrane marking-HarpyWingBionic = Simple Bionic Wings (Whitescale) marking-HarpyWingBionic-bionic_wings_tone_1 = Wings -marking-HarpyWingBionic-bionic_wings_tone_2 = Lights (Unshaded) + +marking-HarpyWingBionicHighlights = Simple Bionic Wings (Lights) +marking-HarpyWingBionicHighlights-bionic_wings_tone_2 = Lights (Unshaded) marking-HarpyEarsDefault = Feather Tufts marking-HarpyEarsDefault-harpy_ears_default = Tufts diff --git a/Resources/Prototypes/Einstein-Engines/Entities/Mobs/Customization/Markings/harpy.yml b/Resources/Prototypes/Einstein-Engines/Entities/Mobs/Customization/Markings/harpy.yml index d13f5f03264..d15c5ae5028 100644 --- a/Resources/Prototypes/Einstein-Engines/Entities/Mobs/Customization/Markings/harpy.yml +++ b/Resources/Prototypes/Einstein-Engines/Entities/Mobs/Customization/Markings/harpy.yml @@ -310,9 +310,24 @@ bodyPart: RArm markingCategory: Arms speciesRestriction: [Harpy] + forcedColoring: false # DeltaV + followSkinColor: false # DeltaV sprites: - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi state: bionic_wings_tone_1 + # DeltaV - commenting out because this does not work. doing an alternate implementation + # - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi + # state: bionic_wings_tone_2 + # shader: unshaded + +- type: marking + id: HarpyWingBionicHighlights + bodyPart: RArm + markingCategory: Overlay + speciesRestriction: [Harpy] + forcedColoring: false + followSkinColor: false + sprites: - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi state: bionic_wings_tone_2 - shader: unshaded + shader: unshaded diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/arachnid.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/arachnid.yml new file mode 100644 index 00000000000..b0bfd6fe5c6 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/arachnid.yml @@ -0,0 +1,23 @@ +- type: marking + id: SpiderMirror + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Arachnid ] + forcedColoring: false + followSkinColor: false + sprites: + - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi + state: spidermirror + shader: unshaded + +- type: marking + id: SpiderGlowEyes + bodyPart: Eyes + markingCategory: Head + speciesRestriction: [ Arachnid ] + forcedColoring: false + followSkinColor: false + sprites: + - sprite: _Impstation/Mobs/Customization/arachnid.rsi + state: spidergloweyes + shader: unshaded diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/diona.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/diona.yml new file mode 100644 index 00000000000..d0b9671b349 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/diona.yml @@ -0,0 +1,35 @@ +- type: marking + id: DionaMoonBloom + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ Diona ] + forcedColoring: false + followSkinColor: false + sprites: + - sprite: _Impstation/Mobs/Customization/diona.rsi + state: dionamoonbloom + shader: unshaded + +- type: marking + id: DionaBigFirefly + bodyPart: Head + markingCategory: Head + speciesRestriction: [ Diona ] + forcedColoring: false + followSkinColor: false + sprites: + - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi + state: dionabigfirefly + shader: unshaded + +- type: marking + id: DionaFirefly + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Diona ] + forcedColoring: false + followSkinColor: false + sprites: + - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi + state: dionafirefly + shader: unshaded diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/moth.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/moth.yml new file mode 100644 index 00000000000..41ce0cb4a14 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/moth.yml @@ -0,0 +1,34 @@ +- type: marking + id: MothGlowAntenna + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ Moth ] + forcedColoring: false + followSkinColor: false + sprites: + - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi + state: mothglowantenna + shader: unshaded + +- type: marking + id: MothFireflyOverlay + bodyPart: Tail + markingCategory: Overlay + speciesRestriction: [ Moth ] + forcedColoring: false + followSkinColor: false + sprites: + - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi + state: mothfirefly1 + shader: unshaded + +- type: marking + id: MothFirefly + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Moth ] + forcedColoring: false + followSkinColor: false + sprites: + - sprite: _Impstation/Mobs/Customization/moth.rsi + state: mothfirefly2 diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/slime.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/slime.yml new file mode 100644 index 00000000000..9f85421cabe --- /dev/null +++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/slime.yml @@ -0,0 +1,30 @@ +- type: marking + id: SlimeEyeglow + bodyPart: Eyes + markingCategory: Head + speciesRestriction: [SlimePerson] + coloring: + default: + type: + !type:EyeColoring + negative: false + sprites: + - sprite: _Impstation/Mobs/Customization/slime_parts.rsi + state: eyeglow + shader: unshaded + +- type: marking + id: FadingStars + bodyPart: Head + markingCategory: Head + speciesRestriction: [SlimePerson] + forcedColoring: false + followSkinColor: false + sprites: + - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi + state: fadingstars1 + - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi + state: fadingstars2 + - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi + state: fadingstars3 + shader: unshaded diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/vox.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/vox.yml new file mode 100644 index 00000000000..e3a03da8850 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/vox.yml @@ -0,0 +1,11 @@ +- type: marking + id: VoxTailLantern + bodyPart: Tail + markingCategory: Overlay + speciesRestriction: [ Vox ] + forcedColoring: false + followSkinColor: false + sprites: + - sprite: _Impstation/Mobs/Customization/vox.rsi + state: voxtaillantern + shader: unshaded diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dionabigfirefly.png b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dionabigfirefly.png new file mode 100644 index 00000000000..f6065b2d048 Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dionabigfirefly.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dionafirefly.png b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dionafirefly.png new file mode 100644 index 00000000000..5b064936760 Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dionafirefly.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fadingstars1.png b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fadingstars1.png new file mode 100644 index 00000000000..350d9eb9773 Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fadingstars1.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fadingstars2.png b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fadingstars2.png new file mode 100644 index 00000000000..5195fef6ebb Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fadingstars2.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fadingstars3.png b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fadingstars3.png new file mode 100644 index 00000000000..754b20777f3 Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fadingstars3.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/meta.json new file mode 100644 index 00000000000..7432468ba11 --- /dev/null +++ b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/meta.json @@ -0,0 +1,359 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Drawn and coded by Carousel for Impstation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dionabigfirefly", + "directions": 4, + "delays": [ + [ + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25 + ], + [ + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25 + ], + [ + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25 + ], + [ + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25 + ] + ] + }, + { + "name": "dionafirefly", + "directions": 4, + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3 + ], + [ + 0.3, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3 + ], + [ + 0.3, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3 + ], + [ + 0.3, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "fadingstars1", + "directions": 4, + "delays": [ + [ + 0.2, + 0.3, + 0.1, + 1.2, + 0.3 + ], + [ + 0.2, + 0.3, + 0.1, + 1.2, + 0.3 + ], + [ + 0.2, + 0.3, + 0.1, + 1.2, + 0.3 + ], + [ + 0.2, + 0.3, + 0.1, + 1.2, + 0.3 + ] + ] + }, + { + "name": "fadingstars2", + "directions": 4, + "delays": [ + [ + 1.0, + 0.2, + 0.1, + 0.6, + 0.2 + ], + [ + 1.0, + 0.2, + 0.1, + 0.6, + 0.2 + ], + [ + 1.0, + 0.2, + 0.1, + 0.6, + 0.2 + ], + [ + 1.0, + 0.2, + 0.1, + 0.6, + 0.2 + ] + ] + }, + { + "name": "fadingstars3", + "directions": 4, + "delays": [ + [ + 1.8, + 0.3, + 0.1, + 0.8, + 0.4 + ], + [ + 1.8, + 0.3, + 0.1, + 0.8, + 0.4 + ], + [ + 1.8, + 0.3, + 0.1, + 0.8, + 0.4 + ], + [ + 1.8, + 0.3, + 0.1, + 0.8, + 0.4 + ] + ] + }, + { + "name": "mothfirefly1", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "mothglowantenna", + "directions": 4, + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3 + ], + [ + 0.3, + 0.3, + 0.3, + 0.3 + ], + [ + 0.3, + 0.3, + 0.3, + 0.3 + ], + [ + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "spidermirror", + "directions": 4, + "delays": [ + [ + 5.0, + 0.1, + 0.1, + 0.1, + 1.0, + 0.1, + 0.1, + 0.1 + ], + [ + 5.0, + 0.1, + 0.1, + 0.1, + 1.0, + 0.1, + 0.1, + 0.1 + ], + [ + 5.0, + 0.1, + 0.1, + 0.1, + 1.0, + 0.1, + 0.1, + 0.1 + ], + [ + 5.0, + 0.1, + 0.1, + 0.1, + 1.0, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] + } diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/mothfirefly1.png b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/mothfirefly1.png new file mode 100644 index 00000000000..8240ed0997a Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/mothfirefly1.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/mothglowantenna.png b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/mothglowantenna.png new file mode 100644 index 00000000000..83207cea34f Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/mothglowantenna.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/spidermirror.png b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/spidermirror.png new file mode 100644 index 00000000000..f091f3f16ab Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/spidermirror.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/arachnid.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Customization/arachnid.rsi/meta.json new file mode 100644 index 00000000000..2af21d40347 --- /dev/null +++ b/Resources/Textures/_Impstation/Mobs/Customization/arachnid.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Drawn and coded by Carousel for Impstation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "spidergloweyes", + "directions": 4 + } + ] + } diff --git a/Resources/Textures/_Impstation/Mobs/Customization/arachnid.rsi/spidergloweyes.png b/Resources/Textures/_Impstation/Mobs/Customization/arachnid.rsi/spidergloweyes.png new file mode 100644 index 00000000000..472b431bfad Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/arachnid.rsi/spidergloweyes.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/dionamoonbloom.png b/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/dionamoonbloom.png new file mode 100644 index 00000000000..4b24e9cb61f Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/dionamoonbloom.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/meta.json new file mode 100644 index 00000000000..65ffbbe422c --- /dev/null +++ b/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Drawn and coded by Carousel for Impstation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dionamoonbloom", + "directions": 4 + } + ] + } diff --git a/Resources/Textures/_Impstation/Mobs/Customization/moth.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Customization/moth.rsi/meta.json new file mode 100644 index 00000000000..855e1f53f4a --- /dev/null +++ b/Resources/Textures/_Impstation/Mobs/Customization/moth.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Drawn and coded by Carousel for Impstation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "mothfirefly2", + "directions": 4 + } + ] + } diff --git a/Resources/Textures/_Impstation/Mobs/Customization/moth.rsi/mothfirefly2.png b/Resources/Textures/_Impstation/Mobs/Customization/moth.rsi/mothfirefly2.png new file mode 100644 index 00000000000..b2bc6e28ac5 Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/moth.rsi/mothfirefly2.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/slime_parts.rsi/eyeglow.png b/Resources/Textures/_Impstation/Mobs/Customization/slime_parts.rsi/eyeglow.png new file mode 100644 index 00000000000..6cac2535b0f Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/slime_parts.rsi/eyeglow.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/slime_parts.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Customization/slime_parts.rsi/meta.json new file mode 100644 index 00000000000..bbe22710708 --- /dev/null +++ b/Resources/Textures/_Impstation/Mobs/Customization/slime_parts.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Eyeglow by Sha-Seng (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "eyeglow", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Impstation/Mobs/Customization/vox.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Customization/vox.rsi/meta.json new file mode 100644 index 00000000000..5ad5d66b30c --- /dev/null +++ b/Resources/Textures/_Impstation/Mobs/Customization/vox.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Drawn and coded by Carousel for Impstation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "voxtaillantern", + "directions": 4 + } + ] + } diff --git a/Resources/Textures/_Impstation/Mobs/Customization/vox.rsi/voxtaillantern.png b/Resources/Textures/_Impstation/Mobs/Customization/vox.rsi/voxtaillantern.png new file mode 100644 index 00000000000..ca0bd3dd805 Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/vox.rsi/voxtaillantern.png differ diff --git a/Tools/markings/markings/prototypes.go b/Tools/markings/markings/prototypes.go index cd969ab4572..dbfed0a1792 100644 --- a/Tools/markings/markings/prototypes.go +++ b/Tools/markings/markings/prototypes.go @@ -68,6 +68,7 @@ type MarkingPrototype struct { MarkingCategory string `yaml:"markingCategory"` SpeciesRestriction []string `yaml:"speciesRestriction,omitempty"` Sprites []SpriteSpecifier `yaml:"sprites"` + Shader string? `yaml:"shader"` // impstation } type SpriteSpecifier struct {