Unstable 1.8.4.0

This commit is contained in:
Markus Isberg
2025-03-12 12:56:27 +00:00
parent a4c3e868e4
commit a4a3427e4e
627 changed files with 29860 additions and 10018 deletions
@@ -131,7 +131,7 @@ namespace Barotrauma.Items.Components
SuitablePlantItem plantItem = GetSuitableItem(character);
if (!plantItem.IsNull())
if (!plantItem.IsNull() && item.GetComponent<Holdable>() is not { Attachable: true, Attached: false })
{
Msg = plantItem.Type switch
{
@@ -159,7 +159,6 @@ namespace Barotrauma.Items.Components
{
SuitablePlantItem plantItem = GetSuitableItem(character);
PickingMsg = plantItem.IsNull() ? MsgUprooting : plantItem.ProgressBarMessage;
return base.Pick(character);
}