Fixes things

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, BaseGunWieldable]
-  id: WeaponEnergyShotgun
+  parent: BaseWeaponBattery
+  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
@@ -126,12 +127,6 @@
     - 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
@@ -140,35 +135,19 @@
     autoRechargeRate: 24
 
 - type: entity
-  name: borg energy shotgun
-  parent: BaseWeaponBattery
-  id: WeaponBorgEnergyShotgun
-  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.
+  name: energy shotgun
+  parent: BaseWeaponEnergyShotgun
+  id: WeaponEnergyShotgun
   components:
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi
-    layers:
-      - state: base
-        map: ["enum.GunVisualLayers.Base"]
-      - state: mag-unshaded-4
-        map: ["enum.GunVisualLayers.MagUnshaded"]
-        shader: unshaded
-  - type: Gun
-    fireRate: 2
-    soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
-  - type: ProjectileBatteryAmmoProvider
-    proto: eShellShotgun
-    fireCost: 150
-  - type: Item
-    size: Large
-    shape:
-    - 0,0,3,1
-    sprite: Objects/Weapons/Guns/Battery/inhands_64x.rsi
-    heldPrefix: energy
-  - type: Battery
-    maxCharge: 1200
-    startingCharge: 1200
-  - type: BatterySelfRecharger
-    autoRecharge: true
-    autoRechargeRate: 24
+  - type: GunRequiresWield
+  - type: Wieldable
+  - type: Tag
+    tags:
+    - HighRiskItem
+  - type: StealTarget
+    stealGroup: WeaponEnergyShotgun
+
+- type: entity
+  suffix: Robot
+  parent: BaseWeaponEnergyShotgun
+  id: WeaponBorgEnergyShotgun