diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 0f63a8c9a64..f708b11a310 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -7335,3 +7335,11 @@ Entries: message: Updated the NT Bottleneck. id: 5317 time: '2024-09-23T21:22:36.0000000+00:00' +- author: whatston3 + changes: + - type: Tweak + message: Fake cap guns are now properly qualified as C3 contraband. + - type: Tweak + message: Grown fake cap guns no longer spawn armor piercing ammunition. + id: 5318 + time: '2024-09-25T16:44:57.0000000+00:00' 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/Consumable/Food/meals.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml index cf7ff508d0a..2a9df9dec32 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml @@ -275,3 +275,120 @@ tags: - Vegetable - Fruit + +- type: entity + name: poached pears + parent: FoodBowlBase + id: FoodMealPoachedPears + description: The classiest use for a can of wine. + components: + - type: FlavorProfile + flavors: + - fruity + - alcohol + - pear + - type: Sprite + sprite: _NF/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: poachedpear + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: Nutriment + Quantity: 12 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Flavorol + Quantity: 8 + - type: Tag + tags: + - Fruit + +- type: entity + name: pears belle helene + parent: FoodBowlBase + id: FoodMealPearsBelleHelene + description: The delicate flavor of the immaculate pear drenched in chocolate. + components: + - type: FlavorProfile + flavors: + - chocolate + - pear + - creamy + - type: Sprite + sprite: _NF/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: bellepear + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 12 + - ReagentId: Vitamin + Quantity: 8 + - ReagentId: Flavorol + Quantity: 8 + - ReagentId: Theobromine + Quantity: 3 + - type: Tag + tags: + - Fruit + +- type: entity + name: pear muffin + parent: FoodMealBase + id: FoodBakedMuffinPear + description: I won't tell if you just try to pick out the chocolate. + components: + - type: FlavorProfile + flavors: + - chocolate + - muffin + - pear + - type: Sprite + sprite: _NF/Objects/Consumable/Food/Baked/bread.rsi + state: pearmuffin + scale: .75, .75 + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 4 + - ReagentId: Flavorol + Quantity: 2 + - ReagentId: Theobromine + Quantity: 1 + - type: Tag + tags: + - Fruit + +- type: entity + name: pear and cheese tart + parent: FoodPieBase + id: FoodTartPearCheese + description: The most sublime pair. + components: + - type: FlavorProfile + flavors: + - sweet + - cheesy + - pear + - type: Sprite + sprite: _NF/Objects/Consumable/Food/Baked/pie.rsi + layers: + - state: tin + - state: pearandcheese + - type: Tag + tags: + - Fruit + - Pie 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 diff --git a/Resources/Prototypes/_NF/Flavors/flavors.yml b/Resources/Prototypes/_NF/Flavors/flavors.yml index 1c3408d5b1b..8279b7e59e4 100644 --- a/Resources/Prototypes/_NF/Flavors/flavors.yml +++ b/Resources/Prototypes/_NF/Flavors/flavors.yml @@ -37,3 +37,8 @@ id: cucumber flavorType: Complex description: flavor-complex-cucumber + +- type: flavor + id: pear + flavorType: Complex + description: flavor-complex-pear diff --git a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml index 249ed7f87e5..e6675fd0571 100644 --- a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml @@ -151,7 +151,7 @@ - type: microwaveMealRecipe id: RecipeRaisins - name: raisins + name: raisins recipe result: ReagentContainerRaisin # A little bit cursed, spawning a bag time: 30 solids: @@ -166,6 +166,55 @@ FoodCucumber: 1 reagents: Saline: 10 + +- type: microwaveMealRecipe + id: RecipePoachedPears + name: poached pears recipe + result: FoodMealPoachedPears + time: 10 + solids: + FoodBowlBig: 1 + FoodPear: 3 + FoodOrange: 2 + reagents: + Wine: 10 + +- type: microwaveMealRecipe + id: RecipePearsBelleHelene + name: pears belle helene recipe + result: FoodMealPearsBelleHelene + time: 10 + solids: + FoodBowlBig: 1 + FoodPear: 3 + FoodSnackChocolateBar: 2 + FoodLemon: 1 + reagents: + Cream: 5 + +- type: microwaveMealRecipe + id: RecipePearMuffin + name: pear muffin recipe + result: FoodBakedMuffinPear + time: 10 + solids: + FoodPear: 1 + FoodSnackChocolateBar: 1 + reagents: + Flour: 5 + Oats: 5 + Sugar: 5 + +- type: microwaveMealRecipe + id: RecipePearCheeseTart + name: pear and cheese tart recipe + result: FoodTartPearCheese + time: 15 + solids: + FoodPlateTin: 1 + FoodDoughPie: 1 + FoodPear: 2 + FoodChevre: 1 # NOT ACTUAL FOOD diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi/meta.json index 35e1f04130b..a31baa50283 100644 --- a/Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi/meta.json @@ -19,6 +19,9 @@ { "name": "cucumbersandwich" }, + { + "name": "pearmuffin" + }, { "name": "inhand-right", "directions": 4 diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi/pearmuffin.png b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi/pearmuffin.png new file mode 100644 index 00000000000..9806beaa663 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi/pearmuffin.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/inhand-left.png new file mode 100644 index 00000000000..23aeffa07a9 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/inhand-right.png new file mode 100644 index 00000000000..01027d3f312 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/meta.json new file mode 100644 index 00000000000..1355ee3a5ca --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, pearandcheese by dustylens (GitHub)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "tin" + }, + { + "name": "pearandcheese" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/pearandcheese.png b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/pearandcheese.png new file mode 100644 index 00000000000..3883f9dbc47 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/pearandcheese.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/tin.png b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/tin.png new file mode 100644 index 00000000000..5bdbc10a939 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/tin.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/bellepear.png b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/bellepear.png new file mode 100644 index 00000000000..bd9c6376eab Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/bellepear.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/meta.json index 06d7333d149..0a3b323861d 100644 --- a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/meta.json @@ -14,7 +14,13 @@ "name": "greek" }, { - "name": "avocado" + "name": "avocado" + }, + { + "name": "poachedpear" + }, + { + "name": "bellepear" } ] } diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/poachedpear.png b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/poachedpear.png new file mode 100644 index 00000000000..931f576a25c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/poachedpear.png differ