diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json index a2d3117948d86..b4e5e1ab7681b 100644 --- a/data/json/furniture_and_terrain/furniture-terrains.json +++ b/data/json/furniture_and_terrain/furniture-terrains.json @@ -888,6 +888,34 @@ ], "examine_action": "rubble" }, + { + "type": "furniture", + "id": "f_plane_wreckage", + "name": "metal wreckage from a plane", + "description": "A pile of various bent and twisted metals. Some of it looks pretty rusty, you wouldn't want to cut yourself on this.", + "looks_like": "t_scrap_wall_halfway", + "symbol": "#", + "color": "cyan", + "move_cost_mod": 6, + "max_volume": "750 L", + "required_str": -1, + "crafting_pseudo_item": "fake_sharp_metal_wreckage", + "flags": [ + "TRANSPARENT", + "UNSTABLE", + "ROUGH", + "SHARP", + "PLACE_ITEM", + "MOUNTABLE", + "CONTAINER", + "SEALED", + "ALLOW_FIELD_EFFECT", + "SHORT", + "SMALL_HIDE", + "RUBBLE" + ], + "examine_action": "rubble" + }, { "type": "furniture", "id": "f_reactor_meltdown", diff --git a/data/json/mapgen_palettes/airliner_palette.json b/data/json/mapgen_palettes/airliner_palette.json index 0d5bad1de4c37..b31d72f3cc93d 100644 --- a/data/json/mapgen_palettes/airliner_palette.json +++ b/data/json/mapgen_palettes/airliner_palette.json @@ -8,7 +8,6 @@ ",": "t_soil", "d": "t_dirtmound", "M": "t_wall_metal", - "m": "t_scrap_wall_halfway", ".": "t_metal_floor", "a": "t_metal_floor", "c": "t_metal_floor", @@ -30,6 +29,7 @@ "c": "f_counter", "f": "f_heavy_duty_fridge", "l": "f_locker", + "m": "f_plane_wreckage", "S": "f_sink", "x": "f_console_broken", "*": "f_wreckage" diff --git a/data/json/monsters/zed_fusion.json b/data/json/monsters/zed_fusion.json index bea5fc4ab678f..5344b2859fa58 100644 --- a/data/json/monsters/zed_fusion.json +++ b/data/json/monsters/zed_fusion.json @@ -35,8 +35,8 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "diff": 8, - "volume": "62500 ml", - "weight": "81500 g", + "volume": "187500 ml", + "weight": "244500 g", "hp": 112, "speed": 60, "material": [ "flesh" ], @@ -74,7 +74,6 @@ "REVIVES", "BILE_BLOOD", "PUSH_MON", - "PATH_AVOID_DANGER", "FILTHY" ], "armor": { "bash": 5, "cut": 5, "bullet": 4, "electric": 3 }