From e106fe4c51ddaba1ee79bb74cf5a0bd2dadadc52 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Mon, 28 May 2012 20:14:19 +0100 Subject: [PATCH] Adds water bottles to vending machines. --- code/defines/obj/vending.dm | 6 +++--- code/modules/chemical/Chemistry-Tools.dm | 9 +++++++++ icons/obj/drinks.dmi | Bin 57915 -> 58202 bytes 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/code/defines/obj/vending.dm b/code/defines/obj/vending.dm index 28f05cb1303..0f3c1fb7473 100755 --- a/code/defines/obj/vending.dm +++ b/code/defines/obj/vending.dm @@ -126,9 +126,9 @@ name = "Robust Softdrinks" desc = "A softdrink vendor provided by Robust Industries, LLC." icon_state = "Cola_Machine" - product_paths = "/obj/item/weapon/reagent_containers/food/drinks/cola;/obj/item/weapon/reagent_containers/food/drinks/space_mountain_wind;/obj/item/weapon/reagent_containers/food/drinks/dr_gibb;/obj/item/weapon/reagent_containers/food/drinks/starkist;/obj/item/weapon/reagent_containers/food/drinks/space_up" - product_amounts = "10;10;10;10;10" - product_prices = "1;1;1;1;1" + product_paths = "/obj/item/weapon/reagent_containers/food/drinks/cola;/obj/item/weapon/reagent_containers/food/drinks/space_mountain_wind;/obj/item/weapon/reagent_containers/food/drinks/dr_gibb;/obj/item/weapon/reagent_containers/food/drinks/starkist;/obj/item/weapon/reagent_containers/food/drinks/space_up;/obj/item/weapon/reagent_containers/food/drinks/waterbottle" +// product_amounts = "10;10;10;10;10" + product_prices = "1;1;1;1;1;1" product_slogans = "Robust Softdrinks: More robust then a toolbox to the head!" product_hidden = "/obj/item/weapon/reagent_containers/food/drinks/thirteenloko" product_hideamt = "5" diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index 5135238bab6..c930c1d6e0b 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -2911,6 +2911,15 @@ src.pixel_x = rand(-10.0, 10) src.pixel_y = rand(-10.0, 10) +/obj/item/weapon/reagent_containers/food/drinks/waterbottle + name = "water bottle" + desc = "Straight from the ice lakes of Mars!" + icon_state = "waterbottle" + New() + ..() + reagents.add_reagent("water", 30) + src.pixel_x = rand(-10.0, 10) + src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/sillycup name = "Paper Cup" diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 11a133c079fd0d54bd38238a19534585c3a83606..e4652f8b6206e06fb803b73de9ffb55aba1d77dd 100644 GIT binary patch delta 1834 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