Merge pull request #36211 from anothersimulacrum/amk

Fix alt map key after #36075
CleverRaven · Dec 18, 2019 · 174cbe3 · 174cbe3
2 parents cd23a72 + 86d18f8
commit 174cbe3
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 18 deletions.
diff --git a/build-scripts/mod_test_blacklist b/build-scripts/mod_test_blacklist
@@ -1,5 +1,4 @@
 aftershock
-alt_map_key
 Animatronics
 Battery_Overhaul_Legacy_Mode
 blazemod

diff --git a/data/mods/Graphical_Overmap/overmap_terrain.json b/data/mods/Graphical_Overmap/overmap_terrain.json
@@ -21460,13 +21460,6 @@
     "sym": "à",
     "color": "light_gray"
   },
-  {
-    "type": "overmap_terrain",
-    "id": "house_base",
-    "copy-from": "house_base",
-    "sym": "à",
-    "color": "light_gray"
-  },
   {
     "type": "overmap_terrain",
     "id": "duplex",

diff --git a/data/mods/alt_map_key/overmap_terrain.json b/data/mods/alt_map_key/overmap_terrain.json
@@ -182,14 +182,6 @@
     "sym": "^",
     "color": "light_green"
   },
-  {
-    "type": "overmap_terrain",
-    "id": "house_base",
-    "copy-from": "house_base",
-    "name": "house",
-    "sym": "^",
-    "color": "light_green"
-  },
   {
     "type": "overmap_terrain",
     "id": "house_prepper",
@@ -887,8 +879,7 @@
     "id": "megastore_1_2_0",
     "copy-from": "megastore_1_2_0",
     "name": "megastore entrance",
-    "color": "i_magenta",
-    "symbol": "M"
+    "color": "i_magenta"
   },
   {
     "type": "overmap_terrain",