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
This commit is contained in:
Cerebulon
2019-12-23 03:53:11 +00:00
committed by Atermonera
parent 7385e03028
commit f3e3703aae
13 changed files with 255 additions and 37 deletions
@@ -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,