Merge remote-tracking branch 'origin/master'

2020-11-05 09:09:27 -05:00
parent 47b123c219 cfdc30ab7e
commit df7b8e78e9
2 changed files with 2 additions and 3 deletions
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1744,7 +1744,6 @@ public class Blocks implements ContentList{

            rotateSpeed = 2.5f;
            reloadTime = 200f;
-            restitution = 0.2f;
            ammoUseEffect = Fx.casing3Double;
            recoilAmount = 5f;
            restitution = 0.009f;