From 0be0888f9781499f0000f8e49a342557a8dc583e Mon Sep 17 00:00:00 2001
From: fasuh <bbkk9@wp.pl>
Date: Sun, 24 May 2026 09:03:02 +0200
Subject: [PATCH 1/3] fix(Species): Fix a bug that did not allow amoxla to
 return blood to avali nor resomi

---
 Resources/Prototypes/_StarLight/Reagents/medicine.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/_StarLight/Reagents/medicine.yml b/Resources/Prototypes/_StarLight/Reagents/medicine.yml
index 0ab670e839a..494756beb31 100644
--- a/Resources/Prototypes/_StarLight/Reagents/medicine.yml
+++ b/Resources/Prototypes/_StarLight/Reagents/medicine.yml
@@ -84,14 +84,14 @@
         damage:
           types:
             Poison: 1.5 #Ammonia is toxic injected directly into bloodstream
-            Asphyxiation: 1 
+            Asphyxiation: 1
             Bloodloss: 0.5
       - !type:ModifyBloodLevel
         conditions:
         - !type:OrganType
           type: Avali
-          shouldHave: false
+          shouldHave: true
         - !type:OrganType
           type: Resomi
-          shouldHave: false
+          shouldHave: true
         amount: 3

From a2502f28aafad8f802a0da1a07be6b2c8d230a36 Mon Sep 17 00:00:00 2001
From: fasuh <bbkk9@wp.pl>
Date: Wed, 27 May 2026 07:20:24 +0200
Subject: [PATCH 2/3] fix(Gun): Revert anaconda changes

---
 .../Objects/Weapons/Guns/Pistols/pistol.yml   | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

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

From 6a16110e18c0e86f6345d7b0f79a507ab3d2b2bf Mon Sep 17 00:00:00 2001
From: fasuh <bbkk9@wp.pl>
Date: Wed, 27 May 2026 08:04:22 +0200
Subject: [PATCH 3/3] fix(Gun): Add a missing tag

---
 Resources/Prototypes/_StarLight/tags.yml | 3 +++
 1 file changed, 3 insertions(+)

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