diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index faf389bc33..be2375d939 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -85,6 +85,7 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/milk = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/cream = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/cola = 5, + /obj/item/weapon/reagent_containers/food/drinks/bottle/decaf_cola = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/space_up = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind = 5, /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater = 15, diff --git a/code/modules/food/food/drinks/bottle.dm b/code/modules/food/food/drinks/bottle.dm index 6000c567ad..046a0ee738 100644 --- a/code/modules/food/food/drinks/bottle.dm +++ b/code/modules/food/food/drinks/bottle.dm @@ -466,7 +466,7 @@ //////////////////////////JUICES AND STUFF/////////////////////// -/obj/item/weapon/reagent_containers/food/drinks/bottle/cola //MODIFIED ON 04/21/2021 +/obj/item/weapon/reagent_containers/food/drinks/bottle/cola name = "\improper two-liter Space Cola" desc = "Cola. In space." icon_state = "colabottle" @@ -476,6 +476,16 @@ . = ..() reagents.add_reagent("cola", 100) +/obj/item/weapon/reagent_containers/food/drinks/bottle/decaf_cola + name = "\improper two-liter Space Cola Free" + desc = "Cola. In space. Caffeine free." + icon_state = "decafcolabottle" + center_of_mass = list("x"=16, "y"=6) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/decaf_cola/Initialize() + . = ..() + reagents.add_reagent("decafcola", 100) + /obj/item/weapon/reagent_containers/food/drinks/bottle/space_up //MODIFIED ON 04/21/2021 name = "\improper two-liter Space-Up" desc = "Tastes like a hull breach in your mouth." diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index e16d82c570..c138e6093e 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