Merge branch 'master' into 2020-08-19-firelocks

This commit is contained in:
Víctor Aguilera Puerto
2020-09-08 15:21:58 +02:00
committed by GitHub
28 changed files with 84 additions and 18 deletions

View File

@@ -15,6 +15,7 @@ using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.ViewVariables;
namespace Content.Client.GameObjects.Components.Mobs
{
@@ -29,7 +30,9 @@ namespace Content.Client.GameObjects.Components.Mobs
[Dependency] private readonly IGameTiming _gameTiming = default!;
private StatusEffectsUI _ui;
[ViewVariables]
private Dictionary<StatusEffect, StatusEffectStatus> _status = new Dictionary<StatusEffect, StatusEffectStatus>();
[ViewVariables]
private Dictionary<StatusEffect, CooldownGraphic> _cooldown = new Dictionary<StatusEffect, CooldownGraphic>();
/// <summary>