Skip to content

Commit

Permalink
fixed real
Browse files Browse the repository at this point in the history
  • Loading branch information
Lyndomen committed Nov 14, 2024
1 parent 1b1f8e1 commit 59ffe83
Show file tree
Hide file tree
Showing 36 changed files with 40 additions and 35 deletions.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Content.Shared.EE.FootPrint;
using Content.Shared._EE.FootPrint;
using Robust.Client.GameObjects;
using Robust.Client.Graphics;
using Robust.Shared.Random;

namespace Content.Client.EE.FootPrint;
namespace Content.Client._EE.FootPrint;

public sealed class FootPrintsVisualizerSystem : VisualizerSystem<FootPrintComponent>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
using Content.Server.Atmos.Components;
using Content.Shared._EE.FootPrint;
using Content.Shared.Inventory;
using Content.Shared.Mobs;
using Content.Shared.Mobs.Components;
using Content.Shared.EE.FootPrint;
using Content.Shared._EE.FootPrint;
// using Content.Shared.Standing;
using Content.Shared.Chemistry.Components.SolutionManager;
using Content.Shared.Chemistry.EntitySystems;
using Robust.Shared.Map;
using Robust.Shared.Random;

namespace Content.Server.EE.FootPrint;
namespace Content.Server._EE.FootPrint;

public sealed class FootPrintsSystem : EntitySystem
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using System.Linq;
using Content.Shared.EE.FootPrint;
using Content.Shared._EE.FootPrint;
using Content.Shared.Chemistry.Components.SolutionManager;
using Content.Shared.Chemistry.EntitySystems;
using Content.Shared.Fluids;
using Content.Shared.Fluids.Components;
using Robust.Shared.Physics.Events;

namespace Content.Server.EE.FootPrint;
namespace Content.Server._EE.FootPrint;

public sealed class PuddleFootPrintsSystem : EntitySystem
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Content.Shared.Chemistry.Components;
using Robust.Shared.GameStates;

namespace Content.Shared.EE.FootPrint;
namespace Content.Shared._EE.FootPrint;

/// <summary>
/// This is used for marking footsteps, handling footprint drawing.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Robust.Shared.Serialization;

namespace Content.Shared.EE.FootPrint;
namespace Content.Shared._EE.FootPrint;

[Serializable, NetSerializable]
public enum FootPrintVisuals : byte
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
using Robust.Shared.Prototypes;
using Robust.Shared.Utility;

namespace Content.Shared.EE.FootPrint;
namespace Content.Shared._EE.FootPrint;

