Merge pull request #302 from MissBrightdawn/development

Coffee Machine: Update 1

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"

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)

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

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"

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"
+

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
+		)

html/changelogs/Brightdawn-Coffee_Machine.yml

@@ -0,0 +1,39 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Brightdawn
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "Added a Coffee Machine."
+  - rscadd: "Added Black Coffee"
+  - rscadd: "Added Cafe Au Lait (Black Coffee and Milk)"
+  - rscadd: "Added Cafe Melange (Black Coffee and Cream)"