diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index b886b2da..31b2ea0c 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -126,7 +126,7 @@ /obj/item/reagent_containers/glass/beaker/on_reagent_change(changetype) update_icon() - + /obj/item/reagent_containers/glass/bottle/viralbase name = "Highly potent Viral Base Bottle" desc = "A small bottle. Contains a trace amount of a substance found by scientists that can be used to create extremely advanced diseases once exposed to uranium." @@ -364,5 +364,15 @@ /obj/item/reagent_containers/glass/beaker/waterbottle/large/empty list_reagents = list() +/obj/item/reagent_containers/glass/beaker/waterbottle/wataur + name = "Bottled Wataur" + desc = "Finally, a bottle as proportionate as you. Incredible!" + icon = 'icons/obj/drinks.dmi' + icon_state = "wataur" + list_reagents = list("water" = 100) //robust ass wataur + volume = 100 + amount_per_transfer_from_this = 20 + container_HP = 1 + /obj/item/reagent_containers/glass/get_belt_overlay() return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "bottle") diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm index 3da3398a..e245b48d 100644 --- a/code/modules/vending/cola.dm +++ b/code/modules/vending/cola.dm @@ -14,7 +14,8 @@ /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10, /obj/item/reagent_containers/glass/beaker/waterbottle = 10) contraband = list(/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6, - /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6) + /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6, + /obj/item/reagent_containers/glass/beaker/waterbottle/wataur = 2) premium = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 1, /obj/item/reagent_containers/food/drinks/soda_cans/air = 1, /obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 1) diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 6c0f7c30..7c154c61 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi index fa74d50e..f2cc0f2a 100644 Binary files a/icons/obj/reagentfillings.dmi and b/icons/obj/reagentfillings.dmi differ