diff --git a/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml b/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml
index 7bc2bce794..fa976d7bc7 100644
--- a/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml
+++ b/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml
@@ -49,18 +49,17 @@
   # - type: Appearance
 
 - type: entity
-  name: Borg mk 58
+  name: mk 58
   parent: BaseWeaponBatterySmall
+  suffix: Robot, energy based
   id: WeaponborgPistolMk58
-  description: This is an antique laser pistol. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy.
+  description: A cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. Uses .35 auto ammo.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
-  - type: Clothing
-    sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
   - type: Gun
     fireRate: 5
     availableModes:
@@ -69,21 +68,11 @@
       path: /Audio/Weapons/Guns/Gunshots/mk58.ogg
     fireOnDropChance: 0.5
   - type: ProjectileBatteryAmmoProvider
-    proto: BulletKineticShuttle
+    proto: BulletPistol
     fireCost: 100
   - type: BatterySelfRecharger
     autoRecharge: true
-    autoRechargeRate: 40
+    autoRechargeRate: 30
   - type: Battery
     maxCharge: 1000
     startingCharge: 1000
-  - type: Appearance
-  - type: Tag
-    tags:
-    - HighRiskItem
-    - Sidearm
-    - WeaponAntiqueLaser
-  - type: StaticPrice
-    price: 750
-  - type: StealTarget
-    stealGroup: WeaponAntiqueLaser