Misc cleanups

data/json/items/gun/223.json

@@ -213,7 +213,7 @@
     "looks_like": "skorpion_61",
     "type": "GUN",
     "name": { "str": "OA-93" },
-    "description": "An AR-15 derivative pistol manufactured by Olympic Arms in the nineties. The main difference compared to the AR-15 is that the recoil spring has been moved to the top of the gun, circumventing the necessity for a solid buttstock.",
+    "description": "An AR-15 derivative pistol manufactured by Olympic Arms in the nineties.  The main difference compared to the AR-15 is that the recoil spring has been moved to the top of the gun, circumventing the necessity for a solid buttstock.",
     "weight": "2023 g",
     "volume": "2135 ml",
     "price": 125000,

data/mods/Aftershock/maps/mapgen/millyficent_lab.json

@@ -243,7 +243,8 @@
         "x": "t_console_broken",
         "*": "t_utility_light",
         "w": "t_window_bars_curtains",
-        ">": "t_wood_stairs_down"
+        ">": "t_wood_stairs_down",
+        "_": "t_open_air"
       },
       "furniture": {
         "T": "f_trashcan",
@@ -272,6 +273,7 @@
         "N": "f_NMR",
         "O": "f_MRI",
         "0": "f_CTscan",
+        "P": "f_dishwasher",
         "r": "f_rack",
         "s": "f_stool",
         "S": "f_sink",

data/mods/Aftershock/npcs/whately_dialogue.json

@@ -12,7 +12,7 @@
       "context": "meeting",
       "value": "yes",
       "yes": [ "What did you bring me?", "Hello.", "How are you?", "Welcome!", "Do you smell something?" ],
-      "no": "New test subjects! I'm so glad you showed up!"
+      "no": "New test subjects!  I'm so glad you showed up!"
     },
     "responses": [
       {
@@ -57,7 +57,7 @@
   {
     "type": "talk_topic",
     "id": "TALK_millyficent_place",
-    "dynamic_line": "Welcome to my lab! Here we explore the boundaries of the possible beyond the reach of small minds.",
+    "dynamic_line": "Welcome to my lab!  Here we explore the boundaries of the possible beyond the reach of small minds.",
     "responses": [
       { "text": "Can you give me something to eat then?", "topic": "TALK_millyficent_food" },
       { "text": "Oh, okay.", "topic": "TALK_Millyficent_1" },

data/mods/Dark-Skies-Above/blacklists/item_blacklist.json

@@ -18,8 +18,6 @@
       "20x66_inc",
       "20x66_shot",
       "20x66_slug",
-      "360_200_mag",
-      "360_400_mag",
       "5x50_100_mag",
       "5x50_50_mag",
       "5x50_hull",
@@ -169,26 +167,11 @@
       "iv_mutagen_ursine",
       "iv_purifier",
       "l_bak_223",
-      "l_base_223",
-      "l_car_223",
-      "l_dsr_223",
-      "l_enforcer_45",
-      "l_HFPack",
-      "l_lmg_223",
-      "l_long_45",
-      "l_lookout_9mm",
-      "l_mbr_223",
-      "l_mp_45",
-      "l_mp_9mm",
-      "l_sp_45",
-      "l_sp_9mm",
       "laser_pack",
       "laser_rifle",
       "leg",
       "light_atomic_battery_cell",
       "light_minus_atomic_battery_cell",
-      "lw12mag",
-      "lw21mag",
       "lwfeed",
       "marloss_berry",
       "marloss_gel",
@@ -246,7 +229,6 @@
       "rm2000_smg",
       "rm228",
       "rm298",
-      "rm360_carbine",
       "rm451_flamethrower",
       "rm51_assault_rifle",
       "rm614_lmg",

data/mods/Dark-Skies-Above/blacklists/trait_blacklist.json

@@ -1,7 +1,7 @@
 [
   {
     "//": "no need for robust genetics atm",
-    "type": "ITEM_BLACKLIST",
+    "type": "TRAIT_BLACKLIST",
     "traits": [ "ROBUST" ]
   }
 ]

data/mods/Dark-Skies-Above/monsters/mongun.json

@@ -18,7 +18,7 @@
     "symbol": "/",
     "color": "red",
     "name": { "str": "fake firecannon" },
-    "description": "Fires an explosive bolt of firey energy. If you're seeing this, it's a bug.",
+    "description": "Fires an explosive bolt of firey energy.  If you're seeing this, it's a bug.",
     "skill": "launcher",
     "range": 15,
     "ranged_damage": 5,
@@ -32,7 +32,7 @@
     "symbol": "/",
     "color": "red",
     "name": { "str": "fake smokegun" },
-    "description": "Shoots dangerous radioactive gas. If you're seeing this, it's a bug.",
+    "description": "Shoots dangerous radioactive gas.  If you're seeing this, it's a bug.",
     "skill": "launcher",
     "range": 10,
     "flags": [ "NEVER_JAMS" ],
@@ -45,7 +45,7 @@
     "symbol": "/",
     "color": "red",
     "name": { "str": "fake riotgun" },
-    "description": "Shoots pacification gas. If you're seeing this, it's a bug.",
+    "description": "Shoots pacification gas.  If you're seeing this, it's a bug.",
     "skill": "launcher",
     "range": 25,
     "flags": [ "NEVER_JAMS" ],

data/mods/Dark-Skies-Above/monsters/monspell.json

@@ -67,7 +67,7 @@
     "type": "SPELL",
     "id": "dks_spell_mindblast",
     "name": "psi mindblast",
-    "description": "blasts a target with a wave of disorienting psionic energy. has random effects",
+    "description": "blasts a target with a wave of disorienting psionic energy.  has random effects",
     "valid_targets": [ "hostile" ],
     "message": "",
     "effect": "none",

data/mods/Dark-Skies-Above/monsters/wild_aliens/strays.json

@@ -29,7 +29,7 @@
     "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "GRAB", 7 ], [ "scratch", 20 ] ],
     "death_drops": "mon_zombie_hulk_death_drops",
     "death_function": [ "NORMAL" ],
-    "upgrades": { "half_life": 10, "into": "DKS_GROUP_STRAY_UPGRADE" },
+    "upgrades": { "half_life": 10, "into_group": "DKS_GROUP_STRAY_UPGRADE" },
     "burn_into": "dks_mon_stray_burnt",
     "flags": [
       "SEES",
@@ -98,7 +98,7 @@
     "id": "dks_mon_stray_fast",
     "type": "MONSTER",
     "name": "stray sprinter",
-    "description": "This once-shambling human body has become subtly toned, and though its still appears caught between putrefying on the spot and living, it now moves with a hint of animal cunning. A tightened mouth surrounds gnashing teeth as it hunts for fresh meat with more intensity than those around it.",
+    "description": "This once-shambling human body has become subtly toned, and though its still appears caught between putrefying on the spot and living, it now moves with a hint of animal cunning.  A tightened mouth surrounds gnashing teeth as it hunts for fresh meat with more intensity than those around it.",
     "default_faction": "stray",
     "looks_like": "mon_zombie_runner",
     "bodytype": "human",

data/mods/Dark-Skies-Above/overrides/furniture_terrain/indoor_furniture.json

@@ -5,6 +5,8 @@
     "id": "t_plut_generator",
     "copy-from": "t_plut_generator",
     "name": "Edison generator",
+    "symbol": "0",
+    "color": "light_green",
     "description": "This imposing apparatus harnesses 'atmospheric charges', or at least thats what the news said when these things came out.  Pioneered by Elton Moosek and his Bluebox team, these were immediately snapped up by the government due to their potential to generate near limitless power.  It's not doing much good here though.  Perhaps it could be salvaged for other purposes.",
     "deconstruct": {
       "ter_set": "t_concrete",
@@ -26,6 +28,8 @@
     "id": "f_dresser",
     "copy-from": "f_dresser",
     "name": "dresser",
+    "symbol": "{",
+    "color": "brown",
     "description": "Dress yourself!"
   }
 ]

data/mods/Dark-Skies-Above/overrides/furniture_terrain/outdoor-furniture.json

@@ -4,6 +4,8 @@
     "id": "f_mutpoppy",
     "copy-from": "f_mutpoppy",
     "name": "poppy bush",
-    "description": "An invasive species brought to Earth by the invaders and found it quite to its liking. It spiny, writhing fronds make it look more like a jungle bush than a conventional poppy except for its red petals, but is named after such due to its similar medicinal properties. It exudes a potent, sleep inducing aroma."
+    "symbol": "f",
+    "color": "light_red",
+    "description": "An invasive species brought to Earth by the invaders and found it quite to its liking.  It spiny, writhing fronds make it look more like a jungle bush than a conventional poppy except for its red petals, but is named after such due to its similar medicinal properties.  It exudes a potent, sleep inducing aroma."
   }
 ]

data/mods/Dark-Skies-Above/overrides/items/electronic.json

@@ -4,7 +4,7 @@
     "type": "TOOL",
     "name": { "str": "smartphone" },
     "copy-from": "smart_phone",
-    "description": "A popular, fancy smartphone.  Capable of making photos due to integrated camera and illuminating an area as per its flashlight app, assuming it has enough charge.  The smartphone also has a clock app that includes an alarm.  Runs on a small, proprietary power cell that needs a specialized charger. That is to say, is quite difficult to recharge post-Cataclysm.",
+    "description": "A popular, fancy smartphone.  Capable of making photos due to integrated camera and illuminating an area as per its flashlight app, assuming it has enough charge.  The smartphone also has a clock app that includes an alarm.  Runs on a small, proprietary power cell that needs a specialized charger.  That is to say, is quite difficult to recharge post-Cataclysm.",
     "delete": { "flags": [ "USE_UPS" ] }
   },
   {

data/mods/Dark-Skies-Above/overrides/locations/evac_center.json

@@ -169,7 +169,7 @@
         "               c  6     ",
         "                        "
       ],
-      "terrain": { " ": "t_null" },
+      "terrain": { " ": "t_null", "6": "t_console" },
       "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" },
       "computers": {
         "6": {
@@ -215,7 +215,7 @@
         "    | =........c..x|    ",
         "    |||||:||+|:|||||    "
       ],
-      "terrain": { "x": "t_console_broken" },
+      "terrain": { "x": "t_console_broken", "=": "t_door_locked_interior", "6": "t_console", ":": "t_window_domestic", "+": "t_door_c" },
       "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" },
       "computers": {
         "6": {
@@ -319,7 +319,7 @@
         "                  l     ",
         "                        "
       ],
-      "terrain": { " ": "t_null" },
+      "terrain": { " ": "t_null", "6": "t_console" },
       "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" },
       "items": { "l": { "item": "SUS_evac_shelter_locker", "chance": 70 }, "c": { "item": "SUS_evac_shelter_cabinet", "chance": 50 } },
       "computers": {
@@ -365,7 +365,14 @@
         "    |..........|..l|    ",
         "    |||||:||+|:|||||    "
       ],
