Soap bottle parity with plastic bottles (#55296)

data/json/items/generic/bathroom_house.json

@@ -284,8 +284,8 @@
     "id": "bottle_bathroom",
     "type": "GENERIC",
     "category": "container",
-    "name": { "str": "plastic bottle" },
-    "description": "A squeezable used bottle to hold various bathroom soaps",
+    "name": { "str": "plastic soap bottle" },
+    "description": "A squeezable bottle used to hold various bathroom soaps.",
     "looks_like": "bottle_plastic",
     "weight": "130 g",
     "volume": "502 ml",
@@ -315,9 +315,8 @@
       { "id": "bbottle_3", "text": "A bottle for body wash.  This one is called 'Afrika'." },
       { "id": "bbottle_4", "text": "A bottle for hair conditioner." },
       { "id": "bbottle_5", "text": "A colorful bottle of body and hair wash marketed for children." },
-      { "id": "bbottle_6", "text": "A plain white bottle made to contain the cheapest shampoo." },
-      { "id": "bbottle_7", "text": "A plain white bottle made to contain the cheapest hair conditioner." },
-      { "id": "bbottle_8", "text": "A plain white bottle made to contain the cheapest shower jell." }
+      { "id": "bbottle_6", "text": "A plain white bottle made to contain the cheapest hair conditioner." },
+      { "id": "bbottle_7", "text": "A plain white bottle made to contain the cheapest shower gel." }
     ]
   },
   {

data/json/recipes/armor/head.json

@@ -345,7 +345,7 @@
     "time": "2 h",
     "autolearn": true,
     "qualities": [ { "id": "CUT", "level": 2 } ],
-    "components": [ [ [ "cordage", 1, "LIST" ] ], [ [ "bottle_plastic", 1 ], [ "bottle_plastic_small", 2 ] ] ],
+    "components": [ [ [ "cordage", 1, "LIST" ] ], [ [ "bottle_plastic", 1 ], [ "bottle_bathroom", 1 ], [ "bottle_plastic_small", 2 ] ] ],
     "proficiencies": [ { "proficiency": "prof_plasticworking" } ]
   },
   {
@@ -1365,7 +1365,7 @@
       [ "textbook_gaswarfare", 3 ]
     ],
     "components": [
-      [ [ "bag_plastic", 2 ], [ "bottle_plastic", 1 ], [ "bottle_plastic_small", 2 ] ],
+      [ [ "bag_plastic", 2 ], [ "bottle_plastic", 1 ], [ "bottle_bathroom", 1 ], [ "bottle_plastic_small", 2 ] ],
       [ [ "rag", 2 ], [ "bandana", 2 ], [ "paper", 10 ] ],
       [ [ "charcoal", 10 ] ]
     ],

data/json/recipes/armor/other.json

@@ -200,7 +200,13 @@
     "components": [
       [ [ "fur", 4 ] ],
       [ [ "cordage", 1, "LIST" ] ],
-      [ [ "plastic_chunk", 10 ], [ "bottle_plastic", 5 ], [ "bottle_plastic_small", 10 ], [ "jug_plastic", 1 ] ]
+      [
+        [ "plastic_chunk", 10 ],
+        [ "bottle_plastic", 5 ],
+        [ "bottle_bathroom", 5 ],
+        [ "bottle_plastic_small", 10 ],
+        [ "jug_plastic", 1 ]
+      ]
     ]
   },
   {
@@ -219,7 +225,13 @@
     "components": [
       [ [ "faux_fur", 4 ] ],
       [ [ "cordage", 1, "LIST" ] ],
-      [ [ "plastic_chunk", 10 ], [ "bottle_plastic", 5 ], [ "bottle_plastic_small", 10 ], [ "jug_plastic", 1 ] ]
+      [
+        [ "plastic_chunk", 10 ],
+        [ "bottle_plastic", 5 ],
+        [ "bottle_bathroom", 5 ],
+        [ "bottle_plastic_small", 10 ],
+        [ "jug_plastic", 1 ]
+      ]
     ]
   },
   {
@@ -284,7 +296,13 @@
     "components": [
       [ [ "leather", 4 ] ],
       [ [ "cordage", 1, "LIST" ] ],
-      [ [ "plastic_chunk", 10 ], [ "bottle_plastic", 5 ], [ "bottle_plastic_small", 10 ], [ "jug_plastic", 1 ] ]
+      [
+        [ "plastic_chunk", 10 ],
+        [ "bottle_plastic", 5 ],
+        [ "bottle_bathroom", 5 ],
+        [ "bottle_plastic_small", 10 ],
+        [ "jug_plastic", 1 ]
+      ]
     ]
   },
   {

data/json/recipes/other/vehicle.json

@@ -68,7 +68,7 @@
     "time": "2 m",
     "book_learn": [ [ "mag_fieldrepair", 2 ] ],
     "qualities": [ { "id": "CUT", "level": 2 } ],
-    "components": [ [ [ "bottle_plastic", 1 ] ], [ [ "paper", 50 ] ], [ [ "duct_tape", 20 ] ] ]
+    "components": [ [ [ "bottle_plastic", 1 ], [ "bottle_bathroom", 1 ] ], [ [ "paper", 50 ] ], [ [ "duct_tape", 20 ] ] ]
   },
   {
     "result": "filter_liquid_makeshift",

data/json/recipes/recipe_others.json

@@ -470,7 +470,15 @@
     "time": "5 m",
     "autolearn": true,
     "qualities": [ { "id": "CUT", "level": 2 } ],
-    "components": [ [ [ "jug_plastic", 1 ], [ "bottle_plastic", 3 ], [ "bottle_plastic_small", 6 ], [ "aluminum_foil", 6 ] ] ]
+    "components": [
+      [
+        [ "jug_plastic", 1 ],
+        [ "bottle_plastic", 3 ],
+        [ "bottle_bathroom", 3 ],
+        [ "bottle_plastic_small", 6 ],
+        [ "aluminum_foil", 6 ]
+      ]
+    ]
   },
   {
     "type": "recipe",
@@ -862,7 +870,7 @@
     "time": "20 m",
     "book_learn": [ [ "fun_survival", 1 ], [ "manual_fabrication", 1 ] ],
     "qualities": [ { "id": "CUT", "level": 2 } ],
-    "components": [ [ [ "can_drink", 2 ] ], [ [ "bottle_plastic", 1 ] ] ]
+    "components": [ [ [ "can_drink", 2 ] ], [ [ "bottle_plastic", 1 ], [ "bottle_bathroom", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -1476,7 +1484,7 @@
     "book_learn": [ [ "mag_survival", 2 ], [ "textbook_survival", 2 ], [ "survival_book", 1 ], [ "pocket_survival", 1 ] ],
     "qualities": [ { "id": "CUT", "level": 2 } ],
     "components": [
-      [ [ "jug_plastic", 2 ], [ "bottle_plastic", 10 ], [ "bottle_plastic_small", 20 ] ],
+      [ [ "jug_plastic", 2 ], [ "bottle_plastic", 10 ], [ "bottle_bathroom", 10 ], [ "bottle_plastic_small", 20 ] ],
       [ [ "cordage", 1, "LIST" ], [ "duct_tape", 50 ], [ "medical_tape", 25 ] ]
     ]
   },

data/json/recipes/recipes_holiday.json

@@ -15,7 +15,7 @@
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
     "using": [ [ "plastic_molding", 2 ] ],
     "components": [
-      [ [ "jug_plastic", 1 ], [ "bottle_plastic", 3 ], [ "bottle_plastic_small", 6 ] ],
+      [ [ "jug_plastic", 1 ], [ "bottle_plastic", 3 ], [ "bottle_bathroom", 3 ], [ "bottle_plastic_small", 6 ] ],
       [ [ "lightstrip_inactive", 1 ] ],
       [ [ "light_battery_cell", 1 ] ],
       [ [ "y_paint", 1 ] ]

data/json/recipes/tools/containers.json

@@ -89,7 +89,7 @@
     "time": "30 m",
     "autolearn": true,
     "qualities": [ { "id": "CUT", "level": 2 } ],
-    "components": [ [ [ "duct_tape", 10 ] ], [ [ "bottle_plastic", 8 ], [ "bottle_plastic_small", 16 ] ] ]
+    "components": [ [ [ "duct_tape", 10 ] ], [ [ "bottle_plastic", 8 ], [ "bottle_bathroom", 8 ], [ "bottle_plastic_small", 16 ] ] ]
   },
   {
     "type": "recipe",
@@ -189,6 +189,22 @@
     "using": [ [ "plastic_molding", 1 ] ],
     "components": [ [ [ "plastic_chunk", 2 ] ] ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "fake",
+    "result": "bottle_bathroom",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_CONTAINERS",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "30 m",
+    "autolearn": true,
+    "book_learn": [ [ "plastics_book", 2 ] ],
+    "proficiencies": [ { "proficiency": "prof_plasticworking" } ],
+    "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
+    "using": [ [ "plastic_molding", 1 ] ],
+    "components": [ [ [ "plastic_chunk", 2 ] ] ]
+  },
   {
     "type": "recipe",
     "activity_level": "fake",

data/json/recipes/tools/lights.json

@@ -71,6 +71,7 @@
         [ "canister_empty", 1 ],
         [ "bottle_glass", 1 ],
         [ "bottle_plastic", 1 ],
+        [ "bottle_bathroom", 1 ],
         [ "bottle_plastic_small", 1 ]
       ],
       [ [ "lightstrip_inactive", 1 ], [ "light_bulb", 1 ] ],

data/json/recipes/tools/tools_electronic.json

@@ -175,7 +175,7 @@
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "components": [
       [ [ "element", 8 ], [ "crude_heating_element", 8 ] ],
-      [ [ "bottle_glass", 2 ], [ "bottle_plastic", 5 ], [ "bottle_plastic_small", 10 ] ],
+      [ [ "bottle_glass", 2 ], [ "bottle_plastic", 5 ], [ "bottle_bathroom", 5 ], [ "bottle_plastic_small", 10 ] ],
       [ [ "hose", 1 ], [ "makeshift_hose", 1 ] ],
       [ [ "scrap", 3 ] ],
       [ [ "cable", 5 ] ]

data/json/recipes/weapon/mods.json

@@ -603,7 +603,11 @@
     "time": "6 m",
     "autolearn": true,
     "qualities": [ { "id": "CUT", "level": 2 } ],
-    "components": [ [ [ "duct_tape", 75 ] ], [ [ "bottle_twoliter", 1 ] ], [ [ "bottle_plastic", 4 ], [ "bottle_plastic_small", 4 ] ] ]
+    "components": [
+      [ [ "duct_tape", 75 ] ],
+      [ [ "bottle_twoliter", 1 ] ],
+      [ [ "bottle_plastic", 4 ], [ "bottle_bathroom", 4 ], [ "bottle_plastic_small", 4 ] ]
+    ]
   },
   {
     "type": "recipe",