Merge pull request unitystation#2011 from chairbender/1749-wonky-shoo…

…ting Recoil, Muzzle Flash, and Shooting Bugs
Unitystation-fork · Jul 9, 2019 · 8ab4abe · 8ab4abe
2 parents 8c30ae0 + 38fad9e
commit 8ab4abe
Show file tree

Hide file tree

Showing 12 changed files with 2,066 additions and 1,906 deletions.
diff --git a/UnityProject/Assets/Prefabs/Items/Weapons/Ballistics/Resources/C20rSMG_Ballistic.prefab b/UnityProject/Assets/Prefabs/Items/Weapons/Ballistics/Resources/C20rSMG_Ballistic.prefab
diff --git a/UnityProject/Assets/Prefabs/Player/Resources/Player_V3(uNet).prefab b/UnityProject/Assets/Prefabs/Player/Resources/Player_V3(uNet).prefab