-      "terrain": { "x": "t_console_broken" },
+      "terrain": {
+        "x": "t_console_broken",
+        "+": "t_door_c",
+        ":": "t_window",
+        "-": "t_wall_w",
+        "=": "t_door_locked_interior",
+        "6": "t_console"
+      },
       "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" },
       "computers": {
         "6": {
@@ -421,7 +428,8 @@
         ":": [ "t_window_frame", "t_window" ],
         "+": [ "t_door_c", "t_door_b" ],
         "=": [ "t_door_b", "t_door_locked_interior", "t_door_c", "t_door_o" ],
-        "6": "t_console_broken"
+        "6": "t_console_broken",
+        "-": "t_wall_w"
       },
       "furniture": { "b": "f_bench", "c": "f_cupboard", "l": [ [ "f_locker", 2 ], "f_wreckage" ], "S": "f_sink", "%": "f_trashcan" },
       "items": {
@@ -465,7 +473,7 @@
         "                   c    ",
         "                        "
       ],
-      "terrain": { " ": "t_null" },
+      "terrain": { " ": "t_null", "6": "t_console" },
       "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" },
       "items": { "l": { "item": "SUS_evac_shelter_locker", "chance": 70 }, "c": { "item": "SUS_evac_shelter_cabinet", "chance": 50 } }
     }
