From 35015795a4dae70a33e3e0525a7697af65e6db37 Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Sat, 12 Nov 2022 14:57:18 +1300 Subject: [PATCH] Species specific jumpsuit sprite fixes (#12552) --- Content.Client/Clothing/ClientClothingSystem.cs | 5 +++++ .../Entities/Clothing/Uniforms/base_clothinguniforms.yml | 4 ---- Resources/Prototypes/Entities/Mobs/Species/base.yml | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs index 4cbeebabd0..2e56c85070 100644 --- a/Content.Client/Clothing/ClientClothingSystem.cs +++ b/Content.Client/Clothing/ClientClothingSystem.cs @@ -298,6 +298,11 @@ public sealed class ClientClothingSystem : ClothingSystem layer.SetRsi(clothingSprite.BaseRSI); } + // Another "temporary" fix for clothing stencil masks. + // Sprite layer redactor when + if (slot == "jumpsuit") + layerData.Shader ??= "StencilDraw"; + sprite.LayerSetData(index, layerData); layer.Offset += slotDef.Offset; } diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml index 2adcc212b0..ac934f74c3 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml @@ -9,10 +9,6 @@ slots: [innerclothing] equipSound: path: /Audio/Items/jumpsuit_equip.ogg - clothingVisuals: - jumpsuit: - - state: equipped-INNERCLOTHING - shader: StencilDraw - type: Butcherable butcheringType: Knife spawned: diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index 1ed322cee0..608cf0e7a2 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -106,6 +106,8 @@ - map: [ "enum.HumanoidVisualLayers.LLeg" ] - shader: StencilClear sprite: Mobs/Species/Human/parts.rsi #PJB on stencil clear being on the left leg: "...this is 'fine'" -https://github.com/space-wizards/space-station-14/pull/12217#issuecomment-1291677115 + # its fine, but its still very stupid that it has to be done like this instead of allowing sprites to just directly insert a stencil clear. + # sprite refactor when state: l_leg - shader: StencilMask map: [ "enum.HumanoidVisualLayers.StencilMask" ]