Skip to content

Commit

Permalink
Merge branch 'Bubberstation:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@MosleyTheMalO
MosleyTheMalO authored Oct 26, 2024
2 parents 08c42d0 + f3344b8 commit 2149939
Show file tree
Hide file tree
Showing 16 changed files with 1,242 additions and 1,235 deletions.
71 changes: 27 additions & 44 deletions _maps/RandomRuins/LavaRuins/bubberstation/lavaland_dauntless.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,7 @@
},
/obj/machinery/vending/drugs{
name = "\improper SyndiDrug Plus";
onstation = 0;
onstation_override = 1
all_products_free = 1
},
/turf/open/floor/iron/white/diagonal,
/area/ruin/space/has_grav/bubbers/dauntless/med/treatment)
Expand Down Expand Up @@ -310,10 +309,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/vending/security/noaccess{
onstation = 0;
density = 0;
onstation_override = 1;
pixel_y = 32
pixel_y = 32;
all_products_free = 1
},
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/bubbers/dauntless/sec/brig)
Expand Down Expand Up @@ -540,8 +538,7 @@
/obj/machinery/vending/medical/syndicate/cybersun{
desc = "An advanced vendor that dispenses medical drugs, both recreational and medicinal. It's said to have been salvaged from an old decommissioned Cybersun Cruiser.";
name = "\improper SyndiMed ++";
onstation = 0;
onstation_override = 1
all_products_free = 1
},
/turf/open/floor/iron/white/diagonal,
/area/ruin/space/has_grav/bubbers/dauntless/med/treatment)
Expand Down Expand Up @@ -708,10 +705,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
/obj/machinery/vending/security/noaccess{
onstation = 0;
pixel_x = -32;
density = 0;
onstation_override = 1
all_products_free = 1
},
/turf/open/floor/carpet/royalblack,
/area/ruin/space/has_grav/bubbers/dauntless/command/maa)
Expand Down Expand Up @@ -844,10 +840,9 @@
/area/ruin/space/has_grav/bubbers/dauntless/engineering/turbine)
"eg" = (
/obj/machinery/vending/dorms/prison{
onstation = 0;
onstation_override = 1;
density = 0;
pixel_x = -27
pixel_x = -27;
all_products_free = 1
},
/turf/open/floor/wood/tile,
/area/ruin/space/has_grav/bubbers/dauntless/sec/prison/rec)
Expand Down Expand Up @@ -900,8 +895,7 @@
/area/ruin/space/has_grav/bubbers/dauntless/sec/prison/rec)
"et" = (
/obj/machinery/vending/games{
onstation = 0;
onstation_override = 1
all_products_free = 1
},
/obj/effect/turf_decal/siding/wood/corner{
dir = 1
Expand Down Expand Up @@ -1267,10 +1261,9 @@
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/siding/wood/corner,
/obj/machinery/vending/wardrobe/syndie_wardrobe{
onstation = 0;
onstation_override = 1;
pixel_x = 28;
density = 0
density = 0;
all_products_free = 1
},
/turf/open/floor/wood/tile,
/area/ruin/space/has_grav/bubbers/dauntless/service/dorms)
Expand Down Expand Up @@ -1918,8 +1911,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/vending/dorms{
onstation_override = 1;
onstation = 0
all_products_free = 1
},
/turf/open/floor/wood/tile,
/area/ruin/space/has_grav/bubbers/dauntless/service/dorms)
Expand Down Expand Up @@ -2319,10 +2311,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/disposalpipe/segment,
/obj/machinery/vending/clothing{
onstation = 0;
onstation_override = 1;
pixel_x = 27;
density = 0
density = 0;
all_products_free = 1
},
/turf/open/floor/wood/tile,
/area/ruin/space/has_grav/bubbers/dauntless/service/dorms)
Expand Down Expand Up @@ -4449,8 +4440,7 @@
/area/ruin/space/has_grav/bubbers/dauntless/sec/officer)
"tx" = (
/obj/machinery/vending/dinnerware{
onstation = 0;
onstation_override = 1
all_products_free = 1
},
/turf/open/floor/iron/kitchen{
dir = 4
Expand Down Expand Up @@ -4568,10 +4558,9 @@
dir = 8
},
/obj/machinery/vending/cigarette/syndicate{
onstation = 0;
onstation_override = 1;
density = 0;
pixel_x = -29
pixel_x = -29;
all_products_free = 1
},
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/bubbers/dauntless/service/diner)
Expand Down Expand Up @@ -5065,18 +5054,16 @@
dir = 8
},
/obj/machinery/vending/hydronutrients{
onstation = 0;
onstation_override = 1;
pixel_x = -28;
can_astar_pass = 1;
density = 0
density = 0;
all_products_free = 1
},
/turf/open/floor/stone,
/area/ruin/space/has_grav/bubbers/dauntless/service/hydro)
"vX" = (
/obj/machinery/vending/boozeomat/syndicate{
onstation = 0;
onstation_override = 1
all_products_free = 1
},
/obj/machinery/door/firedoor,
/obj/structure/curtain/cloth{
Expand Down Expand Up @@ -5889,7 +5876,7 @@
name = "green"
},
/obj/machinery/vending/sustenance{
onstation = 0
all_products_free = 1
},
/turf/open/floor/iron/dark/smooth_large,
/area/ruin/space/has_grav/bubbers/dauntless/sec/prison)
Expand Down Expand Up @@ -6297,10 +6284,9 @@
dir = 4
},
/obj/machinery/vending/wardrobe/sec_wardrobe/red{
onstation = 0;
onstation_override = 1;
pixel_x = 28;
density = 0
density = 0;
all_products_free = 1
},
/turf/open/floor/wood/tile,
/area/ruin/space/has_grav/bubbers/dauntless/service/dorms)
Expand Down Expand Up @@ -10776,8 +10762,7 @@
dir = 8
},
/obj/machinery/vending/imported/tiziran{
onstation = 0;
onstation_override = 1
all_products_free = 1
},
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/bubbers/dauntless/service/diner)
Expand Down Expand Up @@ -10967,10 +10952,9 @@
"UV" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/vending/cigarette{
onstation = 0;
onstation_override = 1;
density = 0;
pixel_x = -27
pixel_x = -27;
all_products_free = 1
},
/turf/open/floor/wood/tile,
/area/ruin/space/has_grav/bubbers/dauntless/sec/prison/rec)
Expand Down Expand Up @@ -11604,11 +11588,10 @@
dir = 10
},
/obj/machinery/vending/hydroseeds{
onstation = 0;
onstation_override = 1;
pixel_x = -28;
can_astar_pass = 1;
density = 0
density = 0;
all_products_free = 1
},
/turf/open/floor/stone,
/area/ruin/space/has_grav/bubbers/dauntless/service/hydro)
Expand Down
Loading

0 comments on commit 2149939

Please sign in to comment.