Skip to content

Commit

Permalink
Removes the nonfunctioning coffee machines (#3015)
Browse files Browse the repository at this point in the history 
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Undoes most of the changes from #2584 pertaining to coffee machines. The
coffee machines didn't work, the coffee pot had missing sprites, and
every sprite was shoved into the same dmi instead of being put into the
proper files.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Bad untested PR's go to Weewish.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
del: Removed nonfunctioning coffee machines and their cargo packs
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: Sun-Soaked <[email protected]>
Co-authored-by: Sun-Soaked <[email protected]>
  • Loading branch information
@Zevotech @Sun-Soaked
Zevotech and Sun-Soaked authored Jun 2, 2024
1 parent 74238eb commit 2d13809
Show file tree
Hide file tree
Showing 9 changed files with 0 additions and 847 deletions.
20 changes: 0 additions & 20 deletions code/game/objects/items/circuitboards/machine_circuitboards.dm
View file
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
View file
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
View file
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
View file
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

0 comments on commit 2d13809

Please sign in to comment.