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

Frontier Guns #128

Merged
merged 13 commits into from
Jan 5, 2025
Merged

Frontier Guns #128

merged 13 commits into from
Jan 5, 2025

Conversation

sleepyyapril
Copy link
Contributor

Description

Ports several frontier guns


Changelog

🆑

  • add: Added the Argenti, the Gestio, the Novalite C1, and the SVT.

Copy link
Contributor

github-actions bot commented Jan 5, 2025

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

Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi

State Old New Status
bigdisplay Added
display Added

Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi

State Old New Status
10x24display Added
bigdisplay Added
bigrubberdisplay Added
display Added
practicedisplay Added
rubberdisplay Added

Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi

State Old New Status
bigdisplay Added
display Added
incendiarydisplay Added
practicedisplay Added
rubberdisplay Added
uraniumdisplay Added

Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi

State Old New Status
capdisplay Added
display Added
incendiarydisplay Added
piercingdisplay Added
practicedisplay Added
rubberdisplay Added
uraniumdisplay Added

Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi

State Old New Status
display Added
empdisplay Added
incendiarydisplay Added
practicedisplay Added
rubberdisplay Added
uraniumdisplay Added

Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi

State Old New Status
bigdisplay Added
bigpracticedisplay Added
display Added
incendiarydisplay Added
practicedisplay Added
rubberdisplay Added
uraniumdisplay Added

Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi

State Old New Status
base Added
mag-1 Added
practice Added
red Added
rubber Added
uranium Added

Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi

State Old New Status
base Added
mag-1 Added
mag-10 Added
mag-11 Added
mag-12 Added
mag-13 Added
mag-14 Added
mag-15 Added
mag-2 Added
mag-3 Added
mag-4 Added
mag-5 Added
mag-6 Added
mag-7 Added
mag-8 Added
mag-9 Added

Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi

State Old New Status
base Added
mag-1 Added
mag-10 Added
mag-2 Added
mag-3 Added
mag-4 Added
mag-5 Added
mag-6 Added
mag-7 Added
mag-8 Added
mag-9 Added

Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi

State Old New Status
base-1 Added
base-2 Added
base-3 Added
base-4 Added
base-5 Added
base-6 Added
base-7 Added
base-8 Added
base Added
icon Added
piercing-1 Added
piercing-2 Added
piercing-3 Added
piercing-4 Added
piercing-5 Added
piercing-6 Added
piercing-7 Added
piercing-8 Added
piercing-icon Added
practice-1 Added
practice-2 Added
practice-3 Added
practice-4 Added
practice-5 Added
practice-6 Added
practice-7 Added
practice-8 Added
practice-icon Added
rubber-1 Added
rubber-2 Added
rubber-3 Added
rubber-4 Added
rubber-5 Added
rubber-6 Added
rubber-7 Added
rubber-8 Added
rubber-icon Added
uranium-1 Added
uranium-2 Added
uranium-3 Added
uranium-4 Added
uranium-5 Added
uranium-6 Added
uranium-7 Added
uranium-8 Added
uranium-icon Added

Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi

State Old New Status
icon Added

Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi

State Old New Status
piercing-icon Added
practice-icon Added
rubber-icon Added
uranium-icon Added

Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi

State Old New Status
icon Added
practice-icon Added
rubber-icon Added

Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi

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

Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi

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

Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi

State Old New Status
base Added
bolt-open Added
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi

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

Edit: diff updated after fb1eefc

@sleepyyapril sleepyyapril merged commit 2d7bad0 into TheDenSS14:master Jan 5, 2025
10 of 11 checks passed
sleepyyapril added a commit that referenced this pull request Jan 5, 2025
VMSolidus added a commit to Simple-Station/Einstein-Engines that referenced this pull request Jan 11, 2025
# 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?"

<details><summary><h1>Media</h1></summary>
<p>

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.

![image](https://github.com/user-attachments/assets/403acae6-deb9-4ef6-b5f4-dab5201d8009)

![image](https://github.com/user-attachments/assets/7ea66718-837c-489e-8da3-5ef60c25e33a)

New salvage vendor "Civilian Grade" equipment

![image](https://github.com/user-attachments/assets/6723f2f7-cf7b-438e-b9b7-2df108d20336)

Tested and verified that the salvage vendor guns actually do spawn
empty:

![image](https://github.com/user-attachments/assets/ea0eb959-2815-4a5b-87ce-d0654b74133f)

</p>
</details>

# Changelog

:cl:
- add: Added the Argenti, Gestio, Novalite C1, and SVT firearms. Added
an "Empty" Mosin variant for Salvage.
- add: Salvage technicians can now spend their mining points on new
"Civilian Grade" firearms from the Mining Vendor. These don't come with
ammo, so you'll have to request ammo be printed by Security.
- add: Added the Argenti Revolver to Security Loadouts.
- tweak: Salvage Specialist lockers are now guaranteed to come with one
pickaxe and one ore bag.

---------

Co-authored-by: sleepyyapril <[email protected]>
Co-authored-by: Rosycup <[email protected]>
Spatison pushed a commit to Spatison/wwdpublic that referenced this pull request Jan 15, 2025
# 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?"

<details><summary><h1>Media</h1></summary>
<p>

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.

![image](https://github.com/user-attachments/assets/403acae6-deb9-4ef6-b5f4-dab5201d8009)

![image](https://github.com/user-attachments/assets/7ea66718-837c-489e-8da3-5ef60c25e33a)

New salvage vendor "Civilian Grade" equipment

![image](https://github.com/user-attachments/assets/6723f2f7-cf7b-438e-b9b7-2df108d20336)

Tested and verified that the salvage vendor guns actually do spawn
empty:

![image](https://github.com/user-attachments/assets/ea0eb959-2815-4a5b-87ce-d0654b74133f)

</p>
</details>

# Changelog

:cl:
- add: Added the Argenti, Gestio, Novalite C1, and SVT firearms. Added
an "Empty" Mosin variant for Salvage.
- add: Salvage technicians can now spend their mining points on new
"Civilian Grade" firearms from the Mining Vendor. These don't come with
ammo, so you'll have to request ammo be printed by Security.
- add: Added the Argenti Revolver to Security Loadouts.
- tweak: Salvage Specialist lockers are now guaranteed to come with one
pickaxe and one ore bag.

---------

Co-authored-by: sleepyyapril <[email protected]>
Co-authored-by: Rosycup <[email protected]>

(cherry picked from commit e2d4a3243e43f73c566d5372297f77083c42cf99)
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.

1 participant