diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Pistols/pistol.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Pistols/pistol.yml
index afcc035b955..de449f23776 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Pistols/pistol.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Pistols/pistol.yml
@@ -60,10 +60,10 @@
       - WeaponPistolDualetta
 
 - type: entity
-  parent: [ NFBaseWeaponRevolverChamber45, BaseItem, BaseC3PirateContraband ]
+  parent: [ BaseItem, BaseC3PirateContraband ]
   id: WeaponPistolAnaconda
   name: Anaconda
-  description: A heavy pistol.
+  description: A heavy pistol capable of supplying itself with the ammo on the way using a built-in fabricator.
   components:
   - type: Item
     size: Small
@@ -91,13 +91,15 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/hpistol.ogg
+  - type: BasicEntityAmmoProvider
+    proto: BulletAnaconda
+    capacity: 7
+    count: 7
+  - type: RechargeBasicEntityAmmo
+    rechargeCooldown: 4
+    rechargeSound:
+      path: /Audio/Weapons/Guns/Cock/shotgun_close.ogg
+  - type: AmmoCounter
   - type: ContainerContainer
     containers:
-      revolver-ammo: !type:Container
-  - type: RevolverAmmoProvider
-    whitelist:
-      tags:
-        - Cartridge45_magnumFMJ
-        - SpeedLoader45_magnumFMJ
-    proto: Cartridge45_ACPFMJ
-  - type: AmmoCounter
+      ballistic-ammo: !type:Container
diff --git a/Resources/Prototypes/_StarLight/tags.yml b/Resources/Prototypes/_StarLight/tags.yml
index 2d2598bbdc4..9b698142431 100644
--- a/Resources/Prototypes/_StarLight/tags.yml
+++ b/Resources/Prototypes/_StarLight/tags.yml
@@ -46,6 +46,9 @@
 - type: Tag
   id: Felionoid
 
+- type: Tag
+  id: GunCanAimShooter
+
 - type: Tag
   id: HiltPlasteel