From e4d22f96cbbba1c59aaffa2a9dd4d6be2aa94ded Mon Sep 17 00:00:00 2001 From: Cerebulon Date: Fri, 18 Mar 2022 18:05:24 +0000 Subject: [PATCH] Adds a bunch of mug variants --- code/game/objects/random/misc.dm | 36 +++ .../loadout/loadout_general.dm | 46 ++++ .../modules/food/drinkingglass/glass_boxes.dm | 2 +- code/modules/food/drinkingglass/mugs.dm | 224 ++++++++++++++++++ code/modules/food/food/drinks.dm | 13 +- icons/obj/drinks_mugs.dmi | Bin 0 -> 6861 bytes icons/obj/drinks_mugs_tall.dmi | Bin 0 -> 1766 bytes polaris.dme | 1 + 8 files changed, 309 insertions(+), 13 deletions(-) create mode 100644 code/modules/food/drinkingglass/mugs.dm create mode 100644 icons/obj/drinks_mugs.dmi create mode 100644 icons/obj/drinks_mugs_tall.dmi diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index 21179e8af6..bee06511aa 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -932,3 +932,39 @@ prob(3);/obj/item/clothing/accessory/poncho/thermal/purple, prob(3);/obj/item/clothing/accessory/poncho/thermal/blue) +/obj/random/mug + name = "Random Mug" + desc = "This is a random coffee mug." + icon = 'icons/obj/drinks_mugs.dmi' + icon_state = "coffeecup_spawner" + +/obj/random/mug/item_to_spawn() + return pick(/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/sol, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/fleet, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/fivearrows, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/psc, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/alma, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/almp, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/nt, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal/wulf, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/gilthari, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/zeng, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/wt, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/aether, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/bishop, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/oculum, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/one, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/puni, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/heart, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/pawn, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/diona, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/britcup, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tourist, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/flame, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/blue, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/black, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green/dark, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/rainbow, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal) \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index 542348fec4..5ea1155eb2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -120,6 +120,52 @@ gear_tweaks += new/datum/gear_tweak/path(sortAssoc(lunchboxes)) gear_tweaks += new/datum/gear_tweak/contents(lunchables_lunches(), lunchables_snacks(), lunchables_drinks()) +/datum/gear/coffeemug + display_name = "coffee mugs" + description = "A coffee mug in various designs." + cost = 1 + path = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug + +/datum/gear/coffeemug/New() + ..() + var/list/coffeemugs = list() + coffeemugs["plain coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug + coffeemugs["SCG coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/sol + coffeemugs["Fleet coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/fleet + coffeemugs["Five Arrows coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/fivearrows + coffeemugs["Pearlshield coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/psc + coffeemugs["Almach Association coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/alma + coffeemugs["Almach Protectorate coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/almp + coffeemugs["NT coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/nt + coffeemugs["Wulf Aeronautics mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal/wulf + coffeemugs["Gilthari Exports coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/gilthari + coffeemugs["Zeng-Hu coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/zeng + coffeemugs["Ward-Takahashi coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/wt + coffeemugs["Aether Atmospherics coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/aether + coffeemugs["Bishop Cybernetics coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/bishop + coffeemugs["Oculum Broadcast coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/oculum + coffeemugs["#1 coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/one + coffeemugs["#1 monkey coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/puni + coffeemugs["heart coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/heart + coffeemugs["pawn coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/pawn + coffeemugs["diona coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/diona + coffeemugs["british coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/britcup + coffeemugs["NCS Northern Star coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tourist + coffeemugs["flame coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/flame + coffeemugs["blue coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/blue + coffeemugs["black coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/black + coffeemugs["green coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green + coffeemugs["dark green coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green/dark + coffeemugs["rainbow coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/rainbow + coffeemugs["metal coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal + coffeemugs["glass coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/glass + coffeemugs["tall coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall + coffeemugs["tall black coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/black + coffeemugs["tall metal coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/metal + coffeemugs["tall rainbow coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/rainbow + gear_tweaks += new /datum/gear_tweak/path(coffeemugs) + gear_tweaks += new /datum/gear_tweak/reagents(lunchables_drink_reagents()) + /datum/gear/towel display_name = "towel" path = /obj/item/weapon/towel diff --git a/code/modules/food/drinkingglass/glass_boxes.dm b/code/modules/food/drinkingglass/glass_boxes.dm index 4573a5520f..b9b5f398f9 100644 --- a/code/modules/food/drinkingglass/glass_boxes.dm +++ b/code/modules/food/drinkingglass/glass_boxes.dm @@ -80,4 +80,4 @@ /obj/item/weapon/storage/box/glasses/coffeemug name = "box of coffee mugs" - starts_with = list(/obj/item/weapon/reagent_containers/food/drinks/britcup = 7) \ No newline at end of file + starts_with = list(/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug = 7) \ No newline at end of file diff --git a/code/modules/food/drinkingglass/mugs.dm b/code/modules/food/drinkingglass/mugs.dm new file mode 100644 index 0000000000..8fa1c42eeb --- /dev/null +++ b/code/modules/food/drinkingglass/mugs.dm @@ -0,0 +1,224 @@ +/obj/item/weapon/reagent_containers/food/drinks/britcup + name = "cup" + desc = "A cup with the British flag emblazoned on it." + icon_state = "britcup" + volume = 30 + center_of_mass = list("x"=15, "y"=13) + +/obj/item/weapon/reagent_containers/food/drinks/britcup/on_reagent_change() + ..() + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug + name = "coffee mug" + base_name = "mug" + desc = "A plain white coffee mug." + icon = 'icons/obj/drinks_mugs.dmi' + base_icon = "coffeecup" + volume = 30 + var/fillsource = "coffeecup" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/update_icon() + cut_overlays() + + if(reagents.total_volume) + var/image/filling = image('icons/obj/drinks_mugs.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) + +// Government +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/sol + name = "\improper SCG coffee mug" + desc = "A blue coffee mug emblazoned with the crest of the Solar Confederate Government." + base_icon = "coffeecup_sol" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/fleet + name = "\improper SCG Fleet coffee cup" + desc = "A coffee mug imprinted with the emblem of the Solar Confederate Fleet." + base_icon = "coffeecup_fleet" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/fivearrows + name = "\improper Five Arrows coffee mug" + desc = "A coffee mug with the flag of the Five Arrows proudly displayed on it." + base_icon = "coffeecup_fivearrows" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/alma + name = "\improper Almach Association coffee cup" + desc = "A grey coffee cup emblazoned with the star of the Almach Association." + icon_state = "coffeecup_alma" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/almp + name = "\improper Almach Protectorate coffee cup" + desc = "A purple coffee cup emblazoned with the star of the Almach Protectorate." + icon_state = "coffeecup_almp" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/psc + name = "\improper Pearlshield coffee mug" + desc = "A coffee mug bearing the symbol of the Pearlshield Coalition." + base_icon = "coffeecup_psc" + +// Corporations +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/nt + name = "\improper NT coffee mug" + desc = "A blue NanoTrasen coffee mug." + base_icon = "coffeecup_NT" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal/wulf + name = "\improper Wulf Aeronautics coffee mug" + desc = "A metal coffee mug bearing the livery of Wulf Aeronautics." + base_icon = "coffeecup_wulf" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/gilthari + name = "\improper Gilthari Exports coffee mug" + desc = "A coffee mug bearing golden G of Gilthari Exports." + base_icon = "coffeecup_gilth" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/wt + name = "\improper Ward-Takahashi coffee mug" + desc = "A coffee mug in a geometric Ward-Takahashi design." + base_icon = "coffeecup_wt" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/aether + name = "\improper Aether Atmospherics coffee mug" + desc = "A coffee mug in Aether Atmospherics colours." + base_icon = "coffeecup_aether" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/zeng + name = "\improper Zeng-Hu coffee cup" + desc = "A coffee cup bearing the Zeng-Hu logo." + icon_state = "coffeecup_zeng" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/bishop + name = "\improper Bishop coffee mug" + desc = "A black coffee mug adorned with Bishop's logo." + base_icon = "coffeecup_bishop" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/oculum + name = "pawn coffee mug" + desc = "A black and blue coffee mug decorated with the logo of Oculum Broadcast." + base_icon = "coffeecup_oculum" + +// Symbols, markings +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/one + name = "#1 coffee mug" + desc = "A white coffee mug, prominently featuring a #1." + base_icon = "coffeecup_one" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/puni + name = "#1 monkey coffee mug" + desc = "A white coffee mug, prominently featuring a \"#1 monkey\" decal." + base_icon = "coffeecup_puni" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/heart + name = "heart coffee mug" + desc = "A white coffee mug, it prominently features a red heart." + base_icon = "coffeecup_heart" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/pawn + name = "pawn coffee mug" + desc = "A black coffee mug adorned with the image of a red chess pawn." + base_icon = "coffeecup_pawn" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/diona + name = "diona nymph coffee mug" + desc = "A green coffee mug featuring the image of a diona nymph." + base_icon = "coffeecup_diona" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/britcup + name = "british coffee mug" + desc = "A coffee mug with the British flag emblazoned on it." + base_icon = "coffeecup_brit" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/flame + name = "flame coffee cup" + desc = "A coffee cup with the a flame emblazoned on it." + icon_state = "coffeecup_flame" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tourist + name = "\improper Northern Star coffee mug" + desc = "A novelty coffee mug depicting the NCS Northern Star." + base_icon = "coffeecup_northstar" + +// Pure colors & other +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/black + name = "black coffee mug" + desc = "A sleek black coffee mug." + base_icon = "coffeecup_black" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green + name = "green coffee mug" + desc = "A pale green and pink coffee mug." + base_icon = "coffeecup_green" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green/dark + desc = "A dark green coffee mug." + base_icon = "coffeecup_corp" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/blue + name = "blue coffee mug" + desc = "A blue coffee mug." + base_icon = "coffeecup_blue" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/rainbow + name = "rainbow coffee mug" + desc = "A rainbow coffee mug. The colors are almost as blinding as a welder." + base_icon = "coffeecup_rainbow" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal + name = "metal coffee mug" + desc = "A metal coffee mug. You're not sure which metal." + base_icon = "coffeecup_metal" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/glass + name = "glass coffee mug" + desc = "A glass coffee mug, using space age technology to keep it cool for use." + base_icon = "glasscoffeecup" + fillsource = "glasscoffeecup" + + +// Tall coffee mugs +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall + name = "tall coffee mug" + desc = "An unreasonably tall coffee mug, for when you really need to wake up in the morning." + icon = 'icons/obj/drinks_mugs_tall.dmi' + base_icon = "coffeecup_tall" + fillsource = "coffeecup_tall" + volume = 60 + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/update_icon() + cut_overlays() + + if(reagents.total_volume) + var/image/filling = image('icons/obj/drinks_mugs_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/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/black + name = "tall black coffee mug" + desc = "An unreasonably tall coffee mug, for when you really need to wake up in the morning. This one is black." + base_icon = "coffeecup_tall_black" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/metal + name = "tall metal coffee mug" + desc = "An unreasonably tall coffee mug, for when you really need to wake up in the morning. This one is made of metal." + base_icon = "coffeecup_tall_metal" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/rainbow + name = "tall rainbow coffee mug" + desc = "An unreasonably tall coffee mug, for when you really need to wake up in the morning. This one is rainbow colored." + base_icon = "coffeecup_tall_rainbow" \ No newline at end of file diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm index 4bf357ed04..0bc37873ee 100644 --- a/code/modules/food/food/drinks.dm +++ b/code/modules/food/food/drinks.dm @@ -418,15 +418,4 @@ desc = "Keeping your drinks at the perfect temperature since 1892." icon_state = "vacuumflask" volume = 60 - center_of_mass = list("x"=15, "y"=4) - -/obj/item/weapon/reagent_containers/food/drinks/britcup - name = "cup" - desc = "A cup with the British flag emblazoned on it." - icon_state = "britcup" - volume = 30 - center_of_mass = list("x"=15, "y"=13) - -/obj/item/weapon/reagent_containers/food/drinks/britcup/on_reagent_change() - ..() - + center_of_mass = list("x"=15, "y"=4) \ No newline at end of file diff --git a/icons/obj/drinks_mugs.dmi b/icons/obj/drinks_mugs.dmi new file mode 100644 index 0000000000000000000000000000000000000000..e562e120d2c2b249cfc28dcefa0b008c334f979d GIT binary patch literal 6861 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Ⓢ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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/polaris.dme b/polaris.dme index e9e331692b..a795b7148f 100644 --- a/polaris.dme +++ b/polaris.dme @@ -1854,6 +1854,7 @@ #include "code\modules\food\drinkingglass\glass_boxes.dm" #include "code\modules\food\drinkingglass\glass_types.dm" #include "code\modules\food\drinkingglass\metaglass.dm" +#include "code\modules\food\drinkingglass\mugs.dm" #include "code\modules\food\drinkingglass\shaker.dm" #include "code\modules\food\food\cans.dm" #include "code\modules\food\food\condiment.dm"