[RegisterComponent]
public sealed partial class FootPrintsComponent : Component
{
[ViewVariables(VVAccess.ReadOnly), DataField]
public ResPath RsiPath = new("/Textures/EE/Effects/footprints.rsi"); //DeltaV moved to its own space
public ResPath RsiPath = new("/Textures/_EE/Effects/footprints.rsi"); //DeltaV moved to its own space

// all of those are set as a layer
[ViewVariables(VVAccess.ReadOnly), DataField]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
namespace Content.Shared.EE.FootPrint;
namespace Content.Shared._EE.FootPrint;

[RegisterComponent]
public sealed partial class PuddleFootPrintsComponent : Component
{
[ViewVariables(VVAccess.ReadWrite)]
[ViewVariables()]
public float SizeRatio = 0.2f;

[ViewVariables(VVAccess.ReadWrite)]
[ViewVariables()]
public float OffPercent = 80f;
}
12 changes: 8 additions & 4 deletions Resources/Prototypes/Entities/Effects/puddle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@
components:
- type: Clickable
- type: Slippery

- type: Transform
noRot: true
anchored: true
Expand Down Expand Up @@ -166,10 +165,10 @@
- type: Tag
tags:
- DNASolutionScannable
- type: PuddleFootPrints #DeltaV- Begin updates from EE Blood Puddle
- type: PuddleFootPrints # DeltaV- Begin updates from EE Blood Puddle

- type: entity
name: Footstep
name: footstep
id: Footstep
save: false
description: Trace of liquid
Expand Down Expand Up @@ -204,4 +203,9 @@
- type: FootPrint
- type: Puddle
solution: step
- type: Appearance #DeltaV-End updates from EE Blood Puddle
- type: Appearance
- type: SpawnOnDespawn
prototype: PuddleSparkle
- type: TimedDespawn
lifetime: 60 # DeltaV End updates from EE Blood Puddle

4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@
sprite: "Effects/creampie.rsi"
state: "creampie_arachnid"
visible: false
- type: FootPrints
leftBarePrint: "footprint-left-bare-spider" #DeltaV port from EE, blood splatter
- type: FootPrints # DeltaV port from EE, blood splatter
leftBarePrint: "footprint-left-bare-spider"
rightBarePrint: "footprint-right-bare-spider"
- type: Inventory
templateId: arachnid
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Mobs/Species/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
- DoorBumpOpener
- AnomalyHost
- type: PotentialPsionic # DeltaV - organic species can all be psionic
- type: FootPrints #DeltaV port from EE, blood splatter
- type: FootPrints # DeltaV port from EE, blood splatter

- type: entity
save: false
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Entities/Mobs/Species/diona.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@
32:
sprite: Mobs/Species/Human/displacement.rsi
state: jumpsuit-female
- type: FootPrints
leftBarePrint: "footprint-left-bare-diona" #DeltaV port from EE, blood splatter
rightBarePrint: "footprint-right-bare-diona" #DeltaV port from EE, blood splatter
- type: FootPrints # DeltaV port from EE, blood splatter
leftBarePrint: "footprint-left-bare-diona"
rightBarePrint: "footprint-right-bare-diona"

- type: entity
parent: BaseSpeciesDummy
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@
32:
sprite: Mobs/Species/Human/displacement.rsi
state: jumpsuit-female
- type: FootPrints
leftBarePrint: "footprint-left-bare-dwarf" #DeltaV port from EE, blood splatter
rightBarePrint: "footprint-right-bare-dwarf" #DeltaV port from EE, blood splatter
- type: FootPrints # DeltaV port from EE, blood splatter
leftBarePrint: "footprint-left-bare-dwarf"
rightBarePrint: "footprint-right-bare-dwarf"

- type: entity
parent: BaseSpeciesDummy
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@
32:
sprite: Mobs/Species/Human/displacement.rsi
state: jumpsuit-female
- type: FootPrints #DeltaV port from EE, blood splatter
leftBarePrint: "footprint-left-bare-lizard" #DeltaV port from EE, blood splatter
rightBarePrint: "footprint-right-bare-lizard" #DeltaV port from EE, blood splatter
- type: FootPrints # DeltaV port from EE, blood splatter
leftBarePrint: "footprint-left-bare-lizard"
rightBarePrint: "footprint-right-bare-lizard"

- type: entity
parent: BaseSpeciesDummy
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Entities/Mobs/Species/slime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,9 @@
32:
sprite: Mobs/Species/Human/displacement.rsi
state: jumpsuit-female
- type: FootPrints #DeltaV port from EE, blood splatter
leftBarePrint: "footprint-left-bare-slime" #DeltaV port from EE, blood splatter
rightBarePrint: "footprint-right-bare-slime" #DeltaV port from EE, blood splatter
- type: FootPrints # DeltaV port from EE, blood splatter
leftBarePrint: "footprint-left-bare-slime"
rightBarePrint: "footprint-right-bare-slime"

- type: entity
parent: MobHumanDummy
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Entities/Mobs/Species/vox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,9 @@
32:
sprite: Mobs/Species/Vox/displacement.rsi
state: shoes
- type: FootPrints #DeltaV port from EE, blood splatter
leftBarePrint: "footprint-left-bare-lizard" #DeltaV port from EE, blood splatter
rightBarePrint: "footprint-right-bare-lizard" #DeltaV port from EE, blood splatter
- type: FootPrints # DeltaV port from EE, blood splatter
leftBarePrint: "footprint-left-bare-lizard"
rightBarePrint: "footprint-right-bare-lizard"

- type: entity
parent: BaseSpeciesDummy
Expand Down

0 comments on commit 59ffe83

Please sign in to comment.