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

Flashes, Expendablelights, and spray bottles will mark as trash when used up (#10430)

Browse Source
This commit is contained in:
Jessica M
2022-08-13 22:14:49 -07:00
committed by GitHub
parent c4fadd0783
commit 9aa4ae1fb4
6 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Flash/FlashSystem.cs
View File

@@ -10,6 +10,7 @@ using Content.Shared.Interaction.Events;
using Content.Shared.Inventory;
using Content.Shared.Physics;
using Content.Shared.Popups;
using Content.Shared.Tag;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
using Robust.Shared.Player;
@@ -26,6 +27,7 @@ namespace Content.Server.Flash
[Dependency] private readonly InventorySystem _inventorySystem = default!;
[Dependency] private readonly MetaDataSystem _metaSystem = default!;
[Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
[Dependency] private readonly TagSystem _tagSystem = default!;
public override void Initialize()
{
@@ -76,7 +78,7 @@ namespace Content.Server.Flash
Flash(e, args.User, uid, comp.FlashDuration, comp.SlowTo);
}
}
private void OnFlashUseInHand(EntityUid uid, FlashComponent comp, UseInHandEvent args)
{
if (args.Handled || !UseFlash(comp, args.User))
@@ -97,6 +99,8 @@ namespace Content.Server.Flash
if (--comp.Uses == 0)
{
sprite.LayerSetState(0, "burnt");
_tagSystem.AddTag(comp.Owner, "Trash");
comp.Owner.PopupMessage(user, Loc.GetString("flash-component-becomes-empty"));
}
else if (!comp.Flashing)

4
Content.Server/Light/EntitySystems/ExpendableLightSystem.cs
View File

@@ -4,6 +4,7 @@ using Content.Shared.Clothing.EntitySystems;
using Content.Shared.Interaction.Events;
using Content.Shared.Item;
using Content.Shared.Light.Component;
using Content.Shared.Tag;
using Content.Shared.Verbs;
using JetBrains.Annotations;
using Robust.Server.GameObjects;
@@ -17,6 +18,7 @@ namespace Content.Server.Light.EntitySystems
{
[Dependency] private readonly SharedItemSystem _item = default!;
[Dependency] private readonly ClothingSystem _clothing = default!;
[Dependency] private readonly TagSystem _tagSystem = default!;
public override void Initialize()
{
@@ -60,6 +62,8 @@ namespace Content.Server.Light.EntitySystems
meta.EntityName = Loc.GetString(component.SpentName);
meta.EntityDescription = Loc.GetString(component.SpentDesc);
_tagSystem.AddTag(component.Owner, "Trash");
UpdateSpriteAndSounds(component);
UpdateVisualizer(component);