diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
index 84e3fa76a8..e126f19cca 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -33,7 +33,7 @@
 
 - type: entity
   name: china lake
-  parent: [BaseWeaponLauncher, BaseGunWieldable]
+  parent: BaseWeaponLauncher # WD removed BaseGunWieldable
   id: WeaponLauncherChinaLake
   description: PLOOP
   components:
@@ -57,6 +57,8 @@
       - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg
+    minAngle: 10 # WD
+    maxAngle: 10 # WD
   - type: BallisticAmmoProvider
     whitelist:
       tags:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 78cd629006..744100cc95 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -764,6 +764,9 @@
   - type: ActiveTimerTrigger
     timeRemaining: 0.3
   - type: DeleteOnTrigger
+  - type: SoundOnTrigger # WD
+    sound:
+      path: "/Audio/Effects/flash_bang.ogg"
 
 # This is supposed to spawn shrapnel and stuff so uhh... TODO?
 - type: entity
diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Launcher/shinano.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Launcher/shinano.yml
index f04b4e31ad..b237d00a57 100644
--- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Launcher/shinano.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Launcher/shinano.yml
@@ -9,6 +9,9 @@
     layers:
       - state: icon
         map: ["enum.GunVisualLayers.Base"]
+      - state: shinano
+        visible: false
+        map: [ "enum.ModuleVisualState.ShutterModule" ]
   - type: Item
     sprite: White/Objects/Weapons/Guns/Launchers/shinano-inhands.rsi
     size: Large
@@ -16,6 +19,7 @@
     - 0,0,2,1
   - type: Clothing
     sprite: White/Objects/Weapons/Guns/Launchers/shinano-inhands.rsi
+    quickEquip: false
     slots:
     - Back
     - suitStorage
@@ -44,11 +48,22 @@
         name: Shutter Module
         insertSound: /Audio/White/Gun/Modules/insertmodule.ogg
         ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg
-        priority: 1
+        priority: 4
         whitelist:
           tags:
           - BaseShutterModule
   - type: ContainerContainer
     containers:
       shutter_module: !type:ContainerSlot
+      ballistic-ammo: !type:Container
+        ents: []
   - type: Appearance
+  - type: EmitSoundOnPickup
+    sound:
+      collection: RiflesPickUp
+  - type: EmitSoundOnDrop
+    sound:
+      collection: RiflesDrop
+  - type: EmitSoundOnLand
+    sound:
+      collection: RiflesDrop
diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/shinanogrenades.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/shinanogrenades.yml
index 2eaad64768..716bb8fbe2 100644
--- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/shinanogrenades.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/shinanogrenades.yml
@@ -41,13 +41,16 @@
       - state: grenade
   - type: FlashOnTrigger
     range: 6
-    stunTime: 3 # WD
-    knockdownTime: 10 # WD
+    stunTime: 3
+    knockdownTime: 10
   - type: SpawnOnTrigger
     proto: GrenadeFlashEffect
   - type: ActiveTimerTrigger
     timeRemaining: 0.6
   - type: DeleteOnTrigger
+  - type: SoundOnTrigger
+    sound:
+      path: "/Audio/Effects/flash_bang.ogg"
 
 - type: entity
   parent: BaseBulletShinanoGranade
diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-icons.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-icons.rsi/meta.json
index 45c099c298..cb8cedb78e 100644
--- a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-icons.rsi/meta.json
+++ b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-icons.rsi/meta.json
@@ -12,6 +12,9 @@
         },
         {
             "name": "bolt-open"
+        },
+        {
+            "name": "shinano"
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-icons.rsi/shinano.png b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-icons.rsi/shinano.png
new file mode 100644
index 0000000000..64c7f9eaf5
Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-icons.rsi/shinano.png differ