diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/candy.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/candy.yml index 865f3abeac3..11eb1fac1c5 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/candy.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/candy.yml @@ -1,47 +1,47 @@ -#- type: entity -# parent: FoodBase -# id: FoodLollipop -# name: lollipop -# description: For being such a good sport. -# components: -# - type: SolutionContainerManager -# solutions: -# food: -# maxVol: 15 -# reagents: -# - ReagentId: Sugar -# Quantity: 3 -# - ReagentId: Nutriment -# Quantity: 3 -# - ReagentId: Omnizine -# Quantity: 3 -# - ReagentId: Iron -# Quantity: 3 -# - ReagentId: Vitamin -# Quantity: 3 -# - type: Sprite -# sprite: Objects/Consumable/Food/candy.rsi -# state: lollipop +- type: entity + parent: FoodBase + id: FoodLollipop + name: lollipop + description: For being such a good sport. + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Sugar + Quantity: 3 + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Omnizine + Quantity: 3 + - ReagentId: Iron + Quantity: 3 + - ReagentId: Vitamin + Quantity: 3 + - type: Sprite + sprite: Nyanotrasen/Objects/Consumable/Food/candy.rsi + state: lollipop -#- type: entity -# parent: FoodBase -# id: FoodGumball -# name: gumball -# description: For being such a good sport. -# components: -# - type: SolutionContainerManager -# solutions: -# food: -# maxVol: 15 -# reagents: -# - ReagentId: Sugar -# Quantity: 5 -# - ReagentId: Kelotane -# Quantity: 3 -# - ReagentId: Tricordrazine -# Quantity: 3 -# - ReagentId: Dylovene -# Quantity: 3 -# - type: Sprite -# sprite: Objects/Consumable/Food/candy.rsi -# state: gumball +- type: entity + parent: FoodBase + id: FoodGumball + name: gumball + description: For being such a good sport. + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Sugar + Quantity: 5 + - ReagentId: Kelotane + Quantity: 3 + - ReagentId: Tricordrazine + Quantity: 3 + - ReagentId: Dylovene + Quantity: 3 + - type: Sprite + sprite: Nyanotrasen/Objects/Consumable/Food/candy.rsi + state: gumball diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/gumball.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/gumball.png new file mode 100644 index 00000000000..655a614af6d Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/gumball.png differ diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/lollipop.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/lollipop.png new file mode 100644 index 00000000000..d7f88400edb Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/lollipop.png differ diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/meta.json b/Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/meta.json new file mode 100644 index 00000000000..a2e6123c153 --- /dev/null +++ b/Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "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": "gumball" + }, + { + "name": "lollipop" + } + ] +}