diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index e1ad784d5a9..ff57190ab7d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -1042,9 +1042,21 @@
     soundHit:
       collection: MeatLaserImpact
 
+- type: entity
+  name: energy bolt
+  id: BulletEnergyGun
+  parent: BulletEnergyGunLaser
+  noSpawn: true
+  components:
+  - type: Projectile
+    impactEffect: BulletImpactEffectRedDisabler
+    damage:
+      types:
+        Heat: 5
+
 - type: entity
   name: wide laser barrage
   id: BulletLaserSpread
   categories: [ HideSpawnMenu ]
-  parent: BulletEnergyGunLaser
+  parent: BulletEnergyGun
 
diff --git a/Resources/Prototypes/Floof/Entities/Objects/Specific/Robotics/Borgmodules.yml b/Resources/Prototypes/Floof/Entities/Objects/Specific/Robotics/Borgmodules.yml
index dec5b4a3c96..8683fadbfbb 100644
--- a/Resources/Prototypes/Floof/Entities/Objects/Specific/Robotics/Borgmodules.yml
+++ b/Resources/Prototypes/Floof/Entities/Objects/Specific/Robotics/Borgmodules.yml
@@ -76,7 +76,7 @@
     - state: icon-Advmeasures
   - type: ItemBorgModule
     items:
-    - WeaponEnergyShotgun
+    - WeaponBorgEnergyShotgun
     - BorgWeaponXrayCannon
     
 - type: entity
diff --git a/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml b/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml
index a22fb9c6169..7c8d17d40be 100644
--- a/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml
+++ b/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml
@@ -1,7 +1,7 @@
 
 - type: entity
-  name: borg disabler
   parent: WeaponDisabler
+  suffix: Robot
   id: WeaponBorgDisabler
   description: A self-defense weapon that exhausts organic targets, weakening them until they collapse.
   components:
@@ -49,25 +49,25 @@
   # - type: Appearance
 
 - type: entity
-  name: borg pulse rifle
   parent: WeaponPulseRifle
+  suffix: Robot
   id: BorgWeaponPulseRifle
   description: A weapon that is almost as infamous as its users.
   components:
   - type: BatterySelfRecharger
     autoRecharge: true
-    autoRechargeRate: 30  
+    autoRechargeRate: 30
 
 - type: entity
-  name: borg Xray Cannon
   parent: WeaponXrayCannon
+  suffix: Robot
   id: BorgWeaponXrayCannon
   description: A weapon that is almost as infamous as its users.
   components:
   - type: BatterySelfRecharger
     autoRecharge: true
     autoRechargeRate: 30
-    
+
 - type: entity
   name: mk 58
   parent: BaseWeaponBatterySmall
@@ -96,11 +96,12 @@
   - type: Battery
     maxCharge: 1000
     startingCharge: 1000
-    
+
 - type: entity
   name: energy shotgun
   parent: BaseWeaponBattery
-  id: WeaponEnergyShotgun
+  id: BaseWeaponEnergyShotgun
+  abstract: true
   description: A one-of-a-kind prototype energy weapon that uses various shotgun configurations. It offers the possibility of both lethal and non-lethal shots, making it a versatile weapon.
   components:
   - type: Sprite
@@ -120,27 +121,33 @@
   - type: ProjectileBatteryAmmoProvider
     proto: eShellShotgun
     fireCost: 150
-  - type: BatteryWeaponFireModes
-    fireModes:
-    - proto: eShellShotgun
-      fireCost: 150
-    - proto: BulletDisablerSmg
-      fireCost: 120
   - type: Item
     size: Large
     shape:
     - 0,0,3,1
     sprite: Objects/Weapons/Guns/Battery/inhands_64x.rsi
     heldPrefix: energy
-  - type: Tag
-    tags:
-    - HighRiskItem
-  - type: StealTarget
-    stealGroup: WeaponEnergyShotgun
-  - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
   - type: Battery
     maxCharge: 1200
     startingCharge: 1200
   - type: BatterySelfRecharger
     autoRecharge: true
-    autoRechargeRate: 24
\ No newline at end of file
+    autoRechargeRate: 24
+
+- type: entity
+  name: energy shotgun
+  parent: BaseWeaponEnergyShotgun
+  id: WeaponEnergyShotgun
+  components:
+  - type: GunRequiresWield
+  - type: Wieldable
+  - type: Tag
+    tags:
+    - HighRiskItem
+  - type: StealTarget
+    stealGroup: WeaponEnergyShotgun
+
+- type: entity
+  suffix: Robot
+  parent: BaseWeaponEnergyShotgun
+  id: WeaponBorgEnergyShotgun
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-left.png
new file mode 100644
index 00000000000..8f7c40c4f9d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-right.png
new file mode 100644
index 00000000000..9b453686633
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/meta.json
new file mode 100644
index 00000000000..2fcf294bc98
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Energy Shotgun inhands made by Boaz1111 based on the energy shotgun icon sprite made by Papermaker48 for SS14",
+    "size": {
+        "x": 64,
+        "y": 64
+    },
+    "states": [
+        {
+            "name": "energy-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "energy-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..056e6026ac1
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..d5933b2f698
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-right.png differ