]> git.smokeofanarchy.ru Git - space-station-14.git/commit
[Christmas] Y'all want a Smite Cranberry? (#33922)
authorHannah Giovanna Dawson <karakkaraz@gmail.com>
Thu, 19 Dec 2024 00:11:59 +0000 (00:11 +0000)
committerGitHub <noreply@github.com>
Thu, 19 Dec 2024 00:11:59 +0000 (01:11 +0100)
commitc33d3350bd99eeaeee1f32342ad1dfb98221b716
tree4dccacb0fb05fc20bfa91e5e3683abb132a7fa7e
parent8f36d7d1c8b89a751c43e34b03dd4820f4a3ac53
[Christmas] Y'all want a Smite Cranberry? (#33922)

* Add a festive lemon-lime soda variant: cranberry!

* Gave lemon-lime a brand name

* Make the CrateFoodSoftdrinksLarge slightly larger to accomodate the extra drinks.

* Extend the Christmas anomaly with extra jolliness

* Minor spelling mistake. Jollyness will not be denied.

* Removed redundant delay from meta file
24 files changed:
Resources/Locale/en-US/flavors/flavor-profiles.ftl
Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl
Resources/Prototypes/Catalog/Fills/Crates/food.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
Resources/Prototypes/Flavors/flavors.yml
Resources/Prototypes/Hydroponics/randomChemicals.yml
Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
Resources/Prototypes/Recipes/Reactions/drinks.yml
Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/icon_open.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/meta.json [new file with mode: 0644]