Convert the Mistress monster into an actual NPC with profession trait.

Update mod for the removal of the armor category.
Update cellphones into smartphones.
Sync the starting gear of the player and npc battle maids.
Replace the starting tool belt with a maid vest.
Maids now start with a petticoat.
Battle Maids/Butlers now start with a compact hardcase and glasses.
Battle Butlers now start with boots instead of dress shoes.
Butlers and Masters now start with an undershirt.
Master/Mistress no longer start with a pet carrier, since Maids are NPCs now.
Remove the man sized carry bag, since Mistresses are NPCs now.
Fix typo preventing battle maids from starting with throwing skill.

11 files changed, 173 insertions, 86 deletions

diff --git a/armor.json b/armor.json
index 368f30a..fa85c79 100644
--- a/armor.json
+++ b/armor.json
@@ -24,7 +24,6 @@
     "id": "kawaii_maid_dress_long_leather",
     "type": "ARMOR",
     "looks_like": "maid_dress",
-    "category": "armor",
     "name": { "str": "tailored victorian maid dress", "str_pl": "tailored victorian maid dresses" },
     "description": "A classic maid outfit with a white apron, frills and a black one piece. It has been reinforced with leather for greater protection.",
     "weight": "5100 g",
@@ -47,7 +46,6 @@
     "note": "Loosely based on medium survivor suit.",
     "type": "ARMOR",
     "looks_like": "maid_dress",
-    "category": "armor",
     "name": { "str": "survivor victorian maid dress", "str_pl": "survivor victorian maid dresses" },
     "description": "A classic maid outfit with a white apron, frills and a black one piece. It has been reinforced with kevlar for greater protection and has an integrated scabbard for storing a sword.",
     "weight": "5100 g",
