Skip to content

Commit f32f21b

Browse files
authored
Merge pull request #81909 from Fris0uman/revert_skin_irrtant_protection
Remove IRRITANT_IMMUNE from armors [need #72271 merged first]
2 parents c7d1bab + b1de43d commit f32f21b

File tree

3 files changed

+5
-29
lines changed

3 files changed

+5
-29
lines changed

data/json/items/armor/combat_exoskeleton.json

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
"PADDED",
1818
"WATERPROOF",
1919
"RAINPROOF",
20-
"IRRITANT_IMMUNE",
2120
"RAD_PROOF",
2221
"ELECTRIC_IMMUNE",
2322
"SUN_GLASSES",
@@ -490,17 +489,7 @@
490489
"warmth": 0,
491490
"environmental_protection": 0,
492491
"delete": {
493-
"flags": [
494-
"STURDY",
495-
"PADDED",
496-
"WATERPROOF",
497-
"RAINPROOF",
498-
"IRRITANT_IMMUNE",
499-
"RAD_PROOF",
500-
"ELECTRIC_IMMUNE",
501-
"SUN_GLASSES",
502-
"COMBAT_TOGGLEABLE"
503-
]
492+
"flags": [ "STURDY", "PADDED", "WATERPROOF", "RAINPROOF", "RAD_PROOF", "ELECTRIC_IMMUNE", "SUN_GLASSES", "COMBAT_TOGGLEABLE" ]
504493
},
505494
"armor": [
506495
{

data/json/items/armor/suits_protection.json

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2783,7 +2783,7 @@
27832783
"longest_side": "30 cm",
27842784
"material_thickness": 5,
27852785
"environmental_protection": 20,
2786-
"flags": [ "VARSIZE", "WATERPROOF", "IRRITANT_IMMUNE", "RAINPROOF", "GAS_PROOF", "STURDY", "OUTER" ],
2786+
"flags": [ "VARSIZE", "WATERPROOF", "RAINPROOF", "GAS_PROOF", "STURDY", "OUTER" ],
27872787
"armor": [
27882788
{
27892789
"encumbrance": 50,
@@ -2893,17 +2893,7 @@
28932893
"warmth": 40,
28942894
"material_thickness": 2,
28952895
"environmental_protection": 20,
2896-
"flags": [
2897-
"VARSIZE",
2898-
"WATERPROOF",
2899-
"IRRITANT_IMMUNE",
2900-
"RAINPROOF",
2901-
"GAS_PROOF",
2902-
"RAD_PROOF",
2903-
"ELECTRIC_IMMUNE",
2904-
"OUTER",
2905-
"SOFT"
2906-
],
2896+
"flags": [ "VARSIZE", "WATERPROOF", "RAINPROOF", "GAS_PROOF", "RAD_PROOF", "ELECTRIC_IMMUNE", "OUTER", "SOFT" ],
29072897
"armor": [
29082898
{
29092899
"encumbrance": 37,
@@ -3112,7 +3102,7 @@
31123102
"msg": "You slip out of the top of the suit and tie the sleeves around your waist.",
31133103
"target": "robofac_enviro_suit_casual"
31143104
},
3115-
"flags": [ "VARSIZE", "WATERPROOF", "IRRITANT_IMMUNE", "RAINPROOF", "GAS_PROOF", "RAD_PROOF", "ELECTRIC_IMMUNE", "STURDY" ]
3105+
"flags": [ "VARSIZE", "WATERPROOF", "RAINPROOF", "GAS_PROOF", "RAD_PROOF", "ELECTRIC_IMMUNE", "STURDY" ]
31163106
},
31173107
{
31183108
"id": "robofac_enviro_suit_casual",
@@ -3203,7 +3193,7 @@
32033193
"msg": "You untie the sleeves and put back on the top of the suit.",
32043194
"target": "robofac_enviro_suit"
32053195
},
3206-
"delete": { "flags": [ "RAINPROOF", "IRRITANT_IMMUNE", "GAS_PROOF", "RAD_PROOF", "ELECTRIC_IMMUNE" ] }
3196+
"delete": { "flags": [ "RAINPROOF", "GAS_PROOF", "RAD_PROOF", "ELECTRIC_IMMUNE" ] }
32073197
},
32083198
{
32093199
"id": "xedra_enviro_suit",

data/json/items/tool_armor.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1444,7 +1444,6 @@
14441444
"ALARMCLOCK",
14451445
"SWIM_GOGGLES",
14461446
"SUN_GLASSES",
1447-
"IRRITANT_IMMUNE",
14481447
"RAD_PROOF",
14491448
"GAS_PROOF",
14501449
"ELECTRIC_IMMUNE",
@@ -1625,7 +1624,6 @@
16251624
"environmental_protection": 10,
16261625
"material_thickness": 3,
16271626
"flags": [
1628-
"IRRITANT_IMMUNE",
16291627
"RAD_PROOF",
16301628
"PORTAL_PROOF",
16311629
"STURDY",
@@ -1738,7 +1736,6 @@
17381736
},
17391737
"environmental_protection": 80,
17401738
"flags": [
1741-
"IRRITANT_IMMUNE",
17421739
"RAD_PROOF",
17431740
"PORTAL_PROOF",
17441741
"STURDY",

0 commit comments

Comments
 (0)