diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
index 2c7e34b2..ad59c6ef 100644
--- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
+++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
@@ -9,12 +9,11 @@
   <component name="ChangeListManager">
     <list default="true" id="8acc2658-cb31-4c49-857f-282cfee74640" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Content/Levels/MainMenuLevel.umap" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Levels/MainMenuLevel.umap" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Content/StarterContent/Particles/P_Ambient_Dust.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/StarterContent/Particles/P_Ambient_Dust.uasset" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/EndlessVendettaCharacter.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/EndlessVendettaCharacter.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/MainSaveGameClass.h" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/MainSaveGameClass.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun_Skeleton.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun_Skeleton.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -41,7 +40,7 @@
     &quot;C++ Project.EndlessVendetta.executor&quot;: &quot;Run&quot;,
     &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;Bounty-System-Rework&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;attachment-bug-fix&quot;,
     &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
     &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
     &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
@@ -52,13 +51,13 @@
   },
   &quot;keyToStringList&quot;: {
     &quot;rider.external.source.directories&quot;: [
-      &quot;C:\\Users\\Rafal\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\DecompilerCache&quot;,
-      &quot;C:\\Users\\Rafal\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\SourcesCache&quot;,
-      &quot;C:\\Users\\Rafal\\AppData\\Local\\Symbols\\src&quot;
+      &quot;C:\\Users\\mhara\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\DecompilerCache&quot;,
+      &quot;C:\\Users\\mhara\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\SourcesCache&quot;,
+      &quot;C:\\Users\\mhara\\AppData\\Local\\Symbols\\src&quot;
     ]
   }
 }</component>
-  <component name="RunManager" selected="C++ Project.EndlessVendetta">
+  <component name="RunManager">
     <configuration name="EndlessVendetta" type="CppProject" factoryName="C++ Project">
       <configuration_1>
         <option name="CONFIGURATION" value="DebugGame Editor" />
@@ -132,29 +131,18 @@
       <workItem from="1705685813496" duration="6457000" />
       <workItem from="1705756768038" duration="3821000" />
       <workItem from="1705856571902" duration="3954000" />
-      <workItem from="1706036726146" duration="5339000" />
-      <workItem from="1706101472121" duration="21314000" />
-      <workItem from="1706203836052" duration="7461000" />
-      <workItem from="1706626387819" duration="5432000" />
-      <workItem from="1706711852868" duration="19944000" />
-      <workItem from="1706799696925" duration="11011000" />
-      <workItem from="1706838825990" duration="4397000" />
+      <workItem from="1706110241756" duration="1092000" />
+      <workItem from="1706705451486" duration="5218000" />
+      <workItem from="1706727398145" duration="597000" />
+      <workItem from="1706790490396" duration="10304000" />
+      <workItem from="1706802528693" duration="3999000" />
+      <workItem from="1706807322577" duration="2357000" />
     </task>
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
-  <component name="UnitTestsCoverage.Settings">
-    <option name="coveragePercentColumnWidth" value="150" />
-    <option name="sortOrder" value="DESCENDING" />
-    <option name="sortedColumn" value="1" />
-    <option name="symbolColumnWidth" value="346" />
-    <coverage-tree-state>
-      <expand />
-      <select />
-    </coverage-tree-state>
-  </component>
   <component name="VcsManagerConfiguration">
     <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
   </component>
