Merge branch 'master' into donut

This commit is contained in:
TrilbySpaceClone
2019-12-22 02:36:57 -05:00
206 changed files with 2433 additions and 1487 deletions

View File

@@ -83,3 +83,22 @@
/obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 10)
product_slogans = "~Shake me up some of that Shambler's Juice!~"
product_ads = "Refreshing!;Jyrbv dv lg jfdv fw kyrk Jyrdscvi'j Alztv!;Over 1 trillion souls drank!;Thirsty? Nyp efk uizeb kyv uribevjj?;Kyv Jyrdscvi uizebj kyv ezxyk!;Drink up!;Krjkp."
/obj/machinery/vending/cola/buzz_fuzz
name = "\improper Buzz Fuzz Vendor"
desc = "~A hive of Flavour!~"
icon_state = "honey_vender"
products = list(/obj/item/reagent_containers/food/drinks/soda_cans/cola = 10,
/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 10,
/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb = 10,
/obj/item/reagent_containers/food/drinks/soda_cans/starkist = 10,
/obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10,
/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10,
/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10,
/obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 5,
/obj/item/reagent_containers/food/drinks/soda_cans/buzz_fuzz = 5,)
contraband = list(/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6)
premium = list(/obj/item/reagent_containers/food/drinks/beer/light = 1,
/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 1)
product_slogans = "~A hive of Flavour!~"
product_ads = "Stinging flavour!;Ideal of the worker drone!;Buzz Buzz!;Got Honey?;The Queen approves of this drink!;Sap back that missing energy!;Bee the consumer unit!"