@@ -502,7 +510,15 @@
         "   ||||||||||......c|   ",
         "            ||:|+|:||   "
       ],
-      "terrain": { "x": "t_console_broken" },
+      "terrain": {
+        "x": "t_console_broken",
+        "-": "t_wall_w",
+        "=": "t_door_locked_interior",
+        "6": "t_console",
+        ":": "t_window_domestic",
+        "+": "t_door_c",
+        "*": "t_ladder_up"
+      },
       "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" },
       "computers": {
         "6": {
@@ -562,7 +578,10 @@
         ":": [ "t_window_frame", "t_window" ],
         "+": [ "t_door_c", "t_door_b" ],
         "=": [ "t_door_b", "t_door_locked_interior", "t_door_c", "t_door_o" ],
-        "6": [ "t_console", "t_console_broken" ]
+        "6": [ "t_console", "t_console_broken" ],
+        "-": "t_wall_w",
+        "*": "t_ladder_up",
+        "x": "t_console_broken"
       },
       "furniture": { "b": "f_bench", "c": "f_cupboard", "l": [ [ "f_locker", 2 ], "f_wreckage" ], "S": "f_sink", "%": "f_trashcan" },
       "items": {

data/mods/Dark-Skies-Above/snippets/fliers.json

@@ -51,7 +51,7 @@
       },
       {
         "id": "dks_flier_14",
-        "text": "This is a government-issued, air-dropped alert.  \"EVACUATION ALERT.  Please make your way to the nearest FEMA evacuation shelter.  Travel in groups and avoid crowds. Avoid hostile forces at all costs.\""
+        "text": "This is a government-issued, air-dropped alert.  \"EVACUATION ALERT.  Please make your way to the nearest FEMA evacuation shelter.  Travel in groups and avoid crowds.  Avoid hostile forces at all costs.\""
       },
       {
         "id": "dks_flier_15",
@@ -71,15 +71,15 @@
       },
       {
         "id": "dks_flier_19",
-        "text": "This very recent looking air-dropped alert. \"THE WAR IS OVER.  Do not continue to fight.  Fugitives will be charged with malcompliant destabilizaion if they do not surrender to their nearest safety office at once.  Join our New Order.  Do not live in squalor.  Witness what we can do *together*.\"  Pictured is one of the Designated Living Zones, a city and its surrounding areas set aside specifically for humans.  Underneath is listed some of the many qualities of the DLZs: safety, cleanliness, opprotunity, and so on."
+        "text": "This very recent looking air-dropped alert.  \"THE WAR IS OVER.  Do not continue to fight.  Fugitives will be charged with malcompliant destabilizaion if they do not surrender to their nearest safety office at once.  Join our New Order.  Do not live in squalor.  Witness what we can do *together*.\"  Pictured is one of the Designated Living Zones, a city and its surrounding areas set aside specifically for humans.  Underneath is listed some of the many qualities of the DLZs: safety, cleanliness, opprotunity, and so on."
       },
       {
         "id": "dks_flier_20",
-        "text": "This very recent looking air-dropped alert. \"THE WAR IS OVER.  Do not continue to fight.  Surrender to your nearest surveillance drone for immediate evacuation to a designated civilian zone.  Join our New Order.  Witness what we can do *together*.\"  Pictured is the president, along with several other 'smiling' world leaders, standing next to multiple cloaked creatures."
+        "text": "This very recent looking air-dropped alert.  \"THE WAR IS OVER.  Do not continue to fight.  Surrender to your nearest surveillance drone for immediate evacuation to a designated civilian zone.  Join our New Order.  Witness what we can do *together*.\"  Pictured is the president, along with several other 'smiling' world leaders, standing next to multiple cloaked creatures."
       },
       {
         "id": "dks_flier_21",
-        "text": "This very recent looking air-dropped alert. \"THE WAR IS OVER.  Resistance will be met with lethal deterrence.  Do not throw away your potential.  Join our New Order.  Witness what we can do *together*.\"  Pictured is a smiling family of humans standing in front of an alien soldier."
+        "text": "This very recent looking air-dropped alert.  \"THE WAR IS OVER.  Resistance will be met with lethal deterrence.  Do not throw away your potential.  Join our New Order.  Witness what we can do *together*.\"  Pictured is a smiling family of humans standing in front of an alien soldier."
       },
       {
         "id": "dks_flier_22",
@@ -104,15 +104,15 @@
       },
       {
         "id": "dks_flier_28",
-        "text": "This is very recent looking air-dropped alert. \"HERE FOR YOU\" is written in somewhat imposing text at the bottom of a depiction of several smiling humans wearing Occupation uniforms."
+        "text": "This is very recent looking air-dropped alert.  \"HERE FOR YOU\" is written in somewhat imposing text at the bottom of a depiction of several smiling humans wearing Occupation uniforms."
       },
       {
         "id": "dks_flier_29",
-        "text": "This is very recent looking air-dropped alert. \"HERE FOR YOU\" is written in somewhat imposing text at the bottom of a depiction of several smiling humans wearing Occupation uniforms. Someone has scrawled \"TRAITORS\" in marker across the front."
+        "text": "This is very recent looking air-dropped alert.  \"HERE FOR YOU\" is written in somewhat imposing text at the bottom of a depiction of several smiling humans wearing Occupation uniforms.  Someone has scrawled \"TRAITORS\" in marker across the front."
       },
       {
         "id": "dks_flier_30",
-        "text": "This is very recent looking air-dropped alert. \"HERE FOR YOU\" is written in somewhat imposing text at the bottom of a depiction of several smiling humans wearing Occupation uniforms. Someone has scrawled \"FAIR WEATHER SOLDIERS\" across the front."
+        "text": "This is very recent looking air-dropped alert.  \"HERE FOR YOU\" is written in somewhat imposing text at the bottom of a depiction of several smiling humans wearing Occupation uniforms.  Someone has scrawled \"FAIR WEATHER SOLDIERS\" across the front."
       },
       {
         "id": "dks_flier_31",
@@ -224,15 +224,15 @@
       },
       {
         "id": "dks_flier_58",
-        "text": "This is a propaganda poster from only a few weeks before the evacuation orders.  A parent dressed in military fatigues hugs their partner goodbye as their smiling children look on. \"Enlist today. Take you freedom in your own hands.\""
+        "text": "This is a propaganda poster from only a few weeks before the evacuation orders.  A parent dressed in military fatigues hugs their partner goodbye as their smiling children look on.  \"Enlist today.  Take your freedom in your own hands.\""
       },
       {
         "id": "dks_flier_59",
-        "text": "This is a propaganda poster from only a few weeks before the evacuation orders.  A handsome looking person dressed in military fatigues exercises along with several other people. \"Enlist today.\""
+        "text": "This is a propaganda poster from only a few weeks before the evacuation orders.  A handsome looking person dressed in military fatigues exercises along with several other people.  \"Enlist today.\""
       },
       {
         "id": "dks_flier_60",
-        "text": "This is a propaganda poster from only a few weeks before the evacuation orders.  Someone in military fatigues is helping someonestand up. \"Enlist today and become a community leader.\""
+        "text": "This is a propaganda poster from only a few weeks before the evacuation orders.  Someone in military fatigues is helping someone stand up.  \"Enlist today and become a community leader.\""
       },
       {
         "id": "dks_flier_61",