]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Added New Cocktails and new fill level sprites to existing drinks. (#33570)
authorRedBookcase <crazykid1590@gmail.com>
Mon, 10 Mar 2025 23:08:23 +0000 (16:08 -0700)
committerGitHub <noreply@github.com>
Mon, 10 Mar 2025 23:08:23 +0000 (19:08 -0400)
* Added New Cocktails and new fill level sprites to existing drinks

* Updated copyright info and fixed recipies for Caipirinha/Mojito.

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
225 files changed:
Resources/Locale/en-US/flavors/flavor-profiles.ftl
Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
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/Reagents/Consumable/Drink/soda.yml
Resources/Prototypes/Recipes/Reactions/drinks.yml
Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon.png
Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/icon.png
Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-5.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/icon.png
Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/icon.png
Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/icon.png
Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/icon.png
Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-5.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-6.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-5.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-6.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/espressomartini/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/espressomartini/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/espressomartini/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-5.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/icon.png
Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-5.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-5.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/icon.png
Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-5.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-6.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/icon.png
Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-5.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-6.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/icon.png
Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-5.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/icon.png
Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-5.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/icon.png
Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon.png
Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon.png
Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-5.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/icon.png
Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-5.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/icon.png
Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-5.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/icon_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/meta.json [new file with mode: 0644]

index 57d95562cb3c0e88e1faf9c88a6a9dfccb53f40a..112f26def2f15690b4acdd5405f2a4002e9a4868 100644 (file)
@@ -264,6 +264,17 @@ flavor-complex-themartinez = like violets and lemon vodka
 flavor-complex-cogchamp = like brass
 flavor-complex-white-gilgamesh = like lightly carbonated cream
 flavor-complex-antifreeze = warm
+flavor-complex-caipirinha = like Brazil
+flavor-complex-daiquiri = like rum, lime and sugar
+flavor-complex-deathintheafternoon = like anise and champagne 
+flavor-complex-empress75 = like tyrian purple
+flavor-complex-espressomartini = like vodka and coffee
+flavor-complex-mayojito = like stomach turmoil
+flavor-complex-mimeosa = like silence and oranges
+flavor-complex-mimosa = like an early brunch
+flavor-complex-moscowmule = like vodka and ginger ale
+flavor-complex-thesunalsorises = like an absinthe daiquiri
+flavor-complex-whiskeysour = like whiskey and egg
 flavor-complex-zombiecocktail = like eating brains
 flavor-complex-absinthe = like anise
 flavor-complex-blue-curacao = like orange flowers
index a4da1b90cf5d3267d31c278403da4bee4111d7ab..3db20a61ab99914757947833e1dfd78ebe0e9279 100644 (file)
@@ -286,5 +286,38 @@ reagent-desc-watermelon-wakeup = If you want to be awake, this will do it... Als
 reagent-name-rubberneck = rubberneck
 reagent-desc-rubberneck = A popular drink amongst those adhering to an all synthetic diet.
 
+reagent-name-caipirinha = caipirinha
+reagent-desc-caipirinha = The São Paulo special, straight from old Brazil.
+
+reagent-name-daiquiri = daiquiri
+reagent-desc-daiquiri = A classic rum cocktail which remains popular even in the cold reaches of space.
+
+reagent-name-death-in-the-afternoon = death in the afternoon
+reagent-desc-death-in-the-afternoon = "Pour one jigger absinthe into a Champagne glass. Add iced Champagne until it attains the proper opalescent milkiness. Drink three to five of these slowly." - Ernest Hemingway
+
+reagent-name-empress-75 = empress 75
+reagent-desc-empress-75 = A more refined take on the mimosa. Just the thing Marie Antoinette might've sipped on before the revolution.
+
+reagent-name-espresso-martini = espresso martini
+reagent-desc-espresso-martini = To wake you up and wind you down. Garnished with coffee beans and icy-cold.
+
+reagent-name-mayojito = mayojito
+reagent-desc-mayojito = An affront to god and man. Do not drink it.
+
+reagent-name-mimeosa = mimeosa 
+reagent-desc-mimeosa = It has an orange tang so sour you just can't describe it.
+
+reagent-name-mimosa = mimosa
+reagent-desc-mimosa = Perfect for a lively brunch out with the girls.
+
+reagent-name-moscow-mule = moscow mule 
+reagent-desc-moscow-mule = A surpsingly strong and refreshing mixed drink, served in an iconic copper mug.
+
+reagent-name-the-sun-also-rises = the sun also rises
+reagent-desc-the-sun-also-rises = A strong cocktail mixed into a murky blend. A secret favorite of tortured authors.
+
+reagent-name-whiskey-sour = whiskey sour 
+reagent-desc-whiskey-sour = What's the secret ingredient? Eggs. It's eggs.
+
 reagent-name-zombiecocktail = Zombie
 reagent-desc-zombiecocktail = It gets in your head. Your he-eyeh-ead.
index 179e4791352c8f2c5deb52f5cba877da25ad7a6f..13f46cc76e5e8b8529fb7d29f19972ad8856ceb8 100644 (file)
         reagents:
         - ReagentId: Sake
           Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/sakeglass.rsi
+    state: icon
 
 - type: entity
   parent: DrinkGlass
     sprite: Objects/Consumable/Drinks/xenobasher.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkCaipirinha
+  suffix: caipirinha
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Caipirinha
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/caipirinha.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkDaiquiri
+  suffix: daiquiri
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Daiquiri 
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/daiquiri.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkDeathInTheAfternoon
+  suffix: death in the afternoon
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: DeathInTheAfternoon
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/deathintheafternoon.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkEmpress75
+  suffix: empress 75
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Empress75
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/empress75.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkEspressoMartini
+  suffix: espresso martini
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: EspressoMartini
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/espressomartini.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkMayojito
+  suffix: mayojito
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Mayojito
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/mayojito.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkMimeosa
+  suffix: mimeosa
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Mimeosa
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/mimeosa.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkMimosa
+  suffix: mimosa
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Mimosa
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/mimosa.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkMoscowMule
+  suffix: moscow mule
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: MoscowMule
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/moscowmule.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkTheSunAlsoRises
+  suffix: the sun also rises
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: TheSunAlsoRises
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/thesunalsorises.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkWhiskeySour
+  suffix: whiskey sour
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: WhiskeySour
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/whiskeysour.rsi
+    state: icon
+
 # TODO: MOVE
 
 - type: entity
index b9609883ab422dff35bf1882158c1ccd4746ff6a..2d488cf0c8d770c174c1a0fe61824f9ae313cccb 100644 (file)
   flavorType: Complex
   description: flavor-complex-compressed-meat
 
+- type: flavor
+  id: caipirinha
+  flavorType: Complex
+  description: flavor-complex-caipirinha
+
+- type: flavor
+  id: daiquiri
+  flavorType: Complex
+  description: flavor-complex-daiquiri
+
+- type: flavor
+  id: deathintheafternoon
+  flavorType: Complex
+  description: flavor-complex-deathintheafternoon
+
+- type: flavor
+  id: empress75
+  flavorType: Complex
+  description: flavor-complex-empress75
+
+- type: flavor
+  id: espressomartini
+  flavorType: Complex
+  description: flavor-complex-espressomartini
+
+- type: flavor
+  id: mayojito
+  flavorType: Complex
+  description: flavor-complex-mayojito
+
+- type: flavor
+  id: mimeosa
+  flavorType: Complex
+  description: flavor-complex-mimeosa
+
+- type: flavor
+  id: mimosa
+  flavorType: Complex
+  description: flavor-complex-mimosa
+
+- type: flavor
+  id: moscowmule
+  flavorType: Complex
+  description: flavor-complex-moscowmule
+
+- type: flavor
+  id: thesunalsorises
+  flavorType: Complex
+  description: flavor-complex-thesunalsorises
+
+- type: flavor
+  id: whiskeysour
+  flavorType: Complex
+  description: flavor-complex-whiskeysour
+
 - type: flavor
   id: zombiecocktail
   flavorType: Complex
index caa3d162760957a49385804171a98bdbac0085ac..72205a8b0c201edb44fbf668b1930ee1c1838841 100644 (file)
@@ -67,9 +67,9 @@
   flavor: bluecuracao
   color: "#0099FF"
   metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/thin_glass.rsi
+    sprite: Objects/Consumable/Drinks/curacaoglass.rsi
     state: icon_empty
-  metamorphicMaxFillLevels: 5
+  metamorphicMaxFillLevels: 4
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
         reagent: Ethanol
         amount: 0.1
 
-- type: reagent
-  id: BlueHawaiian
-  name: reagent-name-blue-hawaiian
-  parent: BaseAlcohol
-  desc: reagent-desc-blue-hawaiian
-  physicalDesc: reagent-physical-desc-tropical
-  flavor: bluehawaiian
-  color: "#47687b"
-  metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/bluehawaiian.rsi
-    state: icon
-  metabolisms:
-    Drink:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.2
-
 - type: reagent
   id: Cognac
   name: reagent-name-cognac
   flavor: watermelon
   color: "#00FF33"
   metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/thin_glass.rsi
+    sprite: Objects/Consumable/Drinks/emeraldglass.rsi
     state: icon_empty
-  metamorphicMaxFillLevels: 5
+  metamorphicMaxFillLevels: 4
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
 
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: sake
   color: "#DDDDDD"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/sakeglass.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.2
 
 - type: reagent
   id: Tequila
   color: "#cccbc8"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/coconutrum.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
   color: "#f73030"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/cosmopolitan.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
   color: "#e6cb47"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/painkiller.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
   flavor: redmead
   color: "#bc5550"
   metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/beerstein.rsi
+    sprite: Objects/Consumable/Drinks/red_meadglass.rsi
     state: icon_empty
   metamorphicMaxFillLevels: 5
   metamorphicFillBaseName: fill-
-  metamorphicChangeColor: true
-  fizziness: 0.4
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.2 
 
 - type: reagent
   id: PinaColada
   color: "#e8dba4"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/pinacolada.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.2  
 
 - type: reagent
   id: Sbiten
   flavor: vodkatonic
   color: "#0064C8"
   metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/gintonicglass.rsi # they look the same
+    sprite: Objects/Consumable/Drinks/vodkatonicglass.rsi
     state: icon_empty
-  metamorphicMaxFillLevels: 6
+  metamorphicMaxFillLevels: 5
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
           time: 1.0
           type: Remove
   fizziness: 0.25
+  
+- type: reagent
+  id: BlueHawaiian
+  name: reagent-name-blue-hawaiian
+  parent: BaseAlcohol
+  desc: reagent-desc-blue-hawaiian
+  physicalDesc: reagent-physical-desc-tropical
+  flavor: bluehawaiian
+  color: "#47687b"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/bluehawaiian.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.2
+
+- type: reagent
+  id: Caipirinha
+  name: reagent-name-caipirinha
+  parent: BaseAlcohol
+  desc: reagent-desc-caipirinha
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: caipirinha
+  color: "#E6EE9C"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/caipirinha.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.1
+
+- type: reagent
+  id: MoscowMule
+  name: reagent-name-moscow-mule
+  parent: BaseAlcohol
+  desc: reagent-desc-moscow-mule
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: moscowmule
+  color: "#CECBAD"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/moscowmule.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.2
+      - !type:AdjustReagent
+        reagent: Copper
+        amount: 0.05        
+        
+- type: reagent
+  id: Mimeosa
+  name: reagent-name-mimeosa
+  parent: BaseAlcohol
+  desc: reagent-desc-mimeosa
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: mimeosa
+  color: "#939393"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/mimeosa.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:GenericStatusEffect
+        key: Muted
+        component: Muted
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.07
+
+- type: reagent
+  id: Mimosa
+  name: reagent-name-mimosa
+  parent: BaseAlcohol
+  desc: reagent-desc-mimosa
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: mimosa
+  color: "#FFCA48"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/mimosa.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.07
+        
+- type: reagent
+  id: Mayojito
+  name: reagent-name-mayojito
+  parent: BaseAlcohol
+  desc: reagent-desc-mayojito
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: mayojito
+  color: "#6FBE44"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/mayojito.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:ChemVomit
+        conditions:
+        - !type:ReagentThreshold
+          min: 5
+        probability: 0.5
+      - !type:HealthChange
+        damage:
+          types:
+            Poison: .5
+      - !type:SatiateThirst
+        factor: 1
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.15
+
+- type: reagent
+  id: DeathInTheAfternoon
+  name: reagent-name-death-in-the-afternoon
+  parent: BaseAlcohol
+  desc: reagent-desc-death-in-the-afternoon
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: deathintheafternoon
+  color: "#57A87D"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/deathintheafternoon.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.3
+
+- type: reagent
+  id: Empress75
+  name: reagent-name-empress-75
+  parent: BaseAlcohol
+  desc: reagent-desc-empress-75
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: empress75
+  color: "#900296"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/empress75.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.3
+
+- type: reagent
+  id: EspressoMartini
+  name: reagent-name-espresso-martini
+  parent: BaseAlcohol
+  desc: reagent-desc-espresso-martini
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: espressomartini
+  color: "#170a0c"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/espressomartini.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.2
+        
+- type: reagent
+  id: Daiquiri
+  name: reagent-name-daiquiri
+  parent: BaseAlcohol
+  desc: reagent-desc-daiquiri
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: daiquiri
+  color: "#DAC865"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/daiquiri.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.1
+        
+- type: reagent
+  id: TheSunAlsoRises
+  name: reagent-name-the-sun-also-rises
+  parent: BaseAlcohol
+  desc: reagent-desc-the-sun-also-rises
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: thesunalsorises
+  color: "#DCE2DE"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/thesunalsorises.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.3
+
+- type: reagent
+  id: WhiskeySour
+  name: reagent-name-whiskey-sour
+  parent: BaseAlcohol
+  desc: reagent-desc-whiskey-sour
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: whiskeysour
+  color: "#8B7941"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/whiskeysour.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.2
 
 - type: reagent
   id: ZombieCocktail
index 3f9fb7b53d289ff3ff8be55ee12e2d02d4ea0ae1..f72733d15dd129262a4245f39ef0982ccaede9bb 100644 (file)
   color: "#d8cc5d"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/arnoldpalmer.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
   flavor: sweet
   color: "#485000"
   metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/beerstein.rsi
+    sprite: Objects/Consumable/Drinks/rewriter.rsi
     state: icon_empty
   metamorphicMaxFillLevels: 5
   metamorphicFillBaseName: fill-
index 7ddf19c14ea069d6bb88047f28707762781bac94..d224d1573e076f3f7a926562853afc9c72809cf3 100644 (file)
   color: "#262019"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/royrogers.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
   color: "#ccb87e"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/sol_dry_glass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: ShirleyTemple
   color: "#af2221"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/shirleytemple.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-fizzy
   flavor: fourteenlokosoda
   color: "#deb928"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/fourteen_loko_glass.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false  
   metabolisms:
     Drink:
       effects:
index 84d79466b9b679076214bfdcf404ec320e9c4ec2..48884f0ad262ec923db77184e25b7799096c239d 100644 (file)
       amount: 1
   products:
     Cola: 4
+    
+- type: reaction
+  id: Caipirinha
+  requiredMixerCategories:
+  - Shake
+  reactants:
+    Rum:
+      amount: 1
+    JuiceLime:
+      amount: 1
+    Sugar:
+      amount: 1
+    Ice:
+      amount: 1
+  products:
+    Caipirinha: 4
+
+- type: reaction
+  id: Daiquiri
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Rum:
+      amount: 4
+    Sugar:
+      amount: 1
+    JuiceLime:
+      amount: 1
+  products:
+    Daiquiri: 6
+
+- type: reaction
+  id: DeathInTheAfternoon
+  reactants:
+    Absinthe:
+      amount: 2
+    Champagne:
+      amount: 1
+  products:
+    DeathInTheAfternoon: 3
+
+- type: reaction
+  id: Empress75
+  requiredMixerCategories:
+  - Shake
+  reactants:
+    Champagne:
+      amount: 2
+    Gin:
+      amount: 2
+    JuiceLime:
+      amount: 1
+    Grenadine:
+      amount: 1
+  products:
+    Empress75: 6
+
+- type: reaction
+  id: EspressoMartini
+  requiredMixerCategories:
+  - Shake
+  reactants:
+    BlackRussian:
+      amount: 1
+    Coffee:
+      amount: 1
+  products:
+    EspressoMartini: 2
+
+- type: reaction
+  id: Mayojito
+  reactants:
+    Mojito:
+      amount: 1
+    Mayo:
+      amount: 1
+  products:
+    Mayojito: 2
+
+- type: reaction
+  id: Mimeosa
+  reactants:
+    Mimosa:
+      amount: 2
+    Nothing:
+      amount: 1
+  products:
+    Mimeosa: 3
+
+- type: reaction
+  id: Mimosa
+  reactants:
+    JuiceOrange:
+      amount: 2
+    Champagne:
+      amount: 1
+  products:
+    Mimosa: 3
+
+- type: reaction
+  id: MoscowMule
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Vodka:
+      amount: 4
+    JuiceLime:
+      amount: 1
+    SolDry:
+      amount: 1
+  products:
+    MoscowMule: 6
+
+- type: reaction
+  id: TheSunAlsoRises
+  reactants:
+    Absinthe:
+      amount: 1
+    Daiquiri:
+      amount: 5
+  products:
+    TheSunAlsoRises: 6
+
+- type: reaction
+  id: WhiskeySour
+  requiredMixerCategories:
+  - Shake
+  reactants:
+    Whiskey:
+      amount: 2
+    Sugar:
+      amount: 1
+    JuiceLemon:
+      amount: 2
+    Egg:
+      amount: 1
+  products:
+    WhiskeySour: 6
 
 - type: reaction
   id: ZombieCocktail
diff --git a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..acdf022
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..b5da710
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..5bc9421
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..5da2461
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-4.png differ
index 81261d0f54f589b5acb8b36b90ae2edf528fd3bd..c9f4f08717f07d490dc0c8440745e9e3ad2803eb 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..7b1ed77
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon_empty.png differ
index f76e61184137b32312e279a920af846b9a3a1854..eb79fc75a30871b38df574bc76c9d4397701ccfd 100644 (file)
@@ -1,14 +1,31 @@
 {
     "version": 1,
-    "size": {
+    "size":
+    {
         "x": 32,
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
-    "states": [
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase on GitHub.",
+    "states":
+    [
         {
             "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..34f11f4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..9be8b96
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..44d1b19
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..fd2f038
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-4.png differ
index d192a884616ee9ae73c071829e15f2a0efaa0db6..d1ce3ffbe3b3c3260c017032bcdb8b95b0980e1f 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..865cdac
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/icon_empty.png differ
index f76e61184137b32312e279a920af846b9a3a1854..eb79fc75a30871b38df574bc76c9d4397701ccfd 100644 (file)
@@ -1,14 +1,31 @@
 {
     "version": 1,
-    "size": {
+    "size":
+    {
         "x": 32,
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
-    "states": [
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase on GitHub.",
+    "states":
+    [
         {
             "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..fd38307
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..714a7ad
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..b640ef8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..a97ed71
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-5.png
new file mode 100644 (file)
index 0000000..380c07a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/icon.png
new file mode 100644 (file)
index 0000000..7c49798
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..a65ad80
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/meta.json
new file mode 100644 (file)
index 0000000..fb4cf99
--- /dev/null
@@ -0,0 +1,34 @@
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by RedBookcase on Github.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..59cb8b9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..8e4c467
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..bb40403
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..7fe5189
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-4.png differ
index 4adab5cb6e6b935cc3878d2c6e533abe8fe82dee..2814b46c8f83c11d59287b3b7434effe8d2efe5a 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..6dc08c2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/icon_empty.png differ
index f76e61184137b32312e279a920af846b9a3a1854..eb79fc75a30871b38df574bc76c9d4397701ccfd 100644 (file)
@@ -1,14 +1,31 @@
 {
     "version": 1,
-    "size": {
+    "size":
+    {
         "x": 32,
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
-    "states": [
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase on GitHub.",
+    "states":
+    [
         {
             "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..b0c98a8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..6788e1b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..61aea2f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/fill-3.png differ
index bd1eff6943ee7cf05e930326b1be97acfa777871..75d89f80c14956f7879ffa508a88e1a90109025a 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..ab35159
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/icon_empty.png differ
index f76e61184137b32312e279a920af846b9a3a1854..95b1af5beb9b4e67cc1c5c3ad1c1d265ba4216f1 100644 (file)
@@ -1,14 +1,28 @@
 {
     "version": 1,
-    "size": {
+    "size":
+    {
         "x": 32,
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
-    "states": [
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase on GitHub.",
+    "states":
+    [
         {
             "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..02ee7d9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..55cea50
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..065e1a8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..a5d98bf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-4.png differ
index 0f6c9575fcb544397bb664224c63cc2f48d5a7f1..fb23f689c19255fbe8431b281864eafde7705f57 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..88a73bf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/icon_empty.png differ
index db0ac608ed068f887d184f45e9acd83fba0a3976..eb79fc75a30871b38df574bc76c9d4397701ccfd 100644 (file)
@@ -1 +1,31 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..4ba2a35
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..83e4d04
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..309d506
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/icon.png
new file mode 100644 (file)
index 0000000..b815147
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..49bd5e5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/meta.json
new file mode 100644 (file)
index 0000000..a8992bc
--- /dev/null
@@ -0,0 +1,28 @@
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by RedBookcase on Github.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..b2a5704
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..5aef80b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..1678c3a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..de6daf5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/icon.png
new file mode 100644 (file)
index 0000000..2ee6ea1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..0aca7f1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/meta.json
new file mode 100644 (file)
index 0000000..ebbb1fa
--- /dev/null
@@ -0,0 +1,31 @@
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by RedBookcase on Github.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..0b5febc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..eb549df
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..e87dfe8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..5f314f3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-4.png differ
index cabe64b7f006a0cff4ffa65c362bcd32e5313546..640e442ee3e0de5b9de53798da9676d53bf6902f 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..88a73bf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/icon_empty.png differ
index db0ac608ed068f887d184f45e9acd83fba0a3976..eb79fc75a30871b38df574bc76c9d4397701ccfd 100644 (file)
@@ -1 +1,31 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..61a8395
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..0138875
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..3fca8ce
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..544f22c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/icon.png
new file mode 100644 (file)
index 0000000..afc52e5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..b96c17d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/meta.json
new file mode 100644 (file)
index 0000000..ebbb1fa
--- /dev/null
@@ -0,0 +1,31 @@
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by RedBookcase on Github.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..a8e5eb8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..35d8cfd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..511d7ce
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..93191f9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-5.png
new file mode 100644 (file)
index 0000000..6be0c6a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-6.png
new file mode 100644 (file)
index 0000000..4ac3030
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-6.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/icon.png
new file mode 100644 (file)
index 0000000..7f3b2ac
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..10848c6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/meta.json
new file mode 100644 (file)
index 0000000..d967d45
--- /dev/null
@@ -0,0 +1,37 @@
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by RedBookcase on Github.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        },
+        {
+            "name": "fill-6"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-1.png
new file mode 100644 (file)
index 0000000..a8e5eb8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-2.png
new file mode 100644 (file)
index 0000000..35d8cfd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-3.png
new file mode 100644 (file)
index 0000000..511d7ce
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-4.png
new file mode 100644 (file)
index 0000000..93191f9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-5.png
new file mode 100644 (file)
index 0000000..6be0c6a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-6.png
new file mode 100644 (file)
index 0000000..4ac3030
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-6.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/icon.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/icon.png
new file mode 100644 (file)
index 0000000..7f3b2ac
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/icon_empty.png
new file mode 100644 (file)
index 0000000..10848c6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/meta.json b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/meta.json
new file mode 100644 (file)
index 0000000..d967d45
--- /dev/null
@@ -0,0 +1,37 @@
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by RedBookcase on Github.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        },
+        {
+            "name": "fill-6"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..6f9251b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..68ddf67
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..57c1000
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..12b8082
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-5.png
new file mode 100644 (file)
index 0000000..e2446bb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-5.png differ
index 13fe259aac551532f2a9899e60ab72cf95b29da7..e020b6d3e01d907f8d3d48c560cd1a3b9b04db76 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..8399d15
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/icon_empty.png differ
index db0ac608ed068f887d184f45e9acd83fba0a3976..8b09e6c0545335dc59ad48324db74d29ce4f6f1b 100644 (file)
@@ -1 +1,34 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..57461a5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..46ce64e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..417e8a4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..236bbfd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-5.png
new file mode 100644 (file)
index 0000000..7a86cdd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/icon.png
new file mode 100644 (file)
index 0000000..7162280
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..788261e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/meta.json
new file mode 100644 (file)
index 0000000..fb4cf99
--- /dev/null
@@ -0,0 +1,34 @@
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by RedBookcase on Github.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..f10ac9c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..89461b0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..1c62d58
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..bfce01a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-5.png
new file mode 100644 (file)
index 0000000..5c20b50
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-5.png differ
index 3330c8791fc7342170c952e001b2e9828246b126..222fad9772f547853261659077539242f2c54539 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..f142a2b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/icon_empty.png differ
index db0ac608ed068f887d184f45e9acd83fba0a3976..8b09e6c0545335dc59ad48324db74d29ce4f6f1b 100644 (file)
@@ -1 +1,34 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..9d844be
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..ad697e5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..04455b8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..02b5bb6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/icon.png
new file mode 100644 (file)
index 0000000..ab028a8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..88a73bf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/meta.json
new file mode 100644 (file)
index 0000000..ebbb1fa
--- /dev/null
@@ -0,0 +1,31 @@
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by RedBookcase on Github.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..659d1c0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..939575a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..5de16f9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..b31fbdf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/icon.png
new file mode 100644 (file)
index 0000000..8ba082f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..ec208ff
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/meta.json
new file mode 100644 (file)
index 0000000..ebbb1fa
--- /dev/null
@@ -0,0 +1,31 @@
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by RedBookcase on Github.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..2aa1740
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..4766be1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..788dbc3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/icon.png
new file mode 100644 (file)
index 0000000..841b2d4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..2dc9ca9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/meta.json
new file mode 100644 (file)
index 0000000..a8992bc
--- /dev/null
@@ -0,0 +1,28 @@
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by RedBookcase on Github.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..6fcc2d4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..fe43507
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..8edd114
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..4f8203d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-5.png
new file mode 100644 (file)
index 0000000..82553f8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-6.png
new file mode 100644 (file)
index 0000000..9bafa75
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-6.png differ
index caa81b36f0adb1d9dbc5c964dab994c504eea8b1..3023c7b4ecb0c1d9f402bd75704921462fa8d68e 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..a0f9a4f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/icon_empty.png differ
index f76e61184137b32312e279a920af846b9a3a1854..de8a24d72927c4a93d177fac5a26ada215942403 100644 (file)
@@ -1,14 +1,37 @@
 {
     "version": 1,
-    "size": {
+    "size":
+    {
         "x": 32,
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
-    "states": [
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase on GitHub.",
+    "states":
+    [
         {
             "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        },
+        {
+            "name": "fill-6"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..f373763
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..939c7aa
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..5df9968
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..00a1b34
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-5.png
new file mode 100644 (file)
index 0000000..d1f8a11
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-6.png
new file mode 100644 (file)
index 0000000..f68a94d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-6.png differ
index 7a6b0624da0eb1cc1c88938523cc31b8458ec3cb..8025bc76a702e6fb95f7b5c3a6c212884696e24f 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..404e1f1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/icon_empty.png differ
index f76e61184137b32312e279a920af846b9a3a1854..de8a24d72927c4a93d177fac5a26ada215942403 100644 (file)
@@ -1,14 +1,37 @@
 {
     "version": 1,
-    "size": {
+    "size":
+    {
         "x": 32,
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
-    "states": [
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase on GitHub.",
+    "states":
+    [
         {
             "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        },
+        {
+            "name": "fill-6"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..a638609
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..49f53c8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..5804191
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..808033e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-5.png
new file mode 100644 (file)
index 0000000..f0b7859
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-5.png differ
index 036e6d23dfa5d190401079438365e394ef7e4544..e5408d257d359aa2d1bc028aad02d3c90b5f7f4f 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..4106655
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/icon_empty.png differ
index db0ac608ed068f887d184f45e9acd83fba0a3976..8b09e6c0545335dc59ad48324db74d29ce4f6f1b 100644 (file)
@@ -1 +1,34 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..5045d33
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..b8b3afd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..ff1609f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..ca3d2c2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-5.png
new file mode 100644 (file)
index 0000000..5e2bcb5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-5.png differ
index 825eb7a688d4afd66ed57158945e6fc8c13ad0d0..31842c75ef936ab7e39948c93f15b9be02fccd98 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..4106655
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/icon_empty.png differ
index db0ac608ed068f887d184f45e9acd83fba0a3976..8b09e6c0545335dc59ad48324db74d29ce4f6f1b 100644 (file)
@@ -1 +1,34 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..1da8f61
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..2174d8f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..e107ae3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..fae410e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-4.png differ
index 9426978d721404fc6b5ad4abf4e6bbb1dc145751..d4d772fa2d2226d363e5d9fd4a5640513d0ed515 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..8e07870
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon_empty.png differ
index d16d731d7f85d34cf1d06d264e06eeac53649322..e499ce642b82ff790d2cf67ec9c8ec049bc4931e 100644 (file)
@@ -1,22 +1,76 @@
 {
     "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
-    "size": {
-      "x": 32,
-      "y": 32
+    "size":
+    {
+        "x": 32,
+        "y": 32
     },
-    "states": [
-      {
-        "name": "icon",
-        "delays": [
-        [
-            1,
-            1,
-            1,
-            1
-        ]
-      ]
-    }
-  ]
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon",
+            "delays":
+            [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1",
+            "delays":
+            [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-2",
+            "delays":
+            [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-3",
+            "delays":
+            [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-4",
+            "delays":
+            [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..0fa8025
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..c4dbad7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..a86e9a1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..eb90aec
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/icon.png
new file mode 100644 (file)
index 0000000..b49fd37
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..88a73bf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/meta.json
new file mode 100644 (file)
index 0000000..ebbb1fa
--- /dev/null
@@ -0,0 +1,31 @@
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by RedBookcase on Github.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..c253b2b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..b153fce
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..9ee530e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..e059d2c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-4.png differ
index 88fdd5e79b971275c4012ee5afd12513bc377fb6..9e8b5a8efbf51be3db36e2c6354710bd8813bd2b 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..9f73430
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon_empty.png differ
index f76e61184137b32312e279a920af846b9a3a1854..eb79fc75a30871b38df574bc76c9d4397701ccfd 100644 (file)
@@ -1,14 +1,31 @@
 {
     "version": 1,
-    "size": {
+    "size":
+    {
         "x": 32,
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
-    "states": [
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase on GitHub.",
+    "states":
+    [
         {
             "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..585418e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..5092088
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..d255a37
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..1a00d8f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-5.png
new file mode 100644 (file)
index 0000000..8b64a51
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-5.png differ
index c4bf829e5d159a8501c10a5388bd153f99343453..9f1e88f87a416d94222fc00e27a405591e123435 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..8399d15
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/icon_empty.png differ
index f76e61184137b32312e279a920af846b9a3a1854..a36dd2a6825ded642c376a8a292451c1da1b7cfb 100644 (file)
@@ -1,14 +1,34 @@
 {
     "version": 1,
-    "size": {
+    "size":
+    {
         "x": 32,
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
-    "states": [
+    "copyright": "Made by RedBookcase on GitHub.",
+    "states":
+    [
         {
             "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..1436763
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..d34afa7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..fbbbac2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..b2bf2de
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/icon.png
new file mode 100644 (file)
index 0000000..20326b1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..0aca7f1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/meta.json
new file mode 100644 (file)
index 0000000..ebbb1fa
--- /dev/null
@@ -0,0 +1,31 @@
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by RedBookcase on Github.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..1826842
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..5228156
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..650e420
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..a909b73
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-5.png
new file mode 100644 (file)
index 0000000..d327962
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-5.png differ
index cba82f25cbca99f86331e44a8e69fc18f6439f2e..841f2966aec67cba1fc9623fd23ef1efd72acc70 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..936c8ed
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/icon_empty.png differ
index db0ac608ed068f887d184f45e9acd83fba0a3976..fb4cf990776000850d9b48a489e956864141a9b3 100644 (file)
@@ -1 +1,34 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by RedBookcase on Github.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..fca1e91
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..37550af
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..24e0b36
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..b3da8f0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-5.png
new file mode 100644 (file)
index 0000000..c57cf4b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/icon.png
new file mode 100644 (file)
index 0000000..b01587c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..189b862
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/meta.json
new file mode 100644 (file)
index 0000000..fb4cf99
--- /dev/null
@@ -0,0 +1,34 @@
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by RedBookcase on Github.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}