diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
index 3071661b..556bc6d0 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
@@ -1,6 +1,6 @@
-"aa" = (/turf/template_noop,/area/template_noop)
-"ab" = (/turf/open/lava/smooth/lava_land_surface,/area/lavaland/surface/outdoors)
-"ac" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
+"aa" = (/turf/template_noop,/area/ruin/unpowered/syndicate_lava_base/outdoors)
+"ab" = (/turf/open/lava/smooth/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors)
+"ac" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors)
"ad" = (/obj/machinery/porta_turret/syndicate{dir = 9},/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/main)
"ae" = (/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/testlab)
"af" = (/obj/machinery/light/small{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/main)
@@ -19,13 +19,13 @@
"as" = (/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/chemistry)
"at" = (/obj/structure/grille,/obj/structure/window/plastitanium,/obj/machinery/door/poddoor{id = "lavalandsyndi_chemistry"},/turf/open/floor/plating,/area/ruin/unpowered/syndicate_lava_base/chemistry)
"au" = (/turf/open/floor/plasteel/white/side{dir = 4},/area/ruin/unpowered/syndicate_lava_base/arrivals)
-"av" = (/obj/structure/flora/rock/pile,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
+"av" = (/obj/structure/flora/rock/pile,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors)
"aw" = (/obj/machinery/camera{c_tag = "Xenobiology Inner South"; dir = 4; network = list("ss13","rd")},/turf/open/floor/mineral/plastitanium,/area/ruin/unpowered/syndicate_lava_base/testlab)
"ax" = (/obj/structure/table/reinforced,/obj/machinery/camera{c_tag = "Xenobiology Inner South"; dir = 4; network = list("ss13","rd")},/obj/item/extinguisher,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/testlab)
"ay" = (/obj/machinery/porta_turret/syndicate{dir = 10},/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/main)
"az" = (/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/testlab)
"aA" = (/obj/effect/decal/cleanable/dirt,/turf/open/floor/mineral/plastitanium,/area/ruin/unpowered/syndicate_lava_base/testlab)
-"aB" = (/obj/machinery/porta_turret/syndicate{dir = 8},/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/main)
+"aB" = (/obj/machinery/porta_turret/syndicate{dir = 8},/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/outdoors)
"aC" = (/obj/machinery/porta_turret/syndicate{dir = 4},/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/main)
"aD" = (/obj/structure/closet/secure_closet/medical1{req_access = null; req_access_txt = "150"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/item/defibrillator/compact/combat,/turf/open/floor/plasteel/white/side{dir = 9},/area/ruin/unpowered/syndicate_lava_base/medbay)
"aE" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/light/small{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/telecomms)
@@ -46,10 +46,10 @@
"aT" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 8},/turf/open/floor/circuit/telecomms,/area/ruin/unpowered/syndicate_lava_base/testlab)
"aU" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/turf/open/floor/circuit/telecomms,/area/ruin/unpowered/syndicate_lava_base/testlab)
"aV" = (/obj/structure/cable/yellow{icon_state = "4-8"},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/medbay)
-"aW" = (/obj/structure/lattice/catwalk,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
+"aW" = (/obj/structure/lattice/catwalk,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors)
"aX" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 1; external_pressure_bound = 140; name = "killroom vent"; pressure_checks = 0},/turf/open/floor/circuit/telecomms,/area/ruin/unpowered/syndicate_lava_base/testlab)
"aY" = (/obj/machinery/disposal/bin,/obj/structure/disposalpipe/trunk{dir = 4},/obj/effect/turf_decal/stripes/red/box,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/testlab)
-"aZ" = (/obj/structure/disposalpipe/trunk,/obj/structure/disposaloutlet{dir = 8},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
+"aZ" = (/obj/structure/disposalpipe/trunk,/obj/structure/disposaloutlet{dir = 8},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors)
"ba" = (/mob/living/simple_animal/slime,/turf/open/floor/mineral/plastitanium,/area/ruin/unpowered/syndicate_lava_base/testlab)
"bb" = (/obj/structure/table/glass,/obj/machinery/light/small{dir = 8},/obj/item/clothing/glasses/science,/obj/item/clothing/mask/gas,/obj/effect/turf_decal/tile/purple{dir = 8},/obj/effect/turf_decal/tile/purple{dir = 1},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/testlab)
"bc" = (/obj/structure/chair/office/light{dir = 1},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/testlab)
@@ -121,17 +121,17 @@
"cr" = (/obj/effect/turf_decal/stripes/line{dir = 10},/obj/machinery/chem_heater,/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/chemistry)
"cs" = (/obj/structure/chair/office/light{dir = 1},/obj/effect/turf_decal/bot,/obj/effect/turf_decal/stripes/line,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/chemistry)
"ct" = (/obj/structure/grille,/obj/structure/window/plastitanium,/obj/machinery/door/poddoor/preopen{id = "lavalandsyndi_virology"},/turf/open/floor/plating,/area/ruin/unpowered/syndicate_lava_base/virology)
-"cx" = (/obj/effect/decal/cleanable/dirt,/obj/effect/mapping_helpers/no_lava,/obj/effect/turf_decal/stripes/line{dir = 4},/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/lavaland/surface/outdoors)
+"cx" = (/obj/effect/decal/cleanable/dirt,/obj/effect/mapping_helpers/no_lava,/obj/effect/turf_decal/stripes/line{dir = 4},/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered/syndicate_lava_base/outdoors)
"cy" = (/obj/effect/decal/cleanable/dirt,/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/circuits)
"cz" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/structure/chair{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/bar)
"cA" = (/obj/effect/turf_decal/stripes/line{dir = 6},/obj/structure/closet/crate/bin,/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/chemistry)
"cB" = (/obj/machinery/light/small{dir = 1},/obj/structure/chair{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/bar)
"cC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/research,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/circuits)
"cD" = (/obj/structure/cable/yellow{icon_state = "2-8"},/turf/open/floor/plasteel/white/side{dir = 4},/area/ruin/unpowered/syndicate_lava_base/medbay)
-"cE" = (/obj/effect/decal/cleanable/dirt,/obj/effect/mapping_helpers/no_lava,/obj/effect/turf_decal/stripes/line{dir = 10},/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/lavaland/surface/outdoors)
-"cF" = (/obj/effect/decal/cleanable/dirt,/obj/effect/mapping_helpers/no_lava,/obj/effect/turf_decal/stripes/line,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/lavaland/surface/outdoors)
+"cE" = (/obj/effect/decal/cleanable/dirt,/obj/effect/mapping_helpers/no_lava,/obj/effect/turf_decal/stripes/line{dir = 10},/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered/syndicate_lava_base/outdoors)
+"cF" = (/obj/effect/decal/cleanable/dirt,/obj/effect/mapping_helpers/no_lava,/obj/effect/turf_decal/stripes/line,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered/syndicate_lava_base/outdoors)
"cG" = (/obj/structure/disposalpipe/trunk{dir = 8},/obj/structure/disposaloutlet{dir = 1},/obj/structure/window/plasma/reinforced,/turf/open/floor/mineral/plastitanium,/area/ruin/unpowered/syndicate_lava_base/testlab)
-"cH" = (/obj/effect/decal/cleanable/dirt,/obj/effect/mapping_helpers/no_lava,/obj/effect/turf_decal/stripes/line{dir = 6},/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/lavaland/surface/outdoors)
+"cH" = (/obj/effect/decal/cleanable/dirt,/obj/effect/mapping_helpers/no_lava,/obj/effect/turf_decal/stripes/line{dir = 6},/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered/syndicate_lava_base/outdoors)
"cI" = (/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/obj/structure/extinguisher_cabinet{pixel_y = -29},/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/circuits)
"cJ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{icon_state = "1-4"},/turf/open/floor/plasteel/white/side{dir = 1},/area/ruin/unpowered/syndicate_lava_base/circuits)
"cK" = (/obj/structure/cable/yellow{icon_state = "0-8"},/obj/machinery/power/apc/syndicate{dir = 1; name = "Circuit Lab APC"; pixel_y = 24},/turf/open/floor/plasteel/white/side{dir = 1},/area/ruin/unpowered/syndicate_lava_base/circuits)
@@ -181,7 +181,7 @@
"dD" = (/obj/structure/window/reinforced,/obj/effect/turf_decal/stripes/corner{dir = 4},/obj/machinery/airalarm/syndicate{dir = 4; pixel_x = -24},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/testlab)
"dE" = (/obj/structure/table/glass,/obj/item/stack/sheet/mineral/plasma{amount = 5; pixel_x = -2; pixel_y = 6},/obj/item/stack/sheet/mineral/plasma{amount = 5; pixel_y = 2},/obj/item/stack/sheet/mineral/plasma{amount = 5; pixel_x = 2; pixel_y = -2},/obj/effect/decal/cleanable/dirt,/obj/item/reagent_containers/glass/bottle/charcoal{pixel_x = 6},/obj/item/reagent_containers/glass/bottle/epinephrine,/turf/open/floor/plasteel/white/corner{dir = 4},/area/ruin/unpowered/syndicate_lava_base/chemistry)
"dF" = (/obj/effect/turf_decal/box/white/corners{dir = 8},/obj/structure/closet/crate,/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{dir = 1},/obj/item/bluespace_thread{pixel_x = -7; pixel_y = 7},/obj/item/bluespace_thread{pixel_x = -5; pixel_y = 5},/obj/item/bluespace_thread{pixel_x = -3; pixel_y = 3},/obj/item/bluespace_thread{pixel_x = -1; pixel_y = 1},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/cargo)
-"dG" = (/obj/structure/lattice/catwalk,/turf/open/lava/smooth/lava_land_surface,/area/lavaland/surface/outdoors)
+"dG" = (/obj/structure/lattice/catwalk,/turf/open/lava/smooth/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors)
"dH" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/stripes/line,/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/cargo)
"dI" = (/obj/structure/table/glass,/obj/machinery/reagentgrinder{pixel_y = 5},/obj/item/reagent_containers/glass/beaker/large,/turf/open/floor/plasteel/white/side{dir = 5},/area/ruin/unpowered/syndicate_lava_base/chemistry)
"dJ" = (/obj/machinery/hydroponics/constructable,/obj/structure/window/reinforced{dir = 4},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals)
@@ -262,7 +262,7 @@
"fg" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 10},/turf/open/floor/plasteel/white/side{dir = 6},/area/ruin/unpowered/syndicate_lava_base/virology)
"fh" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{dir = 4},/turf/open/floor/plasteel/white/side{dir = 10},/area/ruin/unpowered/syndicate_lava_base/virology)
"fi" = (/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,/obj/structure/bed,/obj/effect/spawner/lootdrop/bedsheet,/turf/open/floor/plasteel/grimy,/area/ruin/unpowered/syndicate_lava_base/dormitories)
-"fj" = (/obj/effect/mapping_helpers/no_lava,/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/lavaland/surface/outdoors)
+"fj" = (/obj/effect/mapping_helpers/no_lava,/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered/syndicate_lava_base/outdoors)
"fk" = (/obj/machinery/light/small,/obj/structure/extinguisher_cabinet{pixel_y = -29},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/white/side,/area/ruin/unpowered/syndicate_lava_base/medbay)
"fl" = (/obj/effect/turf_decal/loading_area{dir = 5; icon_state = "steel_panel"; name = "steel pannel"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 5},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals)
"fm" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/medical{name = "Chemistry Lab"; req_access_txt = "150"},/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/turf/open/floor/plasteel/white,/area/ruin/unpowered/syndicate_lava_base/chemistry)
@@ -318,7 +318,7 @@
"gl" = (/obj/structure/grille,/obj/structure/window/plastitanium,/obj/machinery/door/firedoor,/obj/machinery/door/poddoor{id = "lavalandsyndi_circuits"},/turf/open/floor/plating,/area/ruin/unpowered/syndicate_lava_base/circuits)
"gm" = (/obj/structure/reagent_dispensers/watertank/high,/obj/effect/turf_decal/bot,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/obj/machinery/light/small,/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals)
"gn" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 6},/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/engineering)
-"go" = (/obj/structure/flora/rock/pile,/obj/structure/flora/junglebush/c,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
+"go" = (/obj/structure/flora/rock/pile,/obj/structure/flora/junglebush/c,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors)
"gp" = (/obj/machinery/hydroponics/constructable,/obj/structure/window/reinforced{dir = 8},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals)
"gq" = (/obj/machinery/hydroponics/constructable,/obj/structure/window/reinforced{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals)
"gr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 4},/turf/open/floor/plasteel/white,/area/ruin/unpowered/syndicate_lava_base/virology)
@@ -404,31 +404,31 @@
"hW" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 4},/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/door/airlock/medical/glass{dir = 4; name = "Medbay"},/turf/open/floor/plasteel/white,/area/ruin/unpowered/syndicate_lava_base/medbay)
"hX" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/medical/glass{dir = 4; name = "Medbay"},/turf/open/floor/plasteel/white,/area/ruin/unpowered/syndicate_lava_base/medbay)
"hY" = (/obj/machinery/button/door{id = "lavalandsyndi_arrivals"; name = "Arrivals Blast Door Control"; pixel_y = -26; req_access_txt = "150"},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/obj/machinery/light/small,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals)
-"hZ" = (/obj/structure/flora/rock,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
+"hZ" = (/obj/structure/flora/rock,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors)
"ia" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{dir = 8},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/main)
"ib" = (/obj/effect/mob_spawn/human/lavaland_syndicate{dir = 4; icon_state = "sleeper_s"},/turf/open/floor/plasteel/grimy,/area/ruin/unpowered/syndicate_lava_base/dormitories)
"ic" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/turf/open/floor/plasteel/grimy,/area/ruin/unpowered/syndicate_lava_base/dormitories)
"id" = (/obj/structure/toilet{pixel_y = 18},/obj/structure/sink{dir = 4; pixel_x = 11},/obj/machinery/light/small{dir = 8},/obj/structure/mirror{pixel_x = 28},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/dormitories)
"ie" = (/obj/effect/mob_spawn/human/lavaland_syndicate/comms{dir = 8; icon_state = "sleeper_s"},/turf/open/floor/plasteel/grimy,/area/ruin/unpowered/syndicate_lava_base/dormitories)
"if" = (/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/main)
-"ig" = (/obj/structure/flora/grass/jungle,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
-"ih" = (/obj/structure/flora/rock/pile,/obj/structure/flora/grass/jungle/b,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
-"ii" = (/obj/structure/flora/rock/jungle,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
-"ij" = (/obj/structure/flora/grass/jungle/b,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
+"ig" = (/obj/structure/flora/grass/jungle,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors)
+"ih" = (/obj/structure/flora/rock/pile,/obj/structure/flora/grass/jungle/b,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors)
+"ii" = (/obj/structure/flora/rock/jungle,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors)
+"ij" = (/obj/structure/flora/grass/jungle/b,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors)
"ik" = (/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/main)
"il" = (/obj/machinery/door/airlock{name = "Cabin 2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/dormitories)
"im" = (/obj/machinery/door/airlock{name = "Unisex Restrooms"},/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/dormitories)
"in" = (/obj/machinery/door/airlock{name = "Cabin 4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/dormitories)
-"io" = (/obj/structure/flora/junglebush/large,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
+"io" = (/obj/structure/flora/junglebush/large,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors)
"ip" = (/obj/effect/turf_decal/stripes/red/corner,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/main)
"iq" = (/obj/structure/sign/warning/securearea,/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/main)
"ir" = (/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/stripes/red/line{dir = 9},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/main)
"is" = (/obj/machinery/light/small{dir = 1},/obj/machinery/turretid{ailock = 1; control_area = "/area/ruin/unpowered/syndicate_lava_base/main"; dir = 1; icon_state = "control_kill"; lethal = 1; name = "Base turret controls"; pixel_y = 30; req_access = null; req_access_txt = "150"},/turf/open/floor/circuit/red,/area/ruin/unpowered/syndicate_lava_base/main)
"it" = (/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/stripes/red/line{dir = 5},/obj/structure/filingcabinet,/obj/item/folder/syndicate/mining,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/main)
-"iu" = (/obj/effect/turf_decal/stripes/line{dir = 8},/obj/effect/mapping_helpers/no_lava,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/lavaland/surface/outdoors)
-"iv" = (/obj/effect/decal/cleanable/dirt,/obj/effect/mapping_helpers/no_lava,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/lavaland/surface/outdoors)
-"iw" = (/obj/structure/lattice/catwalk,/obj/structure/flora/junglebush{pixel_x = -15},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
-"ix" = (/obj/structure/flora/junglebush/c{pixel_y = 15},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
+"iu" = (/obj/effect/turf_decal/stripes/line{dir = 8},/obj/effect/mapping_helpers/no_lava,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered/syndicate_lava_base/outdoors)
+"iv" = (/obj/effect/decal/cleanable/dirt,/obj/effect/mapping_helpers/no_lava,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered/syndicate_lava_base/outdoors)
+"iw" = (/obj/structure/lattice/catwalk,/obj/structure/flora/junglebush{pixel_x = -15},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors)
+"ix" = (/obj/structure/flora/junglebush/c{pixel_y = 15},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors)
"iy" = (/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/decal/cleanable/dirt,/obj/structure/closet{name = "Hydroponics locker"},/obj/item/storage/box/disks_plantgene,/obj/item/storage/box/disks_plantgene,/obj/item/hatchet,/obj/item/hatchet,/obj/item/watertank,/obj/item/reagent_containers/glass/bucket,/obj/item/reagent_containers/glass/bucket,/obj/item/storage/bag/plants,/obj/item/storage/bag/plants,/obj/item/plant_analyzer,/obj/item/plant_analyzer,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals)
"iz" = (/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/dormitories)
"iA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/dormitories)
@@ -461,7 +461,7 @@
"jh" = (/obj/machinery/door/airlock{name = "Cabin 3"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/dormitories)
"ji" = (/obj/structure/cable/yellow{icon_state = "0-2"},/obj/machinery/power/apc/syndicate{dir = 8; name = "Primary Hallway APC"; pixel_x = -24},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/main)
"jj" = (/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/main)
-"jk" = (/obj/effect/mapping_helpers/no_lava,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/lavaland/surface/outdoors)
+"jk" = (/obj/effect/mapping_helpers/no_lava,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered/syndicate_lava_base/outdoors)
"jl" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/main)
"jm" = (/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/main)
"jn" = (/obj/effect/mob_spawn/human/lavaland_syndicate{dir = 4; icon_state = "sleeper_s"},/obj/machinery/airalarm/syndicate{pixel_y = 24},/turf/open/floor/plasteel/grimy,/area/ruin/unpowered/syndicate_lava_base/dormitories)
@@ -568,8 +568,8 @@
"ls" = (/obj/machinery/atmospherics/pipe/simple/supply/visible,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/engineering)
"lt" = (/obj/machinery/atmospherics/pipe/simple/supplymain/visible,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/engineering)
"lu" = (/obj/machinery/light/small{dir = 4},/obj/machinery/portable_atmospherics/scrubber,/obj/effect/turf_decal/bot,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/engineering)
-"lv" = (/obj/effect/turf_decal/stripes/line{dir = 10},/obj/effect/mapping_helpers/no_lava,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/lavaland/surface/outdoors)
-"lw" = (/obj/effect/turf_decal/stripes/line,/obj/effect/mapping_helpers/no_lava,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/lavaland/surface/outdoors)
+"lv" = (/obj/effect/turf_decal/stripes/line{dir = 10},/obj/effect/mapping_helpers/no_lava,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered/syndicate_lava_base/outdoors)
+"lw" = (/obj/effect/turf_decal/stripes/line,/obj/effect/mapping_helpers/no_lava,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered/syndicate_lava_base/outdoors)
"lx" = (/obj/structure/bookcase/random,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/bar)
"ly" = (/obj/structure/chair/stool/bar,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/bar)
"lz" = (/obj/structure/table/wood,/obj/item/reagent_containers/rag{pixel_x = -4; pixel_y = 9},/obj/item/reagent_containers/food/drinks/beer{pixel_x = 5; pixel_y = -2},/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood,/area/ruin/unpowered/syndicate_lava_base/bar)
diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
index 3e6fc530..c124a462 100644
--- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
@@ -159,6 +159,7 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
+/obj/machinery/poweredfans,
/obj/machinery/door/airlock/external{
id_tag = "syndie_listeningpost_external";
req_access_txt = "150"
@@ -524,11 +525,11 @@
},
/obj/effect/turf_decal/stripes/line,
/obj/effect/decal/cleanable/dirt,
-/obj/item/storage/box/lights/bulbs,
/obj/item/stack/sheet/mineral/plasma{
amount = 30
},
-/obj/item/stock_parts/cell/high/plus,
+/obj/item/storage/box/lights/bulbs,
+/obj/item/storage/box/stockparts/deluxe,
/turf/open/floor/plating,
/area/ruin/space/has_grav/listeningstation)
"aP" = (
@@ -827,7 +828,7 @@
/obj/structure/closet/firecloset/full{
anchored = 1
},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
/area/ruin/space/has_grav/listeningstation)
"bk" = (
/obj/effect/turf_decal/stripes/red/line{
@@ -1077,23 +1078,31 @@
/area/ruin/space/has_grav/listeningstation)
"bD" = (
/obj/structure/table/wood,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/paper/fluff/ruins/listeningstation/briefing,
+/obj/item/ammo_box/magazine/m10mm{
+ pixel_x = 8;
+ pixel_y = 5
+ },
+/obj/item/paper/fluff/ruins/listeningstation/briefing{
+ pixel_x = -7;
+ pixel_y = -3
+ },
+/obj/item/toy/cards/deck/syndicate{
+ pixel_x = -6;
+ pixel_y = 11
+ },
/turf/open/floor/plasteel/grimy,
/area/ruin/space/has_grav/listeningstation)
"bF" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/meter,
-/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/ruin/space/has_grav/listeningstation)
"bH" = (
-/obj/machinery/atmospherics/components/unary/tank/air{
- dir = 1
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
},
-/obj/effect/turf_decal/bot,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/meter,
/turf/open/floor/plating,
/area/ruin/space/has_grav/listeningstation)
"bI" = (
@@ -1154,12 +1163,8 @@
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/listeningstation)
"fJ" = (
-/obj/structure/chair/stool,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small{
- brightness = 3;
- dir = 8
- },
+/obj/machinery/biogenerator,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/listeningstation)
"hJ" = (
@@ -1206,17 +1211,14 @@
req_access = null;
req_access_txt = "150"
},
+/obj/item/storage/box/beakers/bluespace,
/turf/open/floor/plasteel/white/side{
dir = 6
},
/area/ruin/space/has_grav/listeningstation)
"tU" = (
-/obj/structure/sign/poster/contraband/random{
- pixel_y = -32
- },
+/obj/machinery/seed_extractor,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
-/obj/machinery/microwave,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/listeningstation)
"ux" = (
@@ -1227,7 +1229,17 @@
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/listeningstation)
"uB" = (
-/turf/open/floor/plating,
+/obj/machinery/airalarm/syndicate{
+ dir = 1;
+ pixel_y = -25
+ },
+/obj/structure/table,
+/obj/item/kitchen/rollingpin{
+ pixel_x = -6;
+ pixel_y = 8
+ },
+/obj/machinery/reagentgrinder/constructed,
+/turf/open/floor/plasteel,
/area/ruin/space/has_grav/listeningstation)
"za" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -1262,44 +1274,28 @@
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/listeningstation)
"Bd" = (
-/obj/machinery/vending/hydroseeds{
- slogan_delay = 700
- },
/obj/effect/decal/cleanable/dirt,
+/obj/structure/table,
+/obj/machinery/smartfridge/disks{
+ pixel_x = -4;
+ pixel_y = 11
+ },
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/listeningstation)
"Bs" = (
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/listeningstation)
"DC" = (
-/obj/machinery/airalarm/syndicate{
- dir = 1;
- pixel_y = -25
+/obj/structure/chair/stool,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small{
+ brightness = 3;
+ dir = 8
},
-/obj/structure/table,
-/obj/item/kitchen/rollingpin{
- pixel_x = -6;
- pixel_y = 8
- },
-/obj/machinery/reagentgrinder/constructed,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/listeningstation)
"DL" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/beer{
- pixel_x = -4;
- pixel_y = 14
- },
-/obj/item/storage/fancy/cigarettes/cigpack_syndicate{
- pixel_x = -3
- },
-/obj/item/reagent_containers/food/drinks/beer{
- pixel_x = 3;
- pixel_y = 11
- },
-/obj/item/lighter/slime{
- pixel_x = 6
- },
+/obj/structure/chair/stool,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/listeningstation)
"Et" = (
@@ -1324,14 +1320,25 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/computer/arcade/orion_trail,
+/obj/machinery/vending/hydroseeds{
+ slogan_delay = 700
+ },
+/obj/machinery/light/small{
+ brightness = 3;
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/listeningstation)
"Lx" = (
/obj/effect/turf_decal/stripes/line{
- dir = 8
+ dir = 5
},
/obj/effect/decal/cleanable/blood/drip,
+/obj/machinery/atmospherics/components/unary/tank/air{
+ dir = 1
+ },
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/ruin/space/has_grav/listeningstation)
"Mh" = (
@@ -1352,11 +1359,33 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/listeningstation)
-"Ns" = (
-/obj/machinery/biogenerator,
+"Nh" = (
+/obj/structure/table,
+/obj/item/reagent_containers/food/drinks/beer{
+ pixel_x = -4;
+ pixel_y = 14
+ },
+/obj/item/storage/fancy/cigarettes/cigpack_syndicate{
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/food/drinks/beer{
+ pixel_x = 3;
+ pixel_y = 11
+ },
+/obj/item/lighter/slime{
+ pixel_x = 6
+ },
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/listeningstation)
+"Ns" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table,
+/obj/machinery/plantgenes{
+ pixel_y = 6
+ },
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/listeningstation)
"NQ" = (
/obj/item/mop/advanced{
pixel_x = -11
@@ -1365,8 +1394,12 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/listeningstation)
"Qp" = (
+/obj/structure/sign/poster/contraband/random{
+ pixel_y = -32
+ },
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/seed_extractor,
+/obj/structure/table,
+/obj/machinery/microwave,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/listeningstation)
"QM" = (
@@ -1377,7 +1410,7 @@
pixel_x = 5;
pixel_y = 5
},
-/obj/structure/chair/stool,
+/obj/machinery/computer/arcade/orion_trail,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/listeningstation)
"TK" = (
@@ -1927,7 +1960,7 @@ ac
ac
ac
ac
-ab
+ac
ab
ab
ab
@@ -1966,6 +1999,7 @@ Bd
Ns
fJ
DC
+uB
ac
ab
ab
@@ -1986,7 +2020,6 @@ ab
ab
ab
ab
-ab
aa
"}
(16,1,1) = {"
@@ -2003,7 +2036,8 @@ ac
zq
Gb
XM
-Qp
+Bs
+tU
Bs
Mh
ac
@@ -2026,7 +2060,6 @@ ab
ab
ab
ab
-ab
aa
"}
(17,1,1) = {"
@@ -2045,7 +2078,8 @@ XM
Bs
fs
za
-tU
+Bs
+Qp
ac
ab
ab
@@ -2066,7 +2100,6 @@ ab
ab
ab
ab
-ab
aa
"}
(18,1,1) = {"
@@ -2086,6 +2119,7 @@ Bs
IH
QM
DL
+Nh
ac
ab
ab
@@ -2106,7 +2140,6 @@ ab
ab
ab
ab
-ab
aa
"}
(19,1,1) = {"
@@ -2408,7 +2441,7 @@ be
ag
ag
ag
-uB
+ag
Et
NQ
ag
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 5a5826cb..2c4ae316 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -4602,7 +4602,7 @@
/turf/open/space,
/area/solar/port/fore)
"ajf" = (
-/obj/machinery/prisoner/gulag_teleporter,
+/obj/machinery/gulag_teleporter,
/turf/open/floor/plasteel,
/area/security/processing)
"ajg" = (
diff --git a/code/__HELPERS/radiation.dm b/code/__HELPERS/radiation.dm
index 8c34ce35..d527d0ac 100644
--- a/code/__HELPERS/radiation.dm
+++ b/code/__HELPERS/radiation.dm
@@ -13,7 +13,8 @@
var/list/processing_list = list(location)
. = list()
var/i = 0
- while(i < length(processing_list))
+ var/lim = 1
+ while(i < lim)
var/atom/thing = processing_list[++i]
if(ignored_things[thing.type])
continue
@@ -21,6 +22,7 @@
if((thing.rad_flags & RAD_PROTECT_CONTENTS) || (SEND_SIGNAL(thing, COMSIG_ATOM_RAD_PROBE) & COMPONENT_BLOCK_RADIATION))
continue
processing_list += thing.contents
+ lim = processing_list.len
/proc/radiation_pulse(atom/source, intensity, range_modifier, log=FALSE, can_contaminate=TRUE)
if(!SSradiation.can_fire)
diff --git a/code/controllers/subsystem/jukeboxes.dm b/code/controllers/subsystem/jukeboxes.dm
index b43f50d8..2c24262a 100644
--- a/code/controllers/subsystem/jukeboxes.dm
+++ b/code/controllers/subsystem/jukeboxes.dm
@@ -65,6 +65,7 @@ SUBSYSTEM_DEF(jukeboxes)
/datum/controller/subsystem/jukeboxes/Initialize()
var/list/tracks = flist("config/jukebox_music/sounds/")
+ var/songID = 1
for(var/S in tracks)
var/datum/track/T = new()
T.song_path = file("config/jukebox_music/sounds/[S]")
@@ -72,8 +73,9 @@ SUBSYSTEM_DEF(jukeboxes)
T.song_name = L[1]
T.song_length = text2num(L[2])
T.song_beat = text2num(L[3])
- T.song_associated_id = L[4]
+ T.song_associated_id = songID
songs |= T
+ songID++
for(var/i in CHANNEL_JUKEBOX_START to CHANNEL_JUKEBOX)
freejukeboxchannels |= i
return ..()
@@ -83,15 +85,15 @@ SUBSYSTEM_DEF(jukeboxes)
return
for(var/list/jukeinfo in activejukeboxes)
if(!jukeinfo.len)
- EXCEPTION("Active jukebox without any associated metadata.")
+ stack_trace("Active jukebox without any associated metadata.")
continue
var/datum/track/juketrack = jukeinfo[1]
if(!istype(juketrack))
- EXCEPTION("Invalid jukebox track datum.")
+ stack_trace("Invalid jukebox track datum.")
continue
var/obj/jukebox = jukeinfo[3]
if(!istype(jukebox))
- EXCEPTION("Nonexistant or invalid object associated with jukebox.")
+ stack_trace("Nonexistant or invalid object associated with jukebox.")
continue
var/sound/song_played = sound(juketrack.song_path)
var/area/currentarea = get_area(jukebox)
diff --git a/code/datums/components/radioactive.dm b/code/datums/components/radioactive.dm
index b823c705..64bc3765 100644
--- a/code/datums/components/radioactive.dm
+++ b/code/datums/components/radioactive.dm
@@ -34,12 +34,13 @@
var/atom/movable/master = parent
master.add_filter("rad_glow", 2, list("type" = "outline", "color" = "#39ff1430", "size" = 2))
addtimer(CALLBACK(src, .proc/glow_loop, master), rand(1,19))//Things should look uneven
+
START_PROCESSING(SSradiation, src)
/datum/component/radioactive/Destroy()
+ STOP_PROCESSING(SSradiation, src)
var/atom/movable/master = parent
master.remove_filter("rad_glow")
- STOP_PROCESSING(SSradiation, src)
return ..()
/datum/component/radioactive/process()
@@ -60,7 +61,7 @@
animate(filter, alpha = 110, time = 15, loop = -1)
animate(alpha = 40, time = 25)
-/datum/component/radioactive/InheritComponent(datum/component/C, i_am_original, _strength, _source, _half_life, _can_contaminate)
+/datum/component/radioactive/InheritComponent(datum/component/C, i_am_original, list/arguments)
if(!i_am_original)
return
if(!hl3_release_date) // Permanently radioactive things don't get to grow stronger
@@ -69,7 +70,7 @@
var/datum/component/radioactive/other = C
strength = max(strength, other.strength)
else
- strength = max(strength, _strength)
+ strength = max(strength, arguments[1])
/datum/component/radioactive/proc/rad_examine(datum/source, mob/user, list/examine_list)
var/atom/master = parent
diff --git a/code/datums/elements/cleaning.dm b/code/datums/elements/cleaning.dm
index 02084a88..3e0c60ad 100644
--- a/code/datums/elements/cleaning.dm
+++ b/code/datums/elements/cleaning.dm
@@ -35,4 +35,4 @@
SEND_SIGNAL(cleaned_human, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
cleaned_human.wash_cream()
cleaned_human.regenerate_icons()
- to_chat(cleaned_human, "[src] cleans your face!")
+ to_chat(cleaned_human, "[AM] cleans your face!")
diff --git a/code/game/area/areas/ruins/lavaland.dm b/code/game/area/areas/ruins/lavaland.dm
index c4af7323..99245f71 100644
--- a/code/game/area/areas/ruins/lavaland.dm
+++ b/code/game/area/areas/ruins/lavaland.dm
@@ -76,6 +76,9 @@
/area/ruin/unpowered/syndicate_lava_base/circuits
name = "Syndicate Lavaland Circuit Lab"
+/area/ruin/unpowered/syndicate_lava_base/outdoors //Putting this area down should prevent fauna from spawning nearby
+ name = "Syndicate Lavaland Approach"
+ icon_state = "red"
//Xeno Nest
@@ -89,4 +92,4 @@
//ash walker nest
/area/ruin/unpowered/ash_walkers
- icon_state = "red"
\ No newline at end of file
+ icon_state = "red"
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index f165c0b6..027458e3 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -36,12 +36,11 @@
RefreshParts()
add_inital_chems()
-/obj/machinery/sleeper/Destroy()
- var/obj/item/reagent_containers/sleeper_buffer/buffer = new /obj/item/reagent_containers/sleeper_buffer(loc)
+/obj/machinery/sleeper/on_deconstruction()
+ var/obj/item/reagent_containers/sleeper_buffer/buffer = new (loc)
buffer.volume = reagents.maximum_volume
buffer.reagents.maximum_volume = reagents.maximum_volume
reagents.trans_to(buffer.reagents, reagents.total_volume)
- ..()
/obj/machinery/sleeper/proc/add_inital_chems()
for(var/i in available_chems)
@@ -372,7 +371,7 @@
/obj/machinery/sleeper/syndie/Initialize()
. = ..()
component_parts = list()
- component_parts += new /obj/item/circuitboard/machine/sleeper(null)
+ component_parts += new /obj/item/circuitboard/machine/sleeper/syndie(null)
component_parts += new /obj/item/stock_parts/matter_bin/super(null)
component_parts += new /obj/item/stock_parts/manipulator/pico(null)
component_parts += new /obj/item/stack/sheet/glass(null)
@@ -383,7 +382,7 @@
/obj/machinery/sleeper/syndie/fullupgrade/Initialize()
. = ..()
component_parts = list()
- component_parts += new /obj/item/circuitboard/machine/sleeper(null)
+ component_parts += new /obj/item/circuitboard/machine/sleeper/syndie(null)
component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null)
component_parts += new /obj/item/stock_parts/manipulator/femto(null)
component_parts += new /obj/item/stack/sheet/glass(null)
diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm
index 32a20c51..938a4d92 100644
--- a/code/game/machinery/_machinery.dm
+++ b/code/game/machinery/_machinery.dm
@@ -570,6 +570,7 @@ Class Procs:
updateUsrDialog()
/obj/machinery/AltClick(mob/user)
+ . = ..()
if(!user.canUseTopic(src, !issilicon(user)) || !is_operational())
return
if(inserted_modify_id)
diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm
index 78eff08e..a5365127 100644
--- a/code/game/machinery/dance_machine.dm
+++ b/code/game/machinery/dance_machine.dm
@@ -202,6 +202,8 @@
for(var/i in 1 to 10)
spawn_atom_to_turf(/obj/effect/temp_visual/hierophant/telegraph/edge, src, 1, FALSE)
sleep(5)
+ if(QDELETED(src))
+ return
#define DISCO_INFENO_RANGE (rand(85, 115)*0.01)
@@ -364,7 +366,7 @@
//for(var/mob/living/carbon/NS in rangers)
// NS.resting = !NS.resting
// NS.update_canmove()
- time--
+ time--
/obj/machinery/jukebox/disco/proc/dance5(var/mob/living/M)
animate(M, transform = matrix(180, MATRIX_ROTATE), time = 1, loop = 0)
@@ -430,6 +432,14 @@
/obj/machinery/jukebox/disco/process()
. = ..()
if(active)
- for(var/mob/M in rangers)
+ for(var/mob/living/M in range(10,src))
+ if(!M.client || !(M.client.prefs.toggles & SOUND_INSTRUMENTS))
+ continue
+ if(!(M in rangers))
+ rangers += M
+ for(var/mob/living/M in rangers)
+ if(get_dist(src,M) > 10)
+ rangers -= M
+ for(var/mob/living/M in rangers)
if(prob(5+(allowed(M)*4)) && M.canmove)
dance(M)
diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm
index e20c991c..1a9922d6 100644
--- a/code/game/machinery/porta_turret/portable_turret.dm
+++ b/code/game/machinery/porta_turret/portable_turret.dm
@@ -369,7 +369,7 @@
if(check_anomalies)//if it's set to check for simple animals
if(isanimal(A))
var/mob/living/simple_animal/SA = A
- if(SA.stat || in_faction(SA)) //don't target if dead or in faction
+ if(SA.stat || in_faction(SA) || istype(SA, /mob/living/simple_animal/hostile/megafauna)) //don't target if dead or in faction
continue
targets += SA
if(issilicon(A))
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 9754b4f4..68a5d34e 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -456,7 +456,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
if(!SSmapping.station_room_templates[t])
log_world("Station room spawner placed at ([T.x], [T.y], [T.z]) has invalid ruin name of \"[t]\" in its list")
templates -= t
- template_name = pickweight(templates)
+ template_name = pickweightAllowZero(templates) // did you know: pickweightAllowZero is the one that DISALLOWS zero? fun fact.
if(!template_name)
GLOB.stationroom_landmarks -= src
qdel(src)
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index 2e5dee92..b9cc55de 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -15,6 +15,10 @@
/obj/item/stock_parts/manipulator = 1,
/obj/item/stock_parts/capacitor = 1)
+/obj/item/circuitboard/machine/sleeper/syndie
+ name = "Syndicate Sleeper (Machine Board)"
+ build_path = /obj/machinery/sleeper/syndie
+
/obj/item/circuitboard/machine/vr_sleeper
name = "VR Sleeper (Machine Board)"
build_path = /obj/machinery/vr_sleeper
diff --git a/code/modules/events/spontaneous_appendicitis.dm b/code/modules/events/spontaneous_appendicitis.dm
index cb13be4b..dbbbbec3 100644
--- a/code/modules/events/spontaneous_appendicitis.dm
+++ b/code/modules/events/spontaneous_appendicitis.dm
@@ -15,6 +15,8 @@
continue
if(H.stat == DEAD)
continue
+ if(H.z != SSmapping.station_start) //Let's not fucking give Appendicitis to ghost roles or people not on station, shall we?
+ continue
if(!H.getorgan(/obj/item/organ/appendix)) //Don't give the disease to some who lacks it, only for it to be auto-cured
continue
if(!(MOB_ORGANIC in H.mob_biotypes)) //biotype sleeper bugs strike again, once again making appendicitis pick a target that can't take it
@@ -28,4 +30,4 @@
var/datum/disease/D = new /datum/disease/appendicitis()
H.ForceContractDisease(D, FALSE, TRUE)
- break
\ No newline at end of file
+ break
diff --git a/code/modules/mob/living/silicon/pai/pai_defense.dm b/code/modules/mob/living/silicon/pai/pai_defense.dm
index d1dd8602..5ac84132 100644
--- a/code/modules/mob/living/silicon/pai/pai_defense.dm
+++ b/code/modules/mob/living/silicon/pai/pai_defense.dm
@@ -69,7 +69,8 @@
emitterhealth = CLAMP((emitterhealth - amount), -50, emittermaxhealth)
if(emitterhealth < 0)
fold_in(force = TRUE)
- to_chat(src, "The impact degrades your holochassis!")
+ if(amount > 0)
+ to_chat(src, "The impact degrades your holochassis!")
return amount
/mob/living/silicon/pai/adjustBruteLoss(amount, updating_health = TRUE, forced = FALSE)
@@ -87,8 +88,11 @@
/mob/living/silicon/pai/adjustCloneLoss(amount, updating_health = TRUE, forced = FALSE)
return FALSE
-/mob/living/silicon/pai/adjustStaminaLoss(amount)
- take_holo_damage(amount & 0.25)
+/mob/living/silicon/pai/adjustStaminaLoss(amount, updating_health, forced = FALSE)
+ if(forced)
+ take_holo_damage(amount)
+ else
+ take_holo_damage(amount * 0.25)
/mob/living/silicon/pai/adjustOrganLoss(slot, amount, maximum = 500) //I kept this in, unlike tg
Knockdown(amount * 0.2)
diff --git a/code/modules/mob/living/simple_animal/astral.dm b/code/modules/mob/living/simple_animal/astral.dm
index 9bac53ef..8c261157 100644
--- a/code/modules/mob/living/simple_animal/astral.dm
+++ b/code/modules/mob/living/simple_animal/astral.dm
@@ -20,6 +20,7 @@
alpha = 50
attacktext = "touches the mind of"
speak_emote = list("echos")
+ rad_flags = RAD_NO_CONTAMINATE
movement_type = FLYING
var/pseudo_death = FALSE
var/posses_safe = FALSE
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index 021b5fea..018a16e4 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -1,5 +1,5 @@
// stored_power += (pulse_strength-RAD_COLLECTOR_EFFICIENCY)*RAD_COLLECTOR_COEFFICIENT
-#define RAD_COLLECTOR_EFFICIENCY 80 // radiation needs to be over this amount to get power
+#define RAD_COLLECTOR_EFFICIENCY 60 // radiation needs to be over this amount to get power
#define RAD_COLLECTOR_COEFFICIENT 100
#define RAD_COLLECTOR_STORED_OUT 0.04 // (this*100)% of stored power outputted per tick. Doesn't actualy change output total, lower numbers just means collectors output for longer in absence of a source
#define RAD_COLLECTOR_MINING_CONVERSION_RATE 0.00001 //This is gonna need a lot of tweaking to get right. This is the number used to calculate the conversion of watts to research points per process()
diff --git a/code/modules/research/designs/machine_desings/machine_designs_medical.dm b/code/modules/research/designs/machine_desings/machine_designs_medical.dm
index c4f0d842..7cb8a460 100644
--- a/code/modules/research/designs/machine_desings/machine_designs_medical.dm
+++ b/code/modules/research/designs/machine_desings/machine_designs_medical.dm
@@ -32,7 +32,15 @@
id = "sleeper"
build_path = /obj/item/circuitboard/machine/sleeper
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_ENGINEERING
- category = list ("Medical Machinery")
+ category = list("Medical Machinery")
+
+/datum/design/board/syndiesleeper
+ name = "Machine Design (Syndicate Sleeper Board)"
+ desc = "The circuit board for a Syndicate sleeper, with controls inside."
+ id = "syndiesleeper"
+ build_path = /obj/item/circuitboard/machine/sleeper/syndie
+ departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_ENGINEERING
+ category = list("Medical Machinery")
/datum/design/board/cryotube
name = "Machine Design (Cryotube Board)"
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index e61e92e7..9b97f75e 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -1053,7 +1053,7 @@
display_name = "Illegal Technology"
description = "Dangerous research used to create dangerous objects."
prereq_ids = list("adv_engi", "adv_weaponry", "explosive_weapons")
- design_ids = list("decloner", "borg_syndicate_module", "suppressor", "largecrossbow", "donksofttoyvendor", "advanced_camera")
+ design_ids = list("decloner", "borg_syndicate_module", "suppressor", "largecrossbow", "donksofttoyvendor", "advanced_camera", "syndiesleeper")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10000)
export_price = 5000
hidden = TRUE
diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm
index 3ea7fa59..4c01c408 100644
--- a/code/modules/ruins/lavaland_ruin_code.dm
+++ b/code/modules/ruins/lavaland_ruin_code.dm
@@ -148,7 +148,7 @@
/obj/effect/mob_spawn/human/lavaland_syndicate/comms/space/Initialize()
. = ..()
- if(prob(90)) //only has a 10% chance of existing, otherwise it'll just be a NPC syndie.
+ if(prob(50)) //only has a 10% chance of existing, otherwise it'll just be a NPC syndie.
new /mob/living/simple_animal/hostile/syndicate/ranged(get_turf(src))
return INITIALIZE_HINT_QDEL
diff --git a/icons/obj/monitors.dmi b/icons/obj/monitors.dmi
index 93a1908f..5e91660e 100644
Binary files a/icons/obj/monitors.dmi and b/icons/obj/monitors.dmi differ