Skip to content
This repository has been archived by the owner on Apr 16, 2021. It is now read-only.

Adds randomised space cola #54

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 25 additions & 0 deletions code/obj/item/food/drinks.dm
Expand Up @@ -280,6 +280,31 @@
if(prob(50))
src.icon_state = "cola-blue"

/obj/item/reagent_containers/food/drinks/cola/random
name = "space cola"
desc = "You don't recognise this cola brand at all."
icon = 'icons/obj/can.dmi'
heal_amt = 1
rc_flags = RC_FULLNESS
initial_volume = 50

New()
..()
name = "[pick(COLA_prefixes)] [pick(COLA_suffixes)]"
var/n = rand(1,26)
icon_state = "cola-[n]"
reagents.add_reagent("cola, 20")
reagents.add_reagent("VHFCS, 10")
reagents.add_reagent(pick(COLA_flavors), 5,3)

///////////

/var/list/COLA_prefixes = strings("chemistry_tools.txt", "COLA_prefixes")
/var/list/COLA_suffixes = strings("chemistry_tools.txt", "COLA_suffixes")
/var/list/COLA_flavors = strings("chemistry_tools.txt", "COLA_flavors")

///////////

/obj/item/reagent_containers/food/drinks/milk
name = "Creaca's Space Milk"
desc = "A bottle of fresh space milk from happy, free-roaming space cows."
Expand Down
4 changes: 3 additions & 1 deletion code/obj/machinery/vending.dm
Expand Up @@ -326,6 +326,7 @@
product_list += new/datum/data/vending_product("/obj/item/reagent_containers/food/drinks/bottle/lime", 20, cost=5)
product_list += new/datum/data/vending_product("/obj/item/reagent_containers/food/drinks/bottle/grones", 20, cost=5)
product_list += new/datum/data/vending_product("/obj/item/reagent_containers/food/drinks/bottle/bottledwater", 20, cost=10)
product_list += new/datum/data/vending_product("/obj/item/reagent_containers/food/drinks/cola/random", 20, cost=5)

blue
icon_state = "grife"
Expand All @@ -343,6 +344,7 @@
product_list += new/datum/data/vending_product("/obj/item/reagent_containers/food/drinks/bottle/spooky", 20, cost=2)
product_list += new/datum/data/vending_product("/obj/item/reagent_containers/food/drinks/bottle/spooky2",20, cost=2)
product_list += new/datum/data/vending_product("/obj/item/reagent_containers/food/drinks/bottle/bottledwater", 20, cost=10)
product_list += new/datum/data/vending_product("/obj/item/reagent_containers/food/drinks/cola/random", 20, cost=5)

/obj/machinery/vending/electronics
name = "ElecTek Vendomaticotron"
Expand Down Expand Up @@ -1482,4 +1484,4 @@
#undef WIRE_EXTEND
#undef WIRE_SCANID
#undef WIRE_SHOCK
#undef WIRE_SHOOTINV
#undef WIRE_SHOOTINV
Binary file added icons/obj/can.dmi
Binary file not shown.
5 changes: 4 additions & 1 deletion strings/chemistry_tools.txt
Expand Up @@ -7,4 +7,7 @@ traitor_poison_bottle@=sarin@,cyanide@,sulfonal@,initropidril@,initrobeedril@,ro
BOOZE_prefixes@=Mad@,Thunder@,Wild@,Freedom@,Chateau@,Martian@,Mountain@,Woop Woop@,Dad's@,Grampa's@,Jay's@,Bo's@,Faff's@,Olde@,Zesty@,Junkyard@,Lonesome@,Desert@,Night@,Ensign's@,Huk's@,Pope's@, Al's@,Bill's@,Edison's@,Kruse's@,Cap'n Bubs'@,Steve's@,Circus@,Buff's@,Lilingtons'@,Good@,Honest@,Badd@,Zero's@,Jenny's@,Trainyard@,Canadian@,Grump@,Discount@,Bargain@,Crystal@,Select@,Alliman's@,Skull@,Oktoberfest
WINE_suffixes@=Dog@,Dogg@,Train@,Truck@,Locomotive@,Stallion@,Horse@,Castle@,Grappa@,Quality Beverage@,Fortified Wine@,Wine Cooler@,Shiraz@,Lightning@,20/20@,Crunch@,Rouge@,Bird@,Eagle@,Wolf@,Juice@,Bones@,Loco@,Ice@,Rain@,Mist@,Rose@,Tonic@,Sherry@,Wine@,Rebel@,Blues@,Nightcap@,Night@,Noir@,Blanc@,Ranch
BEER_suffixes@=Dog@,Dogg@,Train@,Truck@,Locomotive@,Stallion@,Horse@,Castle@,Quality Beverage@,Fortified Beer@,Spaceweiser@,IPA@,Lightning@,20/20@,Crunch@,Ale@,Bird@,Eagle@,Wolf@,Juice@,Bones@,Loco@,Ice@,Rain@,Mist@,Stout@,Tonic@,Hefeweizen@,Beer@,Rebel@,Blues@,Nightcap@,Night@,Noir@,Lager@,Dopplebock@,Porter@,Ranch@,Wheat@,Chuengling@,Brew
BOOZE_flavors@=aranesp@,vanilla@,rum@,vodka@,anti_fart@,atropine@,ephedrine@,sugar@,meat_slurry@,nectar@,honey@,salt@,pepper@,mustard@,mugwort@,grease@,corn_syrup@,msg@,juice_lime@,juice_cran@,juice_orange@,juice_lemon@,juice_cherry@,cocktail_citrus@,lemonade@,yuck@,ghostchilijuice@,el_diablo@,george_melonium@,bitters@,sewage@,death_spice@,black_goop@,ants@,MRSA@,strange_reagent@,methamphetamine@,crank@,chocolate@,krokodil@,atropine@,e.coli@,glitter@,juice_tomato@,cocktail_grog@,bitters@,squeeze@,pfire@,ectocooler@,green_goop
BOOZE_flavors@=aranesp@,vanilla@,rum@,vodka@,anti_fart@,atropine@,ephedrine@,sugar@,meat_slurry@,nectar@,honey@,salt@,pepper@,mustard@,mugwort@,grease@,corn_syrup@,msg@,juice_lime@,juice_cran@,juice_orange@,juice_lemon@,juice_cherry@,cocktail_citrus@,lemonade@,yuck@,ghostchilijuice@,el_diablo@,george_melonium@,bitters@,sewage@,death_spice@,black_goop@,ants@,MRSA@,strange_reagent@,methamphetamine@,crank@,chocolate@,krokodil@,atropine@,e.coli@,glitter@,juice_tomato@,cocktail_grog@,bitters@,squeeze@,pfire@,ectocooler@,green_goop
COLA_prefixes@=Dr@,Mountain@,Pete's Potable@,Mister@,Bebop@,Mingus@,Syndie@,Wizard@,Changeling@,Vampire@,NanoTrasen@,Iron@,Red@,Orange@,Yellow@,Green@,Blue@,Purple@,Pink@,Special@,Sour@,Toxic@,Fizzy@,Smooth@,Robust@,Diet@,Pubbie@,Clown@,Strange@,Hyper@,Cream@,Ginger@,Dandelion@,Orange@,Grape@,Citrus@,Fruit Punch@,Berry@,Mango@,Melon@,Hemlock@,Licorice@,Strawberry@,Raspberry@,Blueberry@,Pumkpin Spice@,Marshmallow@,Mint@,Taurine@,Ginsing@,Lemon-Lime@,Green Apple@,Blue Raspberry@,Carrot@,Royal Jelly@,Passion Fruit@,Prickly Pear@,Durian@,Star Fruit@,Kiwi@,Beetroot@,Egg@,Eggplant@,Green Tea@,Birthday Cake@,Brine@,Root@,Protein@,Gamma@,Mystery
COLA_suffixes@=Poo@,Water@,Sweat@,Ale@,Iced Tea@,Potion@,Poison@,Brew@,Soda@,Cola@,Pop@,Drink@,Tears@,Neo@,Zero@,and Burdock@,Punch@,Bomb@,Beverage@,Refreshment@,Tears@,Blast@,Essence@,Shake@,Twist@,Tonic@,Slush@,Explosion@,Singularity@,Quasar@,Supernova
COLA_flavors@=sweet_tea@,tonic@,pubbie@tears@,bee@,bacon_grease@,chocolate_milk@,strawberry_milk@,espresso@,energydrink@,tea@,honey_tea@,mint_tea@,ginger_ale@,chocolate@,honey@,vanilla@,cornsyrup@,mugwort@,mint@,juice_lime@,juice_cran@,juice_orange@,juice_lemon@,juice_tomato@,juice_strawberry@,juice_cherry@,juice_pineapple@,juice_apple@,juice_peach@,juice_pickle@,cocktail_citrus@,limade@,lemonade@,coconut_milk@,cold_medicine@,menthol