Skip to content
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

Capfruit: fake cap guns are contraband, grown ones have standard ammo. #2073

Merged
merged 1 commit into from
Sep 25, 2024
Merged

Capfruit: fake cap guns are contraband, grown ones have standard ammo. #2073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2010,7 +2010,7 @@
seedId: fakeCapfruit
- type: Food
trash:
- RevolverCapGunFake
- RevolverCapGunFakeGrown # Frontier: add Grown

- type: entity
name: rice bushel
Expand Down
4 changes: 3 additions & 1 deletion Resources/Prototypes/Entities/Objects/Fun/toys.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,7 +1006,7 @@
revolver-ammo: !type:Container

- type: entity
parent: RevolverCapGun
parent: [RevolverCapGun, BaseC3SyndicateContraband] # Frontier: added BaseC3SyndicateContraband
id: RevolverCapGunFake
name: cap gun
suffix: Fake
Expand All @@ -1020,6 +1020,8 @@
- CartridgeMagnum
- SpeedLoaderMagnum
proto: CartridgeMagnumAP
- type: Contraband # Frontier
hideValues: true # Frontier

- type: entity
parent: BaseItem
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,3 +509,13 @@
steps: 2
zeroVisible: false
- type: Appearance

# Grown cap gun, in toys.yml for consistency with fake parent
- type: entity
parent: [BaseC3SyndicateContrabandNoValue, RevolverCapGunFake] # Frontier: added BaseC3SyndicateContraband
id: RevolverCapGunFakeGrown
suffix: Fake, Grown
noSpawn: true
components:
- type: RevolverAmmoProvider
proto: CartridgeMagnum # Base has AP rounds
Loading