@@ -118,7 +116,6 @@
   {
     "id": "kawaii_maid_dress_ex",
     "type": "ARMOR",
-    "category": "armor",
     "name": { "str": "tailored maid dress", "str_pl": "tailored maid dresses" },
     "description": "A black dress with white apron and lace trim, worn by maids. It has been reinforced with leather for better protection.",
     "weight": "5830 g",
@@ -140,7 +137,6 @@
     "id": "kawaii_maid_dress_lss",
     "note": "Loosely based on light survivor suit.",
     "type": "ARMOR",
-    "category": "armor",
     "name": { "str": "survivor maid dress", "str_pl": "survivor maid dresses" },
     "description": "A black dress with white apron and lace trim, worn by maids. It has been reinforced with kevlar for greater protection and has an integrated scabbard for storing a sword.",
     "weight": "5100 g",
@@ -190,6 +186,7 @@
     "id": "kawaii_hat_cotton",
     "note": "Loosely based on cotton hat.",
     "type": "ARMOR",
+    "category": "clothing",
     "name": { "str": "maid hat" },
     "description": "It's a warm hat made of cotton, coloured white to better match a maid uniform.",
     "weight": "78 g",
@@ -207,6 +204,7 @@
   {
     "id": "kawaii_maid_hat",
     "type": "ARMOR",
+    "category": "clothing",
     "name": { "str": "maid headband" },
     "description": "A black headband with white lace trim, worn by maids.",
     "weight": "150 g",
@@ -225,7 +223,6 @@
   {
     "id": "kawaii_maid_hat_thermal_off",
     "type": "ARMOR",
-    "category": "armor",
     "name": { "str": "tailored maid headband" },
     "description": "A black headband with white lace trim, worn by maids. It has been reinforced with leather for greater protection.",
     "weight": "250 g",
@@ -244,7 +241,6 @@
   {
     "id": "kawaii_maid_hat_lss",
     "type": "ARMOR",
-    "category": "armor",
     "name": { "str": "survivor maid headband" },
     "description": "A black headband with white lace trim, worn by maids. It has been reinforced with kevlar for greater protection.",
     "weight": "350 g",
@@ -266,6 +262,7 @@
     "note": "Copy of the vanilla maid headband, but renamed, super fancy, and with warmth to match the dress.",
     "repairs_like": "balclava",
     "type": "ARMOR",
+    "category": "clothing",
     "name": { "str": "french maid headband"},
     "description": "A frilly white headpiece.",
     "weight": "10 g",
@@ -286,6 +283,7 @@
   {
     "id": "maid_gloves_cotton",
     "type": "ARMOR",
+    "category": "clothing",
     "looks_like": "gloves_liner",
     "name": { "str": "pair of maid gloves", "str_pl": "pairs of maid gloves" },
     "description": "A pair of white gloves, used by maids.",
@@ -328,7 +326,6 @@
     "id": "maid_gloves_armor",
     "type": "ARMOR",
     "looks_like": "gloves_liner",
-    "category": "armor",
     "name": { "str": "pair of survivor maid gloves", "str_pl": "pairs of survivor maid gloves" },
     "description": "A pair of white gloves, used by maids. They have been reinforced with kevlar for greater protection.",
     "weight": "190 g",
@@ -349,6 +346,7 @@
     {
     "id": "maid_gloves_long_cotton",
     "type": "ARMOR",
+    "category": "clothing",
     "looks_like": "long_glove_white",
     "name": { "str": "pair of long maid gloves", "str_pl": "pairs of long maid gloves" },
     "description": "A pair of long white gloves, used by maids.",
@@ -391,7 +389,6 @@
     "id": "maid_gloves_long_armor",
     "type": "ARMOR",
     "looks_like": "long_glove_white",
-    "category": "armor",
     "name": { "str": "pair of survivor long maid gloves", "str_pl": "pairs of survivor long maid gloves" },
     "description": "A pair of long white gloves, used by maids. They have been reinforced with kevlar for greater protection.",
     "weight": "190 g",
@@ -413,6 +410,7 @@
     "id": "kawaii_dress_shoes",
     "note": "Loosely based on dress shoes.",
     "type": "ARMOR",
+    "category": "clothing",
     "name": { "str": "pair of maid shoes", "str_pl": "pairs of maid shoes" },
     "description": "A pair of black dress shoes designed to be worn with a maid dress.",
     "weight": "500 g",
@@ -433,7 +431,6 @@
     "note": "Loosely based on medium survivor boots.",
     "looks_like": "kawaii_dress_shoes",
     "type": "ARMOR",
-    "category": "armor",
     "name": { "str": "pair of survivor maid shoes", "str_pl": "pairs of survivor maid shoes" },
     "description": "A pair of black dress shoes designed to be worn with a maid dress. They have been reinforced with kevlar for greater protection.",
     "weight": "400 g",
@@ -454,6 +451,7 @@
     "id": "kawaii_boots",
     "note": "Loosely based on leather boots.",
     "type": "ARMOR",
+    "category": "clothing",
     "name": { "str": "pair of maid boots", "str_pl": "pairs of maid boots" },
     "description": "A pair of black boots designed to be worn with a maid dress.",
     "weight": "800 g",
@@ -475,7 +473,6 @@
     "note": "Loosely based on medium survivor boots.",
     "looks_like": "kawaii_boots",
     "type": "ARMOR",
-    "category": "armor",
     "name": { "str": "pair of survivor maid boots", "str_pl": "pairs of survivor maid boots" },
     "description": "A pair of black boots designed to be worn with a maid dress. They have been reinforced with kevlar for greater protection.",
     "weight": "600 g",
@@ -495,6 +492,7 @@
   {
     "id": "kawaii_maid_niso_thick",
     "type": "ARMOR",
+    "category": "clothing",
     "name": { "str": "pair of maid stockings", "str_pl": "pairs of maid stockings" },
     "description": "A pair of black stockings with white lace trim. The thick material keeps the wearer's legs warm.",
     "weight": "90 g",
@@ -513,6 +511,7 @@
   {
     "id": "kawaii_maid_niso_thin",
     "type": "ARMOR",
+    "category": "clothing",
     "name": { "str": "pair of maid stockings (sheer)", "str_pl": "pairs of maid stockings (sheer)" },
     "description": "A pair of black stockings with white lace trim. The material is thin enough to be slightly transparent when worn.",
     "weight": "40 g",
@@ -531,6 +530,7 @@
   {
     "id": "kawaii_tights_black",
     "type": "ARMOR",
+    "category": "clothing",
     "name": "black tights",
     "description": "A pair of warm tights.",
     "weight": "40 g",
@@ -549,6 +549,7 @@
   {
     "id": "kawaii_tights_white",
     "type": "ARMOR",
+    "category": "clothing",
     "name": "white tights",
     "description": "A pair of warm tights.",
     "weight": "40 g",
@@ -567,6 +568,7 @@
     {
     "id": "kawaii_maid_garter",
     "type": "ARMOR",
+    "category": "clothing",
     "name": { "str": "garter belt" },
     "description": "A black garter belt, designed to hold up stockings. It could also be used to conceal a handgun under your skirt, if needed.",
     "weight": "10 g",
@@ -587,6 +589,7 @@
     "id": "kawaii_secretpoach",
     "note": "Loosely based on deep concealment holster.",
     "type": "ARMOR",
+    "category": "clothing",
     "name": { "str": "garter purse" },
     "description": "A small storage purse that can be concealed beneath a skirt, held up using a garter band. It also has sleeves for concealing handgun magazines, if needed.",
     "weight": "250 g",
@@ -653,7 +656,6 @@
   {
     "id": "survivor_tux_leather",
     "type": "ARMOR",
-    "category": "armor",
     "name": { "str": "tailored tuxedo" },
     "description": "A full-body tuxedo, the proper uniform of a butler. It has been reinforced with leather for greater protection.",
     "weight": "3050 g",
@@ -674,7 +676,6 @@
   {
     "id": "survivor_tux",
     "type": "ARMOR",
-    "category": "armor",
     "name": { "str": "survivor tuxedo" },
     "description": "A full-body tuxedo, the proper uniform of a butler. It has been reinforced with kevlar for greater protection and has dedicated storage for throwing weapons.",
     "weight": "3050 g",
@@ -704,6 +705,7 @@
     "id": "kawaii_vest",
     "note": "Loosely based on utility vest.",
     "type": "ARMOR",
+    "category": "clothing",
     "name": { "str": "maid vest" },
     "description": "A modified utility vest with many pockets, worn by maids.",
     "weight": "516 g",
@@ -724,6 +726,7 @@
     "id": "kawaii_vest_tac",
     "note": "Loosely based on tac vest.",
     "type": "ARMOR",
+    "category": "clothing",
     "looks_like": "kawaii_vest",
     "name": { "str": "survivor maid vest" },
     "description": "A modified utility vest with many pockets, worn by maids. It has an additional four pouches capable of carrying magazines.",
@@ -808,6 +811,7 @@
   {
     "id": "kawaii_raincoat",
     "type": "ARMOR",
+    "category": "clothing",
     "name": { "str": "transparent rain coat" },
     "description": "A transparent raincoat made from very thin vinyl. The material is thin enough that the entire coat can fold away into a pocket when not in use.",
     "weight": "120 g",
@@ -833,6 +837,7 @@
   {
     "id": "kawaii_raincoat_off",
     "type": "ARMOR",
+    "category": "clothing",
     "name": { "str": "transparent rain coat (hood packed)" },
     "description": "A transparent raincoat made from very thin vinyl. The material is thin enough that the entire coat can fold away into a pocket when not in use.",
     "weight": "120 g",
@@ -859,6 +864,7 @@
     "id": "kawaii_maid_panties",
     "note": "Based on panties. Fancy, no warmth, and different skin.",
     "type": "ARMOR",
+    "category": "clothing",
     "name": { "str_sp": "white panties" },
     "description": "Pure white panties, very breathable and comfortable even in summer.",
     "weight": "32 g",
@@ -879,6 +885,7 @@
     "id": "kawaii_maid_bra",
     "note": "Based on bra. Fancy, no warmth, and different skin.",
     "type": "ARMOR",
+    "category": "clothing",
     "name": { "str": "white bra" },
     "description": "Pure white bra, very breathable and comfortable even in summer.",
     "weight": "32 g",
@@ -898,6 +905,7 @@
   {
     "id": "kawaii_bikini_bottom_black",
     "type": "ARMOR",
+    "category": "clothing",
     "name": "black bikini bottom",
     "description": "A simple black bikini bottom.",
     "weight": 32,
@@ -914,6 +922,7 @@
   {
     "id": "kawaii_bikini_top_black",
     "type": "ARMOR",
+    "category": "clothing",
     "name": "black bikini top",
     "description": "A simple black bikini top.",
     "weight": 32,
@@ -1007,6 +1016,7 @@
     "id": "kawaii_maid_megane_01",
     "note": "Based on standard glasses. Fancy, close layer, and counters both vision impairments.",
     "type": "ARMOR",
+    "category": "clothing",
     "name": { "str": "pair of maid glasses", "str_pl": "pairs of maid glasses" },
     "description": "A maid wearing these will never miss the smallest speck of dust, nor signs of their Mistress's health.",
     "weight": "30 g",
@@ -1028,7 +1038,6 @@
     "id": "kawaii_hitec_megane",
     "note": "Has ballistic glasses protection, survivor goggles perks, is fancy, counters both vision impairments, close layer, with only 75% coverage. These are glasses, not goggles.",
     "type": "ARMOR",
-    "category": "armor",
     "name": { "str": "pair of survivor maid glasses", "str_pl": "pairs of survivor maid glasses" },
     "description": "A maid wearing these will never miss the smallest speck of dust, nor signs of their Mistress's health. These have been reinforced with bullet resistant glass for greater protection, the ability to withstand chemical corrosion, and protection against bright flashes.",
     "weight": "90 g",
@@ -1048,6 +1057,7 @@
     "id": "kawaii_wedding_dress",
     "note": "Based on the standard wedding dress. Covers arms, encumbrance/warmth/volume/weight slightly higher than a regular dress as less tight-fitting, and has a different skin.",
     "type": "ARMOR",
+    "category": "clothing",
     "name": { "str": "wedding dress", "str_pl": "wedding dresses" },
     "description": "A pure white wedding dress.",
     "weight": "850 g",
@@ -1071,6 +1081,7 @@
     "note": "Copy of the standard weding veil. Has a different skin, covers head only, close layer, not oversize.",
     "repairs_like": "veil_wedding",
     "type": "ARMOR",
+    "category": "clothing",
     "name": { "str": "wedding veil" },
     "description": "A lacy white wedding veil.",
     "weight": "78 g",
@@ -1094,6 +1105,7 @@
     "note": "Copy of the standard weding veil. Has a different skin, covers head only, close layer, not oversize.",
     "repairs_like": "veil_wedding",
     "type": "ARMOR",
+    "category": "clothing",
     "name": { "str": "wedding veil" },
     "description": "A lacy white wedding veil with additional adornments.",
     "weight": "78 g",
@@ -1117,6 +1129,7 @@
     "note": "Copy of extra long white gloves. Fancy.",
     "repairs_like": "long_glove_white",
     "type": "ARMOR",
+    "category": "clothing",
     "name": { "str": "pair of wedding gloves", "str_pl": "pairs of wedding gloves" },
     "description": "A pair of pure white gloves to match a wedding dress.",
     "weight": "400 g",
@@ -1139,6 +1152,7 @@
     "note": "Copy of dress shoes, but with the white high maid shoes skin.",
     "repairs_like": "dress_shoes",
     "type": "ARMOR",
+    "category": "clothing",
     "name": { "str": "pair of wedding shoes", "str_pl": "pairs of wedding shoes" },
     "description": "A pair of beautiful white heels to match a wedding dress.",
     "weight": "870 g",
diff --git a/mutations.json b/mutations.json
index 6e64286..0499403 100644
--- a/mutations.json
+++ b/mutations.json
@@ -12,6 +12,17 @@
   },
   {
     "type": "mutation",
+    "id": "PROF_MISTRESS",
+    "name": { "str": "Mistress" },
+    "points": 0,
+    "description": "You are the child of a wealthy family, accustomed to living in luxury. Times may be hard now, but at least you have your loyal servant to keep you safe.",
+    "initial_ma_styles": [ "style_maid" ],
+    "valid": false,
+    "purifiable": false,
+    "profession": true
+  },
+  {
+    "type": "mutation",
     "id": "PROF_NEKOMIMI",
     "name": { "str": "Nekomimi" },
     "points": 0,
diff --git a/npcs/NC_MISTRESS.json b/npcs/NC_MISTRESS.json
new file mode 100644
index 0000000..51671e7
--- /dev/null
+++ b/npcs/NC_MISTRESS.json
@@ -0,0 +1,27 @@
+[
+  {
+    "type": "item_group",
+    "id": "NC_MISTRESS_worn",
+    "subtype": "collection",
+    "entries": [
+      { "item": "bra", "prob": 100 },
+      { "item": "panties", "prob": 100 },
+      { "item": "socks", "prob": 100 },
+      { "item": "dress_shirt", "prob": 100 },
+      { "item": "gloves_light", "prob": 100 },
+      { "item": "pants", "prob": 100 },
+      { "item": "dress_shoes", "prob": 100 },
+      { "item": "peacoat", "prob": 100 },
+      { "item": "knit_scarf", "prob": 100 },
+      { "item": "mbag", "prob": 100 }
+    ]
+  },  {
+    "type": "item_group",
+    "id": "NC_MISTRESS_carried",
+    "subtype": "collection",
+    "entries": [
+      { "item": "pocketwatch", "prob": 100 },
+      { "item": "smart_phone", "prob": 100 }
+    ]
+  }
+]
diff --git a/npcs/NC_SHOGGOTH_MAID.json b/npcs/NC_SHOGGOTH_MAID.json
index 7d18dc7..b0401bb 100644
--- a/npcs/NC_SHOGGOTH_MAID.json
+++ b/npcs/NC_SHOGGOTH_MAID.json
@@ -12,11 +12,9 @@
       { "item": "kawaii_maid_niso_thick", "prob": 100 },
       { "item": "kawaii_maid_bra", "prob": 100 },
       { "item": "kawaii_boots", "prob": 100 },
-      { "item": "maid_gloves_long_cotton", "prob": 100 },
+      { "item": "maid_gloves_leather", "prob": 100 },
       { "item": "kawaii_vest", "prob": 100 },
       { "item": "kawaii_maid_hardcase_slim", "prob": 100 },
-      { "item": "kawaii_secretpoach", "prob": 100 },
-      { "item": "kawaii_secretpoach", "prob": 100 },
       { "item": "kawaii_maid_megane_01", "prob": 100 }
     ]
   },  {
@@ -29,7 +27,8 @@
       { "item": "kawaii_scarf", "prob": 100 },
       { "item": "cloak", "prob": 100 },
       { "item": "assassins_throwing_dagger", "prob": 100 },
-      { "item": "master_doll", "prob": 100 }
+      { "item": "master_doll", "prob": 100 },
+      { "item": "smart_phone", "prob": 100 }
     ]
   }
 ]
diff --git a/npcs/backgrounds.json b/npcs/backgrounds.json
index 230de14..b6128be 100644
--- a/npcs/backgrounds.json
+++ b/npcs/backgrounds.json
@@ -15,7 +15,10 @@
     "id": "BGSS_MAID_KAWAII_1_STORY1",
     "type": "talk_topic",
     "dynamic_line": "My history? You mean before I served you? ...I'm sorry, but...",
-    "responses": [ { "text": "<done_conversation_section>", "topic": "TALK_FRIEND" }, { "text": "<end_talking>", "topic": "TALK_DONE" } ]
+    "responses": [
+        { "text": "<done_conversation_section>", "topic": "TALK_FRIEND" },
+        { "text": "<end_talking>", "topic": "TALK_DONE" }
+    ]
   },
   {
     "id": "TALK_FRIEND_CONVERSATION",
@@ -28,5 +31,38 @@
         "switch": true
       }
     ]
+  },
+  {
+    "type": "mutation",
+    "id": "BGSS_MISTRESS_1",
+    "name": { "str": "Survivor Story" },
+    "points": 0,
+    "description": "This NPC could tell you about how they survived the Cataclysm",
+    "player_display": false,
+    "valid": false,
+    "purifiable": false,
+    "types": [ "BACKGROUND_SURVIVAL_STORY" ],
+    "flags": [ "BG_SURVIVAL_STORY" ]
+  },
+  {
+    "id": "BGSS_MISTRESS_1_STORY1",
+    "type": "talk_topic",
+    "dynamic_line": "You were there. You saw my father killed by zombies. And he ordered you to keep me safe. So you should get back to doing it.",
+    "responses": [
+      { "text": "<done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking>", "topic": "TALK_DONE" }
+    ]
+  },
+  {
+    "id": "TALK_FRIEND_CONVERSATION",
+    "type": "talk_topic",
+    "responses": [
+      {
+        "text": "<BGSS_intro_question>",
+        "topic": "BGSS_MISTRESS_1_STORY1",
+        "condition": { "npc_has_trait": "BGSS_MISTRESS_1"  },
+        "switch": true
+      }
+    ]
   }
 ]
diff --git a/npcs/classes.json b/npcs/classes.json
index c072550..e6fe481 100644
--- a/npcs/classes.json
+++ b/npcs/classes.json
@@ -7,9 +7,9 @@
     "common": false,
     "skills": [
       { "skill": "cooking", "bonus": { "rng": [ 5, 5 ] } },
-      { "skill": "driving", "bonus": { "rng": [ 4, 4 ] } },
-      { "skill": "tailor", "bonus": { "rng": [ 4, 4 ] } },
       { "skill": "tailor", "bonus": { "rng": [ 4, 4 ] } },
+      { "skill": "driving", "bonus": { "rng": [ 4, 4 ] } },
+      { "skill": "throw", "bonus": { "rng": [ 4, 4 ] } },
       { "skill": "melee", "bonus": { "rng": [ 3, 3 ] } },
       { "skill": "unarmed", "bonus": { "rng": [ 3, 3 ] } },
       { "skill": "dodge", "bonus": { "rng": [ 3, 3 ] } }
@@ -30,5 +30,23 @@
     "worn_override": "NC_SHOGGOTH_MAID_worn",
     "carry_override": "NC_SHOGGOTH_MAID_carried",
     "weapon_override": "EMPTY_GROUP"
+  },
+  {
+    "type": "npc_class",
+    "id": "NC_MISTRESS",
+    "name": { "str": "mistress" },
+    "job_description": "I'm your Mistress, loyal servant!",
+    "common": false,
+    "skills": [ ],
+    "traits": [
+      { "group": "NPC_starting_traits" },
+      { "group": "Appearance_Germanic" },
+      [ "BGSS_MISTRESS_1", 100 ],
+      [ "PROF_MISTRESS", 100 ],
+      [ "FLIMSY2", 100 ]
+    ],
+    "worn_override": "NC_MISTRESS_worn",
+    "carry_override": "NC_MISTRESS_carried",
+    "weapon_override": "EMPTY_GROUP"
   }
 ]
diff --git a/npcs/npcs.json b/npcs/npcs.json
index f55a88b..5a93079 100644
--- a/npcs/npcs.json
+++ b/npcs/npcs.json
@@ -8,6 +8,17 @@
     "attitude": 3,
     "mission": 0,
     "chat": "TALK_MAID_ALLY",
-    "faction": "no_faction"
+    "faction": "your_followers"
+  },
+  {
+    "type": "npc",
+    "id": "mistress_npc",
+    "name_suffix": "Mistress",
+    "class": "NC_MISTRESS",
+    "gender": "female",
+    "attitude": 3,
+    "mission": 0,
+    "chat": "TALK_MAID_ALLY",
+    "faction": "your_followers"
   }
 ]
diff --git a/professions.json b/professions.json
index 5820843..5f7c689 100644
--- a/professions.json
+++ b/professions.json
@@ -25,26 +25,30 @@
         "items": [
           "pocketwatch",
           "knife_steak",
-          "tool_belt",
           "kawaii_scarf",
           "cloak",
           "assassins_throwing_dagger",
-          "master_doll"
+          "master_doll",
+          "smart_phone",
+          "kawaii_vest",
+          "kawaii_maid_hardcase_slim",
+          "kawaii_maid_megane_01"
         ],
-        "entries": [ { "group": "charged_cell_phone" } ]
       },
       "male": [
+        "undershirt",
         "briefs",
         "socks",
         "tux",
         "gloves_leather",
-        "dress_shoes"
+        "boots"
       ],
       "female": [
         "kawaii_maid_bra",
         "kawaii_maid_garter",
         "kawaii_maid_panties",
         "kawaii_maid_niso_thick",
+        "petticoat",
         "kawaii_maid_hat",
         "maid_dress",
         "maid_gloves_leather",
@@ -62,7 +66,8 @@
     "description": "You have a maid. She was hired by your father to keep you safe because of your health. She's good-looking and she's good in a fight.",
     "points": 8,
     "traits": [
-      "FLIMSY2"
+      "FLIMSY2",
+      "PROF_MISTRESS"
     ],
     "skills": [  ],
     "items": {
@@ -70,16 +75,18 @@
         "items": [
           "socks",
           "dress_shirt",
-          "peacoat",
-          "knit_scarf",
           "pants",
           "dress_shoes",
+          "peacoat",
+          "knit_scarf",
           "mbag",
-          "res_shoggoth",
-          "pet_carrier"
+          "pocketwatch",
+          "smart_phone",
+          "res_shoggoth"
         ],
-        "entries": [ { "group": "charged_cell_phone" } ] },
+      },
       "male": [
+        "undershirt",
         "briefs"
         ],
       "female": [
@@ -108,11 +115,11 @@
           "pocketwatch",
           "knife_steak",
           "maid_master_child",
-          "man_carrier"
+          "smart_phone"
         ],
-        "entries": [ { "group": "charged_cell_phone" } ]
       },
       "male": [
+        "undershirt",
         "briefs",
         "socks",
         "tux",
@@ -124,6 +131,7 @@
         "kawaii_maid_garter",
         "kawaii_maid_panties",
         "kawaii_maid_niso_thick",
+        "petticoat",
         "kawaii_maid_hat",
         "maid_dress",
         "maid_gloves_long_cotton",
@@ -156,11 +164,12 @@
         "items": [
           "pocketwatch",
           "knife_steak",
-          "leather_collar"
+          "leather_collar",
+          "smart_phone"
         ],
-        "entries": [ { "group": "charged_cell_phone" } ]
       },
       "male": [
+        "undershirt",
         "briefs",
         "socks",
         "tux",
@@ -172,6 +181,7 @@
         "kawaii_maid_garter",
         "kawaii_maid_panties",
         "kawaii_maid_niso_thin",
+        "petticoat",
         "maid_hat",
         "maid_dress_french",
         "maid_gloves_cotton",
@@ -182,7 +192,10 @@
   {
     "type": "profession",
     "ident": "maid",
-    "name": { "male": "Butler", "female": "Maid" },
+    "name": {
+      "male": "Butler",
+      "female": "Maid"
+    },
     "description": "You worked in a wealthy household, but after the cataclysm they took a family vacation to an unknown place, leaving you to fend for yourself.",
     "points": 1,
     "skills": [
@@ -194,11 +207,12 @@
       "both": {
         "items": [
           "pocketwatch",
-          "knife_steak"
+          "knife_steak",
+          "smart_phone"
         ],
-        "entries": [ { "group": "charged_cell_phone" } ]
       },
       "male": [
+        "undershirt",
         "briefs",
         "socks",
         "tux",
@@ -210,6 +224,7 @@
         "kawaii_maid_bra",
         "kawaii_maid_garter",
         "kawaii_maid_niso_thick",
+        "petticoat",
         "kawaii_maid_panties",
         "maid_gloves_long_cotton",
         "maid_dress",
diff --git a/recipes.json b/recipes.json
index cc84f3c..b8df6f8 100644
--- a/recipes.json
+++ b/recipes.json
@@ -929,28 +929,6 @@
     ]
   },
   {
-     "type": "recipe",
-    "result": "man_carrier",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_OTHER",
-    "skill_used": "tailor",
-    "difficulty": 4,
-    "time": "75 m",
-    "reversible": false,
-    "autolearn": true,
-    "using": [
-      [ "filament", 150 ]
-    ],
-    "qualities": [
-      { "id": "SEW", "level": 1 },
-      { "id": "CUT", "level": 1 },
-      { "id": "LEATHER_AWL", "level": 1 }
-    ],
-    "components": [
-      [ [ "tanned_hide", 12 ] ]
-    ]
-  },
-  {
     "type": "recipe",
     "result": "master_doll",
     "category": "CC_OTHER",
diff --git a/tool_armor.json b/tool_armor.json
deleted file mode 100644
index c364e17..0000000
--- a/tool_armor.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "id": "man_carrier",
-    "type": "TOOL_ARMOR",
-    "name": { "str": "human-sized carry bag" },
-    "description": "A large bag that could fit a person inside. The zipper running across it provides ventilation and you can open and close it from the inside.",
-    "weight": "1000 g",
-    "volume": "5 L",
-    "price": 20500,
-    "material": [ "leather" ],
-    "symbol": "[",
-    "color": "brown",
-    "covers": [ "torso" ],
-    "coverage": 50,
-    "encumbrance": 20,
-    "warmth": 10,
-    "material_thickness": 4,
-    "flags": [ "OVERSIZE", "BELTED" ],
-    "use_action": "CAPTURE_MONSTER_ACT",
-    "properties": [ [ "monster_size_capacity", "MEDIUM" ] ]
-  }
-]
diff --git a/tools.json b/tools.json
index 3141dfb..1aa4277 100644
--- a/tools.json
+++ b/tools.json
@@ -106,10 +106,10 @@
     "weight": "1200 g",
     "volume": "250 ml",
     "use_action": {
-      "type": "place_monster",
-      "monster_id": "maid_master",
-      "friendly_msg": "Mistress seemed worried about the state of the neighbours.",
-      "place_randomly": true
+      "type": "place_npc",
+      "npc_class_id": "shoggoth_maid_npc",
+      "friendly_msg": "'Everything that has happened is so terrible. But you will keep me safe, servant.'",
+      "place_randomly": false
     }
   },
   {