Skip to content

Commit

Permalink
Rebrending vending (#1172)
Browse files Browse the repository at this point in the history
Пересмотрены цены, пофикшены небольшие баги карт
  • Loading branch information
MrCat15352 authored Nov 12, 2024
1 parent a18ae7f commit 55f82cd
Show file tree
Hide file tree
Showing 39 changed files with 269 additions and 104 deletions.
8 changes: 6 additions & 2 deletions _maps/_mod_celadon/shuttles/elysium/elysium_aldaama.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,9 @@
/area/ship/engineering/electrical)
"hW" = (
/obj/machinery/light/small/directional/south,
/obj/machinery/vending/engivend,
/obj/machinery/vending/engivend{
all_items_free = 1
},
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
"hY" = (
Expand Down Expand Up @@ -2961,7 +2963,9 @@
/area/ship/engineering/electrical)
"Df" = (
/obj/machinery/light/small/directional/south,
/obj/machinery/vending/tool,
/obj/machinery/vending/tool{
all_items_free = 1
},
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
"Dn" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1087,7 +1087,8 @@
"kD" = (
/obj/structure/table,
/obj/machinery/vending/boozeomat/all_access{
pixel_y = -32
pixel_y = -32;
all_items_free = 1
},
/obj/item/storage/bag/tray,
/obj/effect/spawner/lootdrop/ration{
Expand Down
4 changes: 3 additions & 1 deletion _maps/_mod_celadon/shuttles/independent/independent_box.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1598,7 +1598,9 @@
/turf/open/floor/wood,
/area/ship/crew)
"tn" = (
/obj/machinery/vending/wardrobe/medi_wardrobe,
/obj/machinery/vending/wardrobe/medi_wardrobe{
all_items_free = 1
},
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
},
Expand Down
19 changes: 14 additions & 5 deletions _maps/_mod_celadon/shuttles/independent/independent_boyardee.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,9 @@
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
"gV" = (
/obj/machinery/vending/dinnerware,
/obj/machinery/vending/dinnerware{
all_items_free = 1
},
/obj/effect/turf_decal/corner/opaque/white/half{
dir = 1
},
Expand Down Expand Up @@ -1521,7 +1523,8 @@
/obj/structure/table/reinforced,
/obj/machinery/vending/boozeomat/all_access{
density = 0;
pixel_x = 32
pixel_x = 32;
all_items_free = 1
},
/obj/item/reagent_containers/food/drinks/shaker,
/obj/machinery/reagentgrinder{
Expand Down Expand Up @@ -1646,7 +1649,9 @@
/turf/open/floor/plasteel/mono/dark,
/area/ship/crew/canteen/kitchen)
"DA" = (
/obj/machinery/vending/wardrobe/chef_wardrobe,
/obj/machinery/vending/wardrobe/chef_wardrobe{
all_items_free = 1
},
/obj/machinery/light/directional/south,
/obj/effect/turf_decal/corner/opaque/white/half{
dir = 1
Expand Down Expand Up @@ -2014,7 +2019,9 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/vending/clothing,
/obj/machinery/vending/clothing{
all_items_free = 1
},
/obj/machinery/light/directional/east,
/obj/effect/turf_decal/siding/wood{
dir = 8;
Expand Down Expand Up @@ -2105,7 +2112,9 @@
/area/ship/crew/canteen/kitchen)
"Kl" = (
/obj/effect/turf_decal/box,
/obj/machinery/vending/hydronutrients,
/obj/machinery/vending/hydronutrients{
all_items_free = 1
},
/obj/structure/cable{
icon_state = "0-8"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2623,10 +2623,6 @@
/obj/effect/turf_decal/corner/transparent/neutral/border{
dir = 4
},
/obj/machinery/light_switch{
pixel_x = 25;
pixel_y = 25
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 1
Expand Down
4 changes: 3 additions & 1 deletion _maps/_mod_celadon/shuttles/independent/independent_kilo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,9 @@
/turf/open/floor/mineral/plastitanium,
/area/ship/cargo)
"dt" = (
/obj/machinery/vending/boozeomat/all_access,
/obj/machinery/vending/boozeomat/all_access{
all_items_free = 1
},
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/crew/canteen/kitchen)
"dF" = (
Expand Down
26 changes: 19 additions & 7 deletions _maps/_mod_celadon/shuttles/independent/independent_lagoon.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,9 @@
/turf/open/floor/carpet/black,
/area/ship/crew/office)
"eF" = (
/obj/machinery/vending/autodrobe,
/obj/machinery/vending/autodrobe{
all_items_free = 1
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 4
},
Expand Down Expand Up @@ -1450,7 +1452,8 @@
/obj/item/reagent_containers/glass/rag,
/obj/item/reagent_containers/food/drinks/shaker,
/obj/machinery/vending/boozeomat{
pixel_x = 32
pixel_x = 32;
all_items_free = 1
},
/turf/open/floor/carpet/black,
/area/ship/crew/canteen/kitchen)
Expand Down Expand Up @@ -1619,7 +1622,9 @@
/turf/open/floor/plasteel,
/area/ship/crew/canteen/kitchen)
"kq" = (
/obj/machinery/vending/hydronutrients,
/obj/machinery/vending/hydronutrients{
all_items_free = 1
},
/obj/effect/turf_decal/siding/wood{
dir = 9
},
Expand Down Expand Up @@ -3620,7 +3625,9 @@
/turf/open/floor/carpet,
/area/ship/crew/chapel)
"yj" = (
/obj/machinery/vending/dinnerware,
/obj/machinery/vending/dinnerware{
all_items_free = 1
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/item/radio/intercom/directional/north,
/turf/open/floor/plasteel,
Expand Down Expand Up @@ -4682,7 +4689,9 @@
/turf/open/floor/plating,
/area/ship/engineering)
"Fl" = (
/obj/machinery/vending/classicbeats,
/obj/machinery/vending/classicbeats{
all_items_free = 1
},
/obj/machinery/light/directional/north,
/turf/open/floor/carpet/nanoweave/purple,
/area/ship/crew/canteen)
Expand Down Expand Up @@ -4802,7 +4811,8 @@
/area/ship/hallway/aft)
"Gb" = (
/obj/machinery/vending/security/wall{
pixel_x = -28
pixel_x = -28;
all_items_free = 1
},
/obj/structure/cable{
icon_state = "1-2"
Expand Down Expand Up @@ -6092,7 +6102,9 @@
/turf/open/floor/wood,
/area/ship/crew)
"PX" = (
/obj/machinery/vending/wardrobe/sec_wardrobe,
/obj/machinery/vending/wardrobe/sec_wardrobe{
all_items_free = 1
},
/obj/structure/cable{
icon_state = "1-4"
},
Expand Down
20 changes: 15 additions & 5 deletions _maps/_mod_celadon/shuttles/independent/independent_mimos.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1603,7 +1603,9 @@
/turf/open/floor/wood/maple,
/area/ship/crew/canteen)
"rU" = (
/obj/machinery/vending/wardrobe/sec_wardrobe,
/obj/machinery/vending/wardrobe/sec_wardrobe{
all_items_free = 1
},
/turf/open/floor/wood/mahogany,
/area/ship/security)
"si" = (
Expand Down Expand Up @@ -3194,7 +3196,9 @@
/turf/open/floor/plating,
/area/ship/engineering)
"JQ" = (
/obj/machinery/vending/boozeomat/all_access,
/obj/machinery/vending/boozeomat/all_access{
all_items_free = 1
},
/obj/structure/window/reinforced{
dir = 1
},
Expand Down Expand Up @@ -3451,7 +3455,9 @@
/area/ship/crew)
"Nn" = (
/obj/machinery/light/small/directional/south,
/obj/machinery/vending/clothing,
/obj/machinery/vending/clothing{
all_items_free = 1
},
/turf/open/floor/plasteel/vaporwave{
icon_state = "floor"
},
Expand Down Expand Up @@ -3878,7 +3884,9 @@
/turf/open/floor/plating,
/area/ship/engineering)
"Tt" = (
/obj/machinery/vending/autodrobe/all_access,
/obj/machinery/vending/autodrobe/all_access{
all_items_free = 1
},
/obj/machinery/light/small/broken/directional/north,
/turf/open/floor/plasteel/vaporwave{
icon_state = "floor"
Expand Down Expand Up @@ -4148,7 +4156,9 @@
/turf/open/floor/carpet/royalblack,
/area/ship/crew/library)
"WK" = (
/obj/machinery/vending/security/wall,
/obj/machinery/vending/security/wall{
all_items_free = 1
},
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/security)
"WU" = (
Expand Down
4 changes: 3 additions & 1 deletion _maps/_mod_celadon/shuttles/independent/independent_nemo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3295,7 +3295,9 @@
/turf/open/floor/engine,
/area/ship/engineering/atmospherics)
"VF" = (
/obj/machinery/vending/clothing,
/obj/machinery/vending/clothing{
all_items_free = 1
},
/obj/structure/window/reinforced/tinted/frosted{
dir = 1
},
Expand Down
3 changes: 2 additions & 1 deletion _maps/_mod_celadon/shuttles/independent/independent_qurk.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3641,7 +3641,8 @@
"gR" = (
/obj/machinery/vending/boozeomat/all_access{
pixel_x = 32;
density = 0
density = 0;
all_items_free = 1
},
/obj/structure/table/wood,
/turf/open/floor/wood,
Expand Down
4 changes: 3 additions & 1 deletion _maps/_mod_celadon/shuttles/independent/independent_ramo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,9 @@
/turf/open/floor/wood/walnut,
/area/ship/crew/canteen)
"bj" = (
/obj/machinery/vending/boozeomat/all_access,
/obj/machinery/vending/boozeomat/all_access{
all_items_free = 1
},
/turf/closed/wall,
/area/ship/crew/canteen)
"bk" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,9 @@
/obj/structure/window/reinforced/spawner{
dir = 4
},
/obj/machinery/vending/autodrobe/all_access,
/obj/machinery/vending/autodrobe/all_access{
all_items_free = 1
},
/turf/open/floor/carpet/royalblue,
/area/ship/crew/dorm)
"ez" = (
Expand Down Expand Up @@ -1063,7 +1065,9 @@
/obj/structure/sign/warning/deathsposal{
pixel_x = 30
},
/obj/machinery/vending/wardrobe/engi_wardrobe,
/obj/machinery/vending/wardrobe/engi_wardrobe{
all_items_free = 1
},
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/crew/dorm)
"jV" = (
Expand Down Expand Up @@ -1105,7 +1109,9 @@
/turf/open/floor/plating,
/area/ship/engineering/engine)
"ke" = (
/obj/machinery/vending/tool,
/obj/machinery/vending/tool{
all_items_free = 1
},
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/crew/dorm)
"kn" = (
Expand Down Expand Up @@ -2327,7 +2333,9 @@
/turf/open/floor/engine/airless,
/area/ship/engineering/atmospherics)
"wP" = (
/obj/machinery/vending/boozeomat/all_access,
/obj/machinery/vending/boozeomat/all_access{
all_items_free = 1
},
/obj/structure/window/reinforced/spawner,
/turf/open/floor/plasteel/grimy,
/area/ship/crew/canteen)
Expand Down Expand Up @@ -3301,7 +3309,9 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/storage)
"Gv" = (
/obj/machinery/vending/engivend,
/obj/machinery/vending/engivend{
all_items_free = 1
},
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/crew/dorm)
"Gx" = (
Expand Down Expand Up @@ -4483,14 +4493,18 @@
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"SM" = (
/obj/machinery/vending/wardrobe/atmos_wardrobe,
/obj/machinery/vending/wardrobe/atmos_wardrobe{
all_items_free = 1
},
/obj/structure/window/reinforced/spawner{
dir = 8
},
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/crew/dorm)
"SQ" = (
/obj/machinery/vending/dinnerware,
/obj/machinery/vending/dinnerware{
all_items_free = 1
},
/turf/open/floor/plasteel/grimy,
/area/ship/crew/canteen)
"ST" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1042,7 +1042,9 @@
/area/ship/bridge)
"nz" = (
/obj/machinery/light/small/directional/west,
/obj/machinery/vending/hydronutrients,
/obj/machinery/vending/hydronutrients{
all_items_free = 1
},
/obj/effect/turf_decal/siding/wood/end{
color = "#543C30";
dir = 8
Expand Down Expand Up @@ -2996,7 +2998,9 @@
/obj/structure/railing{
dir = 4
},
/obj/machinery/vending/boozeomat,
/obj/machinery/vending/boozeomat{
all_items_free = 1
},
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/crew/canteen)
"Um" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3597,7 +3597,9 @@
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"GF" = (
/obj/machinery/vending/hydronutrients,
/obj/machinery/vending/hydronutrients{
all_items_free = 1
},
/obj/structure/cable{
icon_state = "1-2"
},
Expand Down
Loading

0 comments on commit 55f82cd

Please sign in to comment.