diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index f22849ec166..3cecba54024 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -71,6 +71,8 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/vodka = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/wine = 5, + /obj/item/weapon/reagent_containers/food/drinks/bottle/whitewine = 5, + /obj/item/weapon/reagent_containers/food/drinks/bottle/grapejuice = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/jager = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale = 15, /obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale/hushedwhisper = 15, @@ -79,6 +81,8 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer/meteor = 15, /obj/item/weapon/reagent_containers/food/drinks/bottle/small/litebeer = 15, /obj/item/weapon/reagent_containers/food/drinks/bottle/small/cider = 15, + /obj/item/weapon/reagent_containers/food/drinks/cans/beercan = 15, + /obj/item/weapon/reagent_containers/food/drinks/cans/alecan = 15, /obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice = 5, @@ -89,6 +93,11 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/cola = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/space_up = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind = 5, + /obj/item/weapon/reagent_containers/food/drinks/bottle/dr_gibb = 5, + /obj/item/weapon/reagent_containers/food/drinks/bottle/small/cola = 15, + /obj/item/weapon/reagent_containers/food/drinks/bottle/small/space_up = 15, + /obj/item/weapon/reagent_containers/food/drinks/bottle/small/space_mountain_wind = 15, + /obj/item/weapon/reagent_containers/food/drinks/bottle/small/dr_gibb = 15, /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater = 15, /obj/item/weapon/reagent_containers/food/drinks/cans/tonic = 15, /obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 15, @@ -1057,12 +1066,16 @@ /obj/machinery/vending/sovietsoda name = "BODA" - desc = "An old sweet water vending machine,how did this end up here?" + desc = "An old sweet water vending machine, how did this end up here?" icon_state = "sovietsoda" product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem." - products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/boda = 30, //ADDITION 04/03/2021 - /obj/item/weapon/reagent_containers/food/drinks/cans/kompot = 20) //ADDITION 04/03/2021 - contraband = list(/obj/item/weapon/reagent_containers/food/drinks/cans/kvass = 20) //ADDITION 04/03/2021 + products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/boda = 30, + /obj/item/weapon/reagent_containers/food/drinks/cans/redarmy = 15, + /obj/item/weapon/reagent_containers/food/drinks/cans/arstbru = 15, + /obj/item/weapon/reagent_containers/food/drinks/cans/terra_cola = 15, + /obj/item/weapon/reagent_containers/food/drinks/cans/kompot = 15) + contraband = list(/obj/item/weapon/reagent_containers/food/drinks/cans/kvass = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/bodaplus = 10) idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. vending_sound = "machines/vending/vending_cans.ogg" @@ -1077,6 +1090,36 @@ /obj/item/weapon/reagent_containers/food/snacks/packaged/meatration = 8) contraband = list(/obj/item/weapon/reagent_containers/food/snacks/packaged/sweetration = 2) +///////////////////////Radical Renard/////////////////////////////////////// + +/obj/machinery/vending/radren + name = "Radical Renard Sodas" + desc = "A softdrink vendor owned by a frontier based soda company that's been contracted by NanoTrasen" + icon_state = "radren" + product_slogans = "Enjoy the rad refreshing taste of Radical Renard brand soda!" + product_ads = "Radically Refreshing!;Get Cool!;Have you tried our new Andromeda Apple?;Enjoy a cold one with Renard!" + products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/straw_cola = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/apple_cola = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/lemon_cola = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/baconsoda = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/sarsaparilla = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/grape_cola = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/orange_cola = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 10) + contraband = list() + prices = list(/obj/item/weapon/reagent_containers/food/drinks/cans/straw_cola = 1, + /obj/item/weapon/reagent_containers/food/drinks/cans/apple_cola = 1, + /obj/item/weapon/reagent_containers/food/drinks/cans/lemon_cola = 1, + /obj/item/weapon/reagent_containers/food/drinks/cans/baconsoda = 1, + /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 2, + /obj/item/weapon/reagent_containers/food/drinks/cans/sarsaparilla = 1, + /obj/item/weapon/reagent_containers/food/drinks/cans/grape_cola = 1, + /obj/item/weapon/reagent_containers/food/drinks/cans/orange_cola = 1, + /obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 1) + idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. + vending_sound = "machines/vending/vending_cans.ogg" + /** * Department/job vendors to sit in place of lockers taking up space */ diff --git a/code/game/machinery/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm similarity index 100% rename from code/game/machinery/vending_machines_vr.dm rename to code/modules/economy/vending_machines_vr.dm diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm index 6b53a966ddc..75018e8683c 100644 --- a/code/modules/food/food/cans.dm +++ b/code/modules/food/food/cans.dm @@ -137,7 +137,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/tonic/Initialize() . = ..() - reagents.add_reagent("tonic", 50) + reagents.add_reagent("tonic", 30) /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater name = "soda water" @@ -147,7 +147,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater/Initialize() . = ..() - reagents.add_reagent("sodawater", 50) + reagents.add_reagent("sodawater", 30) /obj/item/weapon/reagent_containers/food/drinks/cans/gingerale name = "\improper Classic Ginger Ale" @@ -171,7 +171,7 @@ . = ..() reagents.add_reagent("rootbeer", 30) -//ADDITIONS BELOW THIS LINE MADE ON 04/03/2021 +/////////////////////////BODA VENDOR DRINKS///////////////////////// /obj/item/weapon/reagent_containers/food/drinks/cans/kvass name = "\improper Kvass" @@ -203,4 +203,224 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/boda/Initialize() . = ..() - reagents.add_reagent("sodawater", 30) \ No newline at end of file + reagents.add_reagent("sodawater", 30) + +/obj/item/weapon/reagent_containers/food/drinks/cans/bodaplus + name = "\improper Boda-Plyus" + desc = "State regulated soda beverage, now with added surplus flavoring. Enjoy comrades." + icon_state = "bodaplus" + center_of_mass = list("x"=16, "y"=8) + +/obj/item/weapon/reagent_containers/food/drinks/cans/bodaplus/Initialize() + . = ..() + reagents.add_reagent("sodawater", 15) + reagents.add_reagent(pick(list( + "applejuice", + "grapejuice", + "lemonjuice", + "limejuice", + "watermelonjuice", + "banana", + "berryjuice", + "pineapplejuice")), 15) + +/obj/item/weapon/reagent_containers/food/drinks/cans/redarmy + name = "\improper Red Army Twist" + desc = "A taste of what keeps our glorious nation running! Served as Space Commissariat Stahlin prefers it! Luke warm." + icon_state = "red_army" + center_of_mass = list("x"=16, "y"=8) + +/obj/item/weapon/reagent_containers/food/drinks/cans/redarmy/Initialize() + . = ..() + reagents.add_reagent("potatojuice", 15) + reagents.add_reagent("sodawater", 15) + +/obj/item/weapon/reagent_containers/food/drinks/cans/arstbru + name = "\improper Arstotzka Brü" + desc = "Just what any bureaucrat needs to get through the day. Keep stamping those papers!" + icon_state = "arst_bru" + center_of_mass = list("x"=16, "y"=8) + +/obj/item/weapon/reagent_containers/food/drinks/cans/arstbru/Initialize() + . = ..() + reagents.add_reagent("turnipjuice", 30) + +/obj/item/weapon/reagent_containers/food/drinks/cans/terra_cola + name = "\improper Terra-Cola" + desc = "Made by the people. Served to the people." + description_fluff = "A can of the only soft drink state approved for the benefit of the people. Served at room temperature regardless of ambient temperatures thanks to innovative Terran insulation technology." + icon_state = "terra_cola" + center_of_mass = list("x"=16, "y"=8) + +/obj/item/weapon/reagent_containers/food/drinks/cans/terra_cola/Initialize() + . = ..() + reagents.add_reagent("water", 25) + reagents.add_reagent("iron", 5) + +/////////////////////////MISC VENDOR DRINKS///////////////////////// + +/obj/item/weapon/reagent_containers/food/drinks/cans/straw_cola + name = "\improper Superior Strawberry" + desc = "Feel superior above all with Superior Strawberry!" + icon_state = "strawcoke" + center_of_mass = list("x"=16, "y"=8) + +/obj/item/weapon/reagent_containers/food/drinks/cans/straw_cola/Initialize() + . = ..() + reagents.add_reagent("strawsoda", 30) + +/obj/item/weapon/reagent_containers/food/drinks/cans/apple_cola + name = "\improper Andromeda Apple" + desc = "Look to the stars and prepare to explore with Andromeda Apple!" + icon_state = "applecoke" + center_of_mass = list("x"=16, "y"=8) + +/obj/item/weapon/reagent_containers/food/drinks/cans/apple_cola/Initialize() + . = ..() + reagents.add_reagent("applesoda", 30) + +/obj/item/weapon/reagent_containers/food/drinks/cans/lemon_cola + name = "\improper Lunar Lemon" + desc = "Feel back at home on the Lunar Colonies with this classic berverage straight from the source!" + icon_state = "lemoncoke" + center_of_mass = list("x"=16, "y"=8) + +/obj/item/weapon/reagent_containers/food/drinks/cans/lemon_cola/Initialize() + . = ..() + reagents.add_reagent("lemonsoda", 30) + +/obj/item/weapon/reagent_containers/food/drinks/cans/sarsaparilla + name = "\improper Starship Sarsaparilla" + desc = "Take off and shoot for the stars with this classic cowboy cola!" + icon_state = "sarsaparilla" + center_of_mass = list("x"=16, "y"=8) + +/obj/item/weapon/reagent_containers/food/drinks/cans/sarsaparilla/Initialize() + . = ..() + reagents.add_reagent("sarsaparilla", 30) + +/obj/item/weapon/reagent_containers/food/drinks/cans/grape_cola + name = "\improper Gravity Grape" + desc = "Get down with Newton's favorite corbonated science experiment!" + icon_state = "grapesoda" + center_of_mass = list("x"=16, "y"=8) + +/obj/item/weapon/reagent_containers/food/drinks/cans/grape_cola/Initialize() + . = ..() + reagents.add_reagent("grapesoda", 30) + +/obj/item/weapon/reagent_containers/food/drinks/cans/orange_cola + name = "\improper Orion Orange" + desc = "Take a taste-tastic trip to Orion's Belt with Orion Orange!" + icon_state = "orangesoda" + center_of_mass = list("x"=16, "y"=8) + +/obj/item/weapon/reagent_containers/food/drinks/cans/orange_cola/Initialize() + . = ..() + reagents.add_reagent("orangesoda", 30) + +/obj/item/weapon/reagent_containers/food/drinks/cans/baconsoda + name = "\improper Bacon Soda" + desc = "Taste something out of this world with Bacon Soda!" + icon_state = "porkcoke" + center_of_mass = list("x"=16, "y"=8) + +/obj/item/weapon/reagent_containers/food/drinks/cans/baconsoda/Initialize() + . = ..() + reagents.add_reagent("porksoda", 30) + +/obj/item/weapon/reagent_containers/food/drinks/cans/bepis + name = "\improper Bepis" + desc = "It has a smell of 'off-brand' whenever you open it..." + description_fluff = "Puts the 'B' in Best Soda! Bepis is the number one competitor to \ + Space Cola and has vendors scattered across the frontier. While the drink is not as \ + popular as Space Cola, many people across known space enjoy the sweet beverage." + icon = 'icons/obj/drinks_vr.dmi' + icon_state = "bepis" + center_of_mass = list("x"=16, "y"=10) + +/obj/item/weapon/reagent_containers/food/drinks/cans/bepis/Initialize() + . = ..() + reagents.add_reagent("bepis", 30) + +/obj/item/weapon/reagent_containers/food/drinks/cans/astrodew + name = "\improper Astro Dew Spring Water" + desc = "A can of refreshing 'spring' water! Or so the can claims." + icon = 'icons/obj/drinks_vr.dmi' + icon_state = "watercan" + center_of_mass = list("x"=16, "y"=10) + +/obj/item/weapon/reagent_containers/food/drinks/cans/astrodew/Initialize() + . = ..() + reagents.add_reagent("water", 30) + +/obj/item/weapon/reagent_containers/food/drinks/cans/icecoffee + name = "\improper Café Del Consumir" + desc = "A can of deliciously sweet iced coffee that originates from Earth." + description_fluff = "Café Del Consumir originates from a small coffee brewery in México \ + that still opperates to this day. Café Del Consumir prides itself on being true to form \ + and retaining its original recipe. They've been producing and selling thier product across \ + the galaxy for decades without fail. NanoTrasen has attempted to by out the small company for \ + years now, howerver all attempts they've made have failed." + icon = 'icons/obj/drinks_vr.dmi' + icon_state = "coffeecan" + center_of_mass = list("x"=16, "y"=10) + +/obj/item/weapon/reagent_containers/food/drinks/cans/icecoffee/Initialize() + . = ..() + reagents.add_reagent("icecoffee", 30) + +/obj/item/weapon/reagent_containers/food/drinks/cans/buzz + name = "\improper Buzz Fuzz" + desc = "Uses real honey, making it a sweet tooth's dream drink." + icon = 'icons/obj/drinks_vr.dmi' + icon_state = "buzzfuzz" + center_of_mass = list("x"=16, "y"=10) + +/obj/item/weapon/reagent_containers/food/drinks/cans/buzz/Initialize() + . = ..() + reagents.add_reagent("buzz_fuzz", 30) + +/obj/item/weapon/reagent_containers/food/drinks/cans/shambler + name = "\improper Shambler's Juice" + desc = "~Shake me up some of that Shambler's Juice!~" + icon = 'icons/obj/drinks_vr.dmi' + icon_state = "shambler" + center_of_mass = list("x"=16, "y"=10) + +/obj/item/weapon/reagent_containers/food/drinks/cans/shambler/Initialize() + . = ..() + reagents.add_reagent("shamblers", 30) + +/obj/item/weapon/reagent_containers/food/drinks/cans/cranberry + name = "\improper Sprited Cranberry" + desc = "A delicious blend of fresh cranberry juice and various spices, the perfect drink." + icon = 'icons/obj/drinks_vr.dmi' + icon_state = "cranberry" + center_of_mass = list("x"=16, "y"=10) + +/obj/item/weapon/reagent_containers/food/drinks/cans/cranberry/Initialize() + . = ..() + reagents.add_reagent("sprited_cranberry", 30) + +/////////////////////////CANNED BOOZE DRINKS///////////////////////// + +/obj/item/weapon/reagent_containers/food/drinks/cans/beercan + name = "\improper Sunshine Brew" + desc = "Beat the heat with this refreshing brewed beverage." + icon_state = "beercan" + center_of_mass = list("x"=16, "y"=8) + +/obj/item/weapon/reagent_containers/food/drinks/cans/beercan/Initialize() + . = ..() + reagents.add_reagent("beer", 30) + +/obj/item/weapon/reagent_containers/food/drinks/cans/alecan + name = "\improper Spacecastle Pale Ale" + desc = "A delicious IPA that's canned for your pleasure. Drink up!" + icon_state = "alecan" + center_of_mass = list("x"=16, "y"=8) + +/obj/item/weapon/reagent_containers/food/drinks/cans/alecan/Initialize() + . = ..() + reagents.add_reagent("ale", 30) \ No newline at end of file diff --git a/code/modules/food/food/cans_vr.dm b/code/modules/food/food/cans_vr.dm deleted file mode 100644 index 4807d021ef5..00000000000 --- a/code/modules/food/food/cans_vr.dm +++ /dev/null @@ -1,75 +0,0 @@ -//////////////////////Bepis Drinks (04/29/2021)////////////////////// - -/obj/item/weapon/reagent_containers/food/drinks/cans/bepis - name = "\improper Bepis" - desc = "It has a smell of 'off-brand' whenever you open it..." - description_fluff = "Puts the 'B' in Best Soda! Bepis is the number one competitor to \ - Space Cola and has vendors scattered across the frontier. While the drink is not as \ - popular as Space Cola, many people across known space enjoy the sweet beverage." - icon = 'icons/obj/drinks_vr.dmi' - icon_state = "bepis" - center_of_mass = list("x"=16, "y"=10) - -/obj/item/weapon/reagent_containers/food/drinks/cans/bepis/Initialize() - . = ..() - reagents.add_reagent("bepis", 30) - -/obj/item/weapon/reagent_containers/food/drinks/cans/astrodew - name = "\improper Astro Dew Spring Water" - desc = "A can of refreshing 'spring' water! Or so the can claims." - icon = 'icons/obj/drinks_vr.dmi' - icon_state = "watercan" - center_of_mass = list("x"=16, "y"=10) - -/obj/item/weapon/reagent_containers/food/drinks/cans/astrodew/Initialize() - . = ..() - reagents.add_reagent("water", 30) - -/obj/item/weapon/reagent_containers/food/drinks/cans/icecoffee - name = "\improper Café Del Consumir" - desc = "A can of deliciously sweet iced coffee that originates from Earth." - description_fluff = "Café Del Consumir originates from a small coffee brewery in México \ - that still opperates to this day. Café Del Consumir prides itself on being true to form \ - and retaining its original recipe. They've been producing and selling thier product across \ - the galaxy for decades without fail. NanoTrasen has attempted to by out the small company for \ - years now, howerver all attempts they've made have failed." - icon = 'icons/obj/drinks_vr.dmi' - icon_state = "coffeecan" - center_of_mass = list("x"=16, "y"=10) - -/obj/item/weapon/reagent_containers/food/drinks/cans/icecoffee/Initialize() - . = ..() - reagents.add_reagent("icecoffee", 30) - -/obj/item/weapon/reagent_containers/food/drinks/cans/buzz - name = "\improper Buzz Fuzz" - desc = "Uses real honey, making it a sweet tooth's dream drink." - icon = 'icons/obj/drinks_vr.dmi' - icon_state = "buzzfuzz" - center_of_mass = list("x"=16, "y"=10) - -/obj/item/weapon/reagent_containers/food/drinks/cans/buzz/Initialize() - . = ..() - reagents.add_reagent("buzz_fuzz", 30) - -/obj/item/weapon/reagent_containers/food/drinks/cans/shambler - name = "\improper Shambler's Juice" - desc = "~Shake me up some of that Shambler's Juice!~" - icon = 'icons/obj/drinks_vr.dmi' - icon_state = "shambler" - center_of_mass = list("x"=16, "y"=10) - -/obj/item/weapon/reagent_containers/food/drinks/cans/shambler/Initialize() - . = ..() - reagents.add_reagent("shamblers", 30) - -/obj/item/weapon/reagent_containers/food/drinks/cans/cranberry - name = "\improper Sprited Cranberry" - desc = "A delicious blend of fresh cranberry juice and various spices, the perfect drink." - icon = 'icons/obj/drinks_vr.dmi' - icon_state = "cranberry" - center_of_mass = list("x"=16, "y"=10) - -/obj/item/weapon/reagent_containers/food/drinks/cans/cranberry/Initialize() - . = ..() - reagents.add_reagent("sprited_cranberry", 30) \ No newline at end of file diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm index db8a9216058..41217df94b3 100644 --- a/code/modules/food/food/drinks.dm +++ b/code/modules/food/food/drinks.dm @@ -221,7 +221,7 @@ /obj/item/weapon/reagent_containers/food/drinks/ice name = "cup of ice" desc = "Careful, cold ice, do not chew." - icon_state = "coffee" + icon_state = "ice" center_of_mass = list("x"=15, "y"=10) /obj/item/weapon/reagent_containers/food/drinks/ice/Initialize() . = ..() @@ -232,7 +232,7 @@ desc = "Who needs character traits when you can enjoy a hot mug of cocoa?" description_fluff = "Counselor's Choice brand hot cocoa is made with a blend of hot water and non-dairy milk powder substitute, in a compromise destined to annoy all parties." icon_state = "coffee" - item_state = "coffee" + item_state = "hot_choc" trash = /obj/item/trash/coffee center_of_mass = list("x"=15, "y"=13) drop_sound = 'sound/items/drop/papercup.ogg' diff --git a/code/modules/food/food/drinks/bottle.dm b/code/modules/food/food/drinks/bottle.dm index 831bca128e6..26775c90dba 100644 --- a/code/modules/food/food/drinks/bottle.dm +++ b/code/modules/food/food/drinks/bottle.dm @@ -205,7 +205,7 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey name = "Uncle Git's Special Reserve" desc = "A premium single-malt whiskey, gently matured in a highly classified location." - icon_state = "whiskeybottle" + icon_state = "whiskeybottle1" center_of_mass = list("x"=16, "y"=3) /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey/Initialize() @@ -322,16 +322,6 @@ . = ..() reagents.add_reagent("cognac", 100) -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine - name = "Doublebeard Bearded Special Wine" - desc = "Cheap cooking wine pretending to be drinkable." - icon_state = "winebottle" - center_of_mass = list("x"=16, "y"=4) - -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine/Initialize() - . = ..() - reagents.add_reagent("wine", 100) - /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe name = "Jailbreaker Verte" desc = "One sip of this and you just know you're gonna have a good time." @@ -362,26 +352,6 @@ . = ..() reagents.add_reagent("bluecuracao", 100) -/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine - name = "Briar Rose Grenadine Syrup" - desc = "Sweet and tangy, a bar syrup used to add color or flavor to drinks." - icon_state = "grenadinebottle" - center_of_mass = list("x"=16, "y"=6) - -/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine/Initialize() - . = ..() - reagents.add_reagent("grenadine", 100) - -/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine - name = "Warlock's Velvet" - desc = "What a delightful packaging for a surely high quality wine! The vintage must be amazing!" - icon_state = "pwinebottle" - center_of_mass = list("x"=16, "y"=4) - -/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine/Initialize() - . = ..() - reagents.add_reagent("pwine", 100) - /obj/item/weapon/reagent_containers/food/drinks/bottle/redeemersbrew name = "Redeemer's Brew" desc = "Just opening the top of this bottle makes you feel a bit tipsy. Not for the faint of heart." @@ -392,26 +362,6 @@ . = ..() reagents.add_reagent("unathiliquor", 100) -/obj/item/weapon/reagent_containers/food/drinks/bottle/sake - name = "Mono-No-Aware Luxury Sake" - desc = "Dry alcohol made from rice, a favorite of businessmen." - icon_state = "sakebottle" - center_of_mass = list("x"=16, "y"=3) - -/obj/item/weapon/reagent_containers/food/drinks/bottle/sake/Initialize() - . = ..() - reagents.add_reagent("sake", 100) - -/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne - name = "Gilthari Luxury Champagne" - desc = "For those special occassions." - icon_state = "champagne" - center_of_mass = list("x"=16, "y"=3) - -/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne/Initialize() - . = ..() - reagents.add_reagent("champagne", 100) - /obj/item/weapon/reagent_containers/food/drinks/bottle/peppermintschnapps name = "Dr. Bone's Peppermint Schnapps" desc = "A flavoured grain liqueur with a fresh, minty taste." @@ -452,6 +402,68 @@ . = ..() reagents.add_reagent("jager", 100) +/////////////////////////WINES///////////////////////// + +/obj/item/weapon/reagent_containers/food/drinks/bottle/wine + name = "Doublebeard Bearded Special Red" + desc = "Cheap cooking wine pretending to be drinkable." + icon_state = "winebottle" + center_of_mass = list("x"=16, "y"=4) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/wine/Initialize() + . = ..() + reagents.add_reagent("redwine", 100) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/whitewine + name = "Doublebeard Bearded Special White" + desc = "Cooking wine pretending to be drinkable." + icon_state = "whitewinebottle" + center_of_mass = list("x"=16, "y"=4) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/whitewine/Initialize() + . = ..() + reagents.add_reagent("whitewine", 100) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/carnoth //anagram of 'ntcahors' where the bottle sprite originated from + name = "NanoTrasen Carnoth Red" + desc = "A NanoTrasen branded wine given to high ranking staff as gifts. Made special on the agricultural planet Carnoth." + icon_state = "carnoth" + center_of_mass = list("x"=16, "y"=4) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/carnoth/Initialize() + . = ..() + reagents.add_reagent("carnoth", 100) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine + name = "Warlock's Velvet" + desc = "What a delightful packaging for a surely high quality wine! The vintage must be amazing!" + icon_state = "pwinebottle" + center_of_mass = list("x"=16, "y"=4) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine/Initialize() + . = ..() + reagents.add_reagent("pwine", 100) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne + name = "Gilthari Luxury Champagne" + desc = "For those special occassions." + icon_state = "champagne" + center_of_mass = list("x"=16, "y"=3) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne/Initialize() + . = ..() + reagents.add_reagent("champagne", 100) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/sake + name = "Mono-No-Aware Luxury Sake" + desc = "Dry alcohol made from rice, a favorite of businessmen." + icon_state = "sakebottle" + center_of_mass = list("x"=16, "y"=3) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/sake/Initialize() + . = ..() + reagents.add_reagent("sake", 100) + //////////////////////////JUICES AND STUFF/////////////////////// /obj/item/weapon/reagent_containers/food/drinks/bottle/cola //MODIFIED ON 04/21/2021 @@ -578,6 +590,26 @@ . = ..() reagents.add_reagent("lemonjuice", 100) +/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine + name = "Briar Rose Grenadine Syrup" + desc = "Sweet and tangy, a bar syrup used to add color or flavor to drinks." + icon_state = "grenadinebottle" + center_of_mass = list("x"=16, "y"=6) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine/Initialize() + . = ..() + reagents.add_reagent("grenadine", 100) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/grapejuice + name = "Special Blend Grapejuice" + desc = "A delicious blend of various grape species in one succulent blend." + icon_state = "grapejuicebottle" + center_of_mass = list("x"=16, "y"=3) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/grapejuice/Initialize() + . = ..() + reagents.add_reagent("grapejuice", 100) + //////////////////////////SMALL BOTTLES/////////////////////// /obj/item/weapon/reagent_containers/food/drinks/bottle/small @@ -629,7 +661,6 @@ . = ..() reagents.add_reagent("cider", 50) - /obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale name = "\improper Magm-Ale" desc = "A true dorf's drink of choice." @@ -650,3 +681,45 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale/hushedwhisper/Initialize() . = ..() reagents.add_reagent("ale", 50) + +//////////////////////////SMALL BOTTLED SODA/////////////////////// + +/obj/item/weapon/reagent_containers/food/drinks/bottle/small/cola + name = "Space Cola" + desc = "Cola. In space." + icon_state = "colabottle2" + center_of_mass = list("x"=16, "y"=6) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/small/cola/Initialize() + . = ..() + reagents.add_reagent("cola", 50) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/small/space_up + name = "Space-Up" + desc = "Tastes like a hull breach in your mouth." + icon_state = "space-up_bottle2" + center_of_mass = list("x"=16, "y"=6) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/small/space_up/Initialize() + . = ..() + reagents.add_reagent("space_up", 50) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/small/space_mountain_wind + name = "Space Mountain Wind" + desc = "Blows right through you like a space wind." + icon_state = "space_mountain_wind_bottle2" + center_of_mass = list("x"=16, "y"=6) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/small/space_mountain_wind/Initialize() + . = ..() + reagents.add_reagent("spacemountainwind", 50) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/small/dr_gibb + name = "Dr. Gibb" + desc = "A delicious mixture of 42 different flavors." + icon_state = "dr_gibb_bottle2" + center_of_mass = list("x"=16, "y"=6) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/small/dr_gibb/Initialize() + . = ..() + reagents.add_reagent("dr_gibb", 50) \ No newline at end of file diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm index 672356551ba..bc1a199498a 100644 --- a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm +++ b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm @@ -61,8 +61,10 @@ spawn_reagent = "kahlua" /obj/item/weapon/reagent_containers/chem_disp_cartridge/whiskey spawn_reagent = "whiskey" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/wine - spawn_reagent = "wine" +/obj/item/weapon/reagent_containers/chem_disp_cartridge/redwine + spawn_reagent = "redwine" +/obj/item/weapon/reagent_containers/chem_disp_cartridge/whitewine + spawn_reagent = "whitewine" /obj/item/weapon/reagent_containers/chem_disp_cartridge/vodka spawn_reagent = "vodka" /obj/item/weapon/reagent_containers/chem_disp_cartridge/gin diff --git a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm index 9c776d3266d..99f8688a8bb 100644 --- a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm +++ b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm @@ -52,7 +52,7 @@ /obj/machinery/chemical_dispenser/bar_alc dispense_reagents = list( "lemon_lime", "sugar", "orangejuice", "limejuice", "sodawater", "tonic", "beer", "kahlua", - "whiskey", "wine", "vodka", "cider", "gin", "rum", "tequilla", "vermouth", "cognac", "ale", "mead", "bitters" + "whiskey", "redwine", "whitewine", "vodka", "cider", "gin", "rum", "tequilla", "vermouth", "cognac", "ale", "mead", "bitters" ) /obj/machinery/chemical_dispenser/bar_coffee diff --git a/code/modules/reagents/machinery/dispenser/dispenser_presets.dm b/code/modules/reagents/machinery/dispenser/dispenser_presets.dm index 6b90357a2c6..537a980e6cc 100644 --- a/code/modules/reagents/machinery/dispenser/dispenser_presets.dm +++ b/code/modules/reagents/machinery/dispenser/dispenser_presets.dm @@ -105,7 +105,8 @@ /obj/item/weapon/reagent_containers/chem_disp_cartridge/beer, /obj/item/weapon/reagent_containers/chem_disp_cartridge/kahlua, /obj/item/weapon/reagent_containers/chem_disp_cartridge/whiskey, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/wine, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/redwine, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/whitewine, /obj/item/weapon/reagent_containers/chem_disp_cartridge/vodka, /obj/item/weapon/reagent_containers/chem_disp_cartridge/gin, /obj/item/weapon/reagent_containers/chem_disp_cartridge/rum, diff --git a/code/modules/reagents/machinery/dispenser/supply.dm b/code/modules/reagents/machinery/dispenser/supply.dm index ffbad53fab1..e62e3bbb5dc 100644 --- a/code/modules/reagents/machinery/dispenser/supply.dm +++ b/code/modules/reagents/machinery/dispenser/supply.dm @@ -66,7 +66,8 @@ /obj/item/weapon/reagent_containers/chem_disp_cartridge/beer, /obj/item/weapon/reagent_containers/chem_disp_cartridge/kahlua, /obj/item/weapon/reagent_containers/chem_disp_cartridge/whiskey, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/wine, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/redwine, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/whitewine, /obj/item/weapon/reagent_containers/chem_disp_cartridge/vodka, /obj/item/weapon/reagent_containers/chem_disp_cartridge/gin, /obj/item/weapon/reagent_containers/chem_disp_cartridge/rum, @@ -191,19 +192,20 @@ SEC_PACK(tungsten, /obj/item/weapon/reagent_containers/chem_disp_cartridge/tung SEC_PACK(calcium, /obj/item/weapon/reagent_containers/chem_disp_cartridge/calcium, "Reagent refill - Calcium", "calcium reagent cartridge crate", 15, access_chemistry) // Bar-restricted (alcoholic drinks) -// Datum path Contents type Supply pack name Container name Cost Container access -SEC_PACK(beer, /obj/item/weapon/reagent_containers/chem_disp_cartridge/beer, "Reagent refill - Beer", "beer reagent cartridge crate", 15, access_bar) -SEC_PACK(kahlua, /obj/item/weapon/reagent_containers/chem_disp_cartridge/kahlua, "Reagent refill - Kahlua", "kahlua reagent cartridge crate", 15, access_bar) -SEC_PACK(whiskey, /obj/item/weapon/reagent_containers/chem_disp_cartridge/whiskey, "Reagent refill - Whiskey", "whiskey reagent cartridge crate", 15, access_bar) -SEC_PACK(wine, /obj/item/weapon/reagent_containers/chem_disp_cartridge/wine, "Reagent refill - Wine", "wine reagent cartridge crate", 15, access_bar) -SEC_PACK(vodka, /obj/item/weapon/reagent_containers/chem_disp_cartridge/vodka, "Reagent refill - Vodka", "vodka reagent cartridge crate", 15, access_bar) -SEC_PACK(gin, /obj/item/weapon/reagent_containers/chem_disp_cartridge/gin, "Reagent refill - Gin", "gin reagent cartridge crate", 15, access_bar) -SEC_PACK(rum, /obj/item/weapon/reagent_containers/chem_disp_cartridge/rum, "Reagent refill - Rum", "rum reagent cartridge crate", 15, access_bar) -SEC_PACK(tequila, /obj/item/weapon/reagent_containers/chem_disp_cartridge/tequila, "Reagent refill - Tequila", "tequila reagent cartridge crate", 15, access_bar) -SEC_PACK(vermouth, /obj/item/weapon/reagent_containers/chem_disp_cartridge/vermouth, "Reagent refill - Vermouth", "vermouth reagent cartridge crate", 15, access_bar) -SEC_PACK(cognac, /obj/item/weapon/reagent_containers/chem_disp_cartridge/cognac, "Reagent refill - Cognac", "cognac reagent cartridge crate", 15, access_bar) -SEC_PACK(ale, /obj/item/weapon/reagent_containers/chem_disp_cartridge/ale, "Reagent refill - Ale", "ale reagent cartridge crate", 15, access_bar) -SEC_PACK(mead, /obj/item/weapon/reagent_containers/chem_disp_cartridge/mead, "Reagent refill - Mead", "mead reagent cartridge crate", 15, access_bar) +// Datum path Contents type Supply pack name Container name Cost Container access +SEC_PACK(beer, /obj/item/weapon/reagent_containers/chem_disp_cartridge/beer, "Reagent refill - Beer", "beer reagent cartridge crate", 15, access_bar) +SEC_PACK(kahlua, /obj/item/weapon/reagent_containers/chem_disp_cartridge/kahlua, "Reagent refill - Kahlua", "kahlua reagent cartridge crate", 15, access_bar) +SEC_PACK(whiskey, /obj/item/weapon/reagent_containers/chem_disp_cartridge/whiskey, "Reagent refill - Whiskey", "whiskey reagent cartridge crate", 15, access_bar) +SEC_PACK(rwine, /obj/item/weapon/reagent_containers/chem_disp_cartridge/redwine, "Reagent refill - Red Wine", "red wine reagent cartridge crate", 15, access_bar) +SEC_PACK(wwine, /obj/item/weapon/reagent_containers/chem_disp_cartridge/whitewine, "Reagent refill - White Wine", "white wine reagent cartridge crate", 15, access_bar) +SEC_PACK(vodka, /obj/item/weapon/reagent_containers/chem_disp_cartridge/vodka, "Reagent refill - Vodka", "vodka reagent cartridge crate", 15, access_bar) +SEC_PACK(gin, /obj/item/weapon/reagent_containers/chem_disp_cartridge/gin, "Reagent refill - Gin", "gin reagent cartridge crate", 15, access_bar) +SEC_PACK(rum, /obj/item/weapon/reagent_containers/chem_disp_cartridge/rum, "Reagent refill - Rum", "rum reagent cartridge crate", 15, access_bar) +SEC_PACK(tequila, /obj/item/weapon/reagent_containers/chem_disp_cartridge/tequila, "Reagent refill - Tequila", "tequila reagent cartridge crate", 15, access_bar) +SEC_PACK(vermouth, /obj/item/weapon/reagent_containers/chem_disp_cartridge/vermouth, "Reagent refill - Vermouth", "vermouth reagent cartridge crate", 15, access_bar) +SEC_PACK(cognac, /obj/item/weapon/reagent_containers/chem_disp_cartridge/cognac, "Reagent refill - Cognac", "cognac reagent cartridge crate", 15, access_bar) +SEC_PACK(ale, /obj/item/weapon/reagent_containers/chem_disp_cartridge/ale, "Reagent refill - Ale", "ale reagent cartridge crate", 15, access_bar) +SEC_PACK(mead, /obj/item/weapon/reagent_containers/chem_disp_cartridge/mead, "Reagent refill - Mead", "mead reagent cartridge crate", 15, access_bar) // Unrestricted (water, sugar, non-alcoholic drinks) // Datum path Contents type Supply pack name Container name Cost diff --git a/code/modules/reagents/reactions/instant/drinks.dm b/code/modules/reagents/reactions/instant/drinks.dm index 2722d7843bc..8814bf518e7 100644 --- a/code/modules/reagents/reactions/instant/drinks.dm +++ b/code/modules/reagents/reactions/instant/drinks.dm @@ -107,8 +107,8 @@ /decl/chemical_reaction/instant/drinks/wine name = "Wine" - id = "wine" - result = "wine" + id = "redwine" + result = "redwine" required_reagents = list("grapejuice" = 10) catalysts = list("enzyme" = 5) result_amount = 10 diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm index a65dec7e2f8..457a73b01ec 100644 --- a/code/modules/reagents/reagents/food_drinks.dm +++ b/code/modules/reagents/reagents/food_drinks.dm @@ -1091,6 +1091,19 @@ glass_desc = "Juice from a potato. Bleh." allergen_type = ALLERGEN_VEGETABLE //Potatoes are vegetables +/datum/reagent/drink/juice/turnip + name = "Turnip Juice" + id = "turnipjuice" + description = "Juice of the turnip. A step below the potato." + taste_description = "turnips" + nutrition = 2 + color = "#251e2e" + sugary = FALSE + + glass_name = "turnip juice" + glass_desc = "Juice of the turnip. A step below the potato." + allergen_type = ALLERGEN_VEGETABLE //Turnips are vegetables + /datum/reagent/drink/juice/tomato name = "Tomato Juice" id = "tomatojuice" @@ -1769,6 +1782,110 @@ glass_desc = "A glass of refreshing Space Cola" glass_special = list(DRINK_FIZZ) +/datum/reagent/drink/soda/lemon_soda + name = "Lemon Soda" + id = "lemonsoda" + description = "Soda made using lemon concentrate. Sour." + taste_description = "strong sourness" + reagent_state = LIQUID + color = "#ffe658" + adj_drowsy = -3 + adj_temp = -5 + + glass_name = "lemon Soda" + glass_desc = "A glass of refreshing Lemon Soda. So sour!" + glass_special = list(DRINK_FIZZ) + allergen_type = ALLERGEN_FRUIT + +/datum/reagent/drink/soda/apple_soda + name = "Apple Soda" + id = "applesoda" + description = "Soda made using fresh apples." + taste_description = "crisp juiciness" + reagent_state = LIQUID + color = "#c73737" + adj_drowsy = -3 + adj_temp = -5 + + glass_name = "Apple Soda" + glass_desc = "A glass of refreshing Apple Soda. Crisp!" + glass_special = list(DRINK_FIZZ) + allergen_type = ALLERGEN_FRUIT + + +/datum/reagent/drink/soda/straw_soda + name = "Strawberry Soda" + id = "strawsoda" + description = "Soda made using sweet berries." + taste_description = "oddly bland" + reagent_state = LIQUID + color = "#ffa3a3" + adj_drowsy = -3 + adj_temp = -5 + + glass_name = "Strawberry Soda" + glass_desc = "A glass of refreshing Strawberry Soda" + glass_special = list(DRINK_FIZZ) + allergen_type = ALLERGEN_FRUIT + +/datum/reagent/drink/soda/orangesoda + name = "Orange Soda" + id = "orangesoda" + description = "Soda made using fresh picked oranges." + taste_description = "sweet and citrusy" + reagent_state = LIQUID + color = "#ff992c" + adj_drowsy = -3 + adj_temp = -5 + + glass_name = "Orange Soda" + glass_desc = "A glass of refreshing Orange Soda. Delicious!" + glass_special = list(DRINK_FIZZ) + allergen_type = ALLERGEN_FRUIT + +/datum/reagent/drink/soda/grapesoda + name = "Grape Soda" + id = "grapesoda" + description = "Soda made of carbonated grapejuice." + taste_description = "tangy goodness" + reagent_state = LIQUID + color = "#9862d2" + adj_drowsy = -3 + adj_temp = -5 + + glass_name = "Grape Soda" + glass_desc = "A glass of refreshing Grape Soda. Tangy!" + glass_special = list(DRINK_FIZZ) + allergen_type = ALLERGEN_FRUIT + +/datum/reagent/drink/soda/sarsaparilla + name = "Sarsaparilla" + id = "sarsaparilla" + description = "Soda made from genetically modified Mexican sarsaparilla plants." + taste_description = "licorice and caramel" + reagent_state = LIQUID + color = "#e1bb59" + adj_drowsy = -3 + adj_temp = -5 + + glass_name = "Sarsaparilla" + glass_desc = "A glass of refreshing Sarsaparilla. Delicious!" + glass_special = list(DRINK_FIZZ) + +/datum/reagent/drink/soda/pork_soda + name = "Bacon Soda" + id = "porksoda" + description = "Soda made using pork like flavoring." + taste_description = "sugar coated bacon" + reagent_state = LIQUID + color = "ff8080" + adj_drowsy = -3 + adj_temp = -5 + + glass_name = "Bacon Soda" + glass_desc = "A glass of Bacon Soda, very odd..." + glass_special = list(DRINK_FIZZ) + /datum/reagent/drink/soda/spacemountainwind name = "Mountain Wind" id = "spacemountainwind" @@ -2559,19 +2676,71 @@ allergen_type = ALLERGEN_GRAINS //Whiskey is also made from grain. -/datum/reagent/ethanol/wine - name = "Wine" - id = "wine" +/datum/reagent/ethanol/redwine + name = "Red Wine" + id = "redwine" description = "An premium alchoholic beverage made from distilled grape juice." taste_description = "bitter sweetness" color = "#7E4043" // rgb: 126, 64, 67 strength = 15 - glass_name = "wine" + glass_name = "red wine" glass_desc = "A very classy looking drink." allergen_type = ALLERGEN_FRUIT //Wine is made from grapes (fruit) +/datum/reagent/ethanol/whitewine + name = "White Wine" + id = "whitewine" + description = "An premium alchoholic beverage made from fermenting of the non-coloured pulp of grapes." + taste_description = "light fruity flavor" + color = "#F4EFB0" // rgb: 244, 239, 176 + strength = 15 + + glass_name = "white wine" + glass_desc = "A very classy looking drink." + + allergen_type = ALLERGEN_FRUIT //Wine is made from grapes (fruit) + +/datum/reagent/ethanol/carnoth + name = "Carnoth" + id = "carnoth" + description = "An premium alchoholic beverage made with multiple hybridized species of grapes that give it a dark maroon coloration." + taste_description = "alcoholic sweet flavor" + color = "#5B0000" // rgb: 0, 100, 35 + strength = 20 + + glass_name = "carnoth" + glass_desc = "A very classy looking drink." + + allergen_type = ALLERGEN_FRUIT //Wine is made from grapes (fruit) + +/datum/reagent/ethanol/pwine + name = "Poison Wine" + id = "pwine" + description = "Is this even wine? Toxic! Hallucinogenic! Probably consumed in boatloads by your superiors!" + color = "#000000" + strength = 10 + druggy = 50 + halluci = 10 + + glass_name = "???" + glass_desc = "A black ichor with an oily purple sheer on top. Are you sure you should drink this?" + allergen_type = ALLERGEN_FRUIT //Made from berries which are fruit + +/datum/reagent/ethanol/pwine/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + ..() + if(dose > 30) + M.adjustToxLoss(2 * removed) + if(dose > 60 && ishuman(M) && prob(5)) + var/mob/living/carbon/human/H = M + var/obj/item/organ/internal/heart/L = H.internal_organs_by_name[O_HEART] + if (L && istype(L)) + if(dose < 120) + L.take_damage(10 * removed, 0) + else + L.take_damage(100, 0) + /datum/reagent/ethanol/wine/champagne name = "Champagne" id = "champagne" @@ -3195,32 +3364,6 @@ glass_name = "Patron" glass_desc = "Drinking patron in the bar, with all the subpar ladies." -/datum/reagent/ethanol/pwine - name = "Poison Wine" - id = "pwine" - description = "Is this even wine? Toxic! Hallucinogenic! Probably consumed in boatloads by your superiors!" - color = "#000000" - strength = 10 - druggy = 50 - halluci = 10 - - glass_name = "???" - glass_desc = "A black ichor with an oily purple sheer on top. Are you sure you should drink this?" - allergen_type = ALLERGEN_FRUIT //Made from berries which are fruit - -/datum/reagent/ethanol/pwine/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) - ..() - if(dose > 30) - M.adjustToxLoss(2 * removed) - if(dose > 60 && ishuman(M) && prob(5)) - var/mob/living/carbon/human/H = M - var/obj/item/organ/internal/heart/L = H.internal_organs_by_name[O_HEART] - if (L && istype(L)) - if(dose < 120) - L.take_damage(10 * removed, 0) - else - L.take_damage(100, 0) - /datum/reagent/ethanol/red_mead name = "Red Mead" id = "red_mead" diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 6a05cf1443c..24e8b94966f 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index 46212224b45..cfd31736e91 100755 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index 743296980d8..44ba3e7e5c6 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -13339,7 +13339,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 }, -/obj/machinery/vending/snack, +/obj/machinery/vending/snlvend, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/lowernorthhall) "awr" = ( @@ -13566,7 +13566,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 }, -/obj/machinery/vending/coffee, +/obj/machinery/vending/radren, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/lowernorthhall) "awG" = ( @@ -38609,7 +38609,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 }, -/obj/machinery/vending/coffee, +/obj/machinery/vending/radren, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/surface_one_hall) "yaU" = ( diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 16f043d99c9..c9d89ca3bb6 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -12285,13 +12285,15 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_two) "atI" = ( -/obj/machinery/smartfridge, /obj/effect/floor_decal/borderfloor{ dir = 6 }, /obj/effect/floor_decal/corner/lime/border{ dir = 6 }, +/obj/machinery/smartfridge{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_two) "atJ" = ( @@ -33296,6 +33298,16 @@ "jtj" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/readingrooms) +"jvy" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/atmos) "jxi" = ( /obj/structure/cable{ d1 = 1; @@ -33764,6 +33776,13 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) +"nhf" = ( +/obj/structure/railing, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/atmos) "nAh" = ( /obj/structure/table/standard, /obj/item/weapon/aiModule/asimov, @@ -45694,7 +45713,7 @@ aXB bbA bbJ aVP -bcr +nhf baW baW baW @@ -47114,8 +47133,8 @@ bbA bbJ bbJ aVP -baz -baz +jvy +aIh baz bdq aLX @@ -47255,10 +47274,10 @@ aXB bbB bbJ bbJ -aVP -adt -adt -aLY +bbI +baU +baW +baz bdr aLX aLY @@ -47398,9 +47417,9 @@ aVP aVP aVP aVP -adt -adt -aLY +baz +baz +baz bdr aLX aLY diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index cd72ec9a6fc..b5b680db24c 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -11092,7 +11092,7 @@ dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/machinery/vending/cola, +/obj/machinery/vending/radren, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/surface_three_hall) "arF" = ( @@ -12045,6 +12045,7 @@ dir = 1; pixel_y = -24 }, +/obj/item/weapon/reagent_containers/food/drinks/bottle/carnoth, /turf/simulated/floor/wood, /area/crew_quarters/captain) "atv" = ( diff --git a/vorestation.dme b/vorestation.dme index 0f6ca97ec51..b39492513d3 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -873,7 +873,6 @@ #include "code\game\machinery\teleporter.dm" #include "code\game\machinery\transportpod.dm" #include "code\game\machinery\turret_control.dm" -#include "code\game\machinery\vending_machines_vr.dm" #include "code\game\machinery\vitals_monitor.dm" #include "code\game\machinery\wall_frames.dm" #include "code\game\machinery\washing_machine.dm" @@ -2112,6 +2111,7 @@ #include "code\modules\economy\TradeDestinations.dm" #include "code\modules\economy\vending.dm" #include "code\modules\economy\vending_machines.dm" +#include "code\modules\economy\vending_machines_vr.dm" #include "code\modules\emotes\emote_define.dm" #include "code\modules\emotes\emote_mob.dm" #include "code\modules\emotes\definitions\_mob.dm" @@ -2231,7 +2231,6 @@ #include "code\modules\food\drinkingglass\shaker.dm" #include "code\modules\food\drinkingglass\shaker_vr.dm" #include "code\modules\food\food\cans.dm" -#include "code\modules\food\food\cans_vr.dm" #include "code\modules\food\food\condiment.dm" #include "code\modules\food\food\drinks.dm" #include "code\modules\food\food\drinks_vr.dm"