Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Clothing/item ECS & cleanup (#9706)

Browse Source
This commit is contained in:
Kara
2022-07-27 03:53:47 -07:00
committed by GitHub
parent 0f0420eca9
commit 258ec0cac1
164 changed files with 938 additions and 918 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Nutrition/EntitySystems/SmokingSystem.cs
View File

@@ -7,6 +7,7 @@ using Content.Server.Clothing.Components;
using Content.Server.Nutrition.Components;
using Content.Shared.Chemistry;
using Content.Shared.Chemistry.Reagent;
using Content.Shared.Clothing.EntitySystems;
using Content.Shared.FixedPoint;
using Content.Shared.Inventory;
using Content.Shared.Smoking;
@@ -24,6 +25,8 @@ namespace Content.Server.Nutrition.EntitySystems
[Dependency] private readonly AtmosphereSystem _atmos = default!;
[Dependency] private readonly TransformSystem _transformSystem = default!;
[Dependency] private readonly InventorySystem _inventorySystem = default!;
[Dependency] private readonly ClothingSystem _clothing = default!;
private const float UpdateTimer = 3f;
private float _timer = 0f;
@@ -50,13 +53,15 @@ namespace Content.Server.Nutrition.EntitySystems
smokable.State = state;
appearance.SetData(SmokingVisuals.Smoking, state);
clothing.EquippedPrefix = state switch
var newState = state switch
{
SmokableState.Lit => smokable.LitPrefix,
SmokableState.Burnt => smokable.BurntPrefix,
_ => smokable.UnlitPrefix
};
_clothing.SetEquippedPrefix(uid, newState, clothing);
if (state == SmokableState.Lit)
_active.Add(uid);
else