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

Merge remote-tracking branch 'Zumorica/2021-12-03-remove-IEntity-komm-süsser-todd' into 2021-12-03-remove-IEntity-komm-süsser-todd

Browse Source 
# Conflicts:
#	Content.Server/DeviceNetwork/Systems/WiredNetworkSystem.cs
#	Content.Server/Hands/Systems/HandsSystem.cs
#	Content.Server/Radio/Components/IRadio.cs
#	Content.Server/UserInterface/ActivatableUISystem.cs
This commit is contained in:
DrSmugleaf
2021-12-05 22:10:07 +01:00
parent ab9d0cc6d8 75247b7e2b
commit 2b1fecbe02
25 changed files with 100 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs
View File

@@ -384,7 +384,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
return false;
}
public void InsertMagazine(EntityUid user, EntityUidmagazine)
public void InsertMagazine(EntityUid user, EntityUid magazine)
{
SoundSystem.Play(Filter.Pvs(Owner), _soundMagInsert.GetSound(), Owner, AudioParams.Default.WithVolume(-2));
Owner.PopupMessage(user, Loc.GetString("server-magazine-barrel-component-interact-using-success"));