Merge branch 'master' into hard-electrocute-act-

_maps/_basemap.dm

@@ -8,6 +8,7 @@
 		#include "map_files\debug\runtimestation.dmm"
 		#include "map_files\YogStation\Yogstation.dmm"
 		#include "map_files\IceMeta\IceMeta.dmm"
+		#include "map_files\IceMeta_drip\IceMeta_drip.dmm"
 		#include "map_files\GaxStation\GaxStation.dmm"
 		#include "map_files\AsteroidStation\AsteroidStation.dmm"
 		#include "map_files\DonutStation\DonutStation.dmm"

_maps/icemeta_drip.dm

@@ -0,0 +1 @@
+#define FORCE_MAP "icemeta_drip"

_maps/icemeta_drip.json

@@ -0,0 +1,49 @@
+{
+	"map_name": "IceMeta_drip",
+	"map_path": "map_files/IceMeta_drip",
+	"map_file": "IceMeta_drip.dmm",
+	"space_ruin_levels": 0,
+	"space_empty_levels": 0,
+	"planetary": 1,
+	"shuttles": {
+		"cargo": "cargo_box",
+		"ferry": "ferry_fancy",
+		"emergency": "emergency_meta"
+	},
+	"traits": [
+		{
+			"Up": true,
+			"Linkage": null,
+			"Weather_Snowstorm": true,
+			"Mining": true,
+			"Gravity": true,
+			"Ice Ruins Underground": true,
+			"Bombcap Multiplier": 2.5,
+			"Baseturf": "/turf/open/lava/plasma/ice_moon",
+			"No Parallax": true
+		},
+		{
+			"Down": true,
+			"Up": true,	
+			"Linkage": null,
+			"Weather_Snowstorm": true,
+			"Mining": true,
+			"Gravity": true,
+			"Bombcap Multiplier": 2.5,
+			"Ice Ruins": true,
+			"Baseturf": "/turf/open/openspace/icemoon/keep_below",
+			"No Parallax": true
+		},
+		{
+			"Down": true,		
+			"Linkage": null,
+			"Weather_Snowstorm": true,
+			"Ice Ruins": true,
+			"Mining": true,
+			"Gravity": true,
+			"Baseturf": "/turf/open/openspace/icemoon/keep_below",
+			"No Parallax": true
+		}
+	],
+	"minetype": "none"
+}