Skip to content
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

Jump to bottom

Fragile and Sturdy flags cannot be inherited #77256

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+32 −16
Open

Fragile and Sturdy flags cannot be inherited #77256

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 32 additions & 16 deletions data/json/flags.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,8 @@
"id": "FRAGILE",
"type": "json_flag",
"info": "This gear is <bad>fragile</bad> and <info>won't protect you for long</info>.",
"conflicts": [ "STURDY" ]
"conflicts": [ "STURDY" ],
"inherit": false
},
{
"id": "FRAGILE_MELEE",
Expand Down Expand Up @@ -920,7 +921,8 @@
"id": "STURDY",
"type": "json_flag",
"info": "This clothing will <good>protect</good> you from harm and withstand <info>a lot of abuse</info>.",
"conflicts": [ "FRAGILE" ]
"conflicts": [ "FRAGILE" ],
"inherit": false
},
{
"id": "SUN_GLASSES",
Expand Down Expand Up @@ -2210,72 +2212,86 @@
{
"id": "EXO_SMALL",
"type": "json_flag",
"info": "This is meant for a small exosuit hardpoint."
"info": "This is meant for a small exosuit hardpoint.",
"inherit": false
},
{
"id": "EXO_LARGE",
"type": "json_flag",
"info": "This is meant for a large exosuit hardpoint."
"info": "This is meant for a large exosuit hardpoint.",
"inherit": false
},
{
"id": "EXO_PSU",
"type": "json_flag",
"info": "This is meant for an exosuit PSU hardpoint."
"info": "This is meant for an exosuit PSU hardpoint.",
"inherit": false
},
{
"id": "EXO_SMALL_GADGET",
"type": "json_flag",
"info": "This is meant for small exosuit gadgets, 1 L or less."
"info": "This is meant for small exosuit gadgets, 1 L or less.",
"inherit": false
},
{
"id": "EXO_HELMET_GADGET",
"type": "json_flag",
"info": "This is meant for helmet-specific gadgets."
"info": "This is meant for helmet-specific gadgets.",
"inherit": false
},
{
"id": "EXO_MEDIUM_GADGET",
"type": "json_flag",
"info": "This is meant for medium exosuit gadgets, between 1 L and 5 L."
"info": "This is meant for medium exosuit gadgets, between 1 L and 5 L.",
"inherit": false
},
{
"id": "EXO_LARGE_GADGET",
"type": "json_flag",
"info": "This is meant for large exosuit gadgets, larger than 5 L."
"info": "This is meant for large exosuit gadgets, larger than 5 L.",
"inherit": false
},
{
"id": "EXO_UNDERLAYER",
"type": "json_flag",
"info": "This is meant for exosuit underlayers."
"info": "This is meant for exosuit underlayers.",
"inherit": false
},
{
"id": "EXO_HELMET_PLATE",
"type": "json_flag",
"info": "This is meant for exoskeleton helmet plating."
"info": "This is meant for exoskeleton helmet plating.",
"inherit": false
},
{
"id": "EXO_TORSO_PLATE",
"type": "json_flag",
"info": "This is meant for exoskeleton torso plating."
"info": "This is meant for exoskeleton torso plating.",
"inherit": false
},
{
"id": "EXO_ARM_PLATE",
"type": "json_flag",
"info": "This is meant for exoskeleton arm plating."
"info": "This is meant for exoskeleton arm plating.",
"inherit": false
},
{
"id": "EXO_GLOVE_PLATE",
"type": "json_flag",
"info": "This is meant for exoskeleton arm plating."
"info": "This is meant for exoskeleton arm plating.",
"inherit": false
},
{
"id": "EXO_LEG_PLATE",
"type": "json_flag",
"info": "This is meant for exoskeleton leg plating."
"info": "This is meant for exoskeleton leg plating.",
"inherit": false
},
{
"id": "EXO_BOOT_PLATE",
"type": "json_flag",
"info": "This is meant for exoskeleton foot plating."
"info": "This is meant for exoskeleton foot plating.",
"inherit": false
},
{
"id": "ROBOFAC_ROBOT_MEDIUM",
Expand Down
Loading