Skip to content

Commit c144e61

Browse files
zachary-kaelangithub-actions[bot]Maleclypse
authored
Add flag for immunity to skin irritants (#74680)
* Add BILE_PROOF flag * Rename BILE_PROOF to IRRITANT_IMMUNE * Add IRRITANT_IMMUNE flag to various mutant integrated armors * Add IRRITANT_IMMUNE flag to various armored suits * Add IRRITANT_IMMUNE flag to various mutations * Add IRRITANT_IMMUNE flag to Subdermal Carbon Filament bionic * Fix typo * Lint data/json/items/armor/integrated.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Lint data/json/items/armor/integrated.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Remove IRRITANT_IMMUNE flag from Subdermal Carbon Filament * Apply suggestions from code review --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Maleclypse <[email protected]>
1 parent 8a43e0c commit c144e61

File tree

4 files changed

+105
-18
lines changed

4 files changed

+105
-18
lines changed

‎data/json/flags.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2496,5 +2496,10 @@
24962496
"id": "DECAYS_IN_AIR",
24972497
"type": "json_flag",
24982498
"info": "This will eventually <bad>go bad</bad> if left in the open air too long."
2499+
},
2500+
{
2501+
"id": "IRRITANT_IMMUNE",
2502+
"type": "json_flag",
2503+
"info": "This gear <good>completely protects</good> you from <info>skin irritants</info>."
24992504
}
25002505
]

‎data/json/items/armor/integrated.json‎

Lines changed: 75 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,16 @@
4343
"color": "brown",
4444
"warmth": 1,
4545
"environmental_protection": 3,
46-
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "NORMAL", "WATERPROOF", "PADDED", "ALLOWS_TALONS" ],
46+
"flags": [
47+
"INTEGRATED",
48+
"ALLOWS_NATURAL_ATTACKS",
49+
"UNBREAKABLE",
50+
"NORMAL",
51+
"WATERPROOF",
52+
"IRRITANT_IMMUNE",
53+
"PADDED",
54+
"ALLOWS_TALONS"
55+
],
4756
"armor": [
4857
{
4958
"material": [ { "type": "wood", "covered_by_mat": 100, "thickness": 4 }, { "type": "wood", "covered_by_mat": 75, "thickness": 6 } ],
@@ -68,7 +77,16 @@
6877
"color": "brown",
6978
"warmth": 2,
7079
"environmental_protection": 4,
71-
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "NORMAL", "WATERPROOF", "PADDED", "ALLOWS_TALONS" ],
80+
"flags": [
81+
"INTEGRATED",
82+
"ALLOWS_NATURAL_ATTACKS",
83+
"UNBREAKABLE",
84+
"NORMAL",
85+
"WATERPROOF",
86+
"IRRITANT_IMMUNE",
87+
"PADDED",
88+
"ALLOWS_TALONS"
89+
],
7290
"armor": [
7391
{
7492
"material": [ { "type": "wood", "covered_by_mat": 100, "thickness": 6 }, { "type": "wood", "covered_by_mat": 75, "thickness": 7 } ],
@@ -93,7 +111,16 @@
93111
"color": "brown",
94112
"warmth": 2,
95113
"environmental_protection": 4,
96-
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "NORMAL", "WATERPROOF", "PADDED", "ALLOWS_TALONS" ],
114+
"flags": [
115+
"INTEGRATED",
116+
"ALLOWS_NATURAL_ATTACKS",
117+
"UNBREAKABLE",
118+
"NORMAL",
119+
"WATERPROOF",
120+
"IRRITANT_IMMUNE",
121+
"PADDED",
122+
"ALLOWS_TALONS"
123+
],
97124
"armor": [
98125
{
99126
"material": [ { "type": "wood", "covered_by_mat": 100, "thickness": 15 } ],
@@ -344,7 +371,7 @@
344371
"color": "dark_gray",
345372
"warmth": 25,
346373
"environmental_protection": 1,
347-
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "SKINTIGHT", "RAINPROOF" ],
374+
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "SKINTIGHT", "RAINPROOF", "IRRITANT_IMMUNE" ],
348375
"armor": [
349376
{
350377
"material": [ { "type": "mut_fur", "covered_by_mat": 100, "thickness": 8 } ],
@@ -381,7 +408,7 @@
381408
"color": "dark_gray",
382409
"warmth": 18,
383410
"environmental_protection": 1,
384-
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "SKINTIGHT", "RAINPROOF" ],
411+
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "SKINTIGHT", "RAINPROOF", "IRRITANT_IMMUNE" ],
385412
"armor": [
386413
{
387414
"material": [ { "type": "mut_fur", "covered_by_mat": 100, "thickness": 6 } ],
@@ -513,6 +540,7 @@
513540
"UNBREAKABLE",
514541
"SKINTIGHT",
515542
"WATER_FRIENDLY",
543+
"IRRITANT_IMMUNE",
516544
"SOFT",
517545
"TOUGH_FEET",
518546
"NO_SALVAGE"
@@ -549,7 +577,16 @@
549577
"color": "light_red",
550578
"warmth": 15,
551579
"environmental_protection": 1,
552-
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "NORMAL", "WATER_FRIENDLY", "PADDED", "NO_SALVAGE" ],
580+
"flags": [
581+
"INTEGRATED",
582+
"ALLOWS_NATURAL_ATTACKS",
583+
"UNBREAKABLE",
584+
"NORMAL",
585+
"WATER_FRIENDLY",
586+
"PADDED",
587+
"IRRITANT_IMMUNE",
588+
"NO_SALVAGE"
589+
],
553590
"armor": [
554591
{
555592
"material": [
@@ -670,6 +707,7 @@
670707
"UNBREAKABLE",
671708
"NORMAL",
672709
"WATER_FRIENDLY",
710+
"IRRITANT_IMMUNE",
673711
"NO_SALVAGE",
674712
"PADDED",
675713
"ALLOWS_TALONS"
@@ -824,7 +862,16 @@
824862
"color": "brown",
825863
"warmth": 5,
826864
"environmental_protection": 1,
827-
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "BLOCK_WHILE_WORN", "UNBREAKABLE", "OUTER", "PADDED", "ALLOWS_TALONS" ],
865+
"flags": [
866+
"INTEGRATED",
867+
"ALLOWS_NATURAL_ATTACKS",
868+
"BLOCK_WHILE_WORN",
869+
"UNBREAKABLE",
870+
"OUTER",
871+
"PADDED",
872+
"IRRITANT_IMMUNE",
873+
"ALLOWS_TALONS"
874+
],
828875
"armor": [
829876
{
830877
"material": [ { "type": "sclerotin", "covered_by_mat": 100, "thickness": 4 } ],
@@ -983,7 +1030,16 @@
9831030
"color": "brown",
9841031
"warmth": 20,
9851032
"environmental_protection": 1,
986-
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "BLOCK_WHILE_WORN", "UNBREAKABLE", "OUTER", "PADDED", "ALLOWS_TALONS" ],
1033+
"flags": [
1034+
"INTEGRATED",
1035+
"ALLOWS_NATURAL_ATTACKS",
1036+
"BLOCK_WHILE_WORN",
1037+
"UNBREAKABLE",
1038+
"OUTER",
1039+
"PADDED",
1040+
"IRRITANT_IMMUNE",
1041+
"ALLOWS_TALONS"
1042+
],
9871043
"armor": [
9881044
{
9891045
"material": [ { "type": "sclerotin", "covered_by_mat": 100, "thickness": 4.5 } ],
@@ -1348,7 +1404,16 @@
13481404
"color": "light_red",
13491405
"warmth": 3,
13501406
"environmental_protection": 4,
1351-
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "SKINTIGHT", "WATER_FRIENDLY", "TOUGH_FEET", "ALLOWS_TALONS" ],
1407+
"flags": [
1408+
"INTEGRATED",
1409+
"ALLOWS_NATURAL_ATTACKS",
1410+
"UNBREAKABLE",
1411+
"SKINTIGHT",
1412+
"WATER_FRIENDLY",
1413+
"IRRITANT_IMMUNE",
1414+
"TOUGH_FEET",
1415+
"ALLOWS_TALONS"
1416+
],
13521417
"armor": [
13531418
{
13541419
"material": [
@@ -1409,6 +1474,7 @@
14091474
"UNBREAKABLE",
14101475
"SKINTIGHT",
14111476
"WATER_FRIENDLY",
1477+
"IRRITANT_IMMUNE",
14121478
"PADDED",
14131479
"TOUGH_FEET",
14141480
"NO_SALVAGE"

‎data/json/items/armor/suits_protection.json‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2646,7 +2646,7 @@
26462646
"longest_side": "30 cm",
26472647
"material_thickness": 5,
26482648
"environmental_protection": 20,
2649-
"flags": [ "VARSIZE", "WATERPROOF", "RAINPROOF", "GAS_PROOF", "STURDY", "OUTER" ],
2649+
"flags": [ "VARSIZE", "WATERPROOF", "IRRITANT_IMMUNE", "RAINPROOF", "GAS_PROOF", "STURDY", "OUTER" ],
26502650
"armor": [
26512651
{
26522652
"encumbrance": 50,
@@ -2751,7 +2751,17 @@
27512751
"warmth": 40,
27522752
"material_thickness": 2,
27532753
"environmental_protection": 20,
2754-
"flags": [ "VARSIZE", "WATERPROOF", "RAINPROOF", "GAS_PROOF", "RAD_PROOF", "ELECTRIC_IMMUNE", "OUTER", "SOFT" ],
2754+
"flags": [
2755+
"VARSIZE",
2756+
"WATERPROOF",
2757+
"IRRITANT_IMMUNE",
2758+
"RAINPROOF",
2759+
"GAS_PROOF",
2760+
"RAD_PROOF",
2761+
"ELECTRIC_IMMUNE",
2762+
"OUTER",
2763+
"SOFT"
2764+
],
27552765
"armor": [
27562766
{
27572767
"encumbrance": 37,
@@ -2956,7 +2966,7 @@
29562966
"msg": "You slip out of the top of the suit and tie the sleeves around your waist.",
29572967
"target": "robofac_enviro_suit_casual"
29582968
},
2959-
"flags": [ "VARSIZE", "WATERPROOF", "RAINPROOF", "GAS_PROOF", "RAD_PROOF", "ELECTRIC_IMMUNE", "STURDY" ]
2969+
"flags": [ "VARSIZE", "WATERPROOF", "IRRITANT_IMMUNE", "RAINPROOF", "GAS_PROOF", "RAD_PROOF", "ELECTRIC_IMMUNE", "STURDY" ]
29602970
},
29612971
{
29622972
"id": "robofac_enviro_suit_casual",
@@ -3046,7 +3056,7 @@
30463056
"msg": "You untie the sleeves and put back on the top of the suit.",
30473057
"target": "robofac_enviro_suit"
30483058
},
3049-
"delete": { "flags": [ "RAINPROOF", "GAS_PROOF", "RAD_PROOF", "ELECTRIC_IMMUNE" ] }
3059+
"delete": { "flags": [ "RAINPROOF", "IRRITANT_IMMUNE", "GAS_PROOF", "RAD_PROOF", "ELECTRIC_IMMUNE" ] }
30503060
},
30513061
{
30523062
"id": "xedra_enviro_suit",

‎data/json/mutations/mutations.json‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2675,6 +2675,7 @@
26752675
"description": "We have begun adapting local physiology to Mycus physical structure, greatly reducing wet effects.",
26762676
"purifiable": false,
26772677
"category": [ "MYCUS" ],
2678+
"flags": [ "IRRITANT_IMMUNE" ],
26782679
"prereqs": [ "M_IMMUNE" ],
26792680
"threshreq": [ "THRESH_MYCUS" ],
26802681
"leads_to": [ "M_DEFENDER" ],
@@ -2702,7 +2703,7 @@
27022703
"ugliness": 8,
27032704
"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.",
27042705
"purifiable": false,
2705-
"flags": [ "HEAT_IMMUNE" ],
2706+
"flags": [ "HEAT_IMMUNE", "IRRITANT_IMMUNE" ],
27062707
"category": [ "MYCUS" ],
27072708
"prereqs": [ "M_SKIN" ],
27082709
"prereqs2": [ "M_DEFENDER" ],
@@ -2732,7 +2733,7 @@
27322733
"ugliness": 10,
27332734
"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.",
27342735
"purifiable": false,
2735-
"flags": [ "HEAT_IMMUNE" ],
2736+
"flags": [ "HEAT_IMMUNE", "IRRITANT_IMMUNE" ],
27362737
"category": [ "MYCUS" ],
27372738
"prereqs": [ "M_SKIN2" ],
27382739
"threshreq": [ "THRESH_MYCUS" ],
@@ -5660,7 +5661,8 @@
56605661
"prereqs": [ "GASTROPOD_FOOT" ],
56615662
"leads_to": [ "MUCUS_SECRETION2" ],
56625663
"changes_to": [ "SNAIL_TRAIL" ],
5663-
"category": [ "GASTROPOD" ]
5664+
"category": [ "GASTROPOD" ],
5665+
"flags": [ "IRRITANT_IMMUNE" ]
56645666
},
56655667
{
56665668
"type": "mutation",
@@ -5679,7 +5681,8 @@
56795681
"base_damage": { "damage_type": "acid", "amount": 6 }
56805682
},
56815683
"prereqs": [ "MUCUS_SECRETION" ],
5682-
"category": [ "GASTROPOD" ]
5684+
"category": [ "GASTROPOD" ],
5685+
"flags": [ "IRRITANT_IMMUNE" ]
56835686
},
56845687
{
56855688
"type": "mutation",
@@ -5692,6 +5695,7 @@
56925695
"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.",
56935696
"prereqs": [ "MUCUS_SECRETION" ],
56945697
"category": [ "GASTROPOD" ],
5698+
"flags": [ "IRRITANT_IMMUNE" ],
56955699
"active": true,
56965700
"cost": 174,
56975701
"time": "100 s",
@@ -7700,6 +7704,7 @@
77007704
"leads_to": [ "SLIME_HANDS" ],
77017705
"changes_to": [ "VISCOUS" ],
77027706
"category": [ "FISH", "SLIME", "TROGLOBITE", "CEPHALOPOD", "GASTROPOD", "BATRACHIAN" ],
7707+
"flags": [ "IRRITANT_IMMUNE" ],
77037708
"wet_protection": [
77047709
{ "part": "head", "neutral": 3, "good": 4 },
77057710
{ "part": "leg_l", "neutral": 7, "good": 14 },
@@ -7726,6 +7731,7 @@
77267731
"prereqs": [ "SLIMY" ],
77277732
"threshreq": [ "THRESH_SLIME", "THRESH_GASTROPOD" ],
77287733
"category": [ "SLIME", "GASTROPOD" ],
7734+
"flags": [ "IRRITANT_IMMUNE" ],
77297735
"wet_protection": [
77307736
{ "part": "head", "neutral": 4, "good": 5 },
77317737
{ "part": "leg_l", "neutral": 8, "good": 15 },
@@ -8875,7 +8881,7 @@
88758881
"name": { "str": "Acidproof" },
88768882
"points": 3,
88778883
"vitamin_cost": 160,
8878-
"flags": [ "ACID_IMMUNE" ],
8884+
"flags": [ "ACID_IMMUNE", "IRRITANT_IMMUNE" ],
88798885
"description": "Your mutated flesh is immune to the damaging effects of acid.",
88808886
"threshreq": [ "THRESH_INSECT", "THRESH_CHIMERA", "THRESH_MEDICAL", "THRESH_SLIME" ],
88818887
"category": [ "INSECT", "CHIMERA", "MEDICAL", "SLIME" ]

0 commit comments

Comments
 (0)