Skip to content

Commit

Permalink
[PORT] - Adds Coffee Machines from TG (#2584)
Browse files Browse the repository at this point in the history
Full credit for sprites and original code go to:
tgstation/tgstation#70991 and
tgstation/tgstation#68178

## About The Pull Request

Ports over the base coffee machine & the bean version from TG along with
several coffee making accessories

The Impress coffee machine: a bean based coffee maker, similar to the
original except you must procure coffee beans and dry them to be able to
make your coffee, currently comes in two flavours: classic and robusta!

The coffee machine: a cartridge based coffee making machine, you pop in
your desired cartridge flavour (there's 4 of them) and your pot and cook
it then pour, no hassle needed. This sprite has soul.

New sprites for the coffee cups, for all you posh people out there,
along with coffee pots to drink directly out of, you psychopaths.

Syrup bottles to add that special splash of, uh, specialness to your
coffee? And creamer.

Additionally adds boxes of these that you can buy at whatever you guys
call "cargo" so that you can just buy a whole lot of them

## Why It's Good For The Game


![image](https://github.com/shiptest-ss13/Shiptest/assets/75333826/46ff3fa5-4a9b-469d-a38e-27a5fa8f27e7)


Coffee making adds a bit of flavour to life, and there's always a good
conversation to be had about who drank directly from the coffee pot.

## Changelog

:cl:
add: Ports TG's Coffee Makers
soundadd: Adds coffee making sound
imageadd: Adds a new type of coffee cup and pot
code: this changes code yes
/:cl:

---------

Signed-off-by: cowbot92 <[email protected]>
Co-authored-by: Mark Suckerberg <[email protected]>
  • Loading branch information
cowbot92 and MarkSuckerberg authored Jan 5, 2024
1 parent 7483d31 commit b6879de
Show file tree
Hide file tree
Showing 12 changed files with 851 additions and 0 deletions.
5 changes: 5 additions & 0 deletions code/__DEFINES/tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,8 @@
// If delay between the start and the end of tool operation is less than MIN_TOOL_SOUND_DELAY,
// tool sound is only played when op is started. If not, it's played twice.
#define MIN_TOOL_SOUND_DELAY 20

/// When a tooltype_act proc is successful
#define TOOL_ACT_TOOLTYPE_SUCCESS (1<<0)
/// When [COMSIG_ATOM_TOOL_ACT] blocks the act
#define TOOL_ACT_SIGNAL_BLOCKING (1<<1)
20 changes: 20 additions & 0 deletions code/game/objects/items/circuitboards/machine_circuitboards.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1495,3 +1495,23 @@
/obj/item/stock_parts/cell = 3,
/obj/item/stock_parts/capacitor = 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,
)
51 changes: 51 additions & 0 deletions code/game/objects/items/storage/boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1542,3 +1542,54 @@
/obj/item/stack/wrapping_paper/small=1
)
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)
38 changes: 38 additions & 0 deletions code/modules/cargo/packs/food.dm
Original file line number Diff line number Diff line change
Expand Up @@ -258,3 +258,41 @@
/obj/effect/spawner/lootdrop/ration)
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
1 change: 1 addition & 0 deletions code/modules/cargo/packs/machinery.dm
Original file line number Diff line number Diff line change
Expand Up @@ -326,3 +326,4 @@
contains = list(/obj/machinery/the_singularitygen/tesla)
crate_name = "tesla generator crate"
crate_type = /obj/structure/closet/crate/secure/engineering

10 changes: 10 additions & 0 deletions code/modules/food_and_drinks/food/condiment.dm
Original file line number Diff line number Diff line change
Expand Up @@ -323,3 +323,13 @@
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

0 comments on commit b6879de

Please sign in to comment.