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 makeshift armors and role changes #206

Merged

Conversation

PatoGrone
Copy link
Contributor

@PatoGrone PatoGrone commented Jun 13, 2024

Content added for crafting:
i added chitin, yaoguai hide, nightstalker hide and radscorpion exoskeleton has extractable materials from each of those animals.
added 3 armors, light metal armor (craftable with a combination of metallic scrap) chitin armor (made of ant chitin) and radscorpion armor (made of radscorpion exoskeleton).
added 2 hats, nightstalker hat and canine hat
added 1 cloak made of yaoguai hide

about the roles:
i varely modified some remplacing the upstream clothes for N14 variants.
some like the guards/sheriff/deputy got added a different armor and weapon for them to start with.
changed the stun baton sprite for one more fallout fitting.
added some loadout content, mostly gloves and shoes/boots.

last commit changes:
added tons of equipped backpack/suitstorage sprites for all guns except battery ones.
added 3 armors, police related.
changed the sheriff/deputy start armors.
added 45-70 has a ammo caliber.
added speedloaders for all revolvers.
buffed the 308, 50 and 44 ammo calibers damage.
added some guns like the NCR 50 rifle, 10mm revolver, brush gun and ranger sequoia.

Copy link
Contributor

github-actions bot commented Jun 13, 2024

RSI Diff Bot; head commit ae0c7fd merging into 672c866
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/Head/Hats/cowboyhatbountyhunter.rsi

State Old New Status
equipped-HELMET Modified
icon Modified

Resources/Textures/Clothing/Head/Hats/hoshat.rsi

State Old New Status
equipped-HELMET Modified
icon Modified

Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/policethelmet.rsi

State Old New Status
equipped-HELMET Modified
icon Modified

Resources/Textures/Nuclear14/Objects/Weapons/Guns/LMGs/autorifle.rsi

State Old New Status
equipped-BACKPACK Modified
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/LMGs/lmg.rsi

State Old New Status
equipped-BACKPACK Modified
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/hunt_revolver.rsi

State Old New Status
base Modified
bolt-open Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi

State Old New Status
equipped-BACKPACK Modified
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/battlerifle.rsi

State Old New Status
equipped-BACKPACK Modified
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/carbine.rsi

State Old New Status
equipped-BACKPACK Modified
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi

State Old New Status
equipped-BACKPACK Modified
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi

State Old New Status
equipped-BACKPACK Modified
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi

State Old New Status
equipped-BACKPACK Modified
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi

State Old New Status
equipped-BACKPACK Modified
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Melee/ripper.rsi

State Old New Status
inhand-left Modified
inhand-right Modified

Resources/Textures/Nuclear14/Clothing/Belt/beltoverlay.rsi

State Old New Status
10mmrevolver Added
9mmrevolver Added
hunter-revolver Added
magnum Added
ranger-sequoia Added

Resources/Textures/Nuclear14/Clothing/Belt/revolverholster.rsi

State Old New Status
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/animalhat.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/nightstalkerhat.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/Nuclear14/Clothing/Neck/yaoguai.rsi

State Old New Status
equipped-NECK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutchitinarmor.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutlightmetal.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicecombat.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicevest.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutradarmor.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutsheriffvest.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi

State Old New Status
rad_exo Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/45-70.rsi

State Old New Status
base Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi

State Old New Status
base-1 Added
base-2 Added
base-3 Added
base-4 Added
base-5 Added
base-6 Added
base Added
icon Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi

State Old New Status
base-1 Added
base-2 Added
base-3 Added
base-4 Added
base-5 Added
base-6 Added
base Added
icon Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi

State Old New Status
base-1 Added
base-2 Added
base-3 Added
base-4 Added
base-5 Added
base-6 Added
base Added
icon Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi

State Old New Status
base-1 Added
base-2 Added
base-3 Added
base-4 Added
base-5 Added
base-6 Added
base Added
icon Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/10mmrevolver.rsi

State Old New Status
base Added
bolt-open Added
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/ranger_sequoia.rsi

State Old New Status
base Added
bolt-open Added
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi

State Old New Status
equipped-BACKPACK Added
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi

State Old New Status
equipped-BACKPACK Added
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi

State Old New Status
equipped-BACKPACK Added
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi

State Old New Status
equipped-BACKPACK Added
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/45SMG.rsi

State Old New Status
equipped-BACKPACK Added
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/9mmSMG.rsi

State Old New Status
equipped-BACKPACK Added
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi

State Old New Status
equipped-BACKPACK Added
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi

State Old New Status
equipped-BACKPACK Added
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi

State Old New Status
equipped-BACKPACK Added
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi

State Old New Status
equipped-BACKPACK Added
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi

State Old New Status
equipped-BACKPACK Added
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi

State Old New Status
equipped-BACKPACK Added
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi

State Old New Status
equipped-BACKPACK Added
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi

State Old New Status
base Added
bolt-open Added
equipped-BACKPACK Added
equipped-SUITSTORAGE Added
inhand-left Added
inhand-right Added
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimateriel.rsi

State Old New Status
equipped-BACKPACK Added
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi

State Old New Status
base Added
bolt-open Added
equipped-BACKPACK Added
equipped-SUITSTORAGE Added
inhand-left Added
inhand-right Added
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi

State Old New Status
equipped-BACKPACK Added
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi

State Old New Status
equipped-BACKPACK Added
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi

State Old New Status
equipped-BACKPACK Added
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi

State Old New Status
equipped-BACKPACK Added
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/varmint.rsi

State Old New Status
equipped-BACKPACK Added
equipped-SUITSTORAGE Added

Resources/Textures/Nuclear14/Objects/Weapons/Melee/policebaton.rsi

State Old New Status
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Melee/secbaton-inhands.rsi

State Old New Status
inhand-left-blade Added
inhand-left Added
inhand-right-blade Added
inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Melee/secbaton.rsi

State Old New Status
base Added
baton Added

Edit: diff updated after ae0c7fd

Copy link
Collaborator

@Peptide90 Peptide90 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could do with material stack prototypes but otherwise good stuff.

Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link
Contributor

@BlueHNT BlueHNT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Amazing work.

@Peptide90 Peptide90 merged commit 020b2d0 into Vault-Overseers:master Jun 26, 2024
8 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants