diff --git a/baystation12.dme b/baystation12.dme
index fc4a7f6554..02f52ee948 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -1139,6 +1139,7 @@
#include "code\modules\reagents\reagent_containers\robodropper.dm"
#include "code\modules\reagents\reagent_containers\spray.dm"
#include "code\modules\reagents\reagent_containers\syringes.dm"
+#include "code\modules\reagents\reagent_containers\food\cans.dm"
#include "code\modules\reagents\reagent_containers\food\condiment.dm"
#include "code\modules\reagents\reagent_containers\food\drinks.dm"
#include "code\modules\reagents\reagent_containers\food\snacks.dm"
diff --git a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm
index 43292f02f2..20009c0a64 100644
--- a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm
+++ b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm
@@ -204,7 +204,7 @@
var/obj/structure/closet/crate/freezer/C = new(src.loc)
var/num = rand(2,6)
var/new_type = pick(
- /obj/item/weapon/reagent_containers/food/drinks/beer, \
+ /obj/item/weapon/reagent_containers/food/drinks/cans/beer, \
/obj/item/weapon/reagent_containers/food/drinks/tea, \
/obj/item/weapon/reagent_containers/food/drinks/dry_ramen, \
/obj/item/weapon/reagent_containers/food/snacks/candiedapple, \
diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index 9b1ccf64b0..58388c26a0 100755
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -128,12 +128,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager,
/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,
/obj/item/weapon/lipstick/random,
- /obj/item/weapon/reagent_containers/food/drinks/ale,
- /obj/item/weapon/reagent_containers/food/drinks/ale,
- /obj/item/weapon/reagent_containers/food/drinks/beer,
- /obj/item/weapon/reagent_containers/food/drinks/beer,
- /obj/item/weapon/reagent_containers/food/drinks/beer,
- /obj/item/weapon/reagent_containers/food/drinks/beer)
+ /obj/item/weapon/reagent_containers/food/drinks/cans/ale,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/ale,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/beer,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/beer,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/beer,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/beer)
cost = 20
containertype = /obj/structure/closet/crate
containername = "Party equipment"
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 62e7376c4d..f09abfeefe 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -173,7 +173,7 @@
if(D)
var/transaction_amount = currently_vending.price
if(transaction_amount <= D.money)
-
+
//transfer the money
D.money -= transaction_amount
vendor_account.money += transaction_amount
@@ -611,11 +611,11 @@
/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/rum = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/wine = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac = 5,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua = 5,/obj/item/weapon/reagent_containers/food/drinks/beer = 6,
- /obj/item/weapon/reagent_containers/food/drinks/ale = 6,/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice = 4,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua = 5,/obj/item/weapon/reagent_containers/food/drinks/cans/beer = 6,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/ale = 6,/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice = 4,
/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice = 4,/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice = 4,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/cream = 4,/obj/item/weapon/reagent_containers/food/drinks/tonic = 8,
- /obj/item/weapon/reagent_containers/food/drinks/cola = 8, /obj/item/weapon/reagent_containers/food/drinks/sodawater = 15,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/cream = 4,/obj/item/weapon/reagent_containers/food/drinks/cans/tonic = 8,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/cola = 8, /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater = 15,
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 30,/obj/item/weapon/reagent_containers/food/drinks/ice = 9,
/obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor = 2,/obj/item/weapon/reagent_containers/food/drinks/bottle/bluecuracao = 2,
/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe = 2,/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine = 5)
@@ -667,15 +667,15 @@
icon_state = "Cola_Machine"
product_slogans = "Robust Softdrinks: More robust than a toolbox to the head!"
product_ads = "Refreshing!;Hope you're thirsty!;Over 1 million drinks sold!;Thirsty? Why not cola?;Please, have a drink!;Drink up!;The best drinks in space."
- products = list(/obj/item/weapon/reagent_containers/food/drinks/cola = 10,/obj/item/weapon/reagent_containers/food/drinks/space_mountain_wind = 10,
- /obj/item/weapon/reagent_containers/food/drinks/dr_gibb = 10,/obj/item/weapon/reagent_containers/food/drinks/starkist = 10,
- /obj/item/weapon/reagent_containers/food/drinks/waterbottle = 10,/obj/item/weapon/reagent_containers/food/drinks/space_up = 10,
- /obj/item/weapon/reagent_containers/food/drinks/iced_tea = 10, /obj/item/weapon/reagent_containers/food/drinks/grape_juice = 10)
- contraband = list(/obj/item/weapon/reagent_containers/food/drinks/thirteenloko = 5)
- prices = list(/obj/item/weapon/reagent_containers/food/drinks/cola = 1,/obj/item/weapon/reagent_containers/food/drinks/space_mountain_wind = 1,
- /obj/item/weapon/reagent_containers/food/drinks/dr_gibb = 1,/obj/item/weapon/reagent_containers/food/drinks/starkist = 1,
- /obj/item/weapon/reagent_containers/food/drinks/waterbottle = 2,/obj/item/weapon/reagent_containers/food/drinks/space_up = 1,
- /obj/item/weapon/reagent_containers/food/drinks/iced_tea = 1,/obj/item/weapon/reagent_containers/food/drinks/grape_juice = 1)
+ products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 10,/obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind = 10,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb = 10,/obj/item/weapon/reagent_containers/food/drinks/cans/starkist = 10,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 10,/obj/item/weapon/reagent_containers/food/drinks/cans/space_up = 10,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 10)
+ contraband = list(/obj/item/weapon/reagent_containers/food/drinks/cans/thirteenloko = 5)
+ prices = list(/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 1,/obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind = 1,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb = 1,/obj/item/weapon/reagent_containers/food/drinks/cans/starkist = 1,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 2,/obj/item/weapon/reagent_containers/food/drinks/cans/space_up = 1,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 1,/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 1)
//This one's from bay12
/obj/machinery/vending/cart
diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm
index e1ed768593..0e3642b4aa 100644
--- a/code/game/objects/items/weapons/storage/bible.dm
+++ b/code/game/objects/items/weapons/storage/bible.dm
@@ -16,8 +16,8 @@
/obj/item/weapon/storage/bible/booze/New()
..()
- new /obj/item/weapon/reagent_containers/food/drinks/beer(src)
- new /obj/item/weapon/reagent_containers/food/drinks/beer(src)
+ new /obj/item/weapon/reagent_containers/food/drinks/cans/beer(src)
+ new /obj/item/weapon/reagent_containers/food/drinks/cans/beer(src)
new /obj/item/weapon/spacecash(src)
new /obj/item/weapon/spacecash(src)
new /obj/item/weapon/spacecash(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
index b75222fcdc..95ac7f0c94 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
@@ -12,16 +12,16 @@
New()
..()
sleep(2)
- new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
- new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
- new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
- new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
- new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
- new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
- new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
- new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
- new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
- new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
+ new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+ new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+ new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+ new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+ new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+ new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+ new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+ new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+ new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+ new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
return
/obj/structure/closet/secure_closet/bar/update_icon()
diff --git a/code/modules/destilery/main.dm b/code/modules/destilery/main.dm
index 1ce22ef909..429a29afdf 100644
--- a/code/modules/destilery/main.dm
+++ b/code/modules/destilery/main.dm
@@ -118,7 +118,7 @@
switch(fermenting_item.type)
if(/obj/item/weapon/reagent_containers/food/drinks/flour) //Flour is still flour
- var/obj/item/weapon/reagent_containers/food/drinks/beer/B = new(src)
+ var/obj/item/weapon/reagent_containers/food/drinks/cans/beer/B = new(src)
output += B
else
error = 1
@@ -178,7 +178,7 @@
return //Not done yet.
switch(destilling_item.type)
- if(/obj/item/weapon/reagent_containers/food/drinks/beer) //Flour is still flour
+ if(/obj/item/weapon/reagent_containers/food/drinks/cans/beer) //Flour is still flour
var/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka/V = new(src)
output += V
else
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index ab4080ed50..df259c2197 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -169,7 +169,7 @@
New()
..()
- src.modules += new /obj/item/weapon/reagent_containers/food/drinks/beer(src)
+ src.modules += new /obj/item/weapon/reagent_containers/food/drinks/cans/beer(src)
src.modules += new /obj/item/weapon/reagent_containers/food/condiment/enzyme(src)
src.modules += new /obj/item/weapon/pen/robopen(src)
@@ -185,7 +185,7 @@
src.modules += new /obj/item/weapon/tray/robotray(src)
src.modules += new /obj/item/weapon/reagent_containers/food/drinks/shaker(src)
- src.emag = new /obj/item/weapon/reagent_containers/food/drinks/beer(src)
+ src.emag = new /obj/item/weapon/reagent_containers/food/drinks/cans/beer(src)
var/datum/reagents/R = new/datum/reagents(50)
src.emag.reagents = R
diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm
new file mode 100644
index 0000000000..2f997295b1
--- /dev/null
+++ b/code/modules/reagents/reagent_containers/food/cans.dm
@@ -0,0 +1,266 @@
+/obj/item/weapon/reagent_containers/food/drinks/cans
+ var canopened = 0
+
+ attack_self(mob/user as mob)
+ if (canopened == 0)
+ playsound(src.loc,'sound/effects/canopen.ogg', rand(10,50), 1)
+ user << "You open the drink with an audible pop!"
+ canopened = 1
+ else
+ return
+
+ attack(mob/M as mob, mob/user as mob, def_zone)
+ if (canopened == 0)
+ user << " You need to open the drink!"
+ return
+ var/datum/reagents/R = src.reagents
+ var/fillevel = gulp_size
+
+ if(!R.total_volume || !R)
+ user << "\red None of [src] left, oh no!"
+ return 0
+
+ if(M == user)
+ M << "\blue You swallow a gulp of [src]."
+ if(reagents.total_volume)
+ reagents.reaction(M, INGEST)
+ spawn(5)
+ reagents.trans_to(M, gulp_size)
+
+ playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
+ return 1
+ else if( istype(M, /mob/living/carbon/human) )
+
+ for(var/mob/O in viewers(world.view, user))
+ O.show_message("\red [user] attempts to feed [M] [src].", 1)
+ if(!do_mob(user, M)) return
+ for(var/mob/O in viewers(world.view, user))
+ O.show_message("\red [user] feeds [M] [src].", 1)
+
+ M.attack_log += text("\[[time_stamp()]\] Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: [reagentlist(src)]")
+ user.attack_log += text("\[[time_stamp()]\] Fed [M.name] by [M.name] ([M.ckey]) Reagents: [reagentlist(src)]")
+ log_attack("[user.name] ([user.ckey]) fed [M.name] ([M.ckey]) with [src.name] Reagents: [reagentlist(src)] (INTENT: [uppertext(user.a_intent)]) (JMP)")
+
+ if(reagents.total_volume)
+ reagents.reaction(M, INGEST)
+ spawn(5)
+ reagents.trans_to(M, gulp_size)
+
+ if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell
+ var/mob/living/silicon/robot/bro = user
+ bro.cell.use(30)
+ var/refill = R.get_master_reagent_id()
+ spawn(600)
+ R.add_reagent(refill, fillevel)
+
+ playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
+ return 1
+
+ return 0
+
+
+ afterattack(obj/target, mob/user, proximity)
+ if(!proximity) return
+
+ if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
+
+ if(!target.reagents.total_volume)
+ user << "\red [target] is empty."
+ return
+
+ if(reagents.total_volume >= reagents.maximum_volume)
+ user << "\red [src] is full."
+ return
+
+ var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this)
+ user << "\blue You fill [src] with [trans] units of the contents of [target]."
+
+ else if(target.is_open_container()) //Something like a glass. Player probably wants to transfer TO it.
+ if(!reagents.total_volume)
+ user << "\red [src] is empty."
+ return
+
+ if(target.reagents.total_volume >= target.reagents.maximum_volume)
+ user << "\red [target] is full."
+ return
+
+
+
+ var/datum/reagent/refill
+ var/datum/reagent/refillName
+ if(isrobot(user))
+ refill = reagents.get_master_reagent_id()
+ refillName = reagents.get_master_reagent_name()
+
+ var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
+ user << "\blue You transfer [trans] units of the solution to [target]."
+
+ if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell
+ var/mob/living/silicon/robot/bro = user
+ var/chargeAmount = max(30,4*trans)
+ bro.cell.use(chargeAmount)
+ user << "Now synthesizing [trans] units of [refillName]..."
+
+
+ spawn(300)
+ reagents.add_reagent(refill, trans)
+ user << "Cyborg [src] refilled."
+
+ return
+
+/* examine()
+ set src in view()
+ ..()
+ if (!(usr in range(0)) && usr!=src.loc) return
+ if(!reagents || reagents.total_volume==0)
+ usr << "\blue \The [src] is empty!"
+ else if (reagents.total_volume<=src.volume/4)
+ usr << "\blue \The [src] is almost empty!"
+ else if (reagents.total_volume<=src.volume*0.66)
+ usr << "\blue \The [src] is half full!"
+ else if (reagents.total_volume<=src.volume*0.90)
+ usr << "\blue \The [src] is almost full!"
+ else
+ usr << "\blue \The [src] is full!"*/
+
+
+//DRINKS
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/cola
+ name = "Space Cola"
+ desc = "Cola. in space."
+ icon_state = "cola"
+ New()
+ ..()
+ reagents.add_reagent("cola", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle
+ name = "Bottled Water"
+ desc = "Introduced to the vending machines on health nut protest, taste fresh, pure glacial* water! *Note: Might be tapwater."
+ icon_state = "waterbottle"
+ New()
+ ..()
+ reagents.add_reagent("water", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/beer
+ name = "Space Beer"
+ desc = "Beer. In space."
+ icon_state = "beer"
+ New()
+ ..()
+ reagents.add_reagent("beer", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/ale
+ name = "Magm-Ale"
+ desc = "A true dorf's drink of choice."
+ icon_state = "alebottle"
+ item_state = "beer"
+ New()
+ ..()
+ reagents.add_reagent("ale", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
+
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind
+ name = "Space Mountain Wind"
+ desc = "Blows right through you like a space wind."
+ icon_state = "space_mountain_wind"
+ New()
+ ..()
+ reagents.add_reagent("spacemountainwind", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/thirteenloko
+ name = "Thirteen Loko"
+ desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkeness, or even death. Please Drink Responsably."
+ icon_state = "thirteen_loko"
+ New()
+ ..()
+ reagents.add_reagent("thirteenloko", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb
+ name = "Dr. Gibb"
+ desc = "A delicious mixture of 42 different flavors."
+ icon_state = "dr_gibb"
+ New()
+ ..()
+ reagents.add_reagent("dr_gibb", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/starkist
+ name = "Star-kist"
+ desc = "The taste of a star in liquid form. And, a bit of tuna...?"
+ icon_state = "starkist"
+ New()
+ ..()
+ reagents.add_reagent("cola", 15)
+ reagents.add_reagent("orangejuice", 15)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/space_up
+ name = "Space-Up"
+ desc = "Tastes like a hull breach in your mouth."
+ icon_state = "space-up"
+ New()
+ ..()
+ reagents.add_reagent("space_up", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/lemon_lime
+ name = "Lemon-Lime"
+ desc = "You wanted ORANGE. It gave you Lemon Lime."
+ icon_state = "lemon-lime"
+ New()
+ ..()
+ reagents.add_reagent("lemon_lime", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea
+ name = "Vrisk Serket Iced Tea"
+ desc = "That sweet, refreshing southern earthy flavor. That's where it's from, right? South Earth? Whatever!!!!!!!!"
+ icon_state = "ice_tea_can"
+ New()
+ ..()
+ reagents.add_reagent("icetea", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice
+ name = "Grapel Juice"
+ desc = "500 pages of rules of how to appropriately enter into a combat with this juice!"
+ icon_state = "purple_can"
+ New()
+ ..()
+ reagents.add_reagent("grapejuice", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/tonic
+ name = "T-Borg's Tonic Water"
+ desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
+ icon_state = "tonic"
+ New()
+ ..()
+ reagents.add_reagent("tonic", 50)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/sodawater
+ name = "Soda Water"
+ desc = "A can of soda water. Why not make a scotch and soda?"
+ icon_state = "sodawater"
+ New()
+ ..()
+ reagents.add_reagent("sodawater", 50)
\ No newline at end of file
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index 86bd97d7ea..d6eb52bd04 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -242,128 +242,6 @@
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
-/obj/item/weapon/reagent_containers/food/drinks/cola
- name = "Space Cola"
- desc = "Cola. in space."
- icon_state = "cola"
- New()
- ..()
- reagents.add_reagent("cola", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
-
-/obj/item/weapon/reagent_containers/food/drinks/waterbottle
- name = "Bottled Water"
- desc = "Introduced to the vending machines on health nut protest, taste fresh, pure glacial* water! *Note: Might be tapwater."
- icon_state = "waterbottle"
- New()
- ..()
- reagents.add_reagent("water", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
-
-/obj/item/weapon/reagent_containers/food/drinks/beer
- name = "Space Beer"
- desc = "Beer. In space."
- icon_state = "beer"
- New()
- ..()
- reagents.add_reagent("beer", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
-
-/obj/item/weapon/reagent_containers/food/drinks/ale
- name = "Magm-Ale"
- desc = "A true dorf's drink of choice."
- icon_state = "alebottle"
- item_state = "beer"
- New()
- ..()
- reagents.add_reagent("ale", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
-
-
-/obj/item/weapon/reagent_containers/food/drinks/space_mountain_wind
- name = "Space Mountain Wind"
- desc = "Blows right through you like a space wind."
- icon_state = "space_mountain_wind"
- New()
- ..()
- reagents.add_reagent("spacemountainwind", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
-
-/obj/item/weapon/reagent_containers/food/drinks/thirteenloko
- name = "Thirteen Loko"
- desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkeness, or even death. Please Drink Responsably."
- icon_state = "thirteen_loko"
- New()
- ..()
- reagents.add_reagent("thirteenloko", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
-
-/obj/item/weapon/reagent_containers/food/drinks/dr_gibb
- name = "Dr. Gibb"
- desc = "A delicious mixture of 42 different flavors."
- icon_state = "dr_gibb"
- New()
- ..()
- reagents.add_reagent("dr_gibb", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
-
-/obj/item/weapon/reagent_containers/food/drinks/starkist
- name = "Star-kist"
- desc = "The taste of a star in liquid form. And, a bit of tuna...?"
- icon_state = "starkist"
- New()
- ..()
- reagents.add_reagent("cola", 15)
- reagents.add_reagent("orangejuice", 15)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
-
-/obj/item/weapon/reagent_containers/food/drinks/space_up
- name = "Space-Up"
- desc = "Tastes like a hull breach in your mouth."
- icon_state = "space-up"
- New()
- ..()
- reagents.add_reagent("space_up", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
-
-/obj/item/weapon/reagent_containers/food/drinks/lemon_lime
- name = "Lemon-Lime"
- desc = "You wanted ORANGE. It gave you Lemon Lime."
- icon_state = "lemon-lime"
- New()
- ..()
- reagents.add_reagent("lemon_lime", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
-
-/obj/item/weapon/reagent_containers/food/drinks/iced_tea
- name = "Vrisk Serket Iced Tea"
- desc = "That sweet, refreshing southern earthy flavor. That's where it's from, right? South Earth? Whatever!!!!!!!!"
- icon_state = "ice_tea_can"
- New()
- ..()
- reagents.add_reagent("icetea", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
-
-/obj/item/weapon/reagent_containers/food/drinks/grape_juice
- name = "Grapel Juice"
- desc = "500 pages of rules of how to appropriately enter into a combat with this juice!"
- icon_state = "purple_can"
- New()
- ..()
- reagents.add_reagent("grapejuice", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/sillycup
name = "Paper Cup"
@@ -381,21 +259,7 @@
else
icon_state = "water_cup_e"
-/obj/item/weapon/reagent_containers/food/drinks/tonic
- name = "T-Borg's Tonic Water"
- desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
- icon_state = "tonic"
- New()
- ..()
- reagents.add_reagent("tonic", 50)
-/obj/item/weapon/reagent_containers/food/drinks/sodawater
- name = "Soda Water"
- desc = "A can of soda water. Why not make a scotch and soda?"
- icon_state = "sodawater"
- New()
- ..()
- reagents.add_reagent("sodawater", 50)
//////////////////////////drinkingglass and shaker//
//Note by Darem: This code handles the mixing of drinks. New drinks go in three places: In Chemistry-Reagents.dm (for the drink
// itself), in Chemistry-Recipes.dm (for the reaction that changes the components into the drink), and here (for the drinking glass
diff --git a/sound/effects/canopen.ogg b/sound/effects/canopen.ogg
new file mode 100644
index 0000000000..8e266c30b4
Binary files /dev/null and b/sound/effects/canopen.ogg differ