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.

Sign up for GitHub

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

Jump to bottom

Add command version of the coffee maker #14410

Merged
merged 9 commits into from
Jun 6, 2023
Merged

Add command version of the coffee maker #14410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e569a2a
Update master
Glamurio May 10, 2023
e6a2421
Merge branch 'master' of https://github.com/goonstation/goonstation
Glamurio May 10, 2023
96b2011
Merge branch 'master' of https://github.com/goonstation/goonstation
Glamurio May 20, 2023
04f1fa1
Merge branch 'master' of https://github.com/goonstation/goonstation
Glamurio May 21, 2023
4fd0295
Merge branch 'master' of https://github.com/goonstation/goonstation
Glamurio May 21, 2023
805cecc
Merge branch 'master' of https://github.com/goonstation/goonstation
Glamurio Jun 1, 2023
2647f69
Merge branch 'master' of https://github.com/goonstation/goonstation
Glamurio Jun 5, 2023
b085b6c
Merge branch 'master' of https://github.com/goonstation/goonstation
Glamurio Jun 5, 2023
b33f7a7
Add command coffeemaker
Glamurio Jun 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions code/modules/chemistry/tools/food_and_drink.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1900,6 +1900,10 @@ ADMIN_INTERACT_PROCS(/obj/item/reagent_containers/food/drinks/drinkingglass, pro
icon_state = "carafe-eng"
item_state = "carafe-eng"

/obj/item/reagent_containers/food/drinks/carafe/command
icon_state = "carafe-com"
item_state = "carafe-com"

/obj/item/reagent_containers/food/drinks/coconut
name = "Coconut"
desc = "Must be migrational."
Expand Down
4 changes: 4 additions & 0 deletions code/obj/machinery/espresso.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,10 @@ TYPEINFO(/obj/machinery/coffeemaker)
icon_state = "coffeemaker-eng"
default_carafe = /obj/item/reagent_containers/food/drinks/carafe/engineering

/obj/machinery/coffeemaker/command
icon_state = "coffeemaker-com"
default_carafe = /obj/item/reagent_containers/food/drinks/carafe/command

/* ===================================================== */
/* ---------------------- Racks --------------------- */
/* ===================================================== */
Expand Down
Binary file modified icons/mob/inhand/hand_food.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/foodNdrink/espresso.dmi
View file
Open in desktop
Binary file not shown.
17 changes: 14 additions & 3 deletions maps/clarion.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16277,8 +16277,12 @@
dir = 4;
icon_state = "pipe-c"
},
/obj/shrub{
dir = 1
/obj/table/reinforced/bar/auto{
name = "table"
},
/obj/machinery/coffeemaker/command,
/obj/drink_rack/mug{
pixel_y = -24
},
/turf/simulated/floor/black,
/area/station/bridge)
Expand Down Expand Up @@ -32351,7 +32355,13 @@
dir = 8;
icon_state = "pipe-c"
},
/obj/reagent_dispensers/watertank/fountain,
/obj/table/reinforced/bar/auto{
name = "table"
},
/obj/item/reagent_containers/food/drinks/creamer{
pixel_x = -8;
pixel_y = 12
},
/turf/simulated/floor/black,
/area/station/bridge)
"ktK" = (
Expand Down Expand Up @@ -36512,6 +36522,7 @@
dir = 4;
pixel_x = 10
},
/obj/reagent_dispensers/watertank/fountain,
/turf/simulated/floor/black,
/area/station/bridge)
"otP" = (
Expand Down
16 changes: 12 additions & 4 deletions maps/cogmap.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19327,9 +19327,8 @@
/turf/simulated/floor/plating,
/area/station/maintenance/east)
"baO" = (
/obj/shrub{
dir = 1
},
/obj/table/wood/round/auto,
/obj/machinery/coffeemaker/command,
/turf/simulated/floor/black,
/area/station/bridge)
"baP" = (
Expand All @@ -19340,13 +19339,22 @@
name = "autoname - SS13";
tag = ""
},
/obj/item/paper_bin,
/obj/drink_rack/mug{
pixel_y = -26
},
/obj/item/reagent_containers/food/drinks/creamer{
pixel_x = 3;
pixel_y = 11
},
/turf/simulated/floor/black,
/area/station/bridge)
"baQ" = (
/obj/machinery/power/data_terminal,
/obj/cable,
/obj/table/wood/round/auto,
/obj/item/paper_bin{
pixel_y = 6
},
/obj/machinery/networked/printer{
print_id = "Bridge"
},
Expand Down
25 changes: 20 additions & 5 deletions maps/cogmap2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39030,23 +39030,29 @@
},
/area/station/bridge)
"bOC" = (
/obj/machinery/status_display{
pixel_y = -30
/obj/table/reinforced/bar/auto,
/obj/drink_rack/mug{
pixel_y = -26
},
/obj/item/reagent_containers/food/drinks/creamer{
pixel_x = 8;
pixel_y = 12
},
/turf/simulated/floor/carpet{
dir = 6;
icon_state = "fblue6"
},
/area/station/bridge)
"bOD" = (
/obj/reagent_dispensers/watertank/fountain,
/obj/machinery/camera{
c_tag = "autotag";
dir = 10;
name = "autoname - SS13";
tag = ""
},
/obj/machinery/light/emergency,
/obj/table/reinforced/bar/auto,
/obj/machinery/coffeemaker/command,
/turf/simulated/floor/wood{
icon_state = "wooden"
},
Expand Down Expand Up @@ -39662,6 +39668,9 @@
"bPZ" = (
/obj/machinery/disposal/mail/autoname/bridge,
/obj/disposalpipe/trunk/mail/north,
/obj/machinery/status_display{
pixel_y = -30
},
/turf/simulated/floor/wood{
icon_state = "wooden"
},
Expand Down Expand Up @@ -72862,6 +72871,12 @@
},
/turf/simulated/floor,
/area/research_outpost/chamber)
"iSO" = (
/obj/cable{
icon_state = "0-4"
},
/turf/simulated/wall/auto/reinforced/supernorn,
/area/station/bridge)
"iYX" = (
/obj/cable{
icon_state = "1-2"
Expand Down Expand Up @@ -145409,7 +145424,7 @@ bLl
bMf
bOz
bPZ
bAc
iSO
aaa
bTg
bWt
Expand Down Expand Up @@ -145711,7 +145726,7 @@ bLm
bMX
bOA
bQa
bAf
cBj
aaa
bTg
bWu
Expand Down
14 changes: 13 additions & 1 deletion maps/donut2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15914,6 +15914,9 @@
/obj/machinery/camera{
dir = 8
},
/obj/item/reagent_containers/food/drinks/creamer{
pixel_x = 8
},
/turf/simulated/floor/black,
/area/station/bridge)
"bcE" = (
Expand Down Expand Up @@ -44005,6 +44008,15 @@
},
/turf/simulated/floor,
/area/station/science/testchamber)
"rTU" = (
/obj/machinery/light/incandescent,
/obj/table/auto,
/obj/drink_rack/mug{
pixel_y = -26
},
/obj/machinery/coffeemaker/command,
/turf/simulated/floor/black,
/area/station/bridge)
"rTZ" = (
/obj/disposalpipe/segment{
dir = 1;
Expand Down Expand Up @@ -96417,7 +96429,7 @@ aWK
aWI
bbd
aVb
aVN
rTU
bcW
beA
vef
Expand Down
9 changes: 8 additions & 1 deletion maps/donut3.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,8 @@
tag = ""
},
/obj/machinery/light/emergency,
/obj/table/auto,
/obj/item/reagent_containers/food/drinks/creamer,
/turf/simulated/floor/blueblack,
/area/station/bridge)
"abG" = (
Expand Down Expand Up @@ -29278,7 +29280,11 @@
},
/area/station/solar/east)
"iWe" = (
/obj/reagent_dispensers/watertank/fountain,
/obj/table/auto,
/obj/machinery/coffeemaker/command,
/obj/drink_rack/mug{
pixel_x = -26
},
/turf/simulated/floor/blueblack,
/area/station/bridge)
"iWm" = (
Expand Down Expand Up @@ -68528,6 +68534,7 @@
pixel_x = -1;
pixel_y = 26
},
/obj/reagent_dispensers/watertank/fountain,
/turf/simulated/floor/carpet{
dir = 9;
icon_state = "fblue6"
Expand Down
29 changes: 27 additions & 2 deletions maps/kondaru.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37359,6 +37359,11 @@
/obj/cable,
/turf/simulated/floor/plating,
/area/station/security/hos)
"era" = (
/obj/table/reinforced/bar/auto,
/obj/machinery/coffeemaker/command,
/turf/simulated/floor/grey,
/area/station/bridge)
"esb" = (
/obj/machinery/recharge_station,
/turf/simulated/floor/grime,
Expand Down Expand Up @@ -52496,6 +52501,26 @@
/obj/wingrille_spawn/auto/reinforced,
/turf/simulated/floor/plating,
/area/station/routing/depot)
"rIb" = (
/obj/table/reinforced/bar/auto,
/obj/item/reagent_containers/food/drinks/mug{
pixel_x = -8;
pixel_y = 10
},
/obj/item/reagent_containers/food/drinks/mug{
pixel_x = -7
},
/obj/item/reagent_containers/food/drinks/mug{
pixel_x = 4;
pixel_y = 10
},
/obj/item/reagent_containers/food/drinks/mug{
pixel_x = 7;
pixel_y = -1
},
/obj/item/reagent_containers/food/drinks/creamer,
/turf/simulated/floor/grey,
/area/station/bridge)
"rJA" = (
/obj/plasticflaps,
/obj/cable{
Expand Down Expand Up @@ -123602,8 +123627,8 @@ cZL
wDf
cNv
dfl
suM
suM
rIb
era
dfl
cGB
usi
Expand Down
4 changes: 1 addition & 3 deletions maps/nadir.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18044,12 +18044,10 @@
/obj/table/reinforced/bar/auto{
name = "wooden table"
},
/obj/machinery/coffeemaker{
pixel_y = 1
},
/obj/drink_rack/mug{
pixel_y = 32
},
/obj/machinery/coffeemaker/command,
/turf/simulated/floor/blueblack{
dir = 1
},
Expand Down
27 changes: 21 additions & 6 deletions maps/oshan.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25462,7 +25462,11 @@
dir = 9;
icon_state = "line1"
},
/obj/storage/crate/radio,
/obj/table/wood/round/auto,
/obj/item/reagent_containers/food/drinks/creamer{
pixel_x = 3;
pixel_y = 11
},
/turf/simulated/floor/carpet{
dir = 5;
icon_state = "blue2"
Expand Down Expand Up @@ -25704,14 +25708,16 @@
/area/station/bridge)
"bvK" = (
/obj/table/wood/round/auto,
/obj/item/clothing/gloves/yellow/unsulated,
/obj/item/clothing/gloves/yellow,
/obj/item/device/multitool,
/obj/machinery/light/incandescent/warm,
/obj/machinery/power/apc/autoname_north,
/obj/cable{
icon_state = "0-8"
},
/obj/machinery/coffeemaker/command,
/obj/drink_rack/mug{
pixel_x = 26;
pixel_y = 4
},
/turf/simulated/floor/carpet{
dir = 5;
icon_state = "blue2"
Expand Down Expand Up @@ -42025,10 +42031,13 @@
/area/station/science/lobby)
"gxB" = (
/obj/table/wood/round/auto,
/obj/item/disk/data/floppy/read_only/communications,
/obj/machinery/status_display{
pixel_x = 32
},
/obj/item/clothing/gloves/yellow,
/obj/item/device/multitool,
/obj/item/clothing/gloves/yellow/unsulated,
/obj/item/disk/data/floppy/read_only/communications,
/turf/simulated/floor/carpet{
dir = 6;
icon_state = "blue2"
Expand Down Expand Up @@ -42385,6 +42394,12 @@
},
/turf/simulated/floor/white,
/area/station/medical/medbay/cloner)
"hVo" = (
/obj/storage/crate/radio,
/turf/simulated/floor/carpet{
icon_state = "blue2"
},
/area/station/bridge)
"hXh" = (
/obj/machinery/door/airlock/pyro/maintenance/alt,
/obj/cable{
Expand Down Expand Up @@ -94678,7 +94693,7 @@ bvE
bvI
bvI
bvI
bzE
hVo
btK
bCr
bDG
Expand Down