diff --git a/Barotrauma/BarotraumaShared/BarotraumaShared.projitems b/Barotrauma/BarotraumaShared/BarotraumaShared.projitems index 5a76b4df1..91e79eb92 100644 --- a/Barotrauma/BarotraumaShared/BarotraumaShared.projitems +++ b/Barotrauma/BarotraumaShared/BarotraumaShared.projitems @@ -976,6 +976,12 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + PreserveNewest diff --git a/Barotrauma/BarotraumaShared/Content/Items/Door/doors.xml b/Barotrauma/BarotraumaShared/Content/Items/Door/doors.xml index 043507a2d..476f8a787 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Door/doors.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Door/doors.xml @@ -6,12 +6,13 @@ - + + @@ -36,12 +37,13 @@ - + + @@ -66,12 +68,13 @@ - + + diff --git a/Barotrauma/BarotraumaShared/Content/Items/Tools/bump.ogg b/Barotrauma/BarotraumaShared/Content/Items/Tools/bump.ogg new file mode 100644 index 000000000..d3cd6041a Binary files /dev/null and b/Barotrauma/BarotraumaShared/Content/Items/Tools/bump.ogg differ diff --git a/Barotrauma/BarotraumaShared/Content/Items/Tools/crowbar.ogg b/Barotrauma/BarotraumaShared/Content/Items/Tools/crowbar.ogg new file mode 100644 index 000000000..a0f604953 Binary files /dev/null and b/Barotrauma/BarotraumaShared/Content/Items/Tools/crowbar.ogg differ diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Door.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Door.cs index 0f52ffcfe..fbb0e3fe4 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Components/Door.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Door.cs @@ -206,6 +206,9 @@ namespace Barotrauma.Items.Components public override bool OnPicked(Character picker) { SetState(predictedState == null ? !isOpen : !predictedState.Value, false, true); //crowbar function +#if CLIENT + PlaySound(ActionType.OnPicked, item.WorldPosition); +#endif return false; } diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/Pickable.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/Pickable.cs index 7dba6ac00..69e06f783 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/Pickable.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/Pickable.cs @@ -89,6 +89,7 @@ namespace Barotrauma.Items.Components #if CLIENT if (!GameMain.Instance.LoadingScreenOpen && picker == Character.Controlled) GUI.PlayUISound(GUISoundType.PickItem); + PlaySound(ActionType.OnPicked, item.WorldPosition); #endif return true;