Skip to content

Revert anaconda nerf #1937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Fasuh wants to merge 4 commits into
base: master
Choose a base branch
from
+15 −10
Open

Revert anaconda nerf #1937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0be0888
fix(Species): Fix a bug that did not allow amoxla to return blood to …
Fasuh May 24, 2026
a2502f2
fix(Gun): Revert anaconda changes
Fasuh May 27, 2026
aa63c69
Merge remote-tracking branch 'hardlight/master'
Fasuh May 27, 2026
6a16110
fix(Gun): Add a missing tag
Fasuh May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Pistols/pistol.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
3 changes: 3 additions & 0 deletions Resources/Prototypes/_StarLight/tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
- type: Tag
id: Felionoid

- type: Tag
id: GunCanAimShooter

- type: Tag
id: HiltPlasteel

Expand Down
Loading