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

Revert Paint (#26593)

Browse Source 
* Revert "Fix build (#26258)"

This reverts commit 6de5fbfafb.

* Revert "Spray Paint (Review Ready) (#23003)"

This reverts commit e4d5e7f1ae.

# Conflicts:
#	Resources/Prototypes/Entities/Structures/Holographic/projections.yml
This commit is contained in:
metalgearsloth
2024-03-31 16:12:52 +11:00
committed by GitHub
parent 213c075e13
commit c91ed96853
41 changed files with 11 additions and 1000 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs
View File

@@ -80,6 +80,11 @@ namespace Content.Server.Storage.EntitySystems
_adminLogger.Add(LogType.EntitySpawn, LogImpact.Low, $"{ToPrettyString(args.User)} used {ToPrettyString(uid)} which spawned {ToPrettyString(entityToPlaceInHands.Value)}");
}
if (component.Sound != null)
{
_audio.PlayPvs(component.Sound, uid);
}
component.Uses--;
// Delete entity only if component was successfully used
@@ -92,7 +97,6 @@ namespace Content.Server.Storage.EntitySystems
if (entityToPlaceInHands != null)
{
_hands.PickupOrDrop(args.User, entityToPlaceInHands.Value);
_audio.PlayPvs(component.Sound, entityToPlaceInHands.Value);
}
}
}