Merge branch 'master' into pr/1066

_maps/RandomZLevels/away_mission/caves.dmm

@@ -2179,12 +2179,30 @@
 /obj/effect/baseturf_helper/asteroid/basalt,
 /turf/closed/wall,
 /area/awaymission/caves/northblock)
+"zf" = (
+/obj/item/gun/energy/kinetic_accelerator,
+/turf/open/floor/plating/asteroid/basalt{
+	initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+	},
+/area/awaymission/caves/BMP_asteroid/level_two)
+"Cg" = (
+/obj/item/crowbar/red,
+/turf/open/floor/plating/asteroid/basalt{
+	initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+	},
+/area/awaymission/caves/BMP_asteroid/level_two)
 "CY" = (
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel,
 /area/awaymission/caves/listeningpost)
+"Gw" = (
+/obj/item/flashlight/lantern,
+/turf/open/floor/plating/asteroid/basalt{
+	initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+	},
+/area/awaymission/caves/BMP_asteroid/level_two)
 "GV" = (
 /obj/structure/barricade/wooden,
 /obj/structure/cable{
@@ -53529,7 +53547,7 @@ bT
 bT
 bR
 bJ
-bJ
+cd
 bJ
 bJ
 bJ
@@ -53800,7 +53818,7 @@ bK
 bK
 bK
 bK
-bJ
+cd
 bK
 bK
 bK
@@ -54308,11 +54326,11 @@ bO
 bO
 bO
 bO
+cd
 bJ
 bJ
 bJ
 bJ
-cd
 bJ
 bJ
 bJ
@@ -54572,7 +54590,7 @@ bJ
 bJ
 bJ
 bJ
-cd
+bJ
 bJ
 bJ
 bJ
@@ -55594,7 +55612,7 @@ bK
 bK
 bK
 bK
-cd
+bJ
 bJ
 bJ
 bO
@@ -57113,7 +57131,7 @@ bK
 bK
 bK
 bK
-cd
+bJ
 bJ
 bO
 bO
@@ -57369,7 +57387,7 @@ bK
 bK
 bN
 bN
-bJ
+cd
 bJ
 bJ
 bO
@@ -57904,7 +57922,7 @@ bK
 bK
 bK
 bJ
-cd
+bJ
 bO
 bO
 bO
@@ -58404,7 +58422,7 @@ bO
 bO
 bO
 bO
-cd
+bJ
 bJ
 cm
 bQ
@@ -58660,7 +58678,7 @@ bO
 bO
 bO
 bJ
-bJ
+cd
 bJ
 bJ
 cm
@@ -58932,7 +58950,7 @@ cm
 cm
 bK
 bJ
-bJ
+cd
 bO
 bO
 bO
@@ -59188,7 +59206,7 @@ cm
 cm
 cm
 bK
-cd
+bJ
 bJ
 bO
 bO
@@ -59446,7 +59464,7 @@ bJ
 bJ
 bJ
 bJ
-bJ
+bO
 bO
 bO
 bO
@@ -59458,9 +59476,9 @@ cm
 cm
 bK
 bK
+zf
 bJ
-bJ
-bJ
+Gw
 bJ
 bJ
 bJ
@@ -60228,10 +60246,10 @@ cm
 bK
 bK
 bK
-bJ
+cQ
 fd
 bJ
-bJ
+Cg
 bK
 bK
 bJ
@@ -61781,7 +61799,7 @@ bK
 bK
 bK
 bK
-cd
+bJ
 bJ
 bJ
 bJ
@@ -64590,7 +64608,7 @@ bK
 bK
 bK
 bK
-bJ
+cd
 bJ
 bJ
 cU
@@ -64832,7 +64850,7 @@ bJ
 bJ
 cU
 bJ
-bJ
+cd
 bJ
 bJ
 bJ

_maps/_basemap.dm

@@ -4,7 +4,7 @@
 
 #ifndef LOWMEMORYMODE
 	#ifdef ALL_MAPS
-		#include "map_files\Mining\Lavaland_novaya.dmm"
+		#include "map_files\Mining\Lavaland.dmm"
 		#include "map_files\debug\runtimestation.dmm"
 		#include "map_files\Deltastation\DeltaStation2.dmm"
 		#include "map_files\MetaStation\MetaStation.dmm"

_maps/iceboxstation.dm

@@ -0,0 +1 @@
+#define FORCE_MAP "_maps/iceboxstation.json"

_maps/iceboxstation.json

@@ -0,0 +1,11 @@
+{
+    "map_name": "Ice Box Station",
+    "map_path": "map_files/IceBox",
+    "map_file": "IceBoxStation.dmm",
+    "shuttles": {
+	    "cargo": "cargo_box",
+	    "ferry": "ferry_fancy",
+	    "whiteship": "whiteship_box",
+	    "emergency": "emergency_box"
+    }
+}