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

Fixes for FS-61 Dreadnought; Breaker Spray&Pray; Weapon Traits #24

Merged
merged 5 commits into from
Apr 25, 2024
Merged

Fixes for FS-61 Dreadnought; Breaker Spray&Pray; Weapon Traits #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
70dec8d
Fixes for FS-61 Dreadnought
Apr 25, 2024
ee6a901
Updates Trait Names
Apr 25, 2024
67812c5
Spray&Pray Name Type Fix
Apr 25, 2024
88ce4e2
Revert "Spray&Pray Name Type Fix"
Apr 25, 2024
5526399
Fixes Breaker Spray&Pray Name Type
Apr 25, 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
12 changes: 6 additions & 6 deletions items/armor/armor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1332,12 +1332,12 @@
"1400802885": {
"name": "FS-61 Dreadnought",
"description": "With genuine gold accents, 74% of colonists voted this armor the set they would most like to be buried in.",
"type": 1,
"slot": 1,
"armor_rating": 100,
"speed": 100,
"stamina_regen": 100,
"passive": 0
"type": 2,
"slot": 2,
"armor_rating": 150,
"speed": 450,
"stamina_regen": 50,
"passive": 8
},
"854794995": {
"name": "Harbinger of True Equality",
Expand Down
2 changes: 1 addition & 1 deletion items/weapons/primary.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
]
},
"3814689025": {
"name": "SG-225SP Breaker Spray&Pra",
"name": "SG-225SP Breaker Spray&Pray",
"description": "A modified Breaker shotgun firing birdshot, small pellets which saturate an area to clear up smaller targets.",
"type": 2,
"damage": 192,
Expand Down
2 changes: 1 addition & 1 deletion items/weapons/traits.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"0": "None",
"1": "Light Armor Penetrating",
"2": "Medium Armor Penetration",
"2": "Medium Armor Penetrating",
"3": "Heavy Armor Penetrating",
"4": "One Handed",
"5": "Rounds Reload",
Expand Down