commies, guns and the fun police #748
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…/PatoGrone/nuclear-14 into chinese,-guns-and-the-fun-police
|
RSI Diff Bot; head commit becef98 merging into 8e94faa Resources/Textures/_Nuclear14/Clothing/Eyes/goggles.rsi
Resources/Textures/_Nuclear14/Clothing/Head/PowerArmorHelmets/midwest.rsi
Resources/Textures/_Nuclear14/Clothing/Head/PowerArmorHelmets/midwestcommander.rsi
Resources/Textures/_Nuclear14/Clothing/OuterClothing/PowerArmor/midwest.rsi
Resources/Textures/_Nuclear14/Clothing/OuterClothing/PowerArmor/midwestcommander.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/laser_autorifle.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/laser_rifle.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/laser_rifle_proto.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/plasma_autorifle.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/plasma_rifle.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/recharger_rifle.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz2000.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz3000.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/LMGs/autorifle.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/LMGs/bren.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/LMGs/lmg.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Pistols/thespy.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Rifles/battlerifle.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Rifles/carbine.rsi
Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/chinesehat.rsi
Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/vancouverhat.rsi
Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/chinesehelmet.rsi
Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/chinesespecialhelmet.rsi
Resources/Textures/_Nuclear14/Clothing/Mask/whitebalaclava.rsi
Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/falloutcanadiancombat.rsi
Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/falloutchinesearmor.rsi
Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/falloutchinesevest.rsi
Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/falloutleathervest.rsi
Resources/Textures/_Nuclear14/Clothing/OuterClothing/Coats/armoredjacket.rsi
Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/chineseuniform.rsi
Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/vancouver.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/7.62/belt.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/7.62/mag2.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/laser_revolver.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/makeshift_laser_rifle.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Heavy/pipelauncher.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/LMGs/canadianhmg.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/LMGs/chineselmg.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Pistols/webleypistol.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Revolvers/tribalhandcannon.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Revolvers/tribalhandcannon2.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Revolvers/tribalrevolver1.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Revolvers/tribalrevolver2.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Revolvers/tribalrevolver3.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Rifles/butcheredrifle.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Rifles/canadianmarksman.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Rifles/canadianrifle.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Rifles/chinesecarbine.rsi
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
in general the PR is mostly guns and small sprite changes on various guns, 7.62mm got expanded and now it has a lot more of guns that use it
the PR includes:
vancouver preventors (fun police):
law enforcers of the vancouver goverment, they are just a admin tool to prevent caravan from abusing their power, basically a IC way to give warnings or taking down warmongering individuals from the caravan company.
tribal guns finally here:
canadians guns, for admeme and game loot:
new chinese equipment, for admeme and game loot:
some extra guns:
total resprite and new makeshift weaponry:
(mag already fixed, just to lazy to get a new image)
midwest PA resprite:
REMINDER: i add, not implement, thats on you loot/crafting balance nerds.