Port Frontier Guns And The Den PRs For Them #1490
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 is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Ports several frontier guns --- <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: Added the Argenti, the Gestio, the Novalite C1, and the SVT.
…Vend (Simple-Station#133) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Adds various weapons into the salvage vending machine, such as the Argenti revolver, the Gestio, Novalite, and SVT rifles, and a new spear type Harpoon weapon for salvage. --- <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: Added a revolver, three rifles, and a harpoon into the salvage points vend, the guns do not come loaded for workplace gun safety. Have a fun time hunting your white whale! --------- Co-authored-by: Rosycup <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>
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Adds a lethal and non-lethal Argenti for the security loadout, adds missing magazines to the ammofab. --- <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: Added security issued Argentis with lethal and non-lethal options into the security loadout. Rootin' tootin' cowboy shootin'! - add: Added recipes for the magazines for the salvage rifles into the ammo fabricator. --------- Co-authored-by: Rosycup <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>
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Removes the loaded ammo in the Argenti you can buy from the Salvage Vend, as originall --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - tweak: Unloaded the ammo from the Argentis in the Salvage Vend.
github-actions
bot
added
Changes: C#
|
RSI Diff Bot; head commit 8965f96 merging into 07401aa Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi
Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi
Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi
Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi
Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi
Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi
Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi
Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi
Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi
Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi
Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi
Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi
Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi
Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi
Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi
Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi
Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi
Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi
|
…com/VMSolidus/Einstein-Engines into add-mining-tools-to-salvage-lockers
|
Ready for Review! |
sleepyyapril
approved these changes
Jan 11, 2025
SimpleStation14
added a commit
that referenced
this pull request
Jan 11, 2025
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.
Description
this ports the following PRs:
TheDenSS14/TheDen#128
TheDenSS14/TheDen#133
TheDenSS14/TheDen#135
TheDenSS14/TheDen#143
Essentially, this PR adds several new "Civilian Grade" firearms to the game that come from Frontier, most of which use the new LightRifle cartridge, a fairly underpowered round. Security can take the new Argenti revolver in their loadouts, while Salvage can spend their Mining Points on the civilian rifles. Notably, the ones purchased in the Mining Vendor do not come with ammo. Salvage needs to go request ammo from Security, or a traitor salvage can emag the cargo autolathe to get ammo for them.
I'm going to laugh my ass off the first time a Warden has to deal with Salvage specialists coming to ask "Hey can you print me ammo for my MOSIN?"
Media
New 0 point revolver for sec. It does shit-tier damage since it fires .20 rifle, but with an 8 round capacity, it's the highest capacity revolver in the game.
New salvage vendor "Civilian Grade" equipment
Tested and verified that the salvage vendor guns actually do spawn empty:
Changelog
🆑