diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index f05dcb3e9f17f..9a3d6510d664a 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -58,7 +58,7 @@ /obj/item/reagent_containers/cup/soda_cans/melon_soda = 5, ), ), - + /* DOPPLER EDIT REMOVAL START list( "name" = "Glassware", "icon" = "wine-glass", @@ -69,7 +69,7 @@ /obj/item/reagent_containers/cup/glass/bottle = 15, /obj/item/reagent_containers/cup/glass/bottle/small = 15, ), - ), + ), DOPPLER EDIT REMOVAL END*/ ) contraband = list( diff --git a/modular_doppler/modular_vending/code/tg_vendors/boozeomat.dm b/modular_doppler/modular_vending/code/tg_vendors/boozeomat.dm index 9d782a07e8dc3..a40e631c87f22 100644 --- a/modular_doppler/modular_vending/code/tg_vendors/boozeomat.dm +++ b/modular_doppler/modular_vending/code/tg_vendors/boozeomat.dm @@ -1,10 +1,27 @@ /obj/machinery/vending/boozeomat product_categories_doppler = list( list( - "name" = "Synth", + "name" = "Synth-Drinks", "icon" = "robot", "products" = list( - // /obj/item/reagent_containers/cup/soda_cans/doppler/synthanolcan = 6, - ), + /obj/item/reagent_containers/cup/soda_cans/doppler/synthanolcan = 6, + /obj/item/reagent_containers/cup/soda_cans/doppler/lubricola = 3, + /obj/item/reagent_containers/cup/soda_cans/doppler/welding_fizz = 3, ), + ), + list( + "name" = "Glassware", + "icon" = "wine-glass", + "products" = list( + /obj/item/reagent_containers/cup/glass/drinkingglass = 30, + /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass = 12, + /obj/item/reagent_containers/cup/glass/colocup = 12, + /obj/item/reagent_containers/cup/glass/flask = 3, + /obj/item/reagent_containers/cup/glass/bottle = 15, + /obj/item/reagent_containers/cup/glass/bottle/small = 15, + /obj/item/reagent_containers/cup/beaker/large = 3, + /obj/item/reagent_containers/cup/beaker = 6, + /obj/item/reagent_containers/cup/tube = 6, + ), + ), ) diff --git a/modular_doppler/modular_vending/code/tg_vendors/cola.dm b/modular_doppler/modular_vending/code/tg_vendors/cola.dm deleted file mode 100644 index 421602bd042c5..0000000000000 --- a/modular_doppler/modular_vending/code/tg_vendors/cola.dm +++ /dev/null @@ -1,5 +0,0 @@ -/obj/machinery/vending/cola - products_doppler = list( - /obj/item/reagent_containers/cup/soda_cans/doppler/lubricola = 10, - /obj/item/reagent_containers/cup/soda_cans/doppler/welding_fizz = 10, - ) diff --git a/tgstation.dme b/tgstation.dme index 1181e94b2ed04..104d04b4f2893 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6934,7 +6934,6 @@ #include "modular_doppler\modular_vending\code\tg_vendors\autodrobe.dm" #include "modular_doppler\modular_vending\code\tg_vendors\boozeomat.dm" #include "modular_doppler\modular_vending\code\tg_vendors\clothesmate.dm" -#include "modular_doppler\modular_vending\code\tg_vendors\cola.dm" #include "modular_doppler\modular_vending\code\tg_vendors\engivend.dm" #include "modular_doppler\modular_vending\code\tg_vendors\games.dm" #include "modular_doppler\modular_vending\code\tg_vendors\megaseed.dm"