From c10c12596ddc432b7a83edfb6c864a2141634ae1 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 20 May 2018 03:18:24 -0500 Subject: [PATCH] Update boozeomat.dm --- code/modules/vending/boozeomat.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index 2d5f3755b5..fbdfd6f0cd 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -39,10 +39,5 @@ /obj/item/vending_refill/boozeomat machine_name = "Booze-O-Mat" icon_state = "refill_booze" -<<<<<<< HEAD - charges = list(58, 4, 0)//of 174 standard, 12 contraband - init_charges = list(58, 4, 0) -======= charges = list(61, 4, 0)//of 182 standard, 12 contraband init_charges = list(61, 4, 0) ->>>>>>> b0b7f2d... Adds grenadine. (#37598)