some shit hornygranny wanted me to commit, preparation for me making the shuttle fly, combat shotgun fix YEAHHHH

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@331 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
uhangi@gmail.com
2010-10-20 03:19:43 +00:00
parent 9d8040fb83
commit c5d8c60097
7 changed files with 2641 additions and 2314 deletions
+2 -2
View File
@@ -554,8 +554,8 @@
name = "Booze-O-Mat"
desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one."
icon_state = "boozeomat" //////////////18 drink entities below, plus the glasses, in case someone wants to edit the number of bottles
product_paths = "/obj/item/weapon/reagent_containers/food/drinks/gin;/obj/item/weapon/reagent_containers/food/drinks/whiskey;/obj/item/weapon/reagent_containers/food/drinks/tequilla;/obj/item/weapon/reagent_containers/food/drinks/vodka;/obj/item/weapon/reagent_containers/food/drinks/vermouth;/obj/item/weapon/reagent_containers/food/drinks/rum;/obj/item/weapon/reagent_containers/food/drinks/wine;/obj/item/weapon/reagent_containers/food/drinks/cognac;/obj/item/weapon/reagent_containers/food/drinks/kahlua;/obj/item/weapon/reagent_containers/food/drinks/beer;/obj/item/weapon/reagent_containers/food/drinks/ale;/obj/item/weapon/reagent_containers/food/drinks/orangejuice;/obj/item/weapon/reagent_containers/food/drinks/tomatojuice;/obj/item/weapon/reagent_containers/food/drinks/limejuice;/obj/item/weapon/reagent_containers/food/drinks/cream;/obj/item/weapon/reagent_containers/food/drinks/tonic;/obj/item/weapon/reagent_containers/food/drinks/cola;/obj/item/weapon/reagent_containers/food/drinks/drinkingglass"
product_amounts = "5;5;5;5;5;5;5;5;5;6;6;4;4;4;4;8;8;30"
product_paths = "/obj/item/weapon/reagent_containers/food/drinks/gin;/obj/item/weapon/reagent_containers/food/drinks/whiskey;/obj/item/weapon/reagent_containers/food/drinks/tequilla;/obj/item/weapon/reagent_containers/food/drinks/vodka;/obj/item/weapon/reagent_containers/food/drinks/vermouth;/obj/item/weapon/reagent_containers/food/drinks/rum;/obj/item/weapon/reagent_containers/food/drinks/wine;/obj/item/weapon/reagent_containers/food/drinks/cognac;/obj/item/weapon/reagent_containers/food/drinks/kahlua;/obj/item/weapon/reagent_containers/food/drinks/beer;/obj/item/weapon/reagent_containers/food/drinks/ale;/obj/item/weapon/reagent_containers/food/drinks/orangejuice;/obj/item/weapon/reagent_containers/food/drinks/tomatojuice;/obj/item/weapon/reagent_containers/food/drinks/limejuice;/obj/item/weapon/reagent_containers/food/drinks/cream;/obj/item/weapon/reagent_containers/food/drinks/tonic;/obj/item/weapon/reagent_containers/food/drinks/cola;/obj/item/weapon/reagent_containers/food/drinks/sodawater;/obj/item/weapon/reagent_containers/food/drinks/drinkingglass"
product_amounts = "5;5;5;5;5;5;5;5;5;6;6;4;4;4;4;8;8;8;30"
vend_delay = 15
product_hidden = "/obj/item/weapon/reagent_containers/food/drinks/coffee"
product_hideamt = "10"