diff --git a/data/json/bionics.json b/data/json/bionics.json
index 887689feb58d6..6f497dca5eb48 100644
--- a/data/json/bionics.json
+++ b/data/json/bionics.json
@@ -51,7 +51,7 @@
"cut_protec": [ [ "arm_l", 3 ], [ "arm_r", 3 ], [ "hand_l", 3 ], [ "hand_r", 3 ] ],
"bullet_protec": [ [ "arm_l", 3 ], [ "arm_r", 3 ], [ "hand_l", 3 ], [ "hand_r", 3 ] ],
"encumbrance": [ [ "arm_l", 1 ], [ "arm_r", 1 ], [ "hand_l", 1 ], [ "hand_r", 1 ] ],
- "cant_remove_reason": "The Alloy Plating is too thoroughly entwined to be removed safely.",
+ "//": "cant_remove_reason removed for now as these are presently functionally obsolete and characters should be able to remove them to get with the times.",
"flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ],
"mutation_conflicts": [
"THICKSKIN",
@@ -149,13 +149,9 @@
"name": { "str": "Protective Lenses" },
"description": "Your eye sockets have been surgically sealed with highly protective mirrored lenses and your tear ducts have been re-routed to your mouth. When you cry, you must spit out or swallow your tears.",
"occupied_bodyparts": [ [ "eyes", 1 ] ],
- "env_protec": [ [ "eyes", 7 ] ],
- "bash_protec": [ [ "eyes", 3 ] ],
- "cut_protec": [ [ "eyes", 3 ] ],
- "bullet_protec": [ [ "eyes", 3 ] ],
- "encumbrance": [ [ "eyes", 1 ] ],
"mutation_conflicts": [ "COMPOUND_EYES", "CEPH_VISION", "CEPH_EYES", "EYEBULGE", "EYESTALKS1", "EYESTALKS2" ],
- "social_modifiers": { "intimidate": 10 }
+ "social_modifiers": { "intimidate": 10 },
+ "passive_pseudo_items": [ "armor_bio_eyes" ]
},
{
"id": "bio_armor_head",
@@ -167,7 +163,7 @@
"cut_protec": [ [ "head", 3 ], [ "mouth", 3 ] ],
"bullet_protec": [ [ "head", 3 ], [ "mouth", 3 ] ],
"encumbrance": [ [ "head", 1 ] ],
- "cant_remove_reason": "The Alloy Plating is too thoroughly entwined to be removed safely.",
+ "//": "cant_remove_reason removed for now as these are presently functionally obsolete and characters should be able to remove them to get with the times.",
"flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ],
"mutation_conflicts": [
"THICKSKIN",
@@ -285,7 +281,7 @@
"cut_protec": [ [ "leg_l", 3 ], [ "leg_r", 3 ], [ "foot_l", 3 ], [ "foot_r", 3 ] ],
"bullet_protec": [ [ "leg_l", 3 ], [ "leg_r", 3 ], [ "foot_l", 3 ], [ "foot_r", 3 ] ],
"encumbrance": [ [ "leg_l", 1 ], [ "leg_r", 1 ], [ "foot_l", 1 ], [ "foot_r", 1 ] ],
- "cant_remove_reason": "The Alloy Plating is too thoroughly entwined to be removed safely.",
+ "//": "cant_remove_reason removed for now as these are presently functionally obsolete and characters should be able to remove them to get with the times.",
"flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ],
"mutation_conflicts": [
"THICKSKIN",
@@ -383,7 +379,7 @@
"bullet_protec": [ [ "torso", 3 ] ],
"encumbrance": [ [ "torso", 1 ] ],
"flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ],
- "cant_remove_reason": "The Alloy Plating is too thoroughly entwined to be removed safely.",
+ "//": "cant_remove_reason removed for now as these are presently functionally obsolete and characters should be able to remove them to get with the times.",
"canceled_mutations": [ "VINES1", "VINES2", "VINES3" ],
"mutation_conflicts": [
"THICKSKIN",
@@ -535,7 +531,7 @@
"id": "bio_carbon",
"type": "bionic",
"name": { "str": "Subdermal Carbon Filament" },
- "description": "Lying just beneath your skin is a thin armor made of carbon nanotubes. This reduces bashing damage by 2 and cutting damage by 4.",
+ "description": "Lying just beneath your skin is a thin armor made of carbon nanotubes. This has little impact on blunt trauma but will protect you against deep cuts.",
"occupied_bodyparts": [
[ "torso", 6 ],
[ "head", 2 ],
@@ -546,45 +542,11 @@
[ "foot_l", 1 ],
[ "foot_r", 1 ],
[ "hand_l", 1 ],
- [ "hand_r", 1 ]
- ],
- "bash_protec": [
- [ "torso", 2 ],
- [ "head", 2 ],
- [ "arm_l", 2 ],
- [ "arm_r", 2 ],
- [ "leg_l", 2 ],
- [ "leg_r", 2 ],
- [ "foot_l", 2 ],
- [ "foot_r", 2 ],
- [ "hand_l", 2 ],
- [ "hand_r", 2 ]
- ],
- "cut_protec": [
- [ "torso", 4 ],
- [ "head", 4 ],
- [ "arm_l", 4 ],
- [ "arm_r", 4 ],
- [ "leg_l", 4 ],
- [ "leg_r", 4 ],
- [ "foot_l", 4 ],
- [ "foot_r", 4 ],
- [ "hand_l", 4 ],
- [ "hand_r", 4 ]
- ],
- "bullet_protec": [
- [ "torso", 4 ],
- [ "head", 4 ],
- [ "arm_l", 4 ],
- [ "arm_r", 4 ],
- [ "leg_l", 4 ],
- [ "leg_r", 4 ],
- [ "foot_l", 4 ],
- [ "foot_r", 4 ],
- [ "hand_l", 4 ],
- [ "hand_r", 4 ]
+ [ "hand_r", 1 ],
+ [ "mouth", 1 ]
],
- "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ]
+ "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ],
+ "passive_pseudo_items": [ "armor_bio_carbon_filament" ]
},
{
"id": "bio_chain_lightning",
diff --git a/data/json/flags.json b/data/json/flags.json
index a1b16632ad37a..2e4ebacbe9b7e 100644
--- a/data/json/flags.json
+++ b/data/json/flags.json
@@ -44,7 +44,7 @@
{
"id": "ALLOWS_NATURAL_ATTACKS",
"type": "json_flag",
- "info": "This clothing won't hinder special attacks that involve mutated anatomy."
+ "info": "This clothing won't hinder special attacks that involve mutated or cybernetic anatomy."
},
{
"id": "ALLOWS_REMOTE_USE",
diff --git a/data/json/items/armor/integrated.json b/data/json/items/armor/integrated.json
index e8fed77a6247d..e7191322feab9 100644
--- a/data/json/items/armor/integrated.json
+++ b/data/json/items/armor/integrated.json
@@ -786,5 +786,68 @@
"encumbrance": 10
}
]
+ },
+ {
+ "id": "armor_bio_eyes",
+ "//": "These do not preclude wearing glasses, but you'll get double-up penalties. If you really needed to you could likely still situate the lenses in front of them. You should probably just augment your eyes though.",
+ "type": "ARMOR",
+ "category": "armor",
+ "name": { "str_sp": "protective lenses" },
+ "description": "Highly protective lenses which seal off your eyes from danger, routing your tear ducts to your mouth.",
+ "weight": "180 g",
+ "volume": "250 ml",
+ "price": 0,
+ "price_postapoc": 0,
+ "to_hit": -2,
+ "material": [ "plastic", "lvl4ballisticglass" ],
+ "symbol": "[",
+ "color": "dark_gray",
+ "warmth": 5,
+ "material_thickness": 1.5,
+ "environmental_protection": 10,
+ "flags": [ "INTEGRATED", "UNBREAKABLE", "SKINTIGHT", "SOFT", "WATER_FRIENDLY", "SUN_GLASSES", "NO_REPAIR", "SWIM_GOGGLES" ],
+ "armor": [
+ {
+ "material": [
+ { "type": "plastic", "covered_by_mat": 100, "thickness": 0.5 },
+ { "type": "lvl4ballisticglass", "covered_by_mat": 100, "thickness": 1.0 }
+ ],
+ "covers": [ "eyes" ],
+ "coverage": 100,
+ "encumbrance": 5,
+ "rigid_layer_only": true,
+ "cover_vitals": 90
+ }
+ ]
+ },
+ {
+ "id": "armor_bio_carbon_filament",
+ "type": "ARMOR",
+ "category": "armor",
+ "weight": "500 g",
+ "volume": "1200 ml",
+ "price": 0,
+ "price_postapoc": 0,
+ "symbol": ",",
+ "color": "brown",
+ "warmth": 0,
+ "environmental_protection": 1,
+ "material_thickness": 1.25,
+ "flags": [ "INTEGRATED", "UNBREAKABLE", "PERSONAL", "PADDED", "WATER_FRIENDLY", "SOFT", "NO_REPAIR", "ALLOWS_NATURAL_ATTACKS" ],
+ "material": [ "nanotubes" ],
+ "name": { "str_sp": "subdermal carbon filament" },
+ "description": "A layer of thin carbon nanotubes implanted in your skin. Helps protect your vitals from laceration.",
+ "armor": [
+ {
+ "material": [
+ { "type": "nanotubes", "covered_by_mat": 100, "thickness": 1 },
+ { "type": "nanotubes", "covered_by_mat": 75, "thickness": 0.25 }
+ ],
+ "covers": [ "torso", "head", "mouth", "leg_l", "leg_r", "arm_l", "arm_r", "hand_l", "hand_r", "foot_l", "foot_r" ],
+ "coverage": 100,
+ "encumbrance": 0,
+ "cover_vitals": 60
+ }
+ ]
}
]
diff --git a/data/json/items/bionics.json b/data/json/items/bionics.json
index 0c4ffd497787b..48947f4db6206 100644
--- a/data/json/items/bionics.json
+++ b/data/json/items/bionics.json
@@ -72,7 +72,7 @@
"copy-from": "bionic_general_npc_usable",
"type": "BIONIC_ITEM",
"name": { "str": "Arms Alloy Plating CBM" },
- "description": "An advanced protective mesh that weaves into the user's flesh. Provides passive protection at the cost of mild encumbrance and can be used in conjunction with bionic martial arts. A warning indicates that this CBM cannot be removed safely after being installed.",
+ "description": "An advanced protective mesh that weaves into the user's flesh. Provides passive protection at the cost of mild encumbrance and can be used in conjunction with bionic martial arts.",
"price": 350000,
"difficulty": 6,
"installation_data": "AID_bio_armor_arms"
@@ -94,7 +94,7 @@
"type": "BIONIC_ITEM",
"name": { "str": "Head Alloy Plating CBM" },
"looks_like": "bio_int_enhancer",
- "description": "An advanced protective mesh that weaves into the user's flesh, protecting both their head and jaw regions at the cost of mild encumbrance. A warning indicates that this CBM cannot be removed safely after being installed.",
+ "description": "An advanced protective mesh that weaves into the user's flesh, protecting both their head and jaw regions at the cost of mild encumbrance.",
"price": 350000,
"weight": "1000 g",
"difficulty": 6
@@ -105,7 +105,7 @@
"type": "BIONIC_ITEM",
"name": { "str": "Legs Alloy Plating CBM" },
"looks_like": "bio_int_enhancer",
- "description": "An advanced protective mesh that weaves into the user's flesh. Provides passive protection at the cost of mild encumbrance and can be used in conjunction with bionic martial arts. A warning indicates that this CBM cannot be removed safely after being installed.",
+ "description": "An advanced protective mesh that weaves into the user's flesh. Provides passive protection at the cost of mild encumbrance and can be used in conjunction with bionic martial arts.",
"price": 350000,
"difficulty": 6,
"installation_data": "AID_bio_armor_legs"
@@ -116,7 +116,7 @@
"type": "BIONIC_ITEM",
"name": { "str": "Torso Alloy Plating CBM" },
"looks_like": "bio_int_enhancer",
- "description": "An advanced protective mesh that weaves into the user's flesh, protecting it from physical trauma at the cost of mild encumbrance. A warning indicates that this CBM cannot be removed safely after being installed.",
+ "description": "An advanced protective mesh that weaves into the user's flesh, protecting it from physical trauma at the cost of mild encumbrance.",
"price": 350000,
"weight": "3000 g",
"difficulty": 6
diff --git a/data/json/materials.json b/data/json/materials.json
index 3d48047fef74a..3c0b7835f95e9 100644
--- a/data/json/materials.json
+++ b/data/json/materials.json
@@ -2819,5 +2819,25 @@
{ "fuel": 600, "smoke": 0, "burn": 2 },
{ "fuel": 900, "smoke": 0, "burn": 3 }
]
+ },
+ {
+ "type": "material",
+ "id": "nanotubes",
+ "//": "fictional carbon nanotubing, intended for bionic implants",
+ "density": 3.5,
+ "name": "Carbon Lattice",
+ "breathability": "SECOND_SKIN",
+ "specific_heat_liquid": 0.82,
+ "specific_heat_solid": 0.45,
+ "latent_heat": 273,
+ "bash_resist": 1,
+ "cut_resist": 4,
+ "bullet_resist": 4,
+ "acid_resist": 4,
+ "fire_resist": 3,
+ "chip_resist": 20,
+ "dmg_adj": [ "marked", "dented", "smashed", "shattered" ],
+ "bash_dmg_verb": "dented",
+ "cut_dmg_verb": "scratched"
}
]
diff --git a/data/mods/Aftershock/player/bionics.json b/data/mods/Aftershock/player/bionics.json
index 856ba4cf0e810..649eca3342d26 100644
--- a/data/mods/Aftershock/player/bionics.json
+++ b/data/mods/Aftershock/player/bionics.json
@@ -205,381 +205,5 @@
"stat_bonus": [ [ "INT", -4 ], [ "PER", -2 ] ],
"canceled_mutations": [ "INT_UP", "INT_UP_2", "INT_UP_3", "INT_UP_4", "INT_ALPHA" ],
"spell_on_activation": { "id": "skullgun_snapback", "hit_self": true }
- },
- {
- "id": "bio_armor_arms",
- "type": "bionic",
- "name": { "str": "Arms Intradermal Alloy" },
- "description": "An advanced protective meshwork has been woven into the flesh on your arms and hands, protecting them from physical trauma.",
- "occupied_bodyparts": [ [ "arm_l", 4 ], [ "arm_r", 4 ], [ "hand_l", 1 ], [ "hand_r", 1 ] ],
- "bash_protec": [ [ "arm_l", 3 ], [ "arm_r", 3 ], [ "hand_l", 3 ], [ "hand_r", 3 ] ],
- "cut_protec": [ [ "arm_l", 3 ], [ "arm_r", 3 ], [ "hand_l", 3 ], [ "hand_r", 3 ] ],
- "bullet_protec": [ [ "arm_l", 3 ], [ "arm_r", 3 ], [ "hand_l", 3 ], [ "hand_r", 3 ] ],
- "encumbrance": [ [ "arm_l", 1 ], [ "arm_r", 1 ], [ "hand_l", 1 ], [ "hand_r", 1 ] ],
- "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ],
- "mutation_conflicts": [
- "THICKSKIN",
- "THINSKIN",
- "ALBINO",
- "SKIN_ROUGH",
- "M_SKIN",
- "M_SKIN2",
- "M_SKIN3",
- "SCALES",
- "THICK_SCALES",
- "SLEEK_SCALES",
- "FEATHERS",
- "DOWN",
- "LIGHTFUR",
- "FUR",
- "URSINE_FUR",
- "LUPINE_FUR",
- "FELINE_FUR",
- "LYNX_FUR",
- "CHITIN",
- "CHITIN2",
- "CHITIN3",
- "CHITIN_FUR",
- "CHITIN_FUR2",
- "CHITIN_FUR3",
- "CF_HAIR",
- "SPINES",
- "QUILLS",
- "BARBS",
- "PLANTSKIN",
- "BARK",
- "THORNS",
- "LEAVES",
- "LEAVES2",
- "LEAVES3",
- "SLIMY",
- "VISCOUS",
- "AMORPHOUS",
- "BENDY1",
- "BENDY2",
- "BENDY3",
- "WINGS_BIRD",
- "WINGS_INSECT",
- "LARGE",
- "LARGE_OK",
- "HUGE",
- "HUGE_OK",
- "SMALL",
- "SMALL2",
- "SMALL_OK",
- "WINGS_STUB",
- "WINGS_BAT",
- "WINGS_BUTTERFLY",
- "PALE",
- "SPOTS",
- "SUNBURN",
- "SORES",
- "CHLOROMORPH",
- "ARM_FEATHERS",
- "INSECT_ARMS",
- "INSECT_ARMS_OK",
- "ARACHNID_ARMS",
- "ARACHNID_ARMS_OK",
- "ARM_TENTACLES",
- "ARM_TENTACLES_4",
- "ARM_TENTACLES_8",
- "CLAWS_TENTACLES",
- "ACIDPROOF",
- "TOXICFLESH",
- "FRESHWATEROSMOSIS",
- "PAWS",
- "PAWS_LARGE",
- "NAILS",
- "TALONS",
- "CLAWS",
- "CLAWS_RETRACT",
- "CLAWS_RAT",
- "CLAWS_ST",
- "WEBBED",
- "PATCHSKIN1",
- "PATCHSKIN2",
- "RABBIT_FUR",
- "PAWS_LITTLE"
- ]
- },
- {
- "id": "bio_armor_head",
- "type": "bionic",
- "name": { "str": "Head Intradermal Alloy" },
- "description": "An advanced protective meshwork has been woven into the flesh on your head and jaw region, protecting your skull from physical trauma.",
- "occupied_bodyparts": [ [ "head", 3 ], [ "mouth", 1 ] ],
- "bash_protec": [ [ "head", 3 ], [ "mouth", 3 ] ],
- "cut_protec": [ [ "head", 3 ], [ "mouth", 3 ] ],
- "bullet_protec": [ [ "head", 3 ], [ "mouth", 3 ] ],
- "encumbrance": [ [ "head", 1 ] ],
- "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ],
- "mutation_conflicts": [
- "THICKSKIN",
- "THINSKIN",
- "ALBINO",
- "SKIN_ROUGH",
- "M_SKIN",
- "M_SKIN2",
- "M_SKIN3",
- "SCALES",
- "THICK_SCALES",
- "SLEEK_SCALES",
- "FEATHERS",
- "DOWN",
- "LIGHTFUR",
- "FUR",
- "URSINE_FUR",
- "LUPINE_FUR",
- "FELINE_FUR",
- "LYNX_FUR",
- "CHITIN",
- "CHITIN2",
- "CHITIN3",
- "CHITIN_FUR",
- "CHITIN_FUR2",
- "CHITIN_FUR3",
- "CF_HAIR",
- "SPINES",
- "QUILLS",
- "BARBS",
- "PLANTSKIN",
- "BARK",
- "THORNS",
- "LEAVES",
- "LEAVES2",
- "LEAVES3",
- "SLIMY",
- "VISCOUS",
- "AMORPHOUS",
- "LARGE",
- "LARGE_OK",
- "HUGE",
- "HUGE_OK",
- "SMALL",
- "SMALL2",
- "SMALL_OK",
- "PALE",
- "SPOTS",
- "SUNBURN",
- "SORES",
- "CHLOROMORPH",
- "ACIDPROOF",
- "TOXICFLESH",
- "FRESHWATEROSMOSIS",
- "BIOLUM0",
- "BIOLUM0_active",
- "BIOLUM1",
- "BIOLUM1_active",
- "BIOLUM2",
- "BIOLUM2_active",
- "GILLS",
- "GILLS_CEPH",
- "FLOWERS",
- "ROSEBUDS",
- "HORNS",
- "HORNS_CURLED",
- "HORNS_POINTED",
- "ANTLERS",
- "ANTENNAE",
- "HEADBUMPS",
- "HAIRROOTS",
- "SNOUT",
- "MINOTAUR",
- "MUZZLE",
- "MUZZLE_BEAR",
- "MUZZLE_RAT",
- "MUZZLE_LONG",
- "PROBISCIS",
- "MOUTH_FLAPS",
- "MOUTH_TENTACLES",
- "MANDIBLES",
- "FANGS_SPIDER",
- "BEAK",
- "BEAK_PECK",
- "BEAK_HUM",
- "GIZZARD",
- "FELINE_EARS",
- "CANINE_EARS",
- "LUPINE_EARS",
- "RABBIT_EARS",
- "MOUSE_EARS",
- "PATCHSKIN1",
- "PATCHSKIN2",
- "RABBIT_FUR",
- "RABBIT_NOSE",
- "SLIT_NOSTRILS",
- "WHISKERS",
- "WHISKERS_RAT"
- ]
- },
- {
- "id": "bio_armor_torso",
- "type": "bionic",
- "name": { "str": "Torso Intradermal Alloy" },
- "description": "An advanced protective meshwork has been woven into the flesh on your torso, protecting it from physical trauma.",
- "occupied_bodyparts": [ [ "torso", 10 ] ],
- "bash_protec": [ [ "torso", 3 ] ],
- "cut_protec": [ [ "torso", 3 ] ],
- "bullet_protec": [ [ "torso", 3 ] ],
- "encumbrance": [ [ "torso", 3 ] ],
- "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ],
- "canceled_mutations": [ "VINES1", "VINES2", "VINES3" ],
- "mutation_conflicts": [
- "THICKSKIN",
- "THINSKIN",
- "ALBINO",
- "SKIN_ROUGH",
- "M_SKIN",
- "M_SKIN2",
- "M_SKIN3",
- "SCALES",
- "THICK_SCALES",
- "SLEEK_SCALES",
- "FEATHERS",
- "DOWN",
- "LIGHTFUR",
- "FUR",
- "URSINE_FUR",
- "LUPINE_FUR",
- "FELINE_FUR",
- "LYNX_FUR",
- "CHITIN",
- "CHITIN2",
- "CHITIN3",
- "CHITIN_FUR",
- "CHITIN_FUR2",
- "CHITIN_FUR3",
- "CF_HAIR",
- "SPINES",
- "QUILLS",
- "BARBS",
- "PLANTSKIN",
- "BARK",
- "THORNS",
- "LEAVES",
- "LEAVES2",
- "LEAVES3",
- "SLIMY",
- "VISCOUS",
- "AMORPHOUS",
- "BENDY1",
- "BENDY2",
- "BENDY3",
- "LARGE",
- "LARGE_OK",
- "HUGE",
- "HUGE_OK",
- "SMALL",
- "SMALL2",
- "SMALL_OK",
- "PALE",
- "SPOTS",
- "SUNBURN",
- "SORES",
- "CHLOROMORPH",
- "ACIDPROOF",
- "TOXICFLESH",
- "FRESHWATEROSMOSIS",
- "INK_GLANDS",
- "INSECT_ARMS",
- "INSECT_ARMS_OK",
- "ARACHNID_ARMS",
- "ARACHNID_ARMS_OK",
- "CLAWS_TENTACLES",
- "SHELL",
- "SHELL2",
- "PATCHSKIN1",
- "PATCHSKIN2",
- "RABBIT_FUR"
- ]
- },
- {
- "id": "bio_armor_legs",
- "type": "bionic",
- "name": { "str": "Legs Intradermal Alloy" },
- "description": "An advanced protective meshwork has been woven into the flesh on your legs and feet, protecting them from physical trauma.",
- "occupied_bodyparts": [ [ "leg_l", 6 ], [ "leg_r", 6 ], [ "foot_l", 1 ], [ "foot_r", 1 ] ],
- "bash_protec": [ [ "leg_l", 3 ], [ "leg_r", 3 ], [ "foot_l", 3 ], [ "foot_r", 3 ] ],
- "cut_protec": [ [ "leg_l", 3 ], [ "leg_r", 3 ], [ "foot_l", 3 ], [ "foot_r", 3 ] ],
- "bullet_protec": [ [ "leg_l", 3 ], [ "leg_r", 3 ], [ "foot_l", 3 ], [ "foot_r", 3 ] ],
- "encumbrance": [ [ "leg_l", 1 ], [ "leg_r", 1 ], [ "foot_l", 1 ], [ "foot_r", 1 ] ],
- "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ],
- "mutation_conflicts": [
- "THICKSKIN",
- "THINSKIN",
- "ALBINO",
- "SKIN_ROUGH",
- "M_SKIN",
- "M_SKIN2",
- "M_SKIN3",
- "SCALES",
- "THICK_SCALES",
- "SLEEK_SCALES",
- "FEATHERS",
- "DOWN",
- "LIGHTFUR",
- "FUR",
- "URSINE_FUR",
- "LUPINE_FUR",
- "FELINE_FUR",
- "LYNX_FUR",
- "CHITIN",
- "CHITIN2",
- "CHITIN3",
- "CHITIN_FUR",
- "CHITIN_FUR2",
- "CHITIN_FUR3",
- "CF_HAIR",
- "SPINES",
- "QUILLS",
- "BARBS",
- "PLANTSKIN",
- "BARK",
- "THORNS",
- "LEAVES",
- "LEAVES2",
- "LEAVES3",
- "SLIMY",
- "VISCOUS",
- "AMORPHOUS",
- "BENDY1",
- "BENDY2",
- "BENDY3",
- "LARGE",
- "LARGE_OK",
- "HUGE",
- "HUGE_OK",
- "SMALL",
- "SMALL2",
- "SMALL_OK",
- "PALE",
- "SPOTS",
- "SUNBURN",
- "SORES",
- "CHLOROMORPH",
- "ACIDPROOF",
- "TOXICFLESH",
- "FRESHWATEROSMOSIS",
- "TAIL_STUB",
- "TAIL_FIN",
- "TAIL_LONG",
- "TAIL_CATTLE",
- "TAIL_RAT",
- "TAIL_THICK",
- "TAIL_RAPTOR",
- "TAIL_FLUFFY",
- "TAIL_STING",
- "TAIL_CLUB",
- "LEG_TENTACLES",
- "LEG_TENT_BRACE",
- "RAP_TALONS",
- "HOOVES",
- "PADDED_FEET",
- "PATCHSKIN1",
- "PATCHSKIN2",
- "RABBIT_FUR",
- "TAIL_RABBIT",
- "RABBIT_FEET"
- ]
}
]
diff --git a/src/bionics.cpp b/src/bionics.cpp
index 5a159a8ffe6b7..84a7869ce597c 100644
--- a/src/bionics.cpp
+++ b/src/bionics.cpp
@@ -240,11 +240,13 @@ void bionic::initialize_pseudo_items( bool create_weapon )
}
}
}
-
+ //integrated armor uses pseudo item structure to be convenient but these should be visible in inventory
for( const itype_id &id : bid.passive_pseudo_items ) {
if( !id.is_empty() && id.is_valid() ) {
item pseudo( id );
- pseudo.set_flag( flag_PSEUDO );
+ if( !pseudo.has_flag( flag_INTEGRATED ) ) {
+ pseudo.set_flag( flag_PSEUDO );
+ }
passive_pseudo_items.emplace_back( pseudo );
}
}
@@ -2931,6 +2933,13 @@ bionic_uid Character::add_bionic( const bionic_id &b, bionic_uid parent_uid )
add_proficiency( learned );
}
+ for( const itype_id &pseudo : b->passive_pseudo_items ) {
+ item tmparmor( pseudo );
+ if( tmparmor.has_flag( flag_INTEGRATED ) ) {
+ wear_item( tmparmor, false );
+ }
+ }
+
update_bionic_power_capacity();
calc_encumbrance();
@@ -3009,6 +3018,12 @@ void Character::remove_bionic( const bionic &bio )
lose_proficiency( lost );
}
+ for( const itype_id &popped_armor : bio.id->passive_pseudo_items ) {
+ remove_worn_items_with( [&]( item & armor ) {
+ return armor.typeId() == popped_armor;
+ } );
+ }
+
const bool has_enchantments = !bio.id->enchantments.empty();
*my_bionics = new_my_bionics;
update_bionic_power_capacity();