diff --git a/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun.uasset b/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun.uasset
index 0f1eb268..28e6c3fd 100644
--- a/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun.uasset
+++ b/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:67c8259a243d5c66d35b91458da2dd7e9e860224052098ba554eba470cee4a2a
-size 2162660
+oid sha256:388390c8d51429942976c17d06b5e4084e652f9b2554782794c1dad2d766438c
+size 2113778
diff --git a/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset b/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset
index 3a6c6898..8a95da14 100644
--- a/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset
+++ b/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:af19d0a66ac93ccb5502fa57f0fa608709a59cffe2cc9157e8aa8bed3d43b5f9
-size 7712
+oid sha256:a791858557c1d4a2c87aefc7d0cff0cb191cb6d496ec518f602ce3db92323815
+size 9020
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset
index 5cd48aa7..f2ca1773 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:55d9774b1be0067976e247efb9c0924028d8e6f104a2356fc3c244d0ca0bcbab
-size 40721
+oid sha256:da280a53ff9a19fc5698a2e4e87a2f0b6e4fd81c95fb5929a659cdb507b0d446
+size 41581
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset
index a67cfd74..201ac1f9 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ddfeb9078755b405062e9752c733edef8a3ffbb8b12189ef5aee0e306dbf83ac
-size 127463
+oid sha256:f4d4c8728c6346fed52e60b7b56fa54a6492180815d2cee29d8d8730ac624947
+size 125545
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset
index d493546a..bcdca35f 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce09071644a22e6b7450df39c54ef3c4741209a5401376534740dc7d76298276
-size 128111
+oid sha256:27baa0566dff77e1a10c6ad16334355882c66dc68bddb90cd8790af23918a24c
+size 126225
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun.uasset
index 9df6634f..b98fc270 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de2933666cc939d964639b58e5bf9e846486cdeb275977e0112b8e28299168ba
-size 964821
+oid sha256:7c875b5a56660d1175d197651084a60f82e244678cb44b7ed2354937caced1c0
+size 964880
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun_Skeleton.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun_Skeleton.uasset
index cc8853fa..33067b99 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun_Skeleton.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun_Skeleton.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:014ad9c5325cbb86903bde65b93706b130e86ca2fef712a46486f1a58c6ca43d
-size 6330
+oid sha256:224fd066e908fdcb82c95df41d433787f45507d56387cb8978feaf6f2d759125
+size 7075
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset
index b82510b8..2a158809 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:77fc87f2895edafaa9d2192aae11f1d401bd041ac27c83283bcacee09e495bf1
-size 127352
+oid sha256:362a64d67da0cb91a66300f81b87b5482e4cd9a1058aafb5b012ed79a835ba07
+size 125596
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset
index 9c558f37..658f6c74 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f96592b4b4a601faa17cc21653226506c222259441097ed328b9775d5f12a37b
-size 127654
+oid sha256:cf3cb3f1c18d9cef57e27220662bc04a7cfb0de1aff48d810eaefeed37c29d20
+size 127332
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset
index 0bcff90c..9ed6e4f1 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:298d24e922076c08990a077430f8dd16ec7b014029547591be8b7658eb0ec17b
-size 48331
+oid sha256:a90f10864a9825562cc3a8bb9972d912211f53477d808ae9252142fb3b197a85
+size 146446
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_SilencerImage.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_SilencerImage.uasset
new file mode 100644
index 00000000..e4bcc0c7
--- /dev/null
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_SilencerImage.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6541b0e884663dee959f9484786850d0a8dc7727b41a2fc8a063ac28381ee851
+size 22763
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset
index 26b8081a..e02c45b6 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b0b18849fe2fb41c53b6835e8c1d882a5ed56dfa96a403797277280ffd3067b
-size 136669
+oid sha256:cd7b744f17e4d12932b8bc8d1452dcc9d3e54cc83c20d46cd3e8e063a96f11a3
+size 227800
diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
index c2a34afc..a2222591 100644
--- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
+++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6
-size 14948
+oid sha256:61d130e2bfe7d6048f25eb87b7a0936a887ed73ad7fdc29737bbd57569345cac
+size 14831
diff --git a/EndlessVendetta/Content/StarterContent/Shapes/TempSilencer.uasset b/EndlessVendetta/Content/StarterContent/Shapes/TempSilencer.uasset
new file mode 100644
index 00000000..05ac52df
--- /dev/null
+++ b/EndlessVendetta/Content/StarterContent/Shapes/TempSilencer.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:09bd5fb96ee510542e6f9c5439748cae1542863fd4909d649bf76be51e9d4468
+size 28225
diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/24/JBARER4CBJ0QZT5CZY8ID6.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/24/JBARER4CBJ0QZT5CZY8ID6.uasset
index acadf3cb..a5e2facf 100644
--- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/24/JBARER4CBJ0QZT5CZY8ID6.uasset
+++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/24/JBARER4CBJ0QZT5CZY8ID6.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dd163ab11d986d221c1b1ce955970bdf5df7a4ee26a0c3cd0fa374c1bab5574e
-size 7069
+oid sha256:84b30818e9bae891d6c94279a7ca4f0fc7de1ef3432141d4a7adc9057459595e
+size 6503
diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/GQ/QPISORMXEPSB0MNOUMBIZ4.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/GQ/QPISORMXEPSB0MNOUMBIZ4.uasset
index eae0f773..50f5595b 100644
--- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/GQ/QPISORMXEPSB0MNOUMBIZ4.uasset
+++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/GQ/QPISORMXEPSB0MNOUMBIZ4.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e1d15b8a2648519fcec0059b248d90fc57e5a576bad5418d6c81220017272b7
-size 7082
+oid sha256:8c4ce0647a5c6be70b5b2078d285a9d14a8a6eb0264271d36931b66c7a7904b6
+size 6516
diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/PG/AISD2CY0WTWKV1BJDYTYJ3.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/PG/AISD2CY0WTWKV1BJDYTYJ3.uasset
index b2990eba..11295e10 100644
--- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/PG/AISD2CY0WTWKV1BJDYTYJ3.uasset
+++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/PG/AISD2CY0WTWKV1BJDYTYJ3.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bb7fd3b17bbcc170b84fda39c7712b526f201a4a45ea48d1ac36415e0ca366ee
-size 7007
+oid sha256:4d53dac7e3e749916ed5e5802c3c3495f2895827dcb66e9b2f49a8cac9a4ecb5
+size 6664
diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/V5/00HOTT7GJB6N5M6TZHPJO5.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/V5/00HOTT7GJB6N5M6TZHPJO5.uasset
index 35a7b628..0d782ca2 100644
--- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/V5/00HOTT7GJB6N5M6TZHPJO5.uasset
+++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/V5/00HOTT7GJB6N5M6TZHPJO5.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b51d0369a65741c96d3499c1feac5146358708f5dc169e0f26d829accc474e91
-size 7159
+oid sha256:f97293c8252b81250776e74e7637a467ec93628edeac54773472326b7bd45303
+size 6593
diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset
index b8758f85..86bd9ab5 100644
--- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset
+++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4eba44b03ff058bd86a49a05814cbb134bd5c24beb99148a7b8e7c2c7e71eb21
-size 5152
+oid sha256:1a02acdaa622152fe92278f5c6bcfa93a1f8831cee568902f7fde1b519ae6f6f
+size 6374
diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/X5/OKD54JHXNGXNVF4JEBBMVP.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/X5/OKD54JHXNGXNVF4JEBBMVP.uasset
deleted file mode 100644
index e0940ef3..00000000
--- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/X5/OKD54JHXNGXNVF4JEBBMVP.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4f37bd6fd21d44596891c4bd6763bd936b1ff98425033925bbed475ee4d2f5b9
-size 7302
diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp
index dde8cb8c..a3d1b18b 100644
--- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp
@@ -101,6 +101,7 @@ void ABaseWeaponClass::GenerateRecoilVector()
 
 void ABaseWeaponClass::ApplyRecoil(float DeltaTime)
 {
+	if (!endlessVendettaChar->bHasRifle) return;
 	if (recoilTime < 0.3)
 	{
 		float amplitude = RecoilCurve->GetFloatValue(recoilTime); //get current value of curve in time
@@ -257,13 +258,33 @@ void ABaseWeaponClass::InteractPrompt()
 
 void ABaseWeaponClass::SetupSilencerAttachment(UStaticMesh* SilencerMesh)
 {
-	FTransform emptytransform;
-	UActorComponent* SilencerComponent = AddComponentByClass(USilencerAttachmentClass::StaticClass(), true, emptytransform, false);
-	Cast<USilencerAttachmentClass>(SilencerComponent)->AttachToComponent(RootComponent, FAttachmentTransformRules::SnapToTargetIncludingScale);
-	TArray<UActorComponent*> SilencerMeshSocketArray (GetComponentsByTag(UStaticMeshComponent::StaticClass(), FName("SilencerMeshSocket")));
-	Cast<UStaticMeshComponent>(SilencerMeshSocketArray[0])->SetStaticMesh(SilencerMesh);
+	GEngine->AddOnScreenDebugMessage(-1, 15.f, FColor::Red, TEXT("SETTING UP SILENCER ATTACHMENTS"));
+	FTransform EmptyTransform;
+	
+	USceneComponent* SilencerAttachmentClass = Cast<USceneComponent>(AddComponentByClass(USilencerAttachmentClass::StaticClass(), false, EmptyTransform, false));
+	SilencerAttachmentClass->ComponentTags.Add(FName("AttachmentType"));
+	USkeletalMeshComponent* WeaponSkeletonMesh = FindComponentByClass<USkeletalMeshComponent>();
+	if (IsValid(SilencerAttachmentClass))
+	{
+		if (IsValid(WeaponSkeletonMesh))
+		{
+			SilencerAttachmentClass->AttachToComponent(WeaponSkeletonMesh, FAttachmentTransformRules::SnapToTargetIncludingScale, FName(TEXT("SilencerMeshSocket")));
+			UE_LOG(LogTemp, Display, TEXT("All Attachment is valid"));
+			//this makes it showup in editor for better debugging
+			SilencerAttachmentClass->CreationMethod = EComponentCreationMethod::Instance;
+			SilencerAttachmentClass->RegisterComponent();
+			UStaticMeshComponent* StaticMeshComp = NewObject<UStaticMeshComponent>(SilencerAttachmentClass, UStaticMeshComponent::StaticClass());
+			if (IsValid(StaticMeshComp))
+			{
+				StaticMeshComp->AttachToComponent(SilencerAttachmentClass, FAttachmentTransformRules::SnapToTargetIncludingScale);
+				StaticMeshComp->SetStaticMesh(SilencerMesh);
+				StaticMeshComp->SetRelativeRotation(FRotator(0,90,0));
+				StaticMeshComp->SetCollisionEnabled(ECollisionEnabled::NoCollision);
+				//Making it show in editor for debugging
+				StaticMeshComp->CreationMethod = EComponentCreationMethod::Instance;
+				StaticMeshComp->RegisterComponent();
+			}
+		}
+	}
 }
 
-
-
- 
diff --git a/EndlessVendetta/Source/EndlessVendetta/Workbench&Attachments/SilencerAttachmentClass.cpp b/EndlessVendetta/Source/EndlessVendetta/Workbench&Attachments/SilencerAttachmentClass.cpp
index 7f31f73b..50b63063 100644
--- a/EndlessVendetta/Source/EndlessVendetta/Workbench&Attachments/SilencerAttachmentClass.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/Workbench&Attachments/SilencerAttachmentClass.cpp
@@ -29,7 +29,5 @@ void USilencerAttachmentClass::BeginPlay()
 void USilencerAttachmentClass::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction)
 {
 	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
-
-	// ...
 }