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.

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

Added Can opening too Dog Food + Added a special brand of dog food #314

Merged
merged 6 commits into from
Jul 10, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
Quantity: 2
- ReagentId: Theobromine
Quantity: 3

- type: entity
name: Cram
parent: N14FoodSnackBase
Expand All @@ -89,7 +89,7 @@
state: crisps
- type: Food
trash: N14FoodCrispsTrash

- type: entity
name: Dandy Boy Apples
parent: N14FoodSnackBase
Expand All @@ -100,30 +100,61 @@
state: dandyapples
- type: Food
trash: N14FoodDandyboyapplesTrash

- type: entity
name: canned dog food
parent: N14FoodSnackBase
parent: FoodTinBase
id: N14FoodDogfood
name: canned dog food
description: A can of beef stew meant for dogs.
components:
- type: Sprite
state: dogfood
sprite: _Nuclear14/Objects/Consumable/Food/dogfood.rsi
- type: FlavorProfile
flavors:
- meaty
- mushy
- type: Food
trash: N14FoodTinCanTrash
- type: SolutionContainerManager
solutions:
food:
maxVol: 10
reagents:
- ReagentId: Nutriment
Quantity: 7
- ReagentId: N14RadParticleFood
Quantity: 1
- type: PhysicalComposition
materialComposition:
Steel: 100

trash: N14FoodDogFoodTrash
- type: Tag
tags:
- Meat
- Soup

- type: entity
parent: FoodTinBaseTrash
id: N14FoodDogFoodTrash
name: canned dog food
components:
- type: Sprite
sprite: _Nuclear14/Objects/Consumable/Food/dogfood.rsi

- type: entity
parent: FoodTinBase
id: N14FoodDinki-Di
name: Dinki Di Dog Food
description: A can of Gen-u-ine premium dog food, a worthy meal for any road warrior.
components:
- type: Sprite
sprite: _Nuclear14/Objects/Consumable/Food/dinkidi.rsi
- type: FlavorProfile
flavors:
- meaty
- mushy
- type: Food
trash: N14FoodDinki-DiTrash
- type: Tag
tags:
- Meat
- Soup

- type: entity
parent: FoodTinBaseTrash
id: N14FoodDinki-DiTrash
name: Dinki-Di Dog Food
components:
- type: Sprite
sprite: _Nuclear14/Objects/Consumable/Food/dinkidi.rsi

- type: entity
name: Fancy Lads Snack Cakes
parent: N14FoodSnackBase
Expand All @@ -134,7 +165,7 @@
state: fancylads
- type: Food
trash: N14FoodFancyladssnackcakesTrash

- type: entity
name: InstaMash
parent: N14FoodSnackBase
Expand All @@ -145,9 +176,9 @@
state: instamash
- type: Food
trash: N14FoodInstamashTrash

- type: entity
name: Pork n' Beans
name: Pork n' Beans
parent: N14FoodSnackBase
id: N14FoodPorkBeans
description: Beans stewed in a tomato sauce with chunks of cured pork belly.
Expand All @@ -159,7 +190,7 @@
- type: PhysicalComposition
materialComposition:
Steel: 100

- type: entity
name: mouldy food
parent: N14FoodSnackBase
Expand All @@ -181,7 +212,7 @@
Quantity: 3
- ReagentId: Ipecac
Quantity: 2

- type: entity
name: Salisbury Steak
parent: N14FoodSnackBase
Expand All @@ -201,7 +232,7 @@
Quantity: 9
- ReagentId: N14RadParticleFood
Quantity: 1

- type: entity
name: Sugar Bombs
parent: N14FoodSnackBase
Expand All @@ -223,7 +254,7 @@
Quantity: 1
- ReagentId: Sugar
Quantity: 5

- type: entity
name: YumYum Deviled Eggs
parent: N14FoodSnackBase
Expand All @@ -234,7 +265,7 @@
state: yumyum
- type: Food
trash: N14FoodYumyumdeviledeggsTrash

# Trash
- type: entity
noSpawn: true
Expand All @@ -254,7 +285,7 @@
- type: PhysicalComposition
materialComposition:
Cardboard: 100

- type: entity
parent: N14FoodPacketTrash
id: N14FoodTinCanTrash
Expand All @@ -276,83 +307,83 @@
components:
- type: Sprite
state: blamco_trash

- type: entity
parent: N14FoodPacketTrash
id: N14FoodBlamcomaccheeseLargeTrash
name: empty Blamco box
components:
- type: Sprite
state: blamco_large_trash

- type: entity
parent: N14FoodPacketTrash
id: N14FoodBubblegumTrash
name: empty bubblegum pack
components:
- type: Sprite
state: bubblegum_trash

- type: entity
parent: N14FoodPacketTrash
id: N14FoodCramTrash
name: empty cram box
components:
- type: Sprite
state: cram_trash

- type: entity
parent: N14FoodPacketTrash
id: N14FoodCrispsTrash
name: empty crisps pack
components:
- type: Sprite
state: crisps_trash

- type: entity
parent: N14FoodPacketTrash
id: N14FoodDandyboyapplesTrash
name: empty Dandyboy Apples box
components:
- type: Sprite
state: dandyapples_trash

- type: entity
parent: N14FoodPacketTrash
id: N14FoodFancyladssnackcakesTrash
name: empty Fancy Lads Snack Cakes box
components:
- type: Sprite
state: fancylads_trash

- type: entity
parent: N14FoodPacketTrash
id: N14FoodInstamashTrash
name: empty Instamash box
components:
- type: Sprite
state: instamash_trash

- type: entity
parent: N14FoodPacketTrash
id: N14FoodSalisburysteakTrash
name: empty Salisbury Steak box
components:
- type: Sprite
state: steak_trash

- type: entity
parent: N14FoodPacketTrash
id: N14FoodSugarbombsTrash
name: empty Sugar bombs box
components:
- type: Sprite
state: sugarbombs_trash

- type: entity
parent: N14FoodPacketTrash
id: N14FoodYumyumdeviledeggsTrash
name: empty Yumyum Deviled Eggs box
components:
- type: Sprite
state: yumyum_trash
state: yumyum_trash
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "icon-open"
},
{
"name": "trash"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "icon-open"
},
{
"name": "trash"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading