From 949c457e95775800baae67fdd3554254e26801d5 Mon Sep 17 00:00:00 2001 From: Gannets Date: Fri, 27 Apr 2018 11:35:25 +0100 Subject: [PATCH 1/4] New strings for random cola names and flavors. --- strings/chemistry_tools.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/strings/chemistry_tools.txt b/strings/chemistry_tools.txt index 0984b376..ea71139c 100644 --- a/strings/chemistry_tools.txt +++ b/strings/chemistry_tools.txt @@ -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 \ No newline at end of file +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 From 118aade90c3a7fc8ed0e8d550c348b9889631c7e Mon Sep 17 00:00:00 2001 From: Gannets Date: Fri, 27 Apr 2018 11:37:12 +0100 Subject: [PATCH 2/4] Adds cola/random --- code/obj/item/food/drinks.dm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/code/obj/item/food/drinks.dm b/code/obj/item/food/drinks.dm index 5ccfe835..c4fa4e7b 100644 --- a/code/obj/item/food/drinks.dm +++ b/code/obj/item/food/drinks.dm @@ -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." From 092f53e2b889fb56af835d5225e6209789c2e1b4 Mon Sep 17 00:00:00 2001 From: Gannets Date: Fri, 27 Apr 2018 11:40:38 +0100 Subject: [PATCH 3/4] Adds random cola to red/blue vending machine product_lists --- code/obj/machinery/vending.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/obj/machinery/vending.dm b/code/obj/machinery/vending.dm index 8d4bc300..c240c9a0 100644 --- a/code/obj/machinery/vending.dm +++ b/code/obj/machinery/vending.dm @@ -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" @@ -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" @@ -1482,4 +1484,4 @@ #undef WIRE_EXTEND #undef WIRE_SCANID #undef WIRE_SHOCK -#undef WIRE_SHOOTINV \ No newline at end of file +#undef WIRE_SHOOTINV From 4c698e9f340bb1c0eb70a479bcb501ff862fe378 Mon Sep 17 00:00:00 2001 From: Gannets Date: Fri, 27 Apr 2018 11:41:29 +0100 Subject: [PATCH 4/4] Adds random can designs --- icons/obj/can.dmi | Bin 0 -> 1894 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 icons/obj/can.dmi diff --git a/icons/obj/can.dmi b/icons/obj/can.dmi new file mode 100644 index 0000000000000000000000000000000000000000..8d44a9ea06fbffa0ecc3ecd5626591bfa2e88eb9 GIT binary patch literal 1894 zcmW+%dpy(o8~^NUHmqfmmy%2j32{V-vNOblpO@nnVkgO^$PVSYe2If8F04&+T)=k1J z3Cd-pBsF|J?}~)zu1@ZDEEWrf;qGo$QBl!_pr8~0AnWTGI>|7+Ro3x@vi=p|Rjb%& zWBGUh89^#^#_rcE9s~dpJgCxp!ht!)ir?Gdi+doA#~-UDjp3g@A~;TRCkoU-zVopB z$s?4WnfC<2ng%-I%t-(K`_jrJOv341bYJ;#F75H0dWOV422moSB=WSm$HlN@N-XCQD;?X(n_pt!~l4CvDU6)^E%ICa{@cFIn zq2TjKU)=scMUjbi!Oq|Mgrcn{hh>cY`e0p8CEmmwTHH*w^&OTbzu? zenuzbAT6YuOe-$qkgJV)I#E7N&5;kqA6|8xui)5-;~Dj}xA@Ezgr<-7DA>}u3V?Jk z+4g7m*pe?L;W3pCxHN26r9y6XRWk`rWi9oH#R=mc#aUO!1L?#6T%NQD?s7L-bDiYS zYI;L17#BHd54V>(SX-#kb!HrPGW)aa^HvCZlBVCzR4ojf7u(MK@d#ITZu;1vQ_L4U zQX)0eFf}$Yv!9e0muYAR>t;1Qk};aubV3$JB_4(J&AV`j^LP3+Sh+K2Kx7WGu{g(5 zgC!_g)rV@88ErDzj8K(Mu@+pQwP1&eom&mCgWHuBoRMQzdB-(a*PK7y1f2oQT*5~( z7#3j`)FCJTp<;)X_7=uwViY0VSYgUAS0;POC9bp#5LcE6QcjwK)_e4D)SVnZ1nTe= zbh+?9mZ7`NVF+@1s1SO@lhU`MR7>?)FnCun7vRXL;8X?I0jc zE|oH!E7JoCf(6)lBc}c zVguVo2-vzp;0?tP@}nyE08OE4V9LD`YsHS$2f`wXAus8}IT@+jkvpx0g_#&xx6=?+ zDDs+2las-DQk`2mP{0a_S7r@NPr3|pEs=O)YkrLcrU=H)I%o!a{mznWo{s-F`g5Q2iJ!z}oI`I-7o4;uv3~n( zoZx>y`CmCyJFm^l2y=O;rh$^5*2eqL&ux+SA9%AaEcI$>uKC==8$RPV;c+R889axU z4bPbRy(f6+58eJCUsiC^_8sP>A^LHHP8F8dc`uvQd(YQ5zQS3|MTAd?{{3*RkNX7Q zNbFuqtDSoEyn~r<9*P1`I8|cs5E|_|F6c(It|!KV2h+tevokYnDFszEWmqOGS}5X5 zk*&J$YLpkZEO5NOl6@a`u+FhXC$D_J)I42AEfcrCc7j>)gGSetUr5vDM;HA*24u$& zDgqj!oRhl4t7i><{Vom%zzII$E!yAN@aWbU-L&WU3xTga;8Y%XOuXOuQz`-_gX=#x3P6lJX@t>W zGaXTN0b6NdRN|tmLRx|#pkhrIs&+si#^E&P`fiwMJ)drp26_P)Jm!s<`jQ=6+ufm- zD3bO@oP^tLQXVWBa&V8`f#aiX4E6R1X#?F6m6WWvS+$M1GqwC`YkM10e|;pt=zGSm zqs`8y6KYov=Ca(%xbg;TTO!W)rcSUW5`EDLwy6p29C-WXTldGg<|C5A3HvnDxL?jS zxjDY!jXjF8p$zop`RQ|-QhVzmdk|SY!9=6Rl>4YsLwxIRs$+|Te00IO@Oo@$Ktte< dtu7=z6ocHb{i~X(;XKJp0%SWE+j