Skip to content

Commit

Permalink
Coffeemaker Fixes (tgstation#69347)
Browse files Browse the repository at this point in the history
Fixes issues with coffeemakers, as detailed in tgstation#69344:

    Adds coffeemaker boards to the techweb.
    Readds sprites for coffee cartridges, which were lost due to merge skew with 

    Adding tempeh (tem · pay) tgstation#68359.
    Fixes the in-map-editor sprite, which was set to an invalid value.

The others were either unreproducible (I attempted on live, and could not find an issue that lead the coffeemakers to not work) or are simply not something promised in the original PR (they were deliberately not added to maps to avoid the otherwise inevitable map merge conflicts that would arise, and the sprites are the best I can personally muster).
  • Loading branch information
EOBGames authored Aug 22, 2022
1 parent e15e376 commit 540afdc
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion code/modules/reagents/chemistry/machinery/coffeemaker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "coffeemaker"
desc = "A Modello 3 Coffeemaker that brews coffee and holds it at the perfect temperature of 176 fahrenheit. Made by Piccionaia Home Appliances."
icon = 'icons/obj/chemical.dmi'
icon_state = "coffeemaker"
icon_state = "coffeemaker11"
base_icon_state = "coffeemaker"
resistance_flags = FIRE_PROOF | ACID_PROOF
circuit = /obj/item/circuitboard/machine/coffeemaker
Expand Down
8 changes: 8 additions & 0 deletions code/modules/research/designs/machine_designs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -780,3 +780,11 @@
build_path = /obj/item/circuitboard/machine/module_duplicator
category = list(RND_CATEGORY_MISC_MACHINERY)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE

/datum/design/board/coffeemaker
name = "Machine Design (Coffeemaker)"
desc = "The circuit board for a coffeemaker."
id = "coffeemaker"
build_path = /obj/item/circuitboard/machine/coffeemaker
category = list(RND_CATEGORY_MISC_MACHINERY)
departmental_flags = DEPARTMENT_BITFLAG_SERVICE | DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE
1 change: 1 addition & 0 deletions code/modules/research/techweb/all_nodes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"c-reader",
"circuit_imprinter",
"circuit_imprinter_offstation",
"coffeemaker",
"coffeepot",
"coffee_cartridge",
"conveyor_belt",
Expand Down
Binary file modified icons/obj/food/food.dmi
Binary file not shown.

0 comments on commit 540afdc

Please sign in to comment.