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

Added the Argenti, Gestio, Novalite, SVT, and Harpoon to the Salvage Vend #133

Merged
merged 6 commits into from
Jan 6, 2025

Conversation

Rosycup
Copy link
Contributor

@Rosycup Rosycup commented Jan 6, 2025

Description

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.


Changelog

🆑

  • 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!

Copy link
Contributor

github-actions bot commented Jan 6, 2025

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

Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi

State Old New Status
equipped-BACKPACK Added
equipped-SUITSTORAGE Added
inhand-left Added
inhand-right Added
spear Added
spear1 Added
wielded-inhand-left Added
wielded-inhand-right Added

Edit: diff updated after 78e0803

@sleepyyapril sleepyyapril merged commit 8077e97 into TheDenSS14:master Jan 6, 2025
12 of 13 checks passed
sleepyyapril added a commit that referenced this pull request Jan 6, 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]>
@Rosycup Rosycup deleted the salvage-harpoon branch January 12, 2025 00:47
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.

2 participants