Merge pull request #32 from Constellado/cherrypickening

The first Cherrypickening
Constellado · Sep 1, 2024 · fec739b · fec739b
2 parents 0e650bc + e08b615
commit fec739b
Show file tree

Hide file tree

Showing 136 changed files with 1,524 additions and 421 deletions.
diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm
@@ -1070,7 +1070,7 @@
 /turf/open/floor/wood,
 /area/ruin)
 "Ok" = (
-/turf/open/acid/whitesands,
+/turf/open/water/acid/whitesands,
 /area/overmap_encounter/planetoid/sand/explored)
 "Ov" = (
 /obj/item/clothing/head/cowboy{

diff --git a/_maps/outpost/indie_space.dmm b/_maps/outpost/indie_space.dmm
@@ -189,8 +189,9 @@
 	dir = 10
 	},
 /obj/machinery/computer/electrolyzer_console{
-	pixel_y = -31;
-	density = 0
+	pixel_y = -18;
+	density = 0;
+	dir = 1
 	},
 /turf/open/floor/plasteel/patterned,
 /area/outpost/cargo)

diff --git a/_maps/outpost/nanotrasen_ice.dmm b/_maps/outpost/nanotrasen_ice.dmm
@@ -2852,8 +2852,9 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /obj/machinery/computer/electrolyzer_console{
-	pixel_x = 32;
-	density = 0
+	pixel_x = 20;
+	density = 0;
+	dir = 8
 	},
 /turf/open/floor/plasteel/patterned,
 /area/outpost/cargo/smeltery)
@@ -6219,7 +6220,8 @@
 /obj/machinery/mineral/processing_unit_console{
 	machinedir = 8;
 	output_dir = 1;
-	pixel_x = 32
+	pixel_x = 20;
+	dir = 8
 	},
 /turf/open/floor/plasteel/patterned,
 /area/outpost/cargo/smeltery)