diff --git a/Resources/Prototypes/Floof/Entities/Objects/Weapons/Melee.yml b/Resources/Prototypes/Floof/Entities/Objects/Weapons/Melee.yml
index a6c9dc944b9..e2938b1da84 100644
--- a/Resources/Prototypes/Floof/Entities/Objects/Weapons/Melee.yml
+++ b/Resources/Prototypes/Floof/Entities/Objects/Weapons/Melee.yml
@@ -84,93 +84,10 @@
 
 - type: entity
   name: borg stun baton
-  parent: BaseItem
+  parent: Stunbaton
   id: BorgStunbaton
   description: A stun baton for incapacitating people with. Actively harming with this is considered bad tone.
   components:
-  - type: Sprite
-    sprite: Objects/Weapons/Melee/stunbaton.rsi
-    layers:
-    - state: stunbaton_off
-      map: [ "enum.ToggleVisuals.Layer" ]
-  - type: Stunbaton
-    energyPerUse: 50
   - type: BatterySelfRecharger
     autoRecharge: true
     autoRechargeRate: 40
-  - type: ItemToggle
-    predictable: false
-    soundActivate:
-      collection: sparks
-      params:
-        variation: 0.250
-    soundDeactivate:
-      collection: sparks
-      params:
-        variation: 0.250
-    soundFailToActivate:
-      path: /Audio/Machines/button.ogg
-      params:
-        variation: 0.250
-  - type: ItemToggleMeleeWeapon
-    activatedDamage:
-      types:
-        Blunt: 0
-  - type: MeleeWeapon
-    wideAnimationRotation: -135
-    damage:
-      types:
-        Blunt: 7
-    bluntStaminaDamageFactor: 2.5
-    heavyRateModifier: 0.75
-    heavyDamageBaseModifier: 1.75
-    heavyStaminaCost: 1
-    animation: WeaponArcSlash
-  - type: StaminaDamageOnHit
-    damage: 35
-    sound: /Audio/Weapons/egloves.ogg
-  - type: StaminaDamageOnCollide
-    damage: 35
-    sound: /Audio/Weapons/egloves.ogg
-  - type: Battery
-    maxCharge: 1000
-    startingCharge: 1000
-  - type: Item
-    heldPrefix: off
-    size: Normal
-  - type: Clothing
-    sprite: Objects/Weapons/Melee/stunbaton.rsi
-    quickEquip: false
-    slots:
-    - Belt
-  - type: DisarmMalus
-    malus: 0.225
-  - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-     enum.ToggleVisuals.Toggled:
-        enum.ToggleVisuals.Layer:
-          True: {state: stunbaton_on}
-          False: {state: stunbaton_off}
-  - type: StaticPrice
-    price: 80
-  - type: Riggable
-  - type: SolutionContainerManager
-    solutions:
-      battery:
-        maxVol: 5
-  - type: InjectableSolution
-    solution: battery
-  - type: DrawableSolution
-    solution: battery
-  - type: Explosive
-    explosionType: Default
-    intensitySlope: 1.5
-    maxIntensity: 200
-  - type: PhysicalComposition
-    materialComposition:
-      Steel: 100
-      Plastic: 100
-  - type: GuideHelp
-    guides:
-    - Security
diff --git a/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml b/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml
index 1674ad32560..7bc2bce7949 100644
--- a/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml
+++ b/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml
@@ -1,84 +1,52 @@
 
 - type: entity
   name: borg disabler
-  parent: BaseWeaponBatterySmall
+  parent: WeaponDisabler
   id: WeaponBorgDisabler
   description: A self-defense weapon that exhausts organic targets, weakening them until they collapse.
   components:
-    - type: Tag
-      tags:
-        - Taser
-        - Sidearm
-    - type: Sprite
-      sprite: Objects/Weapons/Guns/Battery/disabler.rsi
-      layers:
-        - state: base
-          map: ["enum.GunVisualLayers.Base"]
-        - state: mag-unshaded-0
-          map: ["enum.GunVisualLayers.MagUnshaded"]
-          shader: unshaded
-    - type: Clothing
-      sprite: Objects/Weapons/Guns/Battery/disabler.rsi
-      quickEquip: false
-      slots:
-        - suitStorage
-        - Belt
-    - type: Gun
-      fireRate: 2
-      soundGunshot:
-        path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
-    - type: ProjectileBatteryAmmoProvider
-      proto: BulletDisabler
-      fireCost: 100
     - type: BatterySelfRecharger
       autoRecharge: true
       autoRechargeRate: 30
-    - type: MagazineVisuals
-      magState: mag
-      steps: 5
-      zeroVisible: true
-    - type: Appearance
-    - type: GuideHelp
-      guides:
-      - Security
-- type: entity
-  name: borg taser
-  parent: BaseWeaponBatterySmall
-  id: WeaponborgTaser
-  description: A low-capacity, energy-based stun gun used by security teams to subdue targets at range.
-  components:
-  - type: Tag
-    tags:
-    - Taser
-    - Sidearm
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Battery/taser.rsi
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-unshaded-0
-      map: ["enum.GunVisualLayers.MagUnshaded"]
-      shader: unshaded
-  - type: Item
-    heldPrefix: taser4
-  - type: Clothing
-    quickEquip: false
-    slots:
-    - Belt
-  - type: Gun
-    soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/taser.ogg
-  - type: ProjectileBatteryAmmoProvider
-    proto: BulletTaser
-    fireCost: 200
-  - type: BatterySelfRecharger
-    autoRecharge: true
-    autoRechargeRate: 40
-  - type: MagazineVisuals
-    magState: mag
-    steps: 5
-    zeroVisible: true
-  - type: Appearance
+
+# - type: entity
+  # name: borg taser
+  # parent: BaseWeaponBatterySmall
+  # id: WeaponborgTaser
+  # description: A low-capacity, energy-based stun gun used by security teams to subdue targets at range.
+  # components:
+  # - type: Tag
+    # tags:
+    # - Taser
+    # - Sidearm
+  # - type: Sprite
+    # sprite: Objects/Weapons/Guns/Battery/taser.rsi
+    # layers:
+    # - state: base
+      # map: ["enum.GunVisualLayers.Base"]
+    # - state: mag-unshaded-0
+      # map: ["enum.GunVisualLayers.MagUnshaded"]
+      # shader: unshaded
+  # - type: Item
+    # heldPrefix: taser4
+  # - type: Clothing
+    # quickEquip: false
+    # slots:
+    # - Belt
+  # - type: Gun
+    # soundGunshot:
+      # path: /Audio/Weapons/Guns/Gunshots/taser.ogg
+  # - type: ProjectileBatteryAmmoProvider
+    # proto: BulletTaser
+    # fireCost: 200
+  # - type: BatterySelfRecharger
+    # autoRecharge: true
+    # autoRechargeRate: 40
+  # - type: MagazineVisuals
+    # magState: mag
+    # steps: 5
+    # zeroVisible: true
+  # - type: Appearance
 
 - type: entity
   name: Borg mk 58