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 00000000000..568f6619167 Binary files /dev/null and b/icons/obj/drink_glasses/carafe.dmi differ diff --git a/icons/obj/drink_glasses/cocktail.dmi b/icons/obj/drink_glasses/cocktail.dmi new file mode 100644 index 00000000000..e2d97651133 Binary files /dev/null and b/icons/obj/drink_glasses/cocktail.dmi differ diff --git a/icons/obj/drink_glasses/coconut.dmi b/icons/obj/drink_glasses/coconut.dmi new file mode 100644 index 00000000000..019af1a88cc Binary files /dev/null and b/icons/obj/drink_glasses/coconut.dmi differ diff --git a/icons/obj/drink_glasses/coffecup.dmi b/icons/obj/drink_glasses/coffecup.dmi new file mode 100644 index 00000000000..845d7403aa4 Binary files /dev/null and b/icons/obj/drink_glasses/coffecup.dmi differ diff --git a/icons/obj/drink_glasses/coffecup_tall.dmi b/icons/obj/drink_glasses/coffecup_tall.dmi new file mode 100644 index 00000000000..8e2be2e2cf6 Binary files /dev/null and b/icons/obj/drink_glasses/coffecup_tall.dmi differ diff --git a/icons/obj/drink_glasses/cognac.dmi b/icons/obj/drink_glasses/cognac.dmi new file mode 100644 index 00000000000..23e416e03f4 Binary files /dev/null and b/icons/obj/drink_glasses/cognac.dmi differ diff --git a/icons/obj/drink_glasses/fitness.dmi b/icons/obj/drink_glasses/fitness.dmi new file mode 100644 index 00000000000..2164e52fca1 Binary files /dev/null and b/icons/obj/drink_glasses/fitness.dmi differ diff --git a/icons/obj/drink_glasses/flute.dmi b/icons/obj/drink_glasses/flute.dmi new file mode 100644 index 00000000000..6a49219df86 Binary files /dev/null and b/icons/obj/drink_glasses/flute.dmi differ diff --git a/icons/obj/drink_glasses/goblet.dmi b/icons/obj/drink_glasses/goblet.dmi new file mode 100644 index 00000000000..bec31244d37 Binary files /dev/null and b/icons/obj/drink_glasses/goblet.dmi differ diff --git a/icons/obj/drink_glasses/mug.dmi b/icons/obj/drink_glasses/mug.dmi new file mode 100644 index 00000000000..f7c6f8c2033 Binary files /dev/null and b/icons/obj/drink_glasses/mug.dmi differ diff --git a/icons/obj/drink_glasses/pint.dmi b/icons/obj/drink_glasses/pint.dmi new file mode 100644 index 00000000000..314136c6d18 Binary files /dev/null and b/icons/obj/drink_glasses/pint.dmi differ diff --git a/icons/obj/drink_glasses/rocks.dmi b/icons/obj/drink_glasses/rocks.dmi new file mode 100644 index 00000000000..c9151ef67c2 Binary files /dev/null and b/icons/obj/drink_glasses/rocks.dmi differ diff --git a/icons/obj/drink_glasses/shake.dmi b/icons/obj/drink_glasses/shake.dmi new file mode 100644 index 00000000000..d9b7ef85085 Binary files /dev/null and b/icons/obj/drink_glasses/shake.dmi differ diff --git a/icons/obj/drink_glasses/shot.dmi b/icons/obj/drink_glasses/shot.dmi new file mode 100644 index 00000000000..190c6e6f52c Binary files /dev/null and b/icons/obj/drink_glasses/shot.dmi differ diff --git a/icons/obj/drink_glasses/square.dmi b/icons/obj/drink_glasses/square.dmi new file mode 100644 index 00000000000..1e6721a715b Binary files /dev/null and b/icons/obj/drink_glasses/square.dmi differ diff --git a/icons/obj/drink_glasses/teacup.dmi b/icons/obj/drink_glasses/teacup.dmi new file mode 100644 index 00000000000..e54a7e2dbbd Binary files /dev/null and b/icons/obj/drink_glasses/teacup.dmi differ diff --git a/icons/obj/drink_glasses/wine.dmi b/icons/obj/drink_glasses/wine.dmi new file mode 100644 index 00000000000..11c5eac125b Binary files /dev/null and b/icons/obj/drink_glasses/wine.dmi differ diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 30eb48a2468..ea21f6ecc1b 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index db012e0cc33..0e26057a39a 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -37038,6 +37038,10 @@ pixel_x = 1; pixel_y = 4 }, +/obj/item/reagent_containers/food/drinks/pitcher{ + pixel_x = -3; + pixel_y = 2 + }, /turf/simulated/floor/tiled, /area/engineering/break_room) "ydL" = ( diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index b2df920e9c7..76e3b8a06f6 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -14298,6 +14298,10 @@ pixel_x = 10 }, /obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/pitcher{ + pixel_x = -3; + pixel_y = 2 + }, /turf/simulated/floor/carpet, /area/lawoffice) "azU" = ( @@ -32245,6 +32249,10 @@ /obj/machinery/light_switch{ pixel_x = 24 }, +/obj/item/reagent_containers/food/drinks/pitcher{ + pixel_x = -3; + pixel_y = 2 + }, /turf/simulated/floor/tiled, /area/crew_quarters/medbreak) "bdX" = ( diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm index d9d885e4c30..3314aef8249 100644 --- a/maps/aurora/aurora-5_interstitial.dmm +++ b/maps/aurora/aurora-5_interstitial.dmm @@ -2100,7 +2100,14 @@ "eG" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/grey/diagonal, -/obj/item/storage/box/cups, +/obj/item/storage/box/drinkingglasses{ + pixel_x = 1; + pixel_y = 4 + }, +/obj/item/reagent_containers/food/drinks/pitcher{ + pixel_x = -3; + pixel_y = 2 + }, /turf/simulated/floor/tiled/white, /area/security/break_room) "eH" = ( diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm index b1194a496b0..d63b5f375f5 100644 --- a/maps/aurora/aurora-6_surface.dmm +++ b/maps/aurora/aurora-6_surface.dmm @@ -14282,6 +14282,10 @@ /obj/machinery/light_switch{ pixel_x = -26 }, +/obj/item/reagent_containers/food/drinks/pitcher{ + pixel_x = -3; + pixel_y = 2 + }, /turf/simulated/floor/wood, /area/sconference_room) "mQv" = (