Skip to content

Wyvern, Salamander and Shotgun Shell names#36

Open
SigmaTheDragon wants to merge 3 commits intofunky-station:masterfrom
SigmaTheDragon:wyvern
Open

Wyvern, Salamander and Shotgun Shell names#36
SigmaTheDragon wants to merge 3 commits intofunky-station:masterfrom
SigmaTheDragon:wyvern

Conversation

@SigmaTheDragon
Copy link

@SigmaTheDragon SigmaTheDragon commented Mar 9, 2026

About the PR

Mostly a copy of the original 1651 PR, with some modifications to make it fit for forky.

Why / Balance

Already an existing weapon on funky.

Technical details

FTL & YML files.

Media

See the original PR

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 in-game showcase.
  • If I am porting something, I have done my best to respect the appropriate licenses associated with the presented changes.

License

MIT

Changelog
🆑SigmaDraconis

  • add: Added the Wyvern, a new pistol
  • add: Added the Salamander, a new syndicate revolver.
  • add: Added the .50 AE ammo type and lathe recipes for it
  • add: Added a Wyvern pistol to the vault fridge
  • tweak: Made so all shotgun shells are called 12 gauge instead of .50 shells.

@github-actions
Copy link
Contributor

github-actions bot commented Mar 9, 2026

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

Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi

State Old New Status
base Added
incendiary Added
incendiarydisplay Added
mag-1 Added
mag-2 Added
practice Added
rubber Added
uranium Added

Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Casings/pistol_large.rsi

State Old New Status
base-spent Added
base Added
tip Added

Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi

State Old New Status
base Added
green-icon Added
mag-1 Added
mag-2 Added
mag-3 Added
mag-4 Added
mag-5 Added
piercing Added
practice Added
red-icon Added
red Added
rubber Added
uranium Added

Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi

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

Resources/Textures/_Funkystation/Objects/Weapons/Guns/Revolvers/salamander.rsi

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

@SigmaTheDragon SigmaTheDragon changed the title Wyvern Wyvern, Salamander and Shotgun Shell names Mar 9, 2026
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