v0.10.5.1

2020-09-22 11:31:56 -03:00
parent 44032d0ae0
commit 0002ad2c50
343 changed files with 12276 additions and 5023 deletions
@@ -61,7 +61,7 @@ namespace Barotrauma.Items.Components
                allowedSlots.Add(allowedSlot);
            }

-            canBePicked = true;            
+            canBePicked = true;
        }

        public override bool Pick(Character picker)
@@ -142,7 +142,8 @@ namespace Barotrauma.Items.Components
                    this,
                    item.WorldPosition,
                    pickTimer / requiredTime,
-                    GUI.Style.Red, GUI.Style.Green);
+                    GUI.Style.Red, GUI.Style.Green,
+                    !string.IsNullOrWhiteSpace(PickingMsg) ? PickingMsg : this is Door ? "progressbar.opening" : "progressbar.deattaching");
 #endif
                
                picker.AnimController.UpdateUseItem(true, item.WorldPosition + new Vector2(0.0f, 100.0f) * ((pickTimer / 10.0f) % 0.1f));