tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix vomit mopping (#9358)

Browse Source
This commit is contained in:
themias
2022-07-02 22:13:11 -04:00
committed by GitHub
parent 5a350d6acd
commit 82ee21dec1
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Client/Fluids/PuddleVisualizer.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Linq; using System.Linq;
using Content.Shared.Fluids; using Content.Shared.Fluids;
using JetBrains.Annotations; using JetBrains.Annotations;
@@ -20,6 +20,9 @@ namespace Content.Client.Fluids
// Whether the underlying solution color should be used // Whether the underlying solution color should be used
[DataField("recolor")] public bool Recolor; [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) public override void InitializeEntity(EntityUid entity)
{ {
base.InitializeEntity(entity); base.InitializeEntity(entity);
@@ -75,7 +78,7 @@ namespace Content.Client.Fluids
spriteComponent.LayerSetState(0, "sparkles", "Fluids/wet_floor_sparkles.rsi"); spriteComponent.LayerSetState(0, "sparkles", "Fluids/wet_floor_sparkles.rsi");
spriteComponent.Color = spriteComponent.Color.WithAlpha(0.25f); //should be mostly transparent. 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. spriteComponent.LayerSetState(0, "smear-0", "Fluids/smear.rsi"); // TODO: need a way to implement the random smears again when the mop creates new puddles.
} }

4
Resources/Prototypes/Entities/Effects/puddle.yml
View File

@@ -155,6 +155,10 @@
- type: Slippery - type: Slippery
launchForwardsMultiplier: 2.0 launchForwardsMultiplier: 2.0
- type: StepTrigger - type: StepTrigger
- type: Appearance
visuals:
- type: PuddleVisualizer
customPuddleSprite: true
- type: entity - type: entity
name: toxins vomit name: toxins vomit