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

[Fix] Хотфиксы пары вещей (#286)

Browse Source 
* fix: педали теперь снова могут играть, если у них были выбраны фелиниды

* fix: фикс спама от взаимодействия с цветками
This commit is contained in:
Remuchi
2024-04-20 18:25:15 +07:00
committed by GitHub
parent b212266249
commit fb0b1705ec
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Shared/Plants/PottedPlantHideSystem.cs
View File

@@ -31,7 +31,7 @@ namespace Content.Shared.Plants
if (args.Handled)
return;
Rustle(uid, component);
Rustle(uid, component, args.User);
args.Handled = _stashSystem.TryHideItem(uid, args.User, args.Used);
}
@@ -40,24 +40,24 @@ namespace Content.Shared.Plants
if (args.Handled)
return;
Rustle(uid, component);
Rustle(uid, component, args.User);
var gotItem = _stashSystem.TryGetItem(uid, args.User);
if (!gotItem)
{
var msg = Loc.GetString("potted-plant-hide-component-interact-hand-got-no-item-message");
_popupSystem.PopupEntity(msg, uid, args.User);
_popupSystem.PopupClient(msg, uid, args.User);
}
args.Handled = gotItem;
}
private void Rustle(EntityUid uid, PottedPlantHideComponent? component = null)
private void Rustle(EntityUid uid, PottedPlantHideComponent? component = null, EntityUid? user = null)
{
if (!Resolve(uid, ref component))
return;
_audio.PlayPvs(component.RustleSound, uid, AudioParams.Default.WithVariation(0.25f));
_audio.PlayPredicted(component.RustleSound, uid, user, AudioParams.Default.WithVariation(0.25f));
}
}
}