Skip to content

Commit

Permalink
Merge pull request #50961 from Saicchi/docfix
Browse files Browse the repository at this point in the history
Remove git diff markings in JSON_INFO.md
  • Loading branch information
ZhilkinSerg authored Aug 21, 2021
2 parents 5cba16b + c900807 commit 804fa93
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions doc/JSON_INFO.md
Original file line number Diff line number Diff line change
Expand Up @@ -2400,10 +2400,7 @@ Armor can be defined like this:
"type" : "ARMOR", // Defines this as armor
... // same entries as above for the generic item.
// additional some armor specific entries:
<<<<<<< Updated upstream
=======
"covers" : [ "foot_l", "foot_r" ], // Where it covers. Use bodypart_id defined in body_parts.json Also note that LEG_EITHER ARM_EITHER HAND_EITHER and FOOT_EITHER are allowed.
>>>>>>> Stashed changes
"warmth" : 10, // (Optional, default = 0) How much warmth clothing provides
"environmental_protection" : 0, // (Optional, default = 0) How much environmental protection it affords
"encumbrance" : 0, // Base encumbrance (unfitted value)
Expand Down

0 comments on commit 804fa93

Please sign in to comment.