Skip to content

Commit

Permalink
mrhm
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed Oct 10, 2024
1 parent af046df commit a1f35e1
Show file tree
Hide file tree
Showing 31 changed files with 179 additions and 72 deletions.
2 changes: 1 addition & 1 deletion _maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"bs" = (
/obj/effect/spawner/random/vending/colavend,
/obj/effect/spawner/random/vending/cola,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"bu" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
/turf/open/floor/wood,
/area/ruin/rockplanet/nanotrasen)
"by" = (
/obj/effect/spawner/random/vending/colavend,
/obj/effect/spawner/random/vending/cola,
/obj/effect/turf_decal/industrial/warning,
/obj/machinery/light/dim/directional/north,
/turf/open/floor/plasteel,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@
/turf/open/floor/plating/asteroid/rockplanet/lit,
/area/overmap_encounter/planetoid/rockplanet/explored)
"dZ" = (
/obj/effect/spawner/random/vending/colavend,
/obj/effect/spawner/random/vending/cola,
/obj/effect/turf_decal/spline/fancy/opaque/white,
/turf/open/floor/plasteel/patterned/brushed,
/area/ruin/rockplanet/distillery/crew)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@
/turf/open/floor/plasteel/dark,
/area/ruin/powered)
"uu" = (
/obj/effect/spawner/random/vending/colavend,
/obj/effect/spawner/random/vending/cola,
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/spacemall.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1323,7 +1323,7 @@
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
"eX" = (
/obj/effect/spawner/random/vending/colavend,
/obj/effect/spawner/random/vending/cola,
/obj/effect/turf_decal/corner/transparent/green/diagonal,
/obj/effect/turf_decal/siding/wideplating/dark{
dir = 8
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,7 @@
/turf/open/floor/plating/rust,
/area/ruin/powered)
"HW" = (
/obj/effect/spawner/random/vending/colavend,
/obj/effect/spawner/random/vending/cola,
/turf/open/floor/plating,
/area/ruin/powered)
"Ie" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/outpost/indie_space.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
/turf/open/floor/plasteel/mono,
/area/outpost/vacant_rooms)
"gz" = (
/obj/effect/spawner/random/vending/colavend,
/obj/effect/spawner/random/vending/cola,
/obj/item/radio/intercom/directional/east,
/obj/effect/turf_decal/spline/fancy/opaque/lightgrey{
dir = 1
Expand Down Expand Up @@ -4208,7 +4208,7 @@
/turf/open/floor/plasteel/tech,
/area/outpost/maintenance/fore)
"Am" = (
/obj/effect/spawner/random/vending/colavend,
/obj/effect/spawner/random/vending/cola,
/obj/effect/turf_decal/spline/fancy/opaque/lightgrey{
dir = 8
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_shetland.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3100,7 +3100,7 @@
/turf/open/floor/plating,
/area/ship/hallway/port)
"zr" = (
/obj/effect/spawner/random/vending/colavend,
/obj/effect/spawner/random/vending/cola,
/obj/effect/turf_decal/corner/opaque/neutral/three_quarters{
dir = 8
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/inteq/inteq_colossus.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4498,7 +4498,7 @@
/turf/open/floor/carpet/black,
/area/ship/crew)
"XS" = (
/obj/effect/spawner/random/vending/colavend,
/obj/effect/spawner/random/vending/cola,
/obj/effect/turf_decal/trimline/opaque/yellow/line,
/obj/effect/turf_decal/siding/thinplating,
/obj/machinery/airalarm/directional/south,
Expand Down
4 changes: 2 additions & 2 deletions _maps/shuttles/inteq/inteq_talos.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4547,7 +4547,7 @@
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
"Cp" = (
/obj/effect/spawner/random/vending/colavend,
/obj/effect/spawner/random/vending/cola,
/obj/structure/sign/poster/contraband/inteq{
pixel_x = 32
},
Expand Down Expand Up @@ -6899,7 +6899,7 @@
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
"SS" = (
/obj/effect/spawner/random/vending/colavend,
/obj/effect/spawner/random/vending/cola,
/obj/machinery/airalarm/directional/east,
/turf/open/floor/plasteel/grimy,
/area/ship/crew)
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/inteq/inteq_valor.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5382,7 +5382,7 @@
/obj/effect/turf_decal/trimline/opaque/yellow/line{
dir = 4
},
/obj/effect/spawner/random/vending/colavend,
/obj/effect/spawner/random/vending/cola,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/directional/east,
/turf/open/floor/plasteel/patterned/grid,
Expand Down
Loading

0 comments on commit a1f35e1

Please sign in to comment.