From ee0086caa8e2a6c424cc5caad41867ba96bfa4a4 Mon Sep 17 00:00:00 2001 From: Casper3667 Date: Wed, 7 Jul 2021 03:30:02 +0200 Subject: [PATCH] Adds new drinking glasses and coffee cups (#12133) --- aurorastation.dme | 2 + .../machinery/autolathe/autolathe_datums.dm | 50 ++++++ code/game/machinery/vending_types.dm | 24 ++- .../loadout/loadout_general.dm | 24 ++- .../reagent_containers/food/drinks.dm | 8 + .../reagent_containers/glass/coffeecup.dm | 166 ++++++++++++++++++ .../glass/newdrinkingglas.dm | 132 ++++++++++++++ html/changelogs/CoffeeMugs.yml | 8 + icons/obj/drink_glasses/carafe.dmi | Bin 0 -> 2112 bytes icons/obj/drink_glasses/cocktail.dmi | Bin 0 -> 1321 bytes icons/obj/drink_glasses/coconut.dmi | Bin 0 -> 656 bytes icons/obj/drink_glasses/coffecup.dmi | Bin 0 -> 4632 bytes icons/obj/drink_glasses/coffecup_tall.dmi | Bin 0 -> 1766 bytes icons/obj/drink_glasses/cognac.dmi | Bin 0 -> 1153 bytes icons/obj/drink_glasses/fitness.dmi | Bin 0 -> 1465 bytes icons/obj/drink_glasses/flute.dmi | Bin 0 -> 1706 bytes icons/obj/drink_glasses/goblet.dmi | Bin 0 -> 1318 bytes icons/obj/drink_glasses/mug.dmi | Bin 0 -> 1680 bytes icons/obj/drink_glasses/pint.dmi | Bin 0 -> 2323 bytes icons/obj/drink_glasses/rocks.dmi | Bin 0 -> 1884 bytes icons/obj/drink_glasses/shake.dmi | Bin 0 -> 1636 bytes icons/obj/drink_glasses/shot.dmi | Bin 0 -> 1312 bytes icons/obj/drink_glasses/square.dmi | Bin 0 -> 1568 bytes icons/obj/drink_glasses/teacup.dmi | Bin 0 -> 954 bytes icons/obj/drink_glasses/wine.dmi | Bin 0 -> 1586 bytes icons/obj/drinks.dmi | Bin 128236 -> 128663 bytes maps/aurora/aurora-3_sublevel.dmm | 4 + maps/aurora/aurora-4_mainlevel.dmm | 8 + maps/aurora/aurora-5_interstitial.dmm | 9 +- maps/aurora/aurora-6_surface.dmm | 4 + 30 files changed, 435 insertions(+), 4 deletions(-) create mode 100644 code/modules/reagents/reagent_containers/glass/coffeecup.dm create mode 100644 code/modules/reagents/reagent_containers/glass/newdrinkingglas.dm create mode 100644 html/changelogs/CoffeeMugs.yml create mode 100644 icons/obj/drink_glasses/carafe.dmi create mode 100644 icons/obj/drink_glasses/cocktail.dmi create mode 100644 icons/obj/drink_glasses/coconut.dmi create mode 100644 icons/obj/drink_glasses/coffecup.dmi create mode 100644 icons/obj/drink_glasses/coffecup_tall.dmi create mode 100644 icons/obj/drink_glasses/cognac.dmi create mode 100644 icons/obj/drink_glasses/fitness.dmi create mode 100644 icons/obj/drink_glasses/flute.dmi create mode 100644 icons/obj/drink_glasses/goblet.dmi create mode 100644 icons/obj/drink_glasses/mug.dmi create mode 100644 icons/obj/drink_glasses/pint.dmi create mode 100644 icons/obj/drink_glasses/rocks.dmi create mode 100644 icons/obj/drink_glasses/shake.dmi create mode 100644 icons/obj/drink_glasses/shot.dmi create mode 100644 icons/obj/drink_glasses/square.dmi create mode 100644 icons/obj/drink_glasses/teacup.dmi create mode 100644 icons/obj/drink_glasses/wine.dmi diff --git a/aurorastation.dme b/aurorastation.dme index 5feedecc199..4f663a92a1a 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -2706,6 +2706,8 @@ #include "code\modules\reagents\reagent_containers\food\snacks\meat.dm" #include "code\modules\reagents\reagent_containers\food\snacks\sushi.dm" #include "code\modules\reagents\reagent_containers\glass\bottle.dm" +#include "code\modules\reagents\reagent_containers\glass\coffeecup.dm" +#include "code\modules\reagents\reagent_containers\glass\newdrinkingglas.dm" #include "code\modules\reagents\reagent_containers\glass\bottle\robot.dm" #include "code\modules\recycling\conveyor2.dm" #include "code\modules\recycling\disposal-construction.dm" diff --git a/code/game/machinery/autolathe/autolathe_datums.dm b/code/game/machinery/autolathe/autolathe_datums.dm index 90c05c2cb73..e96029aa582 100644 --- a/code/game/machinery/autolathe/autolathe_datums.dm +++ b/code/game/machinery/autolathe/autolathe_datums.dm @@ -143,6 +143,56 @@ path = /obj/item/reagent_containers/food/drinks/drinkingglass category = "General" +/datum/autolathe/recipe/half_pint_glass + name = "half pint glass" + path = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/square + category = "General" + +/datum/autolathe/recipe/rocks_glass + name = "rocks glass" + path = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/rocks + category = "General" + +/datum/autolathe/recipe/sherry_glass + name = "sherry glass" + path = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/shake + category = "General" + +/datum/autolathe/recipe/cocktail_glass + name = "cocktail glass" + path = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/cocktail + category = "General" + +/datum/autolathe/recipe/shot_glass + name = "shot glass" + path = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/shot + category = "General" + +/datum/autolathe/recipe/pint_glass + name = "pint glass" + path = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/pint + category = "General" + +/datum/autolathe/recipe/mug_glass + name = "mug glass" + path = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/mug + category = "General" + +/datum/autolathe/recipe/flute_glass + name = "flute glass" + path = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/flute + category = "General" + +/datum/autolathe/recipe/cognac_glass + name = "cognac glass" + path = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/cognac + category = "General" + +/datum/autolathe/recipe/goblet_glass + name = "goblet glass" + path = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/goblet + category = "General" + /datum/autolathe/recipe/bottle name = "bottle" path = /obj/item/reagent_containers/food/drinks/bottle diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index 89b69a0b154..fd9852e0608 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -110,7 +110,21 @@ /obj/item/reagent_containers/food/drinks/flask/barflask = 2, /obj/item/reagent_containers/food/drinks/flask/vacuumflask = 2, /obj/item/reagent_containers/food/drinks/ice = 9, - /obj/item/reagent_containers/food/drinks/drinkingglass = 30 + /obj/item/reagent_containers/food/drinks/drinkingglass = 30, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/pint = 10, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/square = 10, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/mug = 10, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/shake = 10, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/goblet = 10, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/wine = 10, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/flute = 10, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/cognac = 10, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/rocks = 10, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/cocktail = 10, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/shot = 10, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/teacup = 10, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/carafe = 4, + /obj/item/reagent_containers/food/drinks/pitcher = 4 ) contraband = list( /obj/item/reagent_containers/food/drinks/tea = 10 @@ -815,6 +829,9 @@ /obj/item/material/knife = 2, /obj/item/material/hatchet/butch = 2, /obj/item/reagent_containers/food/drinks/drinkingglass = 12, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/carafe = 3, + /obj/item/reagent_containers/food/drinks/pitcher = 3, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup = 6, /obj/item/clothing/suit/chef/classic = 2, /obj/item/material/kitchen/rollingpin = 2, /obj/item/reagent_containers/cooking_container/oven = 5, @@ -847,7 +864,10 @@ /obj/item/material/kitchen/utensil/spoon/plastic = 12, /obj/item/material/kitchen/utensil/knife/plastic = 12, /obj/item/material/kitchen/utensil/fork/chopsticks/cheap = 12, - /obj/item/reagent_containers/food/drinks/drinkingglass = 12 + /obj/item/reagent_containers/food/drinks/drinkingglass = 12, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/carafe = 3, + /obj/item/reagent_containers/food/drinks/pitcher = 3, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup = 6 ) /obj/machinery/vending/sovietsoda diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index e3412551565..9ea37f2897c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -90,7 +90,29 @@ lunchboxes[initial(lunchbox.name)] = lunchbox_type sortTim(lunchboxes, /proc/cmp_text_asc) gear_tweaks += new/datum/gear_tweak/path(lunchboxes) - gear_tweaks += new/datum/gear_tweak/contents(lunchables_lunches(), lunchables_snacks(), lunchables_drinks(), lunchables_utensil()) + gear_tweaks += new/datum/gear_tweak/contents(lunchables_lunches(), lunchables_snacks(), lunchables_drinks(), lunchables_utensil()) + +/datum/gear/coffeecup + display_name = "coffee cups" + description = "A coffee cup in various designs." + cost = 1 + path = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup + +/datum/gear/coffeecup/New() + ..() + var/list/coffeecups = list() + for(var/coffeecup_type in typesof(/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup)) + var/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/coffeecup = coffeecup_type + coffeecups[initial(coffeecup.name)] = coffeecup_type + sortTim(coffeecups, /proc/cmp_text_asc) + gear_tweaks += new/datum/gear_tweak/path(coffeecups) + gear_tweaks += new/datum/gear_tweak/reagents(lunchables_drink_reagents()) + +/datum/gear/coffeecup/spawn_item(var/location, var/metadata) + . = ..() + var/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/spawned_cup = . + if(istype(spawned_cup) && spawned_cup.reagents) + spawned_cup.reagents.set_temperature(T0C + 45) /datum/gear/banner display_name = "banner selection" diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index ebfbc6a6f34..817cfa7cbdf 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -470,6 +470,14 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I volume = 120 center_of_mass = list("x"=17, "y"=7) +/obj/item/reagent_containers/food/drinks/pitcher + name = "pitcher" + desc = "Everyone's best friend in the morning." + icon_state = "pitcher" + unacidable = TRUE + amount_per_transfer_from_this = 10 + volume = 120 + /obj/item/reagent_containers/food/drinks/flask name = "captain's flask" desc = "A metal flask belonging to the captain" diff --git a/code/modules/reagents/reagent_containers/glass/coffeecup.dm b/code/modules/reagents/reagent_containers/glass/coffeecup.dm new file mode 100644 index 00000000000..37e5c602737 --- /dev/null +++ b/code/modules/reagents/reagent_containers/glass/coffeecup.dm @@ -0,0 +1,166 @@ +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup + name = "coffee cup" + desc = "A plain white coffee cup." + icon = 'icons/obj/drink_glasses/coffecup.dmi' + icon_state = "coffeecup" + volume = 30 + var/fillsource = "coffeecup" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/update_icon() + cut_overlays() + + if(reagents.total_volume) + var/image/filling = image('icons/obj/drink_glasses/coffecup.dmi', src, null) + var/percent = round((reagents.total_volume / volume) * 100) + switch(percent) + if(0 to 39) + filling.icon_state = null + return + if(40 to 79) filling.icon_state = "[fillsource]40" + if(80 to 99) filling.icon_state = "[fillsource]80" + if(100 to INFINITY) filling.icon_state = "[fillsource]100" + filling.color = reagents.get_color() + add_overlay(filling) + +// Nations +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/sol + name = "\improper sol coffee cup" + desc = "A blue coffee cup emblazoned with the crest of the Sol Alliance." + icon_state = "coffeecup_sol" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/dom + name = "\improper Dominian coffee cup" + desc = "A coffee cup with Dominia's flag proudly displayed on it." + icon_state = "coffeecup_dom" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nka + name = "\improper NKA coffee cup" + desc = "A coffee cup imprinted with the tree symbolising the flag of the New Kingdom of Adhomai." + icon_state = "coffeecup_nka" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/pra + name = "\improper PRA coffee cup" + desc = "A coffee cup bearing the flag of the People's Republic of Adhomai." + icon_state = "coffeecup_pra" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/dpra + name = "\improper DPRA coffee cup" + desc = "A metal coffee cup bearing the flag of the Democratic People's Republic of Adhomai." + icon_state = "coffeecup_dpra" + +// Organisations +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/NT + name = "\improper NT coffee cup" + desc = "A blue NanoTrasen coffee cup." + icon_state = "coffeecup_NT" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/tcfl + name = "\improper Tau Ceti Foreign Legion coffee cup" + desc = "A coffee cup with the TCFL emblem emblazoned on it." + icon_state = "coffeecup_tcfl" + +// Symbols, markings +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/one + name = "#1 coffee cup" + desc = "A white coffee cup, prominently featuring a #1." + icon_state = "coffeecup_one" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/puni + name = "#1 monkey coffee cup" + desc = "A white coffee cup, prominently featuring a \"#1 monkey\" decal." + icon_state = "coffeecup_puni" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/heart + name = "heart coffee cup" + desc = "A white coffee cup, it prominently features a red heart." + icon_state = "coffeecup_heart" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/pawn + name = "pawn coffee cup" + desc = "A black coffee cup adorned with the image of a red chess pawn." + icon_state = "coffeecup_pawn" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/diona + name = "diona nymph coffee cup" + desc = "A green coffee cup featuring the image of a diona nymph." + icon_state = "coffeecup_diona" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/britcup + name = "british coffee cup" + desc = "A coffee cup with the British flag emblazoned on it." + icon_state = "coffeecup_brit" + +// Pure colors & other +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/black + name = "black coffee cup" + desc = "A sleek black coffee cup." + icon_state = "coffeecup_black" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/green + name = "green coffee cup" + desc = "A pale green and pink coffee cup." + icon_state = "coffeecup_green" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/green/dark + desc = "A dark green coffee cup." + icon_state = "coffeecup_corp" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/rainbow + name = "rainbow coffee cup" + desc = "A rainbow coffee cup. The colors are almost as blinding as a welder." + icon_state = "coffeecup_rainbow" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal + name = "metal coffee cup" + desc = "A metal coffee cup. You're not sure which metal." + icon_state = "coffeecup_metal" + flags = OPENCONTAINER | CONDUCT + fragile = 0 + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/glass + name = "glass coffee cup" + desc = "A glass coffee cup, using space age technology to keep it cool for use." + icon_state = "glasscoffeecup" + fillsource = "glasscoffeecup" + +// Tall coffee cups +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/tall + name = "tall coffee cup" + desc = "An unreasonably tall coffee cup, for when you really need to wake up in the morning." + icon = 'icons/obj/drink_glasses/coffecup_tall.dmi' + icon_state = "coffeecup_tall" + fillsource = "coffeecup_tall" + volume = 60 + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/tall/update_icon() + cut_overlays() + + if(reagents.total_volume) + var/image/filling = image('icons/obj/drink_glasses/coffecup_tall.dmi', src, null) + var/percent = round((reagents.total_volume / volume) * 100) + switch(percent) + if(0 to 69) + filling.icon_state = null + return + if(70 to 89) filling.icon_state = "[fillsource]70" + if(90 to 99) filling.icon_state = "[fillsource]90" + if(100 to INFINITY) filling.icon_state = "[fillsource]100" + filling.color = reagents.get_color() + add_overlay(filling) + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/tall/black + name = "tall black coffee cup" + desc = "An unreasonably tall coffee cup, for when you really need to wake up in the morning. This one is black." + icon_state = "coffeecup_tall_black" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/tall/metal + name = "tall metal coffee cup" + desc = "An unreasonably tall coffee cup, for when you really need to wake up in the morning. This one is made of metal." + icon_state = "coffeecup_tall_metal" + flags = OPENCONTAINER | CONDUCT + fragile = 0 + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/tall/rainbow + name = "tall rainbow coffee cup" + desc = "An unreasonably tall coffee cup, for when you really need to wake up in the morning. This one is rainbow colored." + icon_state = "coffeecup_tall_rainbow" \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/glass/newdrinkingglas.dm b/code/modules/reagents/reagent_containers/glass/newdrinkingglas.dm new file mode 100644 index 00000000000..b8d5f546f34 --- /dev/null +++ b/code/modules/reagents/reagent_containers/glass/newdrinkingglas.dm @@ -0,0 +1,132 @@ +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass + + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/on_reagent_change() + update_icon() + return + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/update_icon() + cut_overlays() + + if(reagents.total_volume) + var/image/filling = image(icon, src, "[icon_state]10") + var/percent = round((reagents.total_volume / volume) * 100) + switch(percent) + if(0 to 9) + filling.icon_state = null + return + if(10 to 19) filling.icon_state = "[icon_state]10" + if(20 to 29) filling.icon_state = "[icon_state]20" + if(30 to 39) filling.icon_state = "[icon_state]30" + if(40 to 49) filling.icon_state = "[icon_state]40" + if(50 to 59) filling.icon_state = "[icon_state]50" + if(60 to 69) filling.icon_state = "[icon_state]60" + if(70 to 79) filling.icon_state = "[icon_state]70" + if(80 to 89) filling.icon_state = "[icon_state]80" + if(90 to 99) filling.icon_state = "[icon_state]90" + if(100 to INFINITY) filling.icon_state = "[icon_state]100" + filling.color = reagents.get_color() + add_overlay(filling) + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/square + name = "half-pint glass" + icon_state = "square" + icon = 'icons/obj/drink_glasses/square.dmi' + desc = "Your standard drinking glass." + volume = 30 + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/rocks + name = "rocks glass" + desc = "A robust tumbler with a thick, weighted bottom." + icon_state = "rocks" + icon = 'icons/obj/drink_glasses/rocks.dmi' + volume = 20 + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/shake + name = "sherry glass" + desc = "Stemware with an untapered conical bowl." + icon_state = "shake" + icon = 'icons/obj/drink_glasses/shake.dmi' + volume = 30 + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/cocktail + name = "cocktail glass" + desc = "Fragile stemware with a stout conical bowl. Don't spill." + icon_state = "cocktail" + icon = 'icons/obj/drink_glasses/cocktail.dmi' + volume = 15 + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/shot + name = "shot glass" + desc = "A small glass, designed so that its contents can be consumed in one gulp." + icon_state = "shot" + icon = 'icons/obj/drink_glasses/shot.dmi' + volume = 5 + matter = list(MATERIAL_GLASS = 15) + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/pint + name = "pint glass" + icon_state = "pint" + icon = 'icons/obj/drink_glasses/pint.dmi' + volume = 60 + matter = list(MATERIAL_GLASS = 125) + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/mug + name = "glass mug" + desc = "A heavy mug with thick walls." + icon_state = "mug" + icon = 'icons/obj/drink_glasses/mug.dmi' + volume = 40 + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/wine + name = "wine glass" + desc = "A piece of elegant stemware." + icon_state = "wine" + icon = 'icons/obj/drink_glasses/wine.dmi' + volume = 25 + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/flute + name = "flute glass" + desc = "A piece of very elegant stemware." + icon_state = "flute" + icon = 'icons/obj/drink_glasses/flute.dmi' + volume = 25 + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/carafe + name = "pitcher" + desc = "A handled glass pitcher." + icon_state = "carafe" + icon = 'icons/obj/drink_glasses/carafe.dmi' + volume = 120 + matter = list(MATERIAL_GLASS = 250) + possible_transfer_amounts = list(5,10,15,30,60,120) + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/teacup + name = "teacup" + desc = "A plain white porcelain teacup." + icon = 'icons/obj/drink_glasses/teacup.dmi' + icon_state = "teacup" + volume = 20 + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/teacup/update_icon() + cut_overlays() + + if(reagents.total_volume) + var/image/filling = image('icons/obj/drink_glasses/teacup.dmi', src, "[icon_state]100") + filling.color = reagents.get_color() + add_overlay(filling) + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/cognac + name = "snifter glass" + desc = "A snitfer, also known as a cognac glass, made for serving aged spirits." + icon_state = "cognac" + icon = 'icons/obj/drink_glasses/cognac.dmi' + volume = 20 + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/goblet + name = "goblet" + desc = "A glass goblet, used to deliver alcohol to the upper class since ancient times." + icon_state = "goblet" + icon = 'icons/obj/drink_glasses/goblet.dmi' + volume = 25 + \ No newline at end of file diff --git a/html/changelogs/CoffeeMugs.yml b/html/changelogs/CoffeeMugs.yml new file mode 100644 index 00000000000..78e6def02eb --- /dev/null +++ b/html/changelogs/CoffeeMugs.yml @@ -0,0 +1,8 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - rscadd: "Ported coffee cups. They can be found in the 'general' section in the loadout, in the kitchen dinnerware machine and the diner utensil machine." + - rscadd: "Ported several new drinking glasses. They can be made in the autolathe, found in the booze-o-mat and a pitcher & carafe can be found ain the kitchen dinnerware machine & diner utensil machine." + - maptweak: "Mapped coffee pitchers into command, security, engineering sublevel & medical breakroom and into the surface meeting room alongside with the diplomatic reception." \ No newline at end of file diff --git a/icons/obj/drink_glasses/carafe.dmi b/icons/obj/drink_glasses/carafe.dmi new file mode 100644 index 0000000000000000000000000000000000000000..568f661916783df7311b7f898278bb99bbf5208f GIT binary patch literal 2112 zcmbVOdps2Q7XQsK%+5rnZG^f8v)n~OOH^WLyep3;TqVy`-b6bnGg?$;4CQTQNVS=~ zx`SAQk&N0%@*H^+)eK{lMVQ&KcRza{f85XK-amflch31e&iS41IltfUrt=9~IfM!V z03c^?hj*3q?5zfukx5Lrn#5J&Kc#-F?7A9XPz`eJw(0K~%Vo(4pl!8Vx*ZUW*~ z`TZGl8GX%?0K2p5dCx9x3q2W<`TB_u>ot1@hE=Nab+`&M6E&!!HBvX+K?WfPO_q@aKq z`^Za;u?cfGKFB}KqmEFUJ4q&29yTHvb(8v3TihWEWrsZgvYPgIO9HWQe$+ddV5`(2 zoXbnQiBNBP?od=rr!-5K2wHzE7(=W0spo#Bh`g_^ z_s!cZk!5O_LHp&uUGy`Gikt3<<{poF)yd`N&#gmx_?%AsoJn^flb?CP*VhtM$Tt*$ zi5(DfkThVRz(X5Q?5W=M*KsboW^+@z)Q9@F&5{M3uNj>pH*_B5Vy{k+YS9%y1e?-29 zDJAQ(vOro07#|JCh?Xrk=lV`1QgUYDGg_x$L*cnjMf3`^POi=PJ9&lSqMp##%uO#7 zK}9&pO-x+!WN+DSFi6px>!zo#tQWSow}0C;XoSF(w(Dywtqd@oTF#1M?zCfa%oK}* z^P#WbZ?x>DSYXum;Ref_cND^7giO$usROpxHCE2YsBic*@(R|n3j85Y>j(nbJc;Qo zpMN~kLO9z{u(HtN4)=V#s%%j%JPE_$XC9I6I+T=_PF^Zey{b^zHwfq~6kUP)!hav` zWe*zq2e>N#iu8XM8d%z@zQLdC@ZRH;<1lg%0c=mMk!rL7`+XoOKVY35x`w0n+&hn& zeu5F`ka^8UaEd$Hr^QQ4;B`YdN~2#VpvePC@HBTcs7?boV<_l{1J-hV_+r2D2ZuS~ zv0W3=U`$Er4i&Q^$B`<{6iSrDCeO^7Y0+5GF?G99)zRgvM9$!m=Fl=Jkd%Z~AYg&> zpIiN(!s4rslT%_(W1E7O76qX5X*_h#F%(rj{=RNoI0~8`8!zqfv+L^ct!?wIFA*7hcKW)E|7D-N z=Vu^8iKuJG(B!`;l`Q_M0;*eI1_QR@?{NPQ7ktcU$&qlMy(JuOl6HcscU8kQR^ zwYPWRs85_+27!FLMx>NQbq_M2yV3Ng7S=Ium(S;VE;Z55c-D!GzpJ$!@258r#3RY2 zPI5mzTh-<`Wj*T^ZCu=2m0c<s%1^TyI}r7Ec>z zr~|fe=?Vgz>nYP_o*q)Mj}^(1D6u3_I1m_E9jCDN?cNllZ!G7N;32F7#J$% zOucZH>yQBt`-kG+B8j`ZO609YTnm0WnJ{)Ws|r0)Kv5D=I}dlLbWko=*RJb zRp-8np7K7c{@A9Ef5L=()^z=xCRWbKQ!`C(+%({~Tan=4w8Z@`d#m%2$mVm+EiId` zt=v8HxBLtaBj1-Mi!aadD=*o#{Bn~Ye@WGn%Pwm;%yus{`y%meb%oLqt@_zlic3!K zd9cQ?xvIG(=W{4`c#Xqd{$;#hj@vDGCtLRIy&uojtu3E|KJ&{*d`as1s29h;z#{4C z;uumf=j~lbZ;?cqhL8W#CO$ga)bVPlWF$#4meYRlI>;ATdCFx`H#) zXCW@Z%LkW*eY~*e{f6^<-hH;tm40Wvj(_v#b#M1yeD^NTV~X?_#*BTE3j)|QrZ94) zHaMX&&3D%w{894p!>Zr)HTL`V*F1k0=yK%SrJINEFkh~DA(H^){JM2oy#L+Xy?;OD ze!jmqTTsyOp8buNPfwVLTe0uhTk@@7Pkn)e;OyD_V)1WlZL9D8yIb);;rQnJH7i!F z+F27Hdwub`eq*n{*9{(DK6?1=*R9j*|MMI%|Esd3=JUGq>*vcP969>h@qCTf#I4+U zi;eA;e#(_t$P=K!EOLsW)yM(JT(KnnsB26O|AxJ9ZyUbSvUEremapLygGnQ)B*2_x zFRXMfbn(Tg%`+xleg5m@<&D2)@lQYXb^Y;QC-o0b7oYvL#_IZhx!37u*{2lk` z2B5p`#n;4W2XFV^RktzS;b}x?$MgEU@;?1T46McuOS8_`O`gMU2=diRKcz>pE^D6I zbTDdN_4;$0(f|ItBij?XzGwa{{QUY`kd5s>i^~sP3hUTxI?rSuSii%dO8#Yk&Rh zzw@=2=}oFl_(QdcmUGmDF9n>KcYU6VTg%dT<~0BGQz11Bwh@1ec}}#17%_Zmx8M6u zg^O>2`pN9)EFSC^X0-B8KvQ?Fz9c%vQG8}!^wz*B%bEnt+ zmK6o)j>1UFSQMoGZNGYI`_`?l@=T|Up;=&RF>l4s$se30uP$u*Vkq4 zNc}006J51F+u?Drkopp?&?|a7R;_BYYx^H~s*ukyuVJ#qezrL$Yj*8g=kEOfVOZ$Z zE2XxJ`WK7r-2K4Q<;^i3b4BOA3qN*gzf#>{dW54_-*+OT8;`crWAE^s2EoG}7k+#a xkxe*K+46Z$-ODcifK+2pA|Q}p!3tiPr~Z|xk6qcM04)0$JYD@<);T3K0RR|KQ_27U literal 0 HcmV?d00001 diff --git a/icons/obj/drink_glasses/coconut.dmi b/icons/obj/drink_glasses/coconut.dmi new file mode 100644 index 0000000000000000000000000000000000000000..019af1a88cc2330f703e8c1c39d597651417cd77 GIT binary patch literal 656 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

>5@yH8n8~ju+I1V>X&%E&q1kZt$Cy zW9LZj{cUfniugXP*un#9?CGqYA;-yG4x3diW)x5PQ_#p zsnp|wU+ZG7$@_bn4wJl4LAj}?M24%hGd|`LS$fY)CUawg(3H^`sl4SiP3D}RiTtKD zMy=|Fu5R{a^TIK&mHNfmdjJ@_eVlH>(gtnHs%Whal{K10S$MeZYfWEFSC*bPY`Z?x z;6HQS5z^R`!cVs|?I`6^w>#1EbYic`;g)f0{8!eQyeTSrZ7Ab1m?Hj*7R0W(K*vtb z54%^#bHO=K*j5$Lw^U1an^i`&Ln*qLZ7r7AB}27gN5dupl&YOJ0-RtfV*^)@Od2~K zaHf?P_MtzJ0pgbuNCMy(FKV#D^Djs(XSB!iGUpN2(@}d%CGaP_A8pC|HAH2CGH(26 z*Xk-AuMY*&zBChd-DU40=R)Jzvo9bo6ljS6D1Q110h~mO{iN#IxqYG^#x2~ETc-$A zVY5;IwX5~BXIX%mOSk6(KvFVnS(MSO{fEc!KNdTmcw^dTN#C*TGlI7@-?O#IIk=?% zz$QzlU9&f$?#5(FM)n=p#T2K~k1|-|&y{=FbFtP0=mPy>z& zi^Lpy@VcC|Nfh93V4HdVALmZ!HeUvhX4@mv&^{CXYW~lXE8TB|t;dlVN6m|8s^1Jg zhF8KC*EdBVF=^gnU4zoW70A_(-*33XbilY9{XYmqMnP@->T1-h^plXQxPQanrGeDF zxAq^F(2DM*9V_V?l1LbWM~}FCKD4&B_Do{ps+;C>>$RCC)Jodamm`aBVl4!pMGJ0{ z!}P(e!TgXJ&m(1bxvR)ja%u`wGh#2sdDc49U1=#gZ5BR75X0fgchZ&Ltk5AlrpTAgZt)CFqKZ3RJ(Xjm=*O71gC>a+yoL zN*U;{)J;WNkBP%pR0)&u$X&OBIIL`@!Lyj*V4M8tE_7w;pX)EhVjjR_Ooh<{En$|x4Hq- z_Qm|ob${Bzm%sj$7Y(JSD|QejPU6aiI_lYWg}X;m zZfIsl0iZSh(iYinsF&zOoMW#8g(+Hb|;uX6mP`FUPsE5D}p>?xXZv!I~xhGc-Zcw3AcT>}dT2!&p5 UCl-t`8;=VF`V;)>e5skg19+z-MgRZ+ literal 0 HcmV?d00001 diff --git a/icons/obj/drink_glasses/cognac.dmi b/icons/obj/drink_glasses/cognac.dmi new file mode 100644 index 0000000000000000000000000000000000000000..23e416e03f437de3a464cd8c5dbc1586d1dbbc9a GIT binary patch literal 1153 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 literal 0 HcmV?d00001 diff --git a/icons/obj/drink_glasses/flute.dmi b/icons/obj/drink_glasses/flute.dmi new file mode 100644 index 0000000000000000000000000000000000000000..6a49219df86120290b9599f7dd0e869f2d561d09 GIT binary patch literal 1706 zcma)7X;cze6n-d+L84}*IpUJ#m@R6N%V+_vU=3usG!<#b(XtvbrQAkf)S^t&%*s*| z8#|h&R??6tgmH>8O{LUx%5fbywzI0kT?-Qf^P)j4TO@OHXyR6=BYOdLIi77IX9@!3uRGQ-&zG2xM% z<GtOKoK=FE;mE*W#qn;O`-FaclshO_(86acG ze9O(M$AJ;X0R_Y|cnq(3do0X(LNgk5G=NmWg}`l>3x*SKs8Scf-OX&N+4OnRlDsv3 z{B_bOVj_X>EE4lzQD`Ie3$%Zvu^5iJ9XHsQxK`O5WsgOfoXDzayKIa~j}E#?BH1QU zxo)Q(avEgCeX`=|G+YsR>ksXu1ct1E8T~l8v9S?e$sgPRM5YiHRu9BLfz$w$n*gF6 z$m>Q;2Yk@(RJ~IEQnIo71zVq9eHhrw+!TZHOl^zWh}JFcOYml0=A!XRt@>d6l&rm8 zNULanl8qc8cGz}=sW<+yn>kp-PE8Ge-cr&S9sPk>yn7xj&y$>Pn*;C`pGwwH(iNJP z)qt~2&EwT=zN^nX!Z)Ma zwHB$7LsaY0U|U)iZTEcMt=@3jI7n?WAD^8(^4jA~WjI620fho&vv=K1Guiq&sNaqB zI=zn#70x(d&J%1`yMwl5(KR;-xMF}5G3G+GujJA@LbB^pj!zI9zw?n+RkK8i)(}qipnN71E!x&Wiff^a7owMC`Ak51(i#sIRmRBYZPFLm$X^{huMo?Zf3Zmp-?CoHN@ zsb#c5-*flPjdhHLFe6Uy^WC=G4Sw3Onts#b z!PyBj9c+Tpw@=%ZYU_|Ys>zYAmJ&=tuk|I(Q_4@J?K-COoig+~zv%GuAbrLACxQN7 zphhLc7dm-*diMFm`Ta981I$%9{;Fa5j@KJbxw?k+$ggx(R=T7%90A9~draoaR!ABe z_@UOhlCI`6l8_aq`(vAw0?5e{h+D=Fw_C_3Z3&uQ(0X&D~wILTCSint$bmkdQ?*FtYP~ak-QX+ zvB~doY?YV#(}5QskFI8le@9){RQMo>97R`Q7Y;KHJ^7OCY?J+EDgBp_S=>92T^4leqLlA_5;y1WarH)MY=H~74~q$FLj@umq26Ymj=j6;VSx}!K|U2j#M z?)322y{~oOx7|O#B=^C+7u(OrYJZn{`~JQ3f=^C+8GOu{T0|I~x)>B)8zv|@cnB&i zNvqkHvEBYXoBZ#;pHGS1*SUG^Q0bKV$QfeF>^pAHFP}f_{jS6F{@47tDyX0xh=oHF!+RV8ScUi0D~Mixy)jl$Xz@LHp9Tp}nd9$Po|so%C&1YEVr6)J(wyBQ zEBfb`@phhVQL*<6 zjxV==^ECIqU)uD$`@=t{rInd%e{}7Cjr{w64X*F`+dtG;{}NieRDQ?T|8cGU4pSc2 z6ds*9bMJrKTSrz(tz%@~vTNVNyu5X1&%7yF_slQt@4Ee~6i)nQT%8c4HbF}G!eJF( z1=II?6Xj+%rTW`13;5AAx4~!O$qCuzYrcrgnU-xYqJ4w2aDleMdq`V?snXKuV8DL_2pTd8xGC-+P3>m$)dxX9r>1JFH4tQxA!q%^jmz|@AwWwxKkhWRCC6f+?emDLTb5wtvRoKV0U$q{jT_M`5p4xZ9?Zay?i-6 zblvYJ(POr$HKC=kshQWL^R$?bq;P)n^|*RZaQfbPtLCP{c#M1I3tFrg&%-=Xw@x4_OkHFO#O_j^%M;>4dOXOO0|L3aZ34+J@%^Wg-^yTw9 z9~h1=6Vtjh1eS+u;wFy<9md0+Gl{VLJ!tuxPP6|f}B;+gg Zf~Gg-E?BX6E3n{W@O1TaS?83{1OQ@$T!H`q literal 0 HcmV?d00001 diff --git a/icons/obj/drink_glasses/mug.dmi b/icons/obj/drink_glasses/mug.dmi new file mode 100644 index 0000000000000000000000000000000000000000..f7c6f8c20338c25ab51f755d0ebd578252f4cb6c GIT binary patch literal 1680 zcmbuAeKga19LK*Ki#!a)QY}Oel1xoEk3|T1NJ}_#BDoc=OiMMJY#wUpL1?)iVmG@f znI7cf5*wxDE-HDt9)2EMccX1sjLF^Y+<)%FIrpA(&v|_w-sgPI`;X80obyTZ^>Ncw zTcZX5(DZP3!6_eZ4hwYd_T zxOC@k+(EY^OgA=&dHuDm}h*>H&~i`i0s93f+~E?fDxpC8gT zT)pvr^es5@pnFX(Ys+23r+V7_1e zBko44uiy#}_UzWqduL5f^SQ0M0~-3ac+AN5e9?|#7NeL1qknvuf1$~CK%;m9EpQgb zV)X~Mn(sQcXcGN=9{b7p;P`cD|NJsq(Sj@Xi8&7d1jWO}$&XYpIp9QC>#9$ebnCjf zTf4Y>H*dK{24;vA%aQJB6Jf^Ir==xBL1I_AW_ngJ+eMJ*?6~|Qy7a~&mS1VSViu}+ zQ-rww^nB#QKn8qHCO9iutX_)^p~}a~=AtJJbd1(A;5D<7bcY1uIic{xXpap{{g4dx zvBa>UYV_xP%v5rRy4}-Yvl_j<7D)z4>Jt%OV&MVn+o;ph(2zdp%kO8ec+6I&x)EJJCpf!b0y8i8I`K zJJzli4HYGXQm3HtVKA}_u}LgWOv?jNTj4u-vd>4sN`uhuPHvR1NWCcC{j zLEi*sTx>X^}=qfN~S?6jrs2cf}X1^NRx}_9IC}k_>|w~?8bmD zJ8<9f7(xVsw~99Shdx*P1r`|hR@cc6Y{ldm3r_+g6wGnWe*^CY22Xb6%M3Kj?Z2>W zdFuni!K=2D8TuUL8Sxs9J-TaQl#nlKH%&!VC~dGQv`ykuXTB|2=@wXdezO(jDpbYG z2yd67!e>6@lw`_+X(rS4!0pgd!F`_+Y>vo5OOuIQ#mp5U!u>P!-i$6e$1RN8&^H__ zgte|?p1RD@G<*3SWLe~TjqqVsLhzOkcI@5#c{rvg@1=#W%r7-%;GMeHfbM>ahq_O&FQ^rG8<)A6hBvti5L&?tF4a394sDlVkOrtlvS+jmdnEZ7@G4xl=iqsOH)DD!->ardw z{b{fGNu@xcG=1RKALc-|w!0(7iB4=Ox%sWc zLs$wC#!==eShd3z!mjVIz^ntI${r^wUZ;C9+MwD zP&o*@(|KXl-37Tg=s!F`&LGH!mhPP4Qx zKIZ&enEA*c6@P0m46`R-*g-2LO^rJ`g6SMi{9Xl;A79iMTC6Ibol9MXrtt+KQ~ij* z#r*ZcbzB}n?}U_ai3tP`=X31O!Tgs#v?Qol2FW9N0tn4ey4xWL!H-#R1(13CmK1D* lZc~6sbRx}H8ASY@C1AqnPgbuf%T>G>;Nj}yQoi?S(r<`m`&R$} literal 0 HcmV?d00001 diff --git a/icons/obj/drink_glasses/pint.dmi b/icons/obj/drink_glasses/pint.dmi new file mode 100644 index 0000000000000000000000000000000000000000..314136c6d18f7a2b206e6e7604eadfd409337ee1 GIT binary patch literal 2323 zcma)8dpOg58~@Fi<$M+q$)ShJVI-oaj8QA$5o&X`Ooh;x(^7=?gdFmCm6byWCM;1g zp$M^@S~5m@oR;P^he>-^z1RCbz3+3q*Yn5sdtdkWzVFXA4mW}Xohh$(`rdxUL3xZnAp(1@Ura{v%kkki*7)@-C8GHMZ>cC`W_ zS5zbAQLLptV}PuzlEfJVotd9if4WM~e5O4Yb{^WE=f*}oE-|G?VdL2O`KDdEiPRCr z+gd1GherU~Bgv-^BEK_86@5zGu0XN7w%FnPg}I3{SGe-mg?wE|zmU3&_O!W^szh4l zNV|-6MW#O796I^wn&Od3p;BXvW|KJbqWQbXiQZMZ=~#KCUifyDJ|X`G={+WH9PJSo zy)l0%BgIwwO0+}Jr6G-D%fz_b7x{aahGY8p@*ET&7Jr0&)-mYT{60}$o?{Xz00(=4m7;lloOucLZhi zfS-spHI~zKml{2%O)!FJd+StHZL1MJRO#fBR!O>2U5b8M!ddU`UZ*X_9&m6e8H&C& z+|7x@2I5<unaUnGwJ)mQ;pe z5fB@BHhyBb${Oa-yR7?Oe%`~vzt z0%63I;%Vk{T+VIl1RgBEdO-KsWns>{OuxCC*w}3+QDEutv=TIWDwtV=!KyM`MH+&>DkP zH$lXM$TPW!H6F*m^kMBvm0oL|aN4`g8bYZl^@|afuMgikE?lo8_pes|)YreG1afnc zQv>G^q|$e8t=f(PU zXgiDJzg=RW3@HR3e=}jA=RGYZguod|Eao$>cUsdul8AcEGL&|&ct=bmGkIVV3?Q1e z$+&I@oPGn~WD!v*@?BjisWk}tor8I8s*u^R;=codc+(Fnq^zl;% zE^mz;DD1jJI}Dh3+_F5c{4y-e&3-?YJRvpZ;-R$Cm^KUXJs|pq23FlAJal_&=?fpx z*W`GF8pMYI97%0df3pHrXqMXX0WYc$#stB9H}Ij7@R#!|=xp#kmV`HAK|?s7t8cKB zg^iOkym(|$ZI1Taccp`t;UP>Kx z<12r@uT5^oC4q7ZOB~GQJi(2uEj-Vtuk=gL7ERt71HX4{W1y~F@@Yi$%+>4R&}(Xz z`Fr}}KfdXCWM!m%>0~m(_Tx%w;lBNH#~U|usaBi1xoY0i>Q?bQcawd1w5{#AqjY2l z-m8tBFgLx@NoapYbn zk=s$&X_r^eF08MP9$a3mVClc*x#=~D;?Hi8O=q{%hKCdEAhi;mUDLleGeRW2N4Uo@ zg9VS5WyZ%t%)rH2@`Ba%W44yNBStdFa@@D5`9h@i`Frd=y-(355I6*+kKe>7O@nW|G zhuwYFi5E}*{`$q_v>xM%H1{3;z7?T9borDM)u+Z2+ENi%NE&^nw_1A3r6`U9rJTs}In=JU{01k+wwiO4x6aNXt CvMtO2 literal 0 HcmV?d00001 diff --git a/icons/obj/drink_glasses/rocks.dmi b/icons/obj/drink_glasses/rocks.dmi new file mode 100644 index 0000000000000000000000000000000000000000..c9151ef67c24b3cb854055d6ff8fc5af3544d4ce GIT binary patch literal 1884 zcmZ`)c{JN;7ycz}L}LkOY8j;{)3FSylp$4_Af;vqlT6TBW-M(Oq_wvssSb^;`cc|W zXegT6mm(&Hpq6UsV%Lh;TB?FHB`Uk(-m7~y}8K#U}WhXFurUd~fC?9w3xsa31E zRJ&34baI(S-QJS#7YrS#ZkHN!b@dWN@-DgVE@8dxCS2(J{mQ26N9J%&DuETZ=xy4^ zpw}u`QM-s#)Cs8)QF~}wREPf5)J@MTBSpo--C!u%>2#-E=t|3PpvOs$D%#%Zk$VQb zuNphBWM5Y~_JEfPv(e5;Hu95qpyxb^T1}pvAr|aVv{U&(zLfkkf+bgbgka@T7V*IS zO}%=?GIR^7GhzopSCD1m^%m9NmKAF{$jdtBJd#cT04WD2`ya5ec|4A52o|r}!=Dc} zFg4X38+htLJaMX%Z3iDC|oj7}YUyOIqw9Es;h1)b^Sc0N4tM|b2VVT#qCunM+ zGK!%og(;W=)Qls&ybg7_*F(1u^OIJ>z7-M3?d*++Dl4`i50QN|+sN2htzZ$evQDCS^*up1bV28tztH-dzzt?tKO|NFLe>(zAa%pi#M$Pf_hLxf!C zBJg^Ez}Ki+5j>QS2R4(XctfkTy-$=|NekPZc9()0hxwh9u+?MWd{s4%&38rciUttzb%JHz z6}40V8aNP`q98OPf~3a2^ZyZiwKciRlM=S%fqtk;AEEB?iX9*m+bw@z(K9!zY3SV$ zOCuAH9o>2CU`7iQxTd}5&{e+XYTE9F6DD>^wn*=8#g%}&P%x&g+&YUxvS?<-3 zyjwj7R)~PMHox^^Ta0U!--5Qm@3{fASf0lc+lGX=ZxSDsk9QdFM6x|#gM4}6P zmqS^&?&ka0F9`=9?GZ3II9SWj%7A?)CK7^wc?A6UQ(iCrRgj=G#Vn_xYdP14mFt7` z1X3+b&!q(fhFSQYOz;Z|3Mq&GE^)?_2A91ij-YR;tq+xfo4V@68*b5y*(P;sJ(-f$ zo6iiTM78z5pK53dvA4kvs56()cZzzF1+`4qF*tjowAeOa{LaD0bCPs@Mw|HQjGCrk z97z1AKLpR)%n4c|#5R*k2$t2}88&jUdM#k=aJO}i0VY6bSp@FPwTB#XX25Dhj3oF2 zYC22-U#e8Fm|1`7CarSKnHojc6j#>6FvH_J1*}P#y*45QmeQ2<7nHbo-lT2Z_NNjo zC5$I_;glg6&Frt0v>N9OD4yG8Kr@+@XozISkQv4}t$#}eKn|6=D)|XrPhud{1`(pR z9J#O@j)qW;#$kTS><=I^V-j^FsB$790P4RrTMSx-6`EI~60IfQCE(=XVqb;wOZ*2b C?oh)3 literal 0 HcmV?d00001 diff --git a/icons/obj/drink_glasses/shake.dmi b/icons/obj/drink_glasses/shake.dmi new file mode 100644 index 0000000000000000000000000000000000000000..d9b7ef85085d497462ef324f449a70d7f08de880 GIT binary patch literal 1636 zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I4M=vMPuB%fN2@|2N?cNllZ!G7N;32F7#J$% zOue|5tJy$+;elmkm-F?YNAatjr!5j;uVv+w^1X0v63f#3`v*^6I&@OE{KH-TIsDrn z#a){at{S^!V^tkf`;Rjkk)_W?3Oby;rd(+*icXwcAY@Sy))`nerQ}w`1A%}`(jO;8 z?+a%qPVVsIG{N;Z|7_D#ojd1s;r!sb83rCw@3L;f&HD1_stBPZ!6KiaBrZ z1ZInbOSFG1?@ba~*mB8iM%<1`(z>@&^mQWED4%oBiMINlRueu%jPtM}h$yMa*CT zRuwgz7QQ>v|9#E(KexWVw*EUm`esE*`&;qQ0&yOo#Ua{X>JP7Z)0bbr@5{j_*Z2Sb zIZ^WVdZ%fru0IRsJ=g7j?7p_4y88US&Yx8ZFLGz>l4uoO@UkiVz|+omXVT;CUer{4 z`!Xr(x9AK%Y^|M$Z0Cu@b1Gnch4GRkpB0}O8zXWK5@qw3 z{8OKQu)MfEW#-x0dWT+oc_UEeVmNHrm8TQGP(5V8fV}B*R7Z#t>*CmmYASJ z)5gU+Y$X?-44c>go&EZ@@aT`9Qp%5C1{!kV`1JGVXW#5~w%Zz)b1(k8iJiSDyXHDZ zWm}u#bw9qI<#x88l@h{|dr+ipL<82s}s0j_-sQer{Bsh ziT$~P=_1EiR@AXxQ)DpCWk{RIs3P>o=13g#HsyVG*A9km&pjO9divw7_A}`-9?yO$ z_y130e>2P9gsR?i%d@}N=T&a9e(_M!{^4i&5;LFdZ;yC|=lLK1vDnz|IkVHL-?t44 z`WO^3QVt=nAtk?+A&jg1Gn;}n`BvoI{wJyE(s3$?b%&^}ut`u(gLUnG{*Y;@M-7g3 zK24ohI^j{ry&&0hubPcD^PSl0cxODXT>WmfH!zFMd%o7O=KZ-xP7fb`EEf~+vvr^T zoY^c8D6?qY z*Y>=UN;$D7=AXBR?0VMrpNn?v-W7KGxcsL@1(FJ9=FOD}_J3%)@Ux=B@_RpaFQ0cP z+v)jZvjbMShr6;b*_@9Kz4uOH3DB|+kISVMUTx+&cBYv@cJ=AfgfliV>=Es`5kIE| z$i8cHeqZOkj=7~yv`2P6!`$F__G5kTKgBy4SVb@r6PW)Q9?be+@_)C$3ShOt;OXk; Jvd$@?2>>h@?xz3% literal 0 HcmV?d00001 diff --git a/icons/obj/drink_glasses/shot.dmi b/icons/obj/drink_glasses/shot.dmi new file mode 100644 index 0000000000000000000000000000000000000000..190c6e6f52c37c58d9a64435af88b1bf88cf81ff GIT binary patch literal 1312 zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I4M=vMPuB%fo2x=1N?cNllZ!G7N;32F7#J$% z^j_G=b;v+~?SbWY5%=9)D!yw=Pble5T3FjEtzYLc|7MwOt2IT`;QgVy&$lkg+2q{n`l(p2;iiDFmdJs;i#B&> znR^rntZ-4s1Ud~F}B-6;WXQv>ilnS&d!P7 zJSnx(9QkiP^XL+WlW&65f1%J=@xC#s8<85i3?O{EnV4ryslThsyVZD{7_K zchr2kz4PkVv+j@QMaSN+dG|8hw}MMd>y=)Gl#Z@0ulxRM@4s8Gi@)|O(E34w!H=p7 zu^X2LpEuBYzpzt&{qmF!E(I_+4cXBT}?b0O$r0t&k3@?K7R{A|+|HA8u| z=fB=HIJus0v(&mgGiHA5eOYLLbnRoCQdGcBAZ(CqTKOy}E~mlEP~0hkhf`2$K>*u| zh_COqPyFNy3fPcUT5sOB1zvAF*A|$3e&2jK-gR8{{zt!`dzWYaGmdS=v9P?jNFK$K z<2F~N>muHp{*0^Bi_lol$o;*ptnSCRKUbNLFZJEMBG|xozTa=Ly!*2I>NZQJeXDEP zDm=Z-{F|NF_w@Is35&jO{(Si0O5=yWrk4xDjm6Z7=x! z?!)u*cMb0R6uRaYqxH?iL#vLxgk3B8qPgNbho{!rf7noE?R=qxX&+-+ zt0jfnKdUH}KX@zidU_r2jc*K6yi8V0l5cSQwr|#0$#|_>m@%c2U2UB|yMR*?gJg)} zL!B8?2~&Uk5-ASeQ1_Q@#i1wnTfSCZo$+|)lV6G|fBr4D6P;dc7xVCS_~P?-t#?=7 zI4!^O>*8aZOU2feIxqWKU>NiN#hUju4hy~ZbB8^|mCTW%62jE_Rqu6b;qAAV+Am}Q z(+H~PS6<%uuU5tPu%U*NSHsr=g(|yP(H)YlUQ?1Cp1M6~W4X$h=kQuPFstEqBX2_W zlfc%KrNT}u0rUTzOb%Eiqg?eme)0;=m0nMPu3E$tv$HbQu;KH|7hk9PzkbgA>-@%u jf4&{W1Un>N{xZIb6u7;m?0z+{$Ybzy^>bP0l+XkK=LtRk literal 0 HcmV?d00001 diff --git a/icons/obj/drink_glasses/square.dmi b/icons/obj/drink_glasses/square.dmi new file mode 100644 index 0000000000000000000000000000000000000000..1e6721a715b384181e95ae4c64d3d4dbdde57a6f GIT binary patch literal 1568 zcmbtUdo&bi6#r(1VLYPJP}&S7M6;t>4O>eZ2Far&OCC$L9?J-MH<&~oA(F^*Dvt%@klXs9)(2TqRJyr!m57Zu4XTdW;>xx97%UkrlU-XxrW!G&l~gQ`^Fb z&$c-23_Xh_iPdVyz;Yg|3XtV>qj$H2BeIQg6& zl1ssKcfpWJ5aPrIe@cYyvEUD+ovIt*=$3pz;86Q1OKTlVu@roEa{A0cLuYEYE*+^J zP~$IiEBgIlncxkwOfa{*E168!tg{h96Zu+7cYo+C20&Wc8n@3WvT*uUXTZ9nD!sEm z7LYZaNTnon;n2ZcvR0F_d`=O1?)ych1!k3eD~6`2qN**Wc^=*KvsEH`i*MOO^OCgV zJk7eSh?%HRZV{6Y%g)L&#xs}c`6(t|Q_*Y?;Nbx30x;VEiQfeUeo|ma7F=Hq ztlUxrC z(aTJZIo38vPR(XSdvH?ZsX<>_9KP2WS5Ac~q+Rv0N?X-I7()lT89^hxV1L$ZsJzNj zHm_`p6?WfV&1xtp&!;a%GVYF&dsD{&V@4@1Q{;+LeWDJC20C6T3)@dA0Y8f%FoR&b zYlM@bJnp-fK2w%J=}5niqFADcmz10KmdG-s;%yk6r1@$&~_BCy(Roz(a42`z<=+Vf8GEm`g82oZPJ~^Ud zh1f*lcjq?quT>mjH|{H&ew@}`?Pl4VDinYYmtcg{-&}w5DTiwEJW2rSX|(KXJD&W$ zKu5{pGH2dXsTcC@kP;3kcYljDHmMV!Y zT+XxV!D0oYxgI5oU&d=zR#TjIEd!|Z%{5~`G$AtPqo;**PH1)YZc|!|aaiCZ&YMaf z7|sitiKnQ?BNXH%gm1;v;0O|Yfbxf75)6@!l0Z5|cWx7?H~&xc>OpkH&v|fKj6VQVXGEwQL>q9@-mLBb8NFB(KW?ghe`!ZUc&!GhGk`GbUfPDp%&9MqYVYF=>pWek zF=gN>3)K&gdp}ojP!Ve>{2w8Gk=~2c2pEq_p}c-Y(wE3d^1HrFe0l`pTX3?a-_js= zL_d}SK@RTeGj-9PzmjuUrZkXoGx6bzU5^_A8UE{g#gXEVJ5~kUOxzUO1$XJ--nq4n zgJA6OEpHvTdwGqR;;IXp2?;0cRy^oyjX2{WR36;rGvc!M`SFlfP}>!(W1g9DP=aQR z|H|(KS@yHTh$flymxhsjRe3`=X;foOf@ZC#J#Tm+-0t3`Bt>PtyckHWXc#Ah%G=H| z6vY_Zj&F?CU9XNx;3K_+6$j+v`AA-&c<%tBf8M?qZpEfbUlAK+!&p@5kSpT7nb!UD zjh%1|W?pieVTkA$bVF6VXR3#2?G#PdL(&zDFXoHG`=J;%jvgqycI>ym82RTSIwO5U W?gWS1V^Abn`M}!34p(dLMfw91#jZX8 literal 0 HcmV?d00001 diff --git a/icons/obj/drink_glasses/teacup.dmi b/icons/obj/drink_glasses/teacup.dmi new file mode 100644 index 0000000000000000000000000000000000000000..e54a7e2dbbd408a24fc288b1c0f57d3e8a9fe520 GIT binary patch literal 954 zcmeAS@N?(olHy`uVBq!ia0vp^4M3d0!3HF+R#kZdsR>mf5hX6E#mPmP1tppJc?=8{ zbArPPib}tK2`>2f^@*0ZuGYCT=Yuzd8eBAf@JQ#pkLJk$Ajj;{qca|7ea>q%7Ib+F zc?XH+h)(ee5}xeMJ!OYQuu*pxP=IHr#pN!c;$X!blhiggHkVaB`rbMx^bf7O(bR3M zYO205=wR5v2zJ&YP3;}Oc53YSQB}mqQ2p03+<9-uGzJEyr=Bj3Ar*7p-Zjj=?I3aN zqx;gPNtzXgZ2aL|Z3$dIIpl1X+~2YIFC$N^&$5QFW`k=%Oy(<`m4tiRUftWQzx?@6 z-NK|x-w*vwUdp>%Z1!2UL$AGGv3f*tHOygBSk7=llc5O2+_3w6v%NRa|F&0#G8@@1F!0<+fM_M3p+sW$_{6F2>UMsJEdea77 zb^iVT>vrEMX#ehg@bcZ)n#+GSGk>_Z{qxU1fBuzN+1lTGTc%s^S6~|dI`ad6i%Tan z)c^hSk0asg=PS!Eadu}r%-s_fKea&j?TXzOqNr`Unwd8BZ_!A$2>c)j`K#3eRTdGqo) z7g)=_UekS|;$M11b7tMU=?(TC)fUE2wJ&HMtI1|~BVF*ddBOjUZCq`^ho&(s63Lh| zzlxdRF`LVSgdLu(U(*@Vf7Gn*UvI^?yYfD%Csh%PXAxW5~&+@a%v5{KtO` o7w)%jsFT&Xg5PaOj{nVGJ8AdEX}m0=z|6?t>FVdQ&MBb@0Pa?wtpET3 literal 0 HcmV?d00001 diff --git a/icons/obj/drink_glasses/wine.dmi b/icons/obj/drink_glasses/wine.dmi new file mode 100644 index 0000000000000000000000000000000000000000..11c5eac125bcbc82e9143d3ffd547aed822a0a67 GIT binary patch literal 1586 zcmbuAc~H^`6vuy{cpzSzt9d1>=A?_F>y_y$7)7<4Fr^i_9t~s4C~A3On363XA&8aj zR^Hi^d6jIb;K7(jMrz*WN>H?xidQ)Tg0js1)&8?H&CYz@`@X-v^Jd<6<`v>Yu!c}8 zC;$M4hYw+nX_T+2Dm@)dKfQ+-p^;}7LQkb)Vp53bNy(|Cq(lIqlrcw#pqJfYx~nNl zGjuai?)|~26Ba{xd6Hc-sZ-8+vWKd)4e;~PYj<3AxTLz+W>MUd*WsdgP}CQr0~+)b zCp;Y{nV4Y9Nc79;%INY`s5ZrV__?HEKM{?3Mo4;pd}#|r2NfRhG9Nz`Oti52i6lKj zv}6k75U~4d^258kZ@eTOxo26P2NL?!XSvS#4((l>a1_Defwl|r`Dw3M*A{G-YBj2( zyEU!EPx!qL8w@(#`zc745NHhmkllwd=uk@8l5ix+EXHPFZN==!ypPjl6=tt{t%bMV zr1p-`AE}i|!Pl73Jne~^43+8w9;QI;m)JIL>icfbN^xBEOgJ_~fzypUaTn;? zmXOpO+%OI%?$7xCqCLvR1>zpyL$<5dgir4gk zIxE-h$82OUuo@-+7cl{Li?^qM?0>NN9$K4*Z-*fGR{cg-XQv7Zk`$wBqvMq&v*{I3 z*EAh#XC@A~FI`Z^S`0NPukbD`FC#mz_s0?&dg;r|I#xUll`%KmRw<$k#78~Hr%9Q0 zZVFG-3kPuzov~bBnay!HK3pb{&W@+CdJ6T8Xpn;I5C|WPS;&oqaFr6-YX$c#7{fo{ z{;wo|nd<+T={oH7H>=)-?cQyl4^4vXriE zqSTwngT$FTE=Uzt>DIT69W2QJBIP@7>MVeC mZB`rkmcdw$#`9}8-_~-WKg8~|2We@Z0C4y~2&O4GI`?nzpuBhh literal 0 HcmV?d00001 diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 30eb48a2468f72b9dd6735b949c7277cd461eee0..ea21f6ecc1b0aad1ee5d944ad29ab6e66e12648e 100644 GIT binary patch delta 9466 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 X5sUQOtOP~?`FWxE>iG|OXyE??j7bW; delta 9036 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