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.

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

Some fix #139

Merged
merged 1 commit into from
Dec 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
coefficients:
Blunt: 0.65
Slash: 0.65
Piercing: 0.56
Piercing: 0.6
Heat: 0.6
- type: ClothingSpecialModifier
strengthModifier: 2
Expand All @@ -76,8 +76,8 @@
coefficients:
Blunt: 0.70
Slash: 0.70
Piercing: 0.64
Heat: 0.64
Piercing: 0.65
Heat: 0.65
- type: ClothingSpecialModifier
strengthModifier: 2

Expand Down Expand Up @@ -157,8 +157,8 @@
- type: Armor
modifiers:
coefficients:
Blunt: 0.77
Slash: 0.77
Blunt: 0.75
Slash: 0.75
Piercing: 0.75
Heat: 0.75

Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Maps/N14/sunnyvale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
# BoSWashingtonKnight: [ 2, 2 ]
# BoSWashingtonInitiate: [ 0, 2 ]
BoSMidPaladinCommander: [ 1, 1 ]
BoSMidPaladin: [ 1, 1 ]
BoSMidPaladin: [ 1, 2 ]
BoSMidKnight: [ 2, 3 ]
BoSMidScribe: [ 1, 2 ]
BoSMidSquire: [ 2, 2 ]
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_lt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
jumpsuit: N14ClothingOfficerUniformNCRSnow
shoes: N14ClothingBootsLeather
belt: ClothingBeltRevolverCaptainfilled
outerClothing: N14ClothingOuterNCRTrenchCoat
outerClothing: N14ClothingOuterNCRCombatArmorMK2
eyes: ClothingEyesGlassesSunglasses
pocket1: NCRSGTloadoutkits
pocket2: RadioHandheld
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_sgt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
shoes: N14ClothingBootsLeather
neck: N14ClothingNeckMantleNCR
belt: ClothingBeltNCR
outerClothing: N14ClothingOuterNCRVestSnow
outerClothing: N14ClothingOuterNCRCombatArmor
pocket1: NCRSGTloadoutkits
pocket2: RadioHandheld
id: N14IDNCRDogtagNCO
Expand Down
Loading