Skip to content

Add flag for immunity to skin irritants #74680

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jun 22, 2024
Merged

Add flag for immunity to skin irritants #74680

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
09d847d
Add BILE_PROOF flag
zachary-kaelan Jun 19, 2024
45f4f8b
Rename BILE_PROOF to IRRITANT_IMMUNE
zachary-kaelan Jun 19, 2024
eab1c69
Add IRRITANT_IMMUNE flag to various mutant integrated armors
zachary-kaelan Jun 19, 2024
558df86
Add IRRITANT_IMMUNE flag to various armored suits
zachary-kaelan Jun 19, 2024
9425b02
Add IRRITANT_IMMUNE flag to various mutations
zachary-kaelan Jun 19, 2024
5a60c69
Add IRRITANT_IMMUNE flag to Subdermal Carbon Filament bionic
zachary-kaelan Jun 19, 2024
958337f
Fix typo
zachary-kaelan Jun 19, 2024
d91aed1
Lint data/json/items/armor/integrated.json
zachary-kaelan Jun 19, 2024
788661a
Lint data/json/items/armor/integrated.json
zachary-kaelan Jun 19, 2024
4723c49
Apply suggestions from code review
zachary-kaelan Jun 19, 2024
d7c6203
Remove IRRITANT_IMMUNE flag from Subdermal Carbon Filament
zachary-kaelan Jun 20, 2024
1c13005
Apply suggestions from code review
Maleclypse Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/json/bionics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@
[ "hand_r", 1 ],
[ "mouth", 1 ]
],
"flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ],
"flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF", "IRRITANT_IMMUNE" ],
"protec": [
[ "torso", { "cut": 4, "bullet": 4, "stab": 4 } ],
[ "head", { "cut": 4, "bullet": 4, "stab": 4 } ],
Expand Down
5 changes: 5 additions & 0 deletions data/json/flags.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2496,5 +2496,10 @@
"id": "DECAYS_IN_AIR",
"type": "json_flag",
"info": "This will eventually <bad>go bad</bad> if left in the open air too long."
},
{
"id": "IRRITANT_IMMUNE",
"type": "json_flag",
"info": "This gear <good>completely protects</good> you from <info>skin irritants</info>."
}
]
21 changes: 12 additions & 9 deletions data/json/items/armor/integrated.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"color": "brown",
"warmth": 1,
"environmental_protection": 3,
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "NORMAL", "WATERPROOF", "PADDED", "ALLOWS_TALONS" ],
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "NORMAL", "WATERPROOF", "IRRITANT_IMMUNE", "PADDED", "ALLOWS_TALONS" ],
"armor": [
{
"material": [ { "type": "wood", "covered_by_mat": 100, "thickness": 4 }, { "type": "wood", "covered_by_mat": 75, "thickness": 6 } ],
Expand All @@ -68,7 +68,7 @@
"color": "brown",
"warmth": 2,
"environmental_protection": 4,
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "NORMAL", "WATERPROOF", "PADDED", "ALLOWS_TALONS" ],
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "NORMAL", "WATERPROOF", "IRRITANT_IMMUNE", "PADDED", "ALLOWS_TALONS" ],
"armor": [
{
"material": [ { "type": "wood", "covered_by_mat": 100, "thickness": 6 }, { "type": "wood", "covered_by_mat": 75, "thickness": 7 } ],
Expand All @@ -93,7 +93,7 @@
"color": "brown",
"warmth": 2,
"environmental_protection": 4,
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "NORMAL", "WATERPROOF", "PADDED", "ALLOWS_TALONS" ],
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "NORMAL", "WATERPROOF", "IRRITANT_IMMUNE", "PADDED", "ALLOWS_TALONS" ],
"armor": [
{
"material": [ { "type": "wood", "covered_by_mat": 100, "thickness": 15 } ],
Expand Down Expand Up @@ -344,7 +344,7 @@
"color": "dark_gray",
"warmth": 25,
"environmental_protection": 1,
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "SKINTIGHT", "RAINPROOF" ],
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "SKINTIGHT", "RAINPROOF", "IRRITANT_IMMUNE" ],
"armor": [
{
"material": [ { "type": "mut_fur", "covered_by_mat": 100, "thickness": 8 } ],
Expand Down Expand Up @@ -381,7 +381,7 @@
"color": "dark_gray",
"warmth": 18,
"environmental_protection": 1,
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "SKINTIGHT", "RAINPROOF" ],
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "SKINTIGHT", "RAINPROOF", "IRRITANT_IMMUNE" ],
"armor": [
{
"material": [ { "type": "mut_fur", "covered_by_mat": 100, "thickness": 6 } ],
Expand Down Expand Up @@ -513,6 +513,7 @@
"UNBREAKABLE",
"SKINTIGHT",
"WATER_FRIENDLY",
"IRRITANT_IMMUNE",
"SOFT",
"TOUGH_FEET",
"NO_SALVAGE"
Expand Down Expand Up @@ -549,7 +550,7 @@
"color": "light_red",
"warmth": 15,
"environmental_protection": 1,
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "NORMAL", "WATER_FRIENDLY", "PADDED", "NO_SALVAGE" ],
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "NORMAL", "WATER_FRIENDLY", "PADDED", "IRRITANT_IMMUNE", "NO_SALVAGE" ],
"armor": [
{
"material": [
Expand Down Expand Up @@ -670,6 +671,7 @@
"UNBREAKABLE",
"NORMAL",
"WATER_FRIENDLY",
"IRRITANT_IMMUNE",
"NO_SALVAGE",
"PADDED",
"ALLOWS_TALONS"
Expand Down Expand Up @@ -824,7 +826,7 @@
"color": "brown",
"warmth": 5,
"environmental_protection": 1,
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "BLOCK_WHILE_WORN", "UNBREAKABLE", "OUTER", "PADDED", "ALLOWS_TALONS" ],
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "BLOCK_WHILE_WORN", "UNBREAKABLE", "OUTER", "PADDED", "IRRITANT_IMMUNE", "ALLOWS_TALONS" ],
"armor": [
{
"material": [ { "type": "sclerotin", "covered_by_mat": 100, "thickness": 4 } ],
Expand Down Expand Up @@ -983,7 +985,7 @@
"color": "brown",
"warmth": 20,
"environmental_protection": 1,
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "BLOCK_WHILE_WORN", "UNBREAKABLE", "OUTER", "PADDED", "ALLOWS_TALONS" ],
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "BLOCK_WHILE_WORN", "UNBREAKABLE", "OUTER", "PADDED", "IRRITANT_IMMUNE", "ALLOWS_TALONS" ],
"armor": [
{
"material": [ { "type": "sclerotin", "covered_by_mat": 100, "thickness": 4.5 } ],
Expand Down Expand Up @@ -1348,7 +1350,7 @@
"color": "light_red",
"warmth": 3,
"environmental_protection": 4,
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "SKINTIGHT", "WATER_FRIENDLY", "TOUGH_FEET", "ALLOWS_TALONS" ],
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "SKINTIGHT", "WATER_FRIENDLY", "IRRITANT_IMMUNE", "TOUGH_FEET", "ALLOWS_TALONS" ],
"armor": [
{
"material": [
Expand Down Expand Up @@ -1409,6 +1411,7 @@
"UNBREAKABLE",
"SKINTIGHT",
"WATER_FRIENDLY",
"IRRITANT_IMMUNE",
"PADDED",
"TOUGH_FEET",
"NO_SALVAGE"
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/armor/suits_protection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2646,7 +2646,7 @@
"longest_side": "30 cm",
"material_thickness": 5,
"environmental_protection": 20,
"flags": [ "VARSIZE", "WATERPROOF", "RAINPROOF", "GAS_PROOF", "STURDY", "OUTER" ],
"flags": [ "VARSIZE", "WATERPROOF", "IRRITANT_IMMUNE", "RAINPROOF", "GAS_PROOF", "STURDY", "OUTER" ],
"armor": [
{
"encumbrance": 50,
Expand Down Expand Up @@ -2751,7 +2751,7 @@
"warmth": 40,
"material_thickness": 2,
"environmental_protection": 20,
"flags": [ "VARSIZE", "WATERPROOF", "RAINPROOF", "GAS_PROOF", "RAD_PROOF", "ELECTRIC_IMMUNE", "OUTER", "SOFT" ],
"flags": [ "VARSIZE", "WATERPROOF", "IRRITANT_IMMUNE", "RAINPROOF", "GAS_PROOF", "RAD_PROOF", "ELECTRIC_IMMUNE", "OUTER", "SOFT" ],
"armor": [
{
"encumbrance": 37,
Expand Down Expand Up @@ -2956,7 +2956,7 @@
"msg": "You slip out of the top of the suit and tie the sleeves around your waist.",
"target": "robofac_enviro_suit_casual"
},
"flags": [ "VARSIZE", "WATERPROOF", "RAINPROOF", "GAS_PROOF", "RAD_PROOF", "ELECTRIC_IMMUNE", "STURDY" ]
"flags": [ "VARSIZE", "WATERPROOF", "IRRITANT_IMMUNE", "RAINPROOF", "GAS_PROOF", "RAD_PROOF", "ELECTRIC_IMMUNE", "STURDY" ]
},
{
"id": "robofac_enviro_suit_casual",
Expand Down Expand Up @@ -3046,7 +3046,7 @@
"msg": "You untie the sleeves and put back on the top of the suit.",
"target": "robofac_enviro_suit"
},
"delete": { "flags": [ "RAINPROOF", "GAS_PROOF", "RAD_PROOF", "ELECTRIC_IMMUNE" ] }
"delete": { "flags": [ "RAINPROOF", "IRRITANT_IMMUNE", "GAS_PROOF", "RAD_PROOF", "ELECTRIC_IMMUNE" ] }
},
{
"id": "xedra_enviro_suit",
Expand Down
19 changes: 13 additions & 6 deletions data/json/mutations/mutations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2675,6 +2675,7 @@
"description": "We have begun adapting local physiology to Mycus physical structure, greatly reducing wet effects.",
"purifiable": false,
"category": [ "MYCUS" ],
"flags": [ "IRRITANT_IMMUNE" ],
"prereqs": [ "M_IMMUNE" ],
"threshreq": [ "THRESH_MYCUS" ],
"leads_to": [ "M_DEFENDER" ],
Expand Down Expand Up @@ -2702,7 +2703,7 @@
"ugliness": 8,
"description": "We have spliced the dense, amphibole fibers from Mycus core towers with the resilient, adaptive flesh of local physiology. This reduces our speed by a moderate amount, but provides powerful armor across our body, nullifies wet effects, and provides complete protection from fire.",
"purifiable": false,
"flags": [ "HEAT_IMMUNE" ],
"flags": [ "HEAT_IMMUNE", "IRRITANT_IMMUNE" ],
"category": [ "MYCUS" ],
"prereqs": [ "M_SKIN" ],
"prereqs2": [ "M_DEFENDER" ],
Expand Down Expand Up @@ -2732,7 +2733,7 @@
"ugliness": 10,
"description": "Local physiology has been fully incorporated with that of Mycus silicate fibers. In addition to benefits conferred by previous developments, we may join with Mycus fibers beneath us - sleeping on top of fungal areas places us into a dormant state, which spreads spores around us as we sleep and revitalizes our body much more quickly than regular sleep.",
"purifiable": false,
"flags": [ "HEAT_IMMUNE" ],
"flags": [ "HEAT_IMMUNE", "IRRITANT_IMMUNE" ],
"category": [ "MYCUS" ],
"prereqs": [ "M_SKIN2" ],
"threshreq": [ "THRESH_MYCUS" ],
Expand Down Expand Up @@ -5660,7 +5661,8 @@
"prereqs": [ "GASTROPOD_FOOT" ],
"leads_to": [ "MUCUS_SECRETION2" ],
"changes_to": [ "SNAIL_TRAIL" ],
"category": [ "GASTROPOD" ]
"category": [ "GASTROPOD" ],
"flags": [ "IRRITANT_IMMUNE" ]
},
{
"type": "mutation",
Expand All @@ -5679,7 +5681,8 @@
"base_damage": { "damage_type": "acid", "amount": 6 }
},
"prereqs": [ "MUCUS_SECRETION" ],
"category": [ "GASTROPOD" ]
"category": [ "GASTROPOD" ],
"flags": [ "IRRITANT_IMMUNE" ]
},
{
"type": "mutation",
Expand All @@ -5692,6 +5695,7 @@
"description": "You've developed some ability to control your slime emissions. As a result of this you can leave trails of slime anywhere you walk.",
"prereqs": [ "MUCUS_SECRETION" ],
"category": [ "GASTROPOD" ],
"flags": [ "IRRITANT_IMMUNE" ],
"active": true,
"cost": 174,
"time": "100 s",
Expand Down Expand Up @@ -7700,6 +7704,7 @@
"leads_to": [ "SLIME_HANDS" ],
"changes_to": [ "VISCOUS" ],
"category": [ "FISH", "SLIME", "TROGLOBITE", "CEPHALOPOD", "GASTROPOD", "BATRACHIAN" ],
"flags": [ "IRRITANT_IMMUNE" ],
"wet_protection": [
{ "part": "head", "neutral": 3, "good": 4 },
{ "part": "leg_l", "neutral": 7, "good": 14 },
Expand All @@ -7726,6 +7731,7 @@
"prereqs": [ "SLIMY" ],
"threshreq": [ "THRESH_SLIME", "THRESH_GASTROPOD" ],
"category": [ "SLIME", "GASTROPOD" ],
"flags": [ "IRRITANT_IMMUNE" ],
"wet_protection": [
{ "part": "head", "neutral": 4, "good": 5 },
{ "part": "leg_l", "neutral": 8, "good": 15 },
Expand Down Expand Up @@ -8039,7 +8045,7 @@
"category": [ "PLANT" ],
"scent_type": "sc_flower",
"encumbrance_covered": [ [ "foot_l", 10 ], [ "foot_r", 10 ] ],
"flags": [ "TOUGH_FEET", "ROOTS3" ]
"flags": [ "TOUGH_FEET", "ROOTS3", "IRRITANT_IMMUNE" ]
},
{
"type": "mutation",
Expand Down Expand Up @@ -8875,7 +8881,7 @@
"name": { "str": "Acidproof" },
"points": 3,
"vitamin_cost": 160,
"flags": [ "ACID_IMMUNE" ],
"flags": [ "ACID_IMMUNE", "IRRITANT_IMMUNE" ],
"description": "Your mutated flesh is immune to the damaging effects of acid.",
"threshreq": [ "THRESH_INSECT", "THRESH_CHIMERA", "THRESH_MEDICAL", "THRESH_SLIME" ],
"category": [ "INSECT", "CHIMERA", "MEDICAL", "SLIME" ]
Expand Down Expand Up @@ -8948,6 +8954,7 @@
"vitamin_cost": 60,
"description": "Your flesh is highly poisonous, and creatures that bite you will receive a nasty surprise.",
"category": [ "FISH", "GASTROPOD" ],
"flags": [ "IRRITANT_IMMUNE" ],
"threshreq": [ "THRESH_FISH", "THRESH_GASTROPOD" ],
"purifiable": false
},
Expand Down