Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes the nonfunctioning coffee machines #3015

Merged
merged 7 commits into from
Jun 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions code/game/objects/items/circuitboards/machine_circuitboards.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1524,26 +1524,6 @@
/obj/item/stock_parts/manipulator = 2,
)

/obj/item/circuitboard/machine/coffeemaker
name = "Modello 3 Coffeemaker"
build_path = /obj/machinery/coffeemaker
req_components = list(
/obj/item/stack/sheet/glass = 1,
/obj/item/reagent_containers/glass/beaker = 2,
/obj/item/stock_parts/capacitor = 1,
/obj/item/stock_parts/micro_laser = 2,
)

/obj/item/circuitboard/machine/coffeemaker/impressa
name = "Impressa Coffeemaker"
build_path = /obj/machinery/coffeemaker/impressa
req_components = list(
/obj/item/stack/sheet/glass = 1,
/obj/item/reagent_containers/glass/beaker = 2,
/obj/item/stock_parts/capacitor = 1,
/obj/item/stock_parts/micro_laser = 2,
)

/obj/item/circuitboard/machine/suit_storage_unit
name = "Suit Storage Unit"
icon_state = "engineering"
Expand Down
50 changes: 0 additions & 50 deletions code/game/objects/items/storage/boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1520,53 +1520,3 @@
)
generate_items_inside(items_inside,src)

/obj/item/storage/box/coffeepack
icon_state = "arabica_beans"
name = "arabica beans"
desc = "A bag containing fresh, dry coffee arabica beans. Ethically sourced and packaged by Donk! Co."
illustration = null
icon = 'icons/obj/food/containers.dmi'
var/beantype = /obj/item/reagent_containers/food/snacks/grown/coffee

/obj/item/storage/box/cofeepack/Initialize(mapload)
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 5
STR.set_holdable(list(/obj/item/reagent_containers/food/snacks/grown/coffee))

/obj/item/storage/box/coffeepack/PopulateContents()
var/static/items_inside = list(
/obj/item/reagent_containers/food/snacks/grown/coffee = 5,
/obj/item/reagent_containers/food/snacks/grown/coffee/robusta = 5)
generate_items_inside(items_inside,src)

/obj/item/storage/box/coffeepack/robusta
icon_state = "robusta_beans"
name = "robusta beans"
desc = "A bag containing fresh, dry coffee robusta beans. Ethically sourced and packaged by Donk! Co."
beantype = /obj/item/reagent_containers/food/snacks/grown/coffee/robusta


/*
* Coffee condiments display -- someone can make this fancy eventually, i cant fucking figure it out for the life of me -- it exists in TG
*/

/obj/item/storage/box/coffee_condi_display
name = "coffee condiments display"
desc = "A neat small box, holding all your favorite coffee condiments."

/obj/item/storage/box/coffee_condi_display/Initialize(mapload)
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 14
STR.set_holdable(list(
/obj/item/reagent_containers/food/condiment/pack/sugar,
/obj/item/reagent_containers/food/condiment/pack/creamer,
/obj/item/reagent_containers/food/condiment/pack/astrotame,
))

/obj/item/storage/box/coffee_condi_display/PopulateContents()
for(var/i in 1 to 4)
new /obj/item/reagent_containers/food/condiment/pack/sugar(src)
new /obj/item/reagent_containers/food/condiment/pack/creamer(src)
new /obj/item/reagent_containers/food/condiment/pack/astrotame(src)
37 changes: 0 additions & 37 deletions code/modules/cargo/packs/food.dm
Original file line number Diff line number Diff line change
Expand Up @@ -317,40 +317,3 @@
crate_name = "ration crate"
crate_type = /obj/structure/closet/crate

/datum/supply_pack/food/syrup
name = "Coffee Syrups Box"
desc = "A packaged box of various syrups, perfect for making your delicious coffee even more diabetic."
cost = 200
contains = list(
/obj/item/reagent_containers/food/drinks/bottle/syrup_bottle/caramel,
/obj/item/reagent_containers/food/drinks/bottle/syrup_bottle/liqueur,
)
crate_name = "coffee syrups box"
crate_type = /obj/structure/closet/crate

/datum/supply_pack/food/coffeekit
name = "Coffee Equipment Crate"
desc = "A complete kit to setup your own cozy coffee shop, the coffeemaker is for some reason not included."
cost = 1000
contains = list(
/obj/item/storage/box/coffeepack/robusta,
/obj/item/storage/box/coffeepack,
/obj/item/reagent_containers/food/drinks/bottle/coffeepot,
/obj/item/storage/box/coffee_condi_display,
/obj/item/reagent_containers/food/condiment/milk,
/obj/item/reagent_containers/food/condiment/soymilk,
/obj/item/reagent_containers/food/condiment/sugar,
/obj/item/reagent_containers/food/drinks/bottle/syrup_bottle/caramel, //one extra syrup as a treat
)
crate_name = "coffee equipment crate"

/datum/supply_pack/food/coffeemaker
name = "Impressa Coffeemaker Crate"
desc = "An assembled Impressa model coffeemaker."
cost = 500
contains = list(
/obj/machinery/coffeemaker/impressa,
/obj/item/reagent_containers/food/drinks/bottle/coffeepot,
)
crate_name = "coffeemaker crate"
crate_type = /obj/structure/closet/crate
11 changes: 0 additions & 11 deletions code/modules/food_and_drinks/food/condiment.dm
Original file line number Diff line number Diff line change
Expand Up @@ -322,14 +322,3 @@
desc = "A delicious oil used in cooking"
icon_state = "oliveoil"
list_reagents = list(/datum/reagent/consumable/cornoil = 50)

/obj/item/reagent_containers/food/condiment/pack/sugar
name = "sugar pack"
originalname = "sugar"
list_reagents = list(/datum/reagent/consumable/sugar = 5)

/obj/item/reagent_containers/food/condiment/pack/creamer
name = "creamer" /// dont laugh you child
originalname = "cream"
list_reagents = list(/datum/reagent/consumable/cream = 5)

Loading
Loading