Revert "Add dwarfism and gigantism traits, vehicle disability aids (#…

…70393)" This reverts commit a6117dc.
CleverRaven · Jun 11, 2024 · 24cbfbc · 24cbfbc
1 parent cb25682
commit 24cbfbc
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 272 deletions.
diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -900,8 +900,7 @@
       [ "canister_empty", 45 ],
       [ "tongs", 10 ],
       [ "pressure_cooker", 10 ],
-      [ "sieve_steel", 10 ],
-      [ "hand_controls", 1 ]
+      [ "sieve_steel", 10 ]
     ]
   },
   {

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -1430,7 +1430,6 @@
       [ "solar_cell", 10 ],
       [ "screwdriver", 15 ],
       [ "superglue", 5 ],
-      [ "hand_controls", 1 ],
       { "item": "polisher", "prob": 15, "charges": [ 0, 100 ] },
       [ "solar_panel", 15 ]
     ]

diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json
@@ -666,9 +666,7 @@
       [ "motor_oil", 100 ],
       [ "solar_panel", 3 ],
       [ "recharge_station", 8 ],
-      [ "gas_forge", 2 ],
-      [ "pedal_extenders", 1 ],
-      [ "hand_controls", 1 ]
+      [ "gas_forge", 2 ]
     ]
   },
   {

diff --git a/data/json/items/vehicle/controls.json b/data/json/items/vehicle/controls.json
@@ -148,53 +148,5 @@
     "price": 500000,
     "price_postapoc": 3000,
     "copy-from": "vehicle_controls"
-  },
-  {
-    "type": "GENERIC",
-    "id": "hand_controls",
-    "name": { "str_sp": "hand controls" },
-    "description": "An accessibility tool for the paraplegic or very short, this is a simple pair of metal tubes that clamp to a vehicle's gas and brake pedals, allowing them to be operated by hand with the help of a trigger.",
-    "weight": "1200 g",
-    "to_hit": -1,
-    "color": "light_gray",
-    "symbol": "/",
-    "material": [ "steel" ],
-    "volume": "740 ml",
-    "category": "veh_parts",
-    "price": 40000,
-    "price_postapoc": 40,
-    "melee_damage": { "bash": 3 }
-  },
-  {
-    "type": "GENERIC",
-    "id": "pedal_extenders",
-    "name": { "str_sp": "pedal extenders" },
-    "description": "These thick rubber pads can clamp securely onto a vehicle's gas and brake pedals, allowing even very short people to drive a car.",
-    "weight": "1200 g",
-    "to_hit": -1,
-    "color": "black",
-    "symbol": ",",
-    "material": [ "rubber", "steel" ],
-    "volume": "740 ml",
-    "category": "veh_parts",
-    "price": 10000,
-    "price_postapoc": 40,
-    "melee_damage": { "bash": 3 }
-  },
-  {
-    "type": "GENERIC",
-    "id": "pedal_extenders_makeshift",
-    "name": { "str_sp": "makeshift pedal extenders" },
-    "description": "It is probably not a great idea, but if you wanted to, you could tape these blocks to a vehicle's gas and brake pedals so that a kid or very short adult could drive.",
-    "weight": "388 g",
-    "to_hit": -1,
-    "color": "brown",
-    "symbol": ",",
-    "material": [ "wood" ],
-    "volume": "656 ml",
-    "category": "veh_parts",
-    "price": 2000,
-    "price_postapoc": 20,
-    "melee_damage": { "bash": 1 }
   }
 ]
diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
@@ -6392,39 +6392,6 @@
     "category": [ "SLIME" ],
     "moncams": [ [ "mon_slime_ocularium", 32 ], [ "mon_player_blob", 16 ] ]
   },
-  {
-    "type": "mutation",
-    "id": "VERY_SHORT",
-    "flags": [ "SMALL" ],
-    "name": { "str": "Very Short" },
-    "points": 0,
-    "visibility": 4,
-    "mixed_effect": true,
-    "starting_trait": true,
-    "description": "You are significantly shorter than the general population.  You can't carry quite as much as a person of average height and you need special accommodations to drive a car, but otherwise being little isn't too much of a bother.",
-    "types": [ "SIZE" ],
-    "changes_to": [ "SMALL" ],
-    "category": [ "MOUSE", "RABBIT" ],
-    "stomach_size_multiplier": 0.5,
-    "hp_modifier": -0.05,
-    "weight_capacity_modifier": 0.8
-  },
-  {
-    "type": "mutation",
-    "id": "VERY_TALL",
-    "flags": [ "LARGE" ],
-    "name": { "str": "Very Tall" },
-    "points": 0,
-    "visibility": 1,
-    "mixed_effect": true,
-    "starting_trait": true,
-    "description": "You are significantly taller than the general population.  This leaves you with high blood pressure, a big appetite, and some minor health concerns, but you can carry a bit more than normal.",
-    "types": [ "SIZE" ],
-    "changes_to": [ "LARGE", "HUGE" ],
-    "category": [ "URSINE", "CATTLE", "LIZARD", "CHIMERA", "CRUSTACEAN" ],
-    "stomach_size_multiplier": 1.5,
-    "weight_capacity_modifier": 1.05
-  },
   {
     "type": "mutation",
     "id": "SMALL",

diff --git a/data/json/recipes/recipe_vehicle.json b/data/json/recipes/recipe_vehicle.json
@@ -1440,44 +1440,5 @@
       { "proficiency": "prof_welding" }
     ],
     "components": [ [ [ "material_aluminium_ingot", 7 ], [ "scrap_aluminum", 34 ] ] ]
-  },
-  {
-    "type": "recipe",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_VEHICLE",
-    "activity_level": "NO_EXERCISE",
-    "result": "pedal_extenders_makeshift",
-    "skill_used": "fabrication",
-    "time": "1 s",
-    "components": [ [ [ "wood_block", 2 ] ] ],
-    "autolearn": true,
-    "flags": [ "BLIND_EASY" ]
-  },
-  {
-    "type": "recipe",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_VEHICLE",
-    "activity_level": "NO_EXERCISE",
-    "result": "pedal_extenders",
-    "skill_used": "fabrication",
-    "difficulty": 2,
-    "time": "5 m",
-    "components": [ [ [ "rubber_tire_chunk", 4 ], [ "clamp", 2 ] ] ],
-    "autolearn": true,
-    "flags": [ "BLIND_EASY" ]
-  },
-  {
-    "type": "recipe",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_VEHICLE",
-    "activity_level": "MODERATE_EXERCISE",
-    "result": "hand_controls",
-    "difficulty": 4,
-    "skill_used": "fabrication",
-    "time": "35 m",
-    "using": [ [ "welding_standard", 25 ] ],
-    "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_welding_basic" }, { "proficiency": "prof_welding" } ],
-    "components": [ [ [ "pipe_fittings", 2 ], [ "pipe", 2 ], [ "clamp", 2 ] ] ],
-    "autolearn": true
   }
 ]
diff --git a/data/json/uncraft/vehicle/controls.json b/data/json/uncraft/vehicle/controls.json
diff --git a/data/json/vehicleparts/cargo.json b/data/json/vehicleparts/cargo.json
@@ -16,7 +16,7 @@
       "removal": { "skills": [ [ "fabrication", 2 ] ], "time": "5 m", "using": [ [ "vehicle_nail_removal", 1 ] ] },
       "repair": { "skills": [ [ "fabrication", 2 ] ], "time": "5 m", "using": [ [ "adhesive", 2 ] ] }
     },
-    "flags": [ "CARGO", "BOARDABLE", "COVERED", "CARGO_PASSABLE" ],
+    "flags": [ "CARGO", "BOARDABLE", "COVERED" ],
     "breaks_into": "ig_vp_cloth",
     "variants": [ { "symbols": "o", "symbols_broken": "#" } ]
   },
@@ -74,7 +74,7 @@
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "5 m", "using": [ [ "vehicle_weld_removal", 1 ] ] },
       "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "5 m", "using": [ [ "repair_welding_standard", 3 ] ] }
     },
-    "flags": [ "UNMOUNT_ON_DAMAGE", "CARGO", "PROTRUSION", "CARGO_PASSABLE" ],
+    "flags": [ "UNMOUNT_ON_DAMAGE", "CARGO", "PROTRUSION" ],
     "damage_reduction": { "all": 6 },
     "variants": [ { "symbols": "o", "symbols_broken": "#" } ]
   },
@@ -122,7 +122,7 @@
       "removal": { "skills": [ [ "mechanics", 1 ] ], "time": "150 s", "using": [ [ "vehicle_screw", 1 ] ] },
       "repair": { "skills": [ [ "mechanics", 1 ], [ "fabrication", 1 ] ], "time": "2 m", "using": [ [ "repair_welding_standard", 1 ] ] }
     },
-    "flags": [ "CARGO", "CARGO_PASSABLE" ],
+    "flags": [ "CARGO" ],
     "damage_reduction": { "all": 6 },
     "variants": [ { "symbols": "o", "symbols_broken": "#" } ]
   },
@@ -153,7 +153,7 @@
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "5 m", "using": [ [ "vehicle_weld_removal", 1 ] ] },
       "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "2 m", "using": [ [ "repair_welding_standard", 1 ] ] }
     },
-    "flags": [ "UNMOUNT_ON_DAMAGE", "CARGO", "PROTRUSION", "CARGO_PASSABLE" ],
+    "flags": [ "UNMOUNT_ON_DAMAGE", "CARGO", "PROTRUSION" ],
     "damage_reduction": { "all": 6 },
     "variants": [ { "symbols": "o", "symbols_broken": "#" } ]
   },
@@ -175,7 +175,7 @@
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "5 m", "using": [ [ "vehicle_screw", 1 ] ] },
       "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "2 m", "using": [ [ "repair_welding_standard", 1 ] ] }
     },
-    "flags": [ "CARGO", "BOARDABLE", "COVERED", "LOCKABLE_CARGO", "CARGO_PASSABLE" ],
+    "flags": [ "CARGO", "BOARDABLE", "COVERED", "LOCKABLE_CARGO" ],
     "breaks_into": "ig_vp_frame",
     "damage_reduction": { "all": 28 },
     "variants": [ { "symbols": "o", "symbols_broken": "#" } ]
@@ -200,7 +200,6 @@
     "broken_color": "light_gray",
     "size": "359614 ml",
     "item": "trashcan_large",
-    "delete": { "flags": [ "CARGO_PASSABLE" ] },
     "variants_bases": [ { "id": "trash can", "label": "Trash Can" } ],
     "variants": [ { "symbols": ")", "symbols_broken": "#" } ]
   },
@@ -226,7 +225,7 @@
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] },
       "repair": { "skills": [ [ "mechanics", 4 ] ], "time": "6 m", "using": [ [ "repair_welding_standard", 5 ] ] }
     },
-    "flags": [ "UNMOUNT_ON_DAMAGE", "CARGO", "PROTRUSION", "COVERED", "BOARDABLE", "HUGE_OK", "CARGO_PASSABLE" ],
+    "flags": [ "UNMOUNT_ON_DAMAGE", "CARGO", "PROTRUSION", "COVERED", "BOARDABLE", "HUGE_OK" ],
     "damage_reduction": { "all": 26 },
     "variants": [ { "symbols": "=", "symbols_broken": "#" } ]
   },
@@ -270,7 +269,7 @@
       "install": { "skills": [ [ "mechanics", 1 ] ], "time": "10 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "5 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }
     },
-    "flags": [ "UNMOUNT_ON_DAMAGE", "PROTRUSION", "CARGO_PASSABLE" ],
+    "flags": [ "UNMOUNT_ON_DAMAGE", "PROTRUSION" ],
     "damage_reduction": { "all": 10 },
     "variants": [ { "symbols": "o", "symbols_broken": "#" } ]
   }

diff --git a/data/json/vehicleparts/seats.json b/data/json/vehicleparts/seats.json
@@ -49,7 +49,7 @@
         "using": [ [ "repair_welding_standard", 1 ], [ "sewing_standard", 8 ] ]
       }
     },
-    "size": "85 L",
+    "size": "80 L",
     "type": "vehicle_part",
     "variants_bases": [ { "id": "windshield", "label": "Windshield" }, { "id": "swivel_chair", "label": "Swivel Chair" } ],
     "variants": [
@@ -76,10 +76,9 @@
     "id": "reclining_seat",
     "copy-from": "seat",
     "comfort": 3,
-    "//": "reclining and bench seats are roomier than standard and are able to fit Large characters, if not comfortably",
     "description": "A soft seat with an adjustable backrest, making it a reasonably comfortable place to sleep.",
     "durability": 100,
-    "size": "95 L",
+    "size": "84000 ml",
     "floor_bedding_warmth": 350,
     "name": { "str": "reclining bucket seat" },
     "extend": { "flags": [ "BED" ] },

diff --git a/data/json/vehicleparts/vehicle_parts.json b/data/json/vehicleparts/vehicle_parts.json
@@ -312,7 +312,7 @@
     "size": "100 L",
     "item": "sheet_metal",
     "location": "center",
-    "//": ".5m square sheet of metal, likely affixed with bolts in places, assume 200cm weld to install and 50cm weld to repair",
+    "//": "1m square sheet of metal, likely affixed with bolts in places, assume 200cm weld to install and 50cm weld to repair",
     "requirements": {
       "install": {
         "skills": [ [ "mechanics", 1 ] ],
@@ -875,7 +875,7 @@
     "size": "75 L",
     "item": "frame_wood_light",
     "location": "center",
-    "flags": [ "CARGO", "BOARDABLE", "COVERED", "HUGE_OK", "CARGO_PASSABLE" ],
+    "flags": [ "CARGO", "BOARDABLE", "COVERED", "HUGE_OK" ],
     "breaks_into": [ { "item": "splinter", "count": [ 3, 5 ] }, { "item": "string_36", "count": [ 10, 15 ] } ],
     "requirements": {
       "install": { "time": "10 m", "using": [ [ "rope_natural_short", 1 ] ] },
@@ -902,7 +902,7 @@
       "removal": { "skills": [ [ "fabrication", 1 ] ], "time": "15 m", "using": [ [ "vehicle_nail_removal", 1 ] ] },
       "repair": { "skills": [ [ "fabrication", 1 ] ], "time": "30 m", "using": [ [ "adhesive", 2 ] ] }
     },
-    "flags": [ "CARGO", "BOARDABLE", "COVERED", "LOCKABLE_CARGO", "CARGO_PASSABLE" ],
+    "flags": [ "CARGO", "BOARDABLE", "COVERED", "LOCKABLE_CARGO" ],
     "breaks_into": [ { "item": "splinter", "count": [ 3, 5 ] }, { "item": "nail", "charges": [ 10, 15 ] } ],
     "damage_reduction": { "all": 5 },
     "variants": [ { "symbols": "o", "symbols_broken": "#" } ]
@@ -926,7 +926,7 @@
       "removal": { "skills": [ [ "fabrication", 2 ] ], "time": "15 m", "using": [ [ "vehicle_nail_removal", 1 ] ] },
       "repair": { "skills": [ [ "fabrication", 2 ] ], "time": "30 m", "using": [ [ "adhesive", 2 ] ] }
     },
-    "flags": [ "CARGO", "BOARDABLE", "COVERED", "LOCKABLE_CARGO", "CARGO_PASSABLE" ],
+    "flags": [ "CARGO", "BOARDABLE", "COVERED", "LOCKABLE_CARGO" ],
     "breaks_into": [ { "item": "splinter", "count": [ 3, 5 ] }, { "item": "nail", "charges": [ 10, 15 ] } ],
     "damage_reduction": { "all": 4 },
     "variants": [ { "symbols": "o", "symbols_broken": "#" } ]
@@ -1296,7 +1296,7 @@
         "using": [ [ "repair_welding_standard", 3 ], [ "soldering_standard", 8 ], [ "vehicle_wrench_1", 1 ], [ "vehicle_screw", 1 ] ]
       }
     },
-    "flags": [ "CONTROLS", "NEED_LEG", "INOPERABLE_SMALL" ],
+    "flags": [ "CONTROLS" ],
     "breaks_into": [
       { "item": "steel_lump" },
       { "item": "steel_chunk", "count": [ 1, 3 ] },
@@ -1306,60 +1306,6 @@
     "damage_reduction": { "all": 6 },
     "variants": [ { "symbols": "$", "symbols_broken": "$" } ]
   },
-  {
-    "type": "vehicle_part",
-    "id": "hand_controls",
-    "name": { "str": "hand controls" },
-    "categories": [ "other" ],
-    "broken_color": "red",
-    "durability": 250,
-    "description": "A pair of adjustable rods with a simple trigger.  They easily can be easily installed on top of vehicle controls and will allow a car or similar vehicle to be driven by those who can't use their legs to do so, whether due to disability or small stature.  These are designed for automobiles and will not work on bicycle style foot pedals.",
-    "bonus": 10,
-    "folded_volume": "740 ml",
-    "item": "hand_controls",
-    "flags": [ "IGNORE_LEG_REQUIREMENT", "IGNORE_HEIGHT_REQUIREMENT", "ON_CONTROLS" ],
-    "breaks_into": [ { "item": "scrap", "count": [ 0, 2 ] }, { "item": "pipe", "count": [ 0, 1 ] } ],
-    "variants": [ { "symbols": "/", "symbols_broken": "/" } ]
-  },
-  {
-    "type": "vehicle_part",
-    "id": "pedal_extenders",
-    "name": { "str": "pedal extenders" },
-    "categories": [ "other" ],
-    "broken_color": "red",
-    "durability": 250,
-    "description": "Thick rubber pads which can be easily clamped onto gas and brake pedals to allow vehicle controls to be used even by people who are very short.",
-    "bonus": 10,
-    "folded_volume": "2 L",
-    "item": "pedal_extenders",
-    "flags": [ "IGNORE_HEIGHT_REQUIREMENT", "ON_CONTROLS" ],
-    "breaks_into": [
-      { "item": "rubber_tire_chunk", "count": [ 0, 1 ] },
-      { "item": "rubber_tire_chunk", "count": [ 0, 8 ] },
-      { "item": "clamp", "count": [ 0, 1 ] },
-      { "item": "scrap", "count": [ 0, 2 ] }
-    ],
-    "variants": [ { "symbols": ",", "symbols_broken": "," } ]
-  },
-  {
-    "type": "vehicle_part",
-    "id": "pedal_extenders_makeshift",
-    "name": { "str": "makeshift pedal extenders" },
-    "categories": [ "other" ],
-    "broken_color": "red",
-    "durability": 50,
-    "description": "Blocks of wood, taped to the pedals to allow vehicle controls to be used even by people who are very short.",
-    "bonus": 10,
-    "folded_volume": "2 L",
-    "item": "pedal_extenders_makeshift",
-    "flags": [ "IGNORE_HEIGHT_REQUIREMENT", "ON_CONTROLS" ],
-    "requirements": {
-      "install": { "skills": [ [ "mechanics", 1 ] ], "time": "350 s", "components": [ [ [ "duct_tape", 25 ] ] ] },
-      "repair": { "skills": [ [ "mechanics", 1 ] ], "time": "80 s", "using": [ [ "adhesive", 1 ] ] }
-    },
-    "breaks_into": [ { "item": "splinter", "count": [ 0, 4 ] } ],
-    "variants": [ { "symbols": ",", "symbols_broken": "," } ]
-  },
   {
     "type": "vehicle_part",
     "id": "dashboard",