Coffee Shop Revamp (#6559)

* Adds bagels and decaf coffee

* Remaps the coffee shop to be a bit more appealing to visit.

* Map merge fuckery.

* Map merge fuckery. also changelog.

* took out blank line just in case

* why did the dmi do that

* revert unintended revert

code/game/objects/items/weapons/storage/boxes.dm

@@ -325,6 +325,13 @@
 	icon_state = "donk_kit"
 	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket = 7)
 
+/obj/item/weapon/storage/box/buns
+	name = "box of bread buns"
+	desc = "Freshly baked at some point in the past few months."
+	icon_state = "bun_box"
+	max_storage_space = ITEMSIZE_COST_NORMAL * 5
+	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/bun = 12)
+
 /obj/item/weapon/storage/box/monkeycubes
 	name = "monkey cube box"
 	desc = "Drymate brand monkey cubes. Just add water!"
@@ -345,7 +352,7 @@
 
 /obj/item/weapon/storage/box/monkeycubes/neaeracubes
 	name = "neaera cube box"
-	desc = "Drymate brand neaera cubes, shipped from Jargon 4. Just add water!"
+	desc = "Drymate brand neaera cubes, shipped from Qerr'balak. Just add water!"
 	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube = 4)
 
 /obj/item/weapon/storage/box/ids
@@ -400,7 +407,7 @@
 		W.lit = 1
 		W.damtype = "burn"
 		W.icon_state = "match_lit"
-		START_PROCESSING(SSobj, W)
+		START_PROCESSING(SSobj, W)
 	W.update_icon()
 	return
 

code/game/objects/structures/crates_lockers/closets/secure/freezer.dm

@@ -14,7 +14,7 @@
 
 /obj/structure/closet/secure_closet/freezer/kitchen
 	name = "kitchen cabinet"
-	req_access = list(access_kitchen)
+	req_access = list()
 
 	starts_with = list(
 		/obj/item/weapon/reagent_containers/food/condiment/flour = 7,

code/modules/food/food/snacks.dm

@@ -4192,3 +4192,96 @@
 	reagents.trans_to(O, reagents.total_volume)
 	user.drop_from_inventory(src)
 	qdel(src)
+
+/obj/item/weapon/reagent_containers/food/snacks/bagelplain
+	name = "plain bagel"
+	desc = "This bread's got chutzpah!"
+	icon_state = "bagelplain"
+	nutriment_amt = 3
+	nutriment_desc = list("bread" = 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/bagelplain/Initialize()
+	. = ..()
+	reagents.add_reagent("nutriment", 3)
+	bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/bagelsunflower
+	name = "sunflower seed bagel"
+	desc = "This bread's got chutzpah - and sunflower seeds!"
+	icon_state = "bagelsunflower"
+	nutriment_amt = 4
+	nutriment_desc = list("bread" = 1, "sunflower seeds" = 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/bagelsunflower/Initialize()
+	. = ..()
+	reagents.add_reagent("nutriment", 3)
+	bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/bagelcheese
+	name = "cheese bagel"
+	desc = "This bread's got cheese n' chutzpah!"
+	icon_state = "bagelcheese"
+	nutriment_amt = 4
+	nutriment_desc = list("bread" = 1, "cheese" = 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/bagelcheese/Initialize()
+	. = ..()
+	reagents.add_reagent("protein", 4)
+	reagents.add_reagent("nutriment", 4)
+	bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/bagelraisin
+	name = "cinnamon raisin bagel"
+	desc = "This bread's got... Raisins!"
+	icon_state = "bagelraisin"
+	nutriment_amt = 5
+	nutriment_desc = list("bread" = 1, "sweetness" = 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/bagelraisin/Initialize()
+	. = ..()
+	reagents.add_reagent("nutriment", 3)
+	bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/bagelpoppy
+	name = "poppy seed bagel"
+	desc = "This bread's got Chutzpah, and poppy seeds!"
+	icon_state = "bagelpoppy"
+	nutriment_amt = 5
+	nutriment_desc = list("bread" = 1, "sweetness" = 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/bagelpoppy/Initialize()
+	. = ..()
+	reagents.add_reagent("nutriment", 3)
+	bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/bageleverything
+	name = "everything bagel"
+	desc = "Mmm... Immeasurably unfathomable!"
+	icon_state = "bageleverything"
+	nutriment_amt = 40
+	nutriment_desc = list("life" = 1, "death" = 1, "entropy" = 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/bageleverything/Initialize()
+	. = ..()
+	reagents.add_reagent("phoron", 5)
+	reagents.add_reagent("defective_nanites", 5)
+	bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/bageltwo
+	name = "two bagels"
+	desc = "Noo! ...Two bagels!"
+	icon_state = "bagelplain"
+
+/obj/item/weapon/reagent_containers/food/snacks/bageltwo/Initialize()
+	. = ..()
+	spawn_bagels()
+	spawn_bagels()
+	sleep(30)
+	qdel(src)
+
+/obj/item/weapon/reagent_containers/food/snacks/bageltwo/proc/spawn_bagels()
+	var/build_path = /obj/item/weapon/reagent_containers/food/snacks/bagelplain
+	var/atom/A = new build_path(get_turf(src))
+	if(pixel_x || pixel_y)
+		A.pixel_x = pixel_x
+		A.pixel_y = pixel_y

code/modules/food/kitchen/microwave.dm

@@ -52,6 +52,8 @@
 		// impure carbon. ~Z
 		acceptable_items |= /obj/item/weapon/holder
 		acceptable_items |= /obj/item/weapon/reagent_containers/food/snacks/grown
+		acceptable_items |= /obj/item/device/soulstone
+		acceptable_items |= /obj/item/weapon/fuel_assembly/supermatter
 
 	RefreshParts()
 	soundloop = new(list(src), FALSE)
@@ -393,4 +395,4 @@
 
 		if ("dispose")
 			dispose()
-	return
+	return

code/modules/food/recipes_microwave.dm

@@ -1263,3 +1263,58 @@ I said no!
 	reagents = list("milk" = 5, "flour" = 15, "sugar" = 15, "egg" = 9)
 	items = list(/obj/item/organ/internal/brain)
 	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake
+
+/datum/recipe/bagelplain
+	reagents = list("water" = 5)
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/bun
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/bagelplain
+
+/datum/recipe/bagelsunflower
+	reagents = list("water" = 5)
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/bun,
+		/obj/item/weapon/reagent_containers/food/snacks/rawsunflower
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/bagelsunflower
+
+/datum/recipe/bagelcheese
+	reagents = list("water" = 5)
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/bun,
+		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/bagelcheese
+
+/datum/recipe/bagelraisin
+	reagents = list("water" = 5)
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/bun,
+		/obj/item/weapon/reagent_containers/food/snacks/no_raisin
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/bagelraisin
+
+/datum/recipe/bagelpoppy
+	fruit = list("poppy" = 1)
+	reagents = list("water" = 5)
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/bun
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/bagelraisin
+
+/datum/recipe/bageleverything
+	reagents = list("water" = 5)
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/bun,
+		/obj/item/weapon/fuel_assembly/supermatter
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/bageleverything
+
+/datum/recipe/bageltwo
+	reagents = list("water" = 5)
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/bun,
+		/obj/item/device/soulstone
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/bageltwo

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

@@ -1142,6 +1142,22 @@
 	..()
 	M.heal_organ_damage(0.5 * removed, 0)
 
+/datum/reagent/drink/decaf
+	name = "Decaf Coffee"
+	id = "decaf"
+	description = "Coffee with all the wake-up sucked out."
+	taste_description = "bad coffee"
+	taste_mult = 1.3
+	color = "#482000"
+	adj_temp = 25
+
+	cup_icon_state = "cup_coffee"
+	cup_name = "cup of decaf"
+	cup_desc = "Basically just brown, bitter water."
+
+	glass_name = "decaf coffee"
+	glass_desc = "Basically just brown, bitter water."
+
 /datum/reagent/drink/hot_coco
 	name = "Hot Chocolate"
 	id = "hot_coco"

code/modules/reagents/dispenser/cartridge_presets.dm

@@ -73,6 +73,7 @@
 	cream		spawn_reagent = "cream"
 	mint		spawn_reagent = "mint"
 	berry		spawn_reagent = "berryjuice"
+	decaf		spawn_reagent = "decaf"
 
 	// ERT
 	inaprov		spawn_reagent = "inaprovaline"

code/modules/reagents/dispenser/dispenser2_energy.dm

@@ -58,5 +58,5 @@
 /obj/machinery/chemical_dispenser/bar_coffee
 	dispense_reagents = list(
 		"coffee", "cafe_latte", "soy_latte", "hot_coco", "milk", "cream", "tea", "ice",
-		"orangejuice", "lemonjuice", "limejuice", "berryjuice", "mint"
+		"orangejuice", "lemonjuice", "limejuice", "berryjuice", "mint", "decaf"
 		)

code/modules/reagents/dispenser/dispenser_presets.dm

@@ -139,6 +139,7 @@
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/lime,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/berry,
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/decaf
 
 
 		)