From 3719d5183b57bff1ef2cd4237c46afa19866c5b2 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Wed, 25 Sep 2024 12:01:20 -0400 Subject: [PATCH] Capfruit contraband --- .../Entities/Objects/Consumable/Food/produce.yml | 2 +- Resources/Prototypes/Entities/Objects/Fun/toys.yml | 4 +++- Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml | 10 ++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 70e27f264bc..997e6160882 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -2010,7 +2010,7 @@ seedId: fakeCapfruit - type: Food trash: - - RevolverCapGunFake + - RevolverCapGunFakeGrown # Frontier: add Grown - type: entity name: rice bushel diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 53875d958d6..5e98de80ad3 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -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 @@ -1020,6 +1020,8 @@ - CartridgeMagnum - SpeedLoaderMagnum proto: CartridgeMagnumAP + - type: Contraband # Frontier + hideValues: true # Frontier - type: entity parent: BaseItem diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml index da520be4fe7..b45488f1d74 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml @@ -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