diff --git a/baystation12.dme b/baystation12.dme
index ae6e4f8cb2e..35e3228c020 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -1512,6 +1512,7 @@
 #include "code\modules\reagents\dispenser\cartridge.dm"
 #include "code\modules\reagents\dispenser\cartridge_presets.dm"
 #include "code\modules\reagents\dispenser\cartridge_spawn.dm"
+#include "code\modules\reagents\dispenser\coffeebeans.dm"
 #include "code\modules\reagents\dispenser\dispenser2.dm"
 #include "code\modules\reagents\dispenser\dispenser_presets.dm"
 #include "code\modules\reagents\dispenser\supply.dm"
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
index 76abf6c14ad..83a2384dbb5 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
@@ -1949,3 +1949,59 @@
 	glass_name = "glass of special blend whiskey"
 	glass_desc = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything."
 	glass_center_of_mass = list("x"=16, "y"=12)
+
+/////////////////////////////////////////////////////////////////Brightdawns super cool coffee area//////////////////////////////////////////////
+
+
+/datum/reagent/drink/black_coffee
+	name = "Black Coffee"
+	id = "black_coffee"
+	description = "A rich strong roast, you think it could be a lot better if someone added something extra."
+	color = "#482000"
+	adj_dizzy = -6
+	adj_drowsy = -4
+	adj_sleepy = -3
+	adj_temp = 30
+	overdose = 40
+
+	glass_icon_state = "blackcoffee"
+	glass_name = "A mug of rich Black Coffee"
+	glass_desc = "A mug of a rich strong roast, you think it could be a lot better if someone added something extra to it."
+
+/datum/reagent/drink/white_coffee
+	name = "Café Au Lait"
+	id = "white_coffee"
+	description = "A fancy name for something thats just coffee and milk."
+	color = "#482000"
+	adj_dizzy = -6
+	adj_drowsy = -4
+	adj_sleepy = -3
+	adj_temp = 30
+	overdose = 40
+
+	glass_icon_state = "whitecoffee"
+	glass_name = "A mug of Café Au Lait"
+	glass_desc = "A fancy name for something thats just coffee and milk."
+
+/datum/reagent/drink/white_coffee/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+	..()
+	M.heal_organ_damage(0.5 * removed, 0)
+
+/datum/reagent/drink/cafe_melange
+	name = "Café Mélange"
+	id = "cafe_melange"
+	description = "A delicious mug of creamy coffee."
+	color = "#482000"
+	adj_dizzy = -6
+	adj_drowsy = -4
+	adj_sleepy = -3
+	adj_temp = 30
+	overdose = 40
+
+	glass_icon_state = "whitecoffee"
+	glass_name = "A mug of Café Mélange"
+	glass_desc = "A delicious mug of creamy coffee, keeps you cool headed in the most heated of situations."
+
+/datum/reagent/drink/cafe_melange/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+	..()
+	M.reagents.add_reagent("kelotane", removed * 0.2)
\ No newline at end of file
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index c0f546a152d..62add52b3c2 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -1962,3 +1962,12 @@
 	result = "luminol"
 	required_reagents = list("hydrogen" = 2, "carbon" = 2, "ammonia" = 2)
 	result_amount = 6
+
+/////////////////////////////////////////Brightdawns super cool coffee drinks//////////////////////////////////////////////
+
+/datum/chemical_reaction/white_coffee
+	name = "Café Au Lait"
+	id = "white_coffee"
+	result = "white_coffee"
+	required_reagents = list("milk" = 1, "blackcoffee" = 2)
+	result_amount = 2
\ No newline at end of file
diff --git a/code/modules/reagents/dispenser/cartridge_presets.dm b/code/modules/reagents/dispenser/cartridge_presets.dm
index 007660c1e9a..bc75edd6ac7 100644
--- a/code/modules/reagents/dispenser/cartridge_presets.dm
+++ b/code/modules/reagents/dispenser/cartridge_presets.dm
@@ -61,6 +61,7 @@
 	orange		spawn_reagent = "orangejuice"
 	lime		spawn_reagent = "limejuice"
 	watermelon	spawn_reagent = "watermelonjuice"
+	coffee_beans  	spawn_reagent = "black_coffee"
 
 	// ERT
 	inaprov		spawn_reagent = "inaprovaline"
diff --git a/code/modules/reagents/dispenser/coffeebeans.dm b/code/modules/reagents/dispenser/coffeebeans.dm
new file mode 100644
index 00000000000..fff719ffbbe
--- /dev/null
+++ b/code/modules/reagents/dispenser/coffeebeans.dm
@@ -0,0 +1,15 @@
+/obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee_beans
+	name = "A jar of Coffee Beans "
+	desc = "This goes into a coffee maker!"
+	label = "Spesscafe Dark Blend"
+	icon_state = "coffeejar"
+
+	w_class = 3
+
+	volume = CARTRIDGE_VOLUME_SMALL
+	amount_per_transfer_from_this = 20
+	possible_transfer_amounts = list(20, 40)
+	unacidable = 1
+
+	spawn_reagent = "black_coffee"
+
diff --git a/code/modules/reagents/dispenser/dispenser_presets.dm b/code/modules/reagents/dispenser/dispenser_presets.dm
index 60d30506920..b41864791c9 100644
--- a/code/modules/reagents/dispenser/dispenser_presets.dm
+++ b/code/modules/reagents/dispenser/dispenser_presets.dm
@@ -113,3 +113,15 @@
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/ale,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/mead
 		)
+
+/obj/machinery/chemical_dispenser/coffee
+	name = "Coffee Machine"
+	desc = "The only thing that can get some workers though the day, the coffee maker is the stations most valuable resource."
+	icon_state = "coffee_machine"
+	ui_title = "Morning Glory Coffee Mate"
+	accept_drinking = 1
+
+/obj/machinery/chemical_dispenser/coffee/full
+	spawn_cartridges = list(
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee_beans
+		)
\ No newline at end of file
diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi
index 2b0f051bd20..1c13d05a774 100644
Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index 2db7f08f624..04e940f3384 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