Merge branch 'space-wizards:master' into master

Merrokitsune · web-flow · commit 9ab5bb3d90ed · 2025-05-08T02:51:07.000+07:00
diff --git a/Content.Shared/Weapons/Ranged/Upgrades/GunUpgradeSystem.cs b/Content.Shared/Weapons/Ranged/Upgrades/GunUpgradeSystem.cs
@@ -89,7 +89,7 @@ private void OnAfterInteractUsing(Entity<UpgradeableGunComponent> ent, ref After
         _gun.RefreshModifiers(ent.Owner);
         args.Handled = _container.Insert(args.Used, _container.GetContainer(ent, ent.Comp.UpgradesContainerId));
 
-        _adminLog.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(args.Used):player} inserted gun upgrade {ToPrettyString(args.Used)} into {ToPrettyString(ent.Owner)}.");
+        _adminLog.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(args.User):player} inserted gun upgrade {ToPrettyString(args.Used)} into {ToPrettyString(ent.Owner)}.");
     }
 
     private void OnFireRateRefresh(Entity<GunUpgradeFireRateComponent> ent, ref GunRefreshModifiersEvent args)

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ private void OnAfterInteractUsing(Entity<UpgradeableGunComponent> ent, ref After`
`89`	`89`	`_gun.RefreshModifiers(ent.Owner);`
`90`	`90`	`args.Handled = _container.Insert(args.Used, _container.GetContainer(ent, ent.Comp.UpgradesContainerId));`
`91`	`91`
`92`		`- _adminLog.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(args.Used):player} inserted gun upgrade {ToPrettyString(args.Used)} into {ToPrettyString(ent.Owner)}.");`
	`92`	`+ _adminLog.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(args.User):player} inserted gun upgrade {ToPrettyString(args.Used)} into {ToPrettyString(ent.Owner)}.");`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`private void OnFireRateRefresh(Entity<GunUpgradeFireRateComponent> ent, ref GunRefreshModifiersEvent args)`