Merge branch 'master' into fix-binoculars

TTT-2 · Dec 10, 2024 · 9072e31 · 9072e31
2 parents 474c690 + ad5d5f5
commit 9072e31
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,7 @@ All notable changes to TTT2 will be documented here. Inspired by [keep a changel
 - Fixed the targetID corpse hint not respecting `ttt_identify_body_woconfirm` (by @Histalek)
 - Fixed the beacon not being properly translated when placed (by @Histalek)
 - Fixed binoculars zooming not being predicted (by @Histalek)
+- Fixed an error when trying to pickup a placed equipment (e.g. beacon) (by @Histalek)
 
 ### Changed
 

diff --git a/gamemodes/terrortown/entities/entities/ttt_base_placeable.lua b/gamemodes/terrortown/entities/entities/ttt_base_placeable.lua
@@ -69,7 +69,7 @@ if CLIENT then
         end
 
         if not self:PlayerCanPickupWeapon(client) then
-            LANG.Msg(client, "pickup_fail", nil, MSG_MSTACK_WARN)
+            LANG.Msg("pickup_fail", nil, MSG_MSTACK_WARN)
 
             self:EmitSound(soundDeny)