From d418c36e49de820e29fec4d5a29436f04d467483 Mon Sep 17 00:00:00 2001 From: Themias Date: Sat, 2 Jul 2022 14:42:46 -0400 Subject: [PATCH] Fix vomit mopping --- Content.Client/Fluids/PuddleVisualizer.cs | 7 +++++-- Resources/Prototypes/Entities/Effects/puddle.yml | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Content.Client/Fluids/PuddleVisualizer.cs b/Content.Client/Fluids/PuddleVisualizer.cs index 72e04e7079fe..d92da990206c 100644 --- a/Content.Client/Fluids/PuddleVisualizer.cs +++ b/Content.Client/Fluids/PuddleVisualizer.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using Content.Shared.Fluids; using JetBrains.Annotations; @@ -20,6 +20,9 @@ public sealed class PuddleVisualizer : AppearanceVisualizer // Whether the underlying solution color should be used [DataField("recolor")] public bool Recolor; + // Whether the puddle has a unique sprite we don't want to overwrite + [DataField("customPuddleSprite")] public bool CustomPuddleSprite; + public override void InitializeEntity(EntityUid entity) { base.InitializeEntity(entity); @@ -75,7 +78,7 @@ private void UpdateVisual(AppearanceComponent component, SpriteComponent spriteC spriteComponent.LayerSetState(0, "sparkles", "Fluids/wet_floor_sparkles.rsi"); spriteComponent.Color = spriteComponent.Color.WithAlpha(0.25f); //should be mostly transparent. } - else + else if(!CustomPuddleSprite) { spriteComponent.LayerSetState(0, "smear-0", "Fluids/smear.rsi"); // TODO: need a way to implement the random smears again when the mop creates new puddles. } diff --git a/Resources/Prototypes/Entities/Effects/puddle.yml b/Resources/Prototypes/Entities/Effects/puddle.yml index 94c69fa8dbf5..a24b5534b506 100644 --- a/Resources/Prototypes/Entities/Effects/puddle.yml +++ b/Resources/Prototypes/Entities/Effects/puddle.yml @@ -155,6 +155,10 @@ - type: Slippery launchForwardsMultiplier: 2.0 - type: StepTrigger + - type: Appearance + visuals: + - type: PuddleVisualizer + customPuddleSprite: true - type: entity name: toxins vomit