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

up #16

Merged
merged 60 commits into from
Jul 17, 2024
Merged

up #16

Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
5b8ec7b
adds Dual wielding for revolvers (#329)
ScyronX Jul 11, 2024
e2df12e
Makes shotguns require wielding to fire (#330)
ScyronX Jul 11, 2024
a3ab3fb
Adds ID locked doors (#331)
BlueHNT Jul 11, 2024
2d975c2
QoL 3 (#327)
Peptide90 Jul 11, 2024
909aa2c
nospawn and abstract part 1 (#334)
Peptide90 Jul 11, 2024
0bb2e4d
increases projectile speed and fixes projectiles inheriting velocity…
ScyronX Jul 11, 2024
37a9881
Adds laser gatling (#335)
BlueHNT Jul 11, 2024
c75f325
Adds bandanas to the crafting menu (#332)
ScyronX Jul 12, 2024
c3607f1
NPC Taming (#336)
JerryImMouse Jul 12, 2024
2510cde
Bullet Projectile damage changes (#339)
MutantMan2040 Jul 12, 2024
976a387
More locked doors (#337)
BlueHNT Jul 12, 2024
006bbe5
AntiMateriel changes from internal mag to magazine (#342)
BlueHNT Jul 12, 2024
197c1a4
Collection of Fixes and QOL Features (#341)
BlueHNT Jul 12, 2024
88cf562
make blast doors very strong
Peptide90 Jul 12, 2024
ed6ff6b
Merge remote-tracking branch 'origin/master'
Peptide90 Jul 12, 2024
b55aa1e
increase mini fusion power
Peptide90 Jul 12, 2024
94d58c6
set fallback mode to extended from waves
Peptide90 Jul 12, 2024
daf38b3
disable more events
Peptide90 Jul 12, 2024
da45956
depopulate mob spawning
Peptide90 Jul 12, 2024
b13080e
some new floor items, remove subfloor from tiles
Peptide90 Jul 13, 2024
4109aa5
suffixes and bounding boxes on floor decor
Peptide90 Jul 13, 2024
b6825fb
1307 sunnyvale update
Peptide90 Jul 13, 2024
7120d17
fix
Peptide90 Jul 13, 2024
48f06c6
Fixes WallFrame, Indestructible BlastDoor (#349)
BlueHNT Jul 13, 2024
403ca25
Chemicals are dangerous and Aluminium exists (#345)
BlueHNT Jul 13, 2024
c23f07b
Crafting, Loadouts and Kits (AMR, BrushTube) v2 (#344)
BlueHNT Jul 13, 2024
40aa41f
name description fix
Peptide90 Jul 13, 2024
f20106b
Merge remote-tracking branch 'origin/master'
Peptide90 Jul 13, 2024
a754912
add wooden settler table
Peptide90 Jul 13, 2024
7315d9f
Adds Lootable fridge (#351)
MutantMan2040 Jul 14, 2024
a65bc0c
map update
Peptide90 Jul 14, 2024
7a3a13f
Merge remote-tracking branch 'origin/master'
Peptide90 Jul 14, 2024
86a9695
Table and chair construction 1 (#353)
Peptide90 Jul 14, 2024
513a157
map update
Peptide90 Jul 14, 2024
bc5f5a4
Fixes door suffix (#352)
BlueHNT Jul 14, 2024
c088263
RadAway Phial and some changes (#350)
BlueHNT Jul 14, 2024
42b8633
Added maidclaws (#347)
Noliuss Jul 14, 2024
93ddd16
Merge remote-tracking branch 'origin/master'
Peptide90 Jul 14, 2024
388c38f
map update
Peptide90 Jul 14, 2024
55a52d4
Merge remote-tracking branch 'origin/master'
Peptide90 Jul 14, 2024
cf1582a
half hunger decay rate
Peptide90 Jul 14, 2024
7d61437
nospawn intercom
Peptide90 Jul 15, 2024
fdca353
Clothes pack 1 (#359)
Peptide90 Jul 15, 2024
5e8e87c
adds a short doafter to hypospray for when you use it on others (#358)
ScyronX Jul 15, 2024
49f91e8
Fixes fox ranger helmet / Updates balancing (#357)
BlueHNT Jul 15, 2024
983287d
Merge remote-tracking branch 'origin/master'
Peptide90 Jul 15, 2024
451bf74
robit progress
Peptide90 Jul 15, 2024
0ed8877
update
Peptide90 Jul 15, 2024
dc08f0c
eyebot music and lint fix
Peptide90 Jul 15, 2024
4f62eff
Update base_borg_chassis.yml
Peptide90 Jul 15, 2024
f23e347
Update borg_chassis.yml
Peptide90 Jul 15, 2024
caa2b83
Update base_borg_chassis.yml
Peptide90 Jul 15, 2024
4c92980
fix master
Peptide90 Jul 16, 2024
3eca788
Little Locale fixes and other. (#362)
Vonsant Jul 16, 2024
4d809ee
fix master
Peptide90 Jul 16, 2024
9eef148
Respawn button (#361)
Vonsant Jul 16, 2024
54f7307
Fix and Nerfs (#363)
BlueHNT Jul 16, 2024
6844945
Armor, Coats and Power Armors pack (#360)
BlueHNT Jul 16, 2024
0450b48
quick fix (#367)
Vonsant Jul 16, 2024
966cbb1
Map fix (#368)
Vonsant Jul 16, 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
Prev Previous commit
Next Next commit
Fixes fox ranger helmet / Updates balancing (Vault-Overseers#357)
* fixes for ranger and custom helmet

* rebalances ncr gear to be up to par with combat armor / marine armor
BlueHNT authored Jul 15, 2024
commit 49f91e886d31b98b972e349016798719dc59985c
37 changes: 8 additions & 29 deletions Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml
Original file line number Diff line number Diff line change
@@ -269,7 +269,7 @@
sprite: _Nuclear14/Clothing/Head/FalloutHelmets/ncrhelmetmedic.rsi

- type: entity
parent: N14ClothingHeadHatBaseHelmetMK2
parent: N14ClothingHeadHatBaseHelmetmarine
id: N14ClothingHeadHatRangerHelmet
name: ranger combat helmet
description: A helmet offering advanced protection, this one is commonly used by rangers.
@@ -283,7 +283,7 @@
- HidesHair

- type: entity
parent: N14ClothingHeadHatBaseHelmetMK2
parent: N14ClothingHeadHatBaseHelmetmarine
id: N14ClothingHeadHatRangerHelmetOld
name: old ranger combat helmet
description: An old combat helmet, out of use around the time of the war.
@@ -297,7 +297,7 @@
- HidesHair

- type: entity
parent: N14ClothingHeadHatBaseHelmetMK2
parent: N14ClothingHeadHatBaseHelmetmarine
id: N14ClothingHeadHatRangerHelmetDesert
name: desert ranger combat helmet
description: An U.S Marine Corps helmet, used by the legendary Desert Rangers.
@@ -306,19 +306,12 @@
sprite: _Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetdesert.rsi
- type: Clothing
sprite: _Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetdesert.rsi
- type: Armor
modifiers:
coefficients:
Blunt: 0.7
Slash: 0.65
Piercing: 0.75
Heat: 0.7
- type: Tag
tags:
- HidesHair

- type: entity
parent: N14ClothingHeadHatBaseHelmetMK2
parent: N14ClothingHeadHatBaseHelmetmarine
id: N14ClothingHeadHatRangerHelmetPrice
name: spider ranger combat helmet
description: A customised riot helmet reminiscient of the more advanced riot helmets found in the Divide, sporting purple lenses over the traditional red or green and a pair of red fangs painted over the respirator. The back of the helmet has a the face of an albino spider painted over it.
@@ -327,19 +320,12 @@
sprite: _Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetprice.rsi
- type: Clothing
sprite: _Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetprice.rsi
- type: Armor
modifiers:
coefficients:
Blunt: 0.7
Slash: 0.65
Piercing: 0.75
Heat: 0.7
- type: Tag
tags:
- HidesHair

- type: entity
parent: N14ClothingHeadHatBaseHelmetMK2
parent: N14ClothingHeadHatBaseHelmetmarine
id: N14ClothingHeadHatRangerHelmetElite
name: elite ranger combat helmet
description: An old combat helmet seen in the divide, repurposed for higher ranking Rangers.
@@ -360,7 +346,7 @@
- HidesHair

- type: entity
parent: N14ClothingHeadHatBaseHelmetMK2
parent: N14ClothingHeadHatBaseHelmetmarine
id: N14ClothingHeadHatRangerHelmetEliteOld
name: elite ranger combat helmet
description: An old combat helmet seen in the divide, repurposed for higher ranking Rangers.
@@ -381,7 +367,7 @@
- HidesHair

- type: entity
parent: N14ClothingHeadHatBaseHelmetMK2
parent: N14ClothingHeadHatBaseHelmetmarine
id: N14ClothingHeadHatRangerHelmetFox
name: fox ranger combat helmet
description: A customized and well-worn helmet of riot gear with parts of the suit reinforced with leather armor and slain Centurion armor pieces by the wearer. A sniper's veil is wrapped around the neck.
@@ -390,19 +376,12 @@
sprite: _Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetfox.rsi
- type: Clothing
sprite: _Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetfox.rsi
- type: Armor
modifiers:
coefficients:
Blunt: 0.7
Slash: 0.65
Piercing: 0.75
Heat: 0.7
- type: Tag
tags:
- HidesHair

- type: entity
parent: N14ClothingHeadHatBaseHelmetMK2
parent: N14ClothingHeadHatBaseHelmetmarine
id: N14ClothingHeadHatRangerHelmetEliteModif
name: modified ranger combat helmet
description: A thicker than average helmet worn by rangers out in the field. This one appears have its mask welded to helmet with some unique modifications.
Original file line number Diff line number Diff line change
@@ -414,7 +414,7 @@
Piercing: 0.5
Heat: 0.5

#NCR Rangers
#MARK: NCR Rangers

- type: entity
parent: ClothingOuterStorageBase
@@ -429,8 +429,8 @@
- type: Armor
modifiers:
coefficients:
Blunt: 0.7
Slash: 0.7
Blunt: 0.65
Slash: 0.65
Piercing: 0.6
Heat: 0.6

@@ -447,13 +447,13 @@
- type: Armor
modifiers:
coefficients:
Blunt: 0.6
Slash: 0.6
Blunt: 0.65
Slash: 0.65
Piercing: 0.6
Heat: 0.6

- type: entity
parent: ClothingOuterBase
parent: ClothingOuterStorageBase
id: N14ClothingOuterRangerArmorB
name: customized ranger patrol armor
description: A customized and moderately-worn suit of patrol ranger armor. A sun-worn thick olive duster is worn over the armor.
@@ -466,12 +466,12 @@
modifiers:
coefficients:
Blunt: 0.6
Slash: 0.55
Slash: 0.6
Piercing: 0.6
Heat: 0.7
Heat: 0.6

- type: entity
parent: ClothingOuterBase
parent: ClothingOuterStorageBase
id: N14ClothingOuterRangerDuster
name: ranger recon duster
description: A thicker than average duster worn by NCR recon rangers out in the field. It's not heavily armored by any means, but is easy to move around in and provides excellent protection from the harsh desert environment.
@@ -483,10 +483,12 @@
- type: Armor
modifiers:
coefficients:
Blunt: 0.65
Slash: 0.65
Piercing: 0.7
Heat: 0.7
Blunt: 0.6
Slash: 0.6
Piercing: 0.6
Heat: 0.6

#MARK: Veteran

- type: entity
parent: ClothingOuterStorageBase
@@ -501,10 +503,10 @@
- type: Armor
modifiers:
coefficients:
Blunt: 0.7
Slash: 0.7
Piercing: 0.5
Heat: 0.6
Blunt: 0.6
Slash: 0.6
Piercing: 0.45
Heat: 0.45

- type: entity
parent: ClothingOuterStorageBase
@@ -520,9 +522,9 @@
modifiers:
coefficients:
Blunt: 0.6
Slash: 0.5
Slash: 0.6
Piercing: 0.45
Heat: 0.5
Heat: 0.45

- type: entity
parent: ClothingOuterStorageBase
@@ -538,7 +540,7 @@
modifiers:
coefficients:
Blunt: 0.6
Slash: 0.55
Slash: 0.6
Piercing: 0.4
Heat: 0.5

@@ -556,9 +558,9 @@
modifiers:
coefficients:
Blunt: 0.6
Slash: 0.55
Piercing: 0.4
Heat: 0.6
Slash: 0.5
Piercing: 0.45
Heat: 0.5

- type: entity
parent: ClothingOuterStorageBase
@@ -573,7 +575,7 @@
- type: Armor
modifiers:
coefficients:
Blunt: 0.8
Blunt: 0.7
Slash: 0.7
Piercing: 0.7
Heat: 0.7
@@ -609,13 +611,10 @@
- type: Armor
modifiers:
coefficients:
Blunt: 0.55
Blunt: 0.5
Slash: 0.5
Piercing: 0.35
Heat: 0.45
- type: ClothingSpeedModifier # a little heavier due to the high protection
walkModifier: 0.95
sprintModifier: 0.95
Heat: 0.4

- type: entity
parent: ClothingOuterStorageBase
@@ -631,7 +630,7 @@
modifiers:
coefficients:
Blunt: 0.6
Slash: 0.55
Slash: 0.6
Piercing: 0.4
Heat: 0.5

Original file line number Diff line number Diff line change
@@ -11,7 +11,8 @@
"name": "icon"
},
{
"name": "equipped-HELMET"
"name": "equipped-HELMET",
"directions": 4
}
]
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.