From 440d12397262036952198496cd764da6bf347c22 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 13 May 2018 10:16:04 -0500 Subject: [PATCH] Update boozeomat.dm --- code/modules/vending/boozeomat.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index 94249e9cb4..2d5f3755b5 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -19,11 +19,8 @@ /obj/item/reagent_containers/food/drinks/bottle/orangejuice = 4, /obj/item/reagent_containers/food/drinks/bottle/tomatojuice = 4, /obj/item/reagent_containers/food/drinks/bottle/limejuice = 4, -<<<<<<< HEAD -======= /obj/item/reagent_containers/food/drinks/bottle/grenadine = 4, /obj/item/reagent_containers/food/drinks/bottle/menthol = 4, ->>>>>>> b0b7f2d... Adds grenadine. (#37598) /obj/item/reagent_containers/food/drinks/bottle/cream = 4, /obj/item/reagent_containers/food/drinks/soda_cans/tonic = 8, /obj/item/reagent_containers/food/drinks/soda_cans/cola = 8,