Skip to content

Conversation

@juniwoofs
Copy link
Contributor

@juniwoofs juniwoofs commented Nov 19, 2025

About the PR

Added the 8 gauge MA-A49 Salamander to the game.
Added the .30 rifle MA-A22 Wyvern to the game.

Why / Balance

CBURN has jack and shit and needs a lil somethin to deal with those zombie bastards

Technical details

Yml + json + sprites

Media

image
Content.Client_fwcXcU85UT.mp4

Requirements

  • I have read and am following the Pull Request and Changelog Guidelines.
  • I have added media to this PR or it does not require an ingame showcase.
  • I have tested any changes or additions.
  • I can confirm this PR contains no AI-generated content, and did not use any AI-generated content.

Changelog

🆑 Juniwoofs

  • add: Added the Salamander pump action shotgun for CBURN
  • add: Added the Wyvern Assault Rifle for CBURN

@juniwoofs juniwoofs changed the title CBURN/ERT weapons CBURN/ERT @eapons Nov 19, 2025
@juniwoofs juniwoofs changed the title CBURN/ERT @eapons CBURN/ERT Weapons Nov 19, 2025
@github-actions
Copy link
Contributor

github-actions bot commented Nov 19, 2025

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

Resources/Textures/_DEN/Objects/Weapons/Guns/Rifles/wyvern.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/_DEN/Objects/Weapons/Guns/Shotguns/salamander.rsi

State Old New Status
base Added
bolt-open Added
equipped-BACKPACK Added
equipped-SUITSTORAGE Added
icon Added

Resources/Textures/_DEN/Objects/Weapons/Guns/Shotguns/salamander_inhands_64x.rsi

State Old New Status
inhand-left Added
inhand-right Added
wielded-inhand-left Added
wielded-inhand-right Added

Edit: diff updated after 190b5c9

@juniwoofs juniwoofs changed the title CBURN/ERT Weapons CBURN/ERT Touchups Nov 19, 2025
@Jakumba Jakumba marked this pull request as ready for review November 20, 2025 00:02
@github-actions github-actions bot added the Status: Needs Review This PR needs a review from a maintainer. label Nov 20, 2025
@Jakumba Jakumba marked this pull request as draft November 20, 2025 00:20
@github-actions github-actions bot added the Status: Merge Conflict This PR contains an unhandled merge conflict. label Nov 29, 2025
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Changes: C# Changes: Localization Changes: Sprite Changes: YML Status: Merge Conflict This PR contains an unhandled merge conflict. Status: Needs Review This PR needs a review from a maintainer.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants