Skip to content
This repository has been archived by the owner on Oct 25, 2023. It is now read-only.

Arsenal expansion #189

Open
wants to merge 12 commits into
base: master
Choose a base branch
from

Conversation

TadJohnson00
Copy link
Contributor

Adds a new .35 pistol (Pollock, Mercenary), .20 rifle (Tenebra, Mercenary), and .25 rifle (Jackdaw, Admin).
Adds new sounds for Jackdaw and Universal weapons.
Tweaks .45 snubbed, Mk32 Universal.

About the PR

Media

image

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Changelog

🆑 TJohnson

  • add: Added new weapons for mercenaries and enforcers. Pray you never see them in action.
  • tweak: Tweaked sprites and sounds for Universal and snubbed .45

Adds a new .35 pistol, .20 rifle, and .25 rifle.
Adds new sounds for Jackdaw and Universal weapons.
Tweaks .45 snubbed, Mk32 Universal.
@github-actions github-actions bot added Changes: Sprite Changes any png or json in an rsi No C# labels Sep 16, 2023
@github-actions
Copy link

github-actions bot commented Sep 16, 2023

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

Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/webleysnubnose.rsi

State Old New Status
icon Modified
bolt-open Added

Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi

State Old New Status
base Modified
icon Modified
mag-0 Modified
bolt-open Added

Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi

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

Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/viperwood.rsi

State Old New Status
bolt-open Added

Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi

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

Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi

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

Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi

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

Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/typewriter.rsi

State Old New Status
bolt-open Added

Edit: diff updated after 013cd98

@TadJohnson00
Copy link
Contributor Author

Standard validation error afaik

@TadJohnson00
Copy link
Contributor Author

Wait, hang on, is this a greentext?

Copy link
Member

@DEATHB4DEFEAT DEATHB4DEFEAT left a comment

Choose a reason for hiding this comment

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

I'm very tired but it looks good other than formatting in the meta files.

Thanks for formatting help :3

Co-authored-by: DEATHB4DEFEAT <[email protected]>
@TadJohnson00
Copy link
Contributor Author

Greentext (cont.)

@github-actions github-actions bot added the Status: Needs Review Someone please review this label Sep 23, 2023
TadJohnson00 and others added 7 commits September 23, 2023 19:09
Magazine boxes now show proper sprite
Universal and magazines now rechambered to .45 magnum

I got bored waiting for the PR to get merged and decided that sec deserves a .45 option that isn't a full-on Vector
i forgor to change these
Copy link
Member

@DEATHB4DEFEAT DEATHB4DEFEAT left a comment

Choose a reason for hiding this comment

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

yml, sprites, and paths all look fine, I'll leave audio for someone else to care about

@TadJohnson00
Copy link
Contributor Author

Damn it, I forgot to finish mixing universal.ogg until you mentioned audio >.<

@TadJohnson00
Copy link
Contributor Author

Eh it's of no matter, I'll hotfix it later.

@TadJohnson00 TadJohnson00 mentioned this pull request Oct 8, 2023
1 task
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Changes: Sprite Changes any png or json in an rsi Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants