]> git.smokeofanarchy.ru Git - space-station-14.git/commit
New Drinks (#36287)
authorSharkSnake98 <peanutbuttersharky@gmail.com>
Sat, 19 Apr 2025 05:12:10 +0000 (01:12 -0400)
committerGitHub <noreply@github.com>
Sat, 19 Apr 2025 05:12:10 +0000 (22:12 -0700)
commit9599f582f3e08c711431910b2f4043fc8fdf75cb
treef92a8fba4d76dd52f0315912da32ece876abc894
parentbe8fa724a759682bbae3cbb6fd36a3ce64aba5f4
New Drinks (#36287)

Co-authored-by: RedBookcase <crazykid1590@gmail.com>
Co-authored-by: SharkSnake98 <sharksnake87@gmail.com>
98 files changed:
Resources/Locale/en-US/flavors/flavor-profiles.ftl
Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
Resources/Prototypes/Flavors/flavors.yml
Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
Resources/Prototypes/Recipes/Reactions/drinks.yml
Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/fill-5.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/fill-5.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/fill-5.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/fill-5.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/fill-5.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/radler.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/radler.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/radler.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/radler.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/radler.rsi/fill-5.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/radler.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/radler.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/radler.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/meta.json [new file with mode: 0644]