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: Nanotrasen Food vendor & Refactor fancy food #1539

Merged
merged 8 commits into from
Sep 23, 2024
Merged

Add: Nanotrasen Food vendor & Refactor fancy food #1539

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
596aa88
Add: Nanotrasen Food vendor
dj-34 Sep 20, 2024
2d138fa
Add vendor on maps
dj-34 Sep 22, 2024
4d2a27c
More sprites for vendor
dj-34 Sep 22, 2024
8795ee8
Inhand drinks
dj-34 Sep 22, 2024
5705fd3
Refactor & Update by review
dj-34 Sep 22, 2024
64c147f
Update by reviews
dj-34 Sep 23, 2024
a388bd0
Update modular_ss220/food_and_drinks/code/food/fancy_food.dm
AyIong Sep 23, 2024
802b54f
Update fancy_food.dm
dj-34 Sep 23, 2024
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
59 changes: 35 additions & 24 deletions _maps/map_files220/generic/centcomm.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,7 @@
/turf/simulated/floor/wood/oak,
/area/syndicate_mothership/infteam)
"aAE" = (
/obj/machinery/economy/vending/chinese,
/obj/machinery/economy/vending/nt_food/free,
/turf/simulated/floor/mineral/plastitanium,
/area/centcom/ss220/general)
"aBb" = (
Expand Down Expand Up @@ -1741,9 +1741,7 @@
/turf/simulated/floor/indestructible/transparent_floor,
/area/shuttle/syndicate)
"bgR" = (
/obj/structure/closet/crate/secure/bin{
color = "36373a"
},
/obj/structure/closet/crate/secure/bin,
/turf/simulated/floor/plasteel/dark{
icon_state = "darkyellowalt"
},
Expand Down Expand Up @@ -2109,7 +2107,7 @@
/obj/effect/turf_decal/tile/neutral/full{
color = "#000000"
},
/turf/simulated/floor/wood/fancy/cherry,
/turf/simulated/floor/wood/parquet,
/area/centcom/ss220/admin2)
"bpw" = (
/obj/machinery/computer/shuttle/syndicate{
Expand Down Expand Up @@ -4716,7 +4714,7 @@
"cXK" = (
/obj/structure/lattice,
/obj/effect/light_emitter/colored{
light_color = "#FFFFF";
light_color = "#FFFFFF";
light_power = 10;
light_range = 5
},
Expand Down Expand Up @@ -4779,7 +4777,7 @@
"cYX" = (
/obj/structure/marker_beacon/spotlight/jade,
/obj/effect/light_emitter/colored{
light_color = "#FFFFF";
light_color = "#FFFFFF";
light_power = 10;
light_range = 5
},
Expand Down Expand Up @@ -5799,7 +5797,7 @@
/turf/simulated/floor/wood/parquet/tile,
/area/centcom/ss220/bar)
"dBb" = (
/obj/machinery/economy/vending/cigarette/free,
/obj/machinery/economy/vending/nt_food/free,
/turf/simulated/floor/plasteel/dark{
icon_state = "darkbluealt"
},
Expand Down Expand Up @@ -6282,6 +6280,7 @@
/area/shuttle/administration)
"dOx" = (
/obj/structure/marker_beacon/spotlight/jade,
/obj/structure/light_fake/spot,
/turf/simulated/floor/plasteel/dark,
/area/centcom/ss220/command)
"dON" = (
Expand Down Expand Up @@ -10168,7 +10167,7 @@
/area/centcom/ss220/admin2)
"gcj" = (
/obj/effect/light_emitter/colored{
light_color = "#FFFFF";
light_color = "#FFFFFF";
light_power = 10;
light_range = 5
},
Expand Down Expand Up @@ -12663,9 +12662,7 @@
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"hFD" = (
/obj/structure/closet/crate/secure/bin{
color = "36373a"
},
/obj/structure/closet/crate/secure/bin,
/turf/simulated/floor/plasteel/dark,
/area/centcom/ss220/admin3)
"hFE" = (
Expand Down Expand Up @@ -14947,7 +14944,7 @@
/turf/simulated/floor/mineral/titanium,
/area/shuttle/syndicate)
"iRb" = (
/obj/machinery/economy/vending/chinese/free,
/obj/machinery/economy/vending/nt_food/free,
/obj/structure/sign/poster/official/high_class_martini{
pixel_y = 32
},
Expand Down Expand Up @@ -16613,8 +16610,8 @@
"jXb" = (
/obj/structure/light_fake/spot,
/obj/structure/closet/crate/secure/bin{
anchored = 1;
color = "#996633"
color = "#36373a";
anchored = 1
},
/turf/simulated/floor/plasteel/dark{
dir = 6;
Expand Down Expand Up @@ -17357,7 +17354,7 @@
/turf/simulated/floor/wood/fancy/cherry,
/area/centcom/ss220/admin2)
"kwP" = (
/obj/machinery/economy/vending/chinese/free,
/obj/machinery/economy/vending/cigarette/free,
/turf/simulated/floor/plasteel/dark{
dir = 6;
icon_state = "darkbluealt"
Expand Down Expand Up @@ -18161,7 +18158,7 @@
"kQG" = (
/obj/structure/marker_beacon/spotlight/jade,
/obj/effect/light_emitter/colored{
light_color = "#FFFFF";
light_color = "#FFFFFF";
light_power = 10;
light_range = 5
},
Expand Down Expand Up @@ -22727,6 +22724,16 @@
icon_state = "darkredalt"
},
/area/centcom/ss220/jail)
"nEQ" = (
/obj/effect/light_emitter/colored{
light_color = "#FFFFFF";
light_power = 10;
light_range = 5
},
/turf/simulated/floor/plasteel/dark{
icon_state = "dark_large"
},
/area/centcom/ss220/command)
"nEU" = (
/obj/structure/sink/directional/west,
/turf/simulated/floor/carpet/black,
Expand Down Expand Up @@ -23305,7 +23312,7 @@
/turf/simulated/floor/carpet/black,
/area/syndicate_mothership/jail)
"nVy" = (
/obj/machinery/economy/vending/snack/free,
/obj/machinery/economy/vending/nt_food/free,
/obj/structure/light_fake/spot{
dir = 8
},
Expand All @@ -23329,7 +23336,7 @@
"nWa" = (
/obj/structure/marker_beacon/spotlight/jade,
/obj/effect/light_emitter/colored{
light_color = "#FFFFF";
light_color = "#FFFFFF";
light_power = 10;
light_range = 5
},
Expand Down Expand Up @@ -23714,7 +23721,9 @@
},
/obj/effect/turf_decal/stripes/red/box,
/obj/effect/light_emitter/colored{
light_color = "white"
light_color = "#FFFFFF";
light_power = 10;
light_range = 5
},
/turf/simulated/floor/plasteel/dark{
dir = 8;
Expand Down Expand Up @@ -25179,7 +25188,7 @@
/obj/effect/turf_decal/tile/neutral/full{
color = "#000000"
},
/turf/simulated/floor/wood/fancy/cherry,
/turf/simulated/floor/wood/parquet,
/area/centcom/ss220/admin2)
"pcg" = (
/obj/structure/chair/sofa,
Expand Down Expand Up @@ -32138,7 +32147,7 @@
},
/area/syndicate_mothership/elite_squad)
"tiF" = (
/obj/machinery/economy/vending/snack/free,
/obj/machinery/economy/vending/nt_food/free,
/turf/simulated/floor/plasteel/dark,
/area/centcom/ss220/admin3)
"tjz" = (
Expand Down Expand Up @@ -36378,7 +36387,9 @@
},
/obj/effect/turf_decal/stripes/red/box,
/obj/effect/light_emitter/colored{
light_color = "white"
light_color = "#FFFFFF";
light_power = 10;
light_range = 5
},
/turf/simulated/floor/plasteel/dark{
dir = 8;
Expand Down Expand Up @@ -58955,7 +58966,7 @@ siO
xwO
shq
rmd
shq
nEQ
shq
shq
shq
Expand Down
33 changes: 33 additions & 0 deletions modular_ss220/food_and_drinks/code/drinks.dm
View file
Open in desktop
m-dzianishchyts marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -792,3 +792,36 @@
drink_name = "Citrus Beer"
drink_desc = "Обычное пиво оранжевого оттенка, пахнет апельсинами."
taste_description = "кисленькое пиво"

// MARK: NT Food Drinks
/obj/item/reagent_containers/drinks/cans/nt_iced_black_tea
name = "iced black tea"
desc = "Холодный чёрный чай, натуральный и полезный."
icon = 'modular_ss220/food_and_drinks/icons/drinks.dmi'
icon_state = "tea_bottle_grey"
item_state = "beer"
list_reagents = list("icetea" = 30)

/obj/item/reagent_containers/drinks/cans/nt_iced_green_tea
name = "iced green tea"
desc = "Холодный зелёный чай, натуральный и полезный."
icon = 'modular_ss220/food_and_drinks/icons/drinks.dmi'
icon_state = "tea_bottle"
item_state = "beer"
list_reagents = list("icetea" = 30)

/obj/item/reagent_containers/drinks/cans/nt_iced_mint_tea
name = "iced mint tea"
desc = "Освежающий холодный чай с листьями мяты."
icon = 'modular_ss220/food_and_drinks/icons/drinks.dmi'
icon_state = "tea_bottle_blue"
item_state = "beer"
list_reagents = list("icetea" = 30)

/obj/item/reagent_containers/drinks/cans/nt_iced_berry_tea
name = "iced berry tea"
desc = "Холодный чай с натуральными ягодами без сахара."
icon = 'modular_ss220/food_and_drinks/icons/drinks.dmi'
icon_state = "tea_bottle_pink"
item_state = "beer"
list_reagents = list("icetea" = 30)
Loading
Loading