Cherrypick Gunplay Changes from RMC #74

Merged

ashley-graves merged 2 commits from ashley-graves/rmc-itemslots-20260430 into master 2026-04-30 20:37:55 +00:00

Conversation 2 Commits 2 Files changed 45 +1482 -68

ashley-graves commented 2026-04-30 13:32:06 +00:00 (Migrated from github.com)

Copy link

About the PR

Ported a lot of gunplay features from RMC (namely holstering)

Why / Balance

Technical details

Media

https://github.com/user-attachments/assets/a75660f4-2690-4dd7-adeb-a9097280b6c2

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.

Breaking changes

Changelog

🆑 LilithArson

• add: Cherrypicked gunplay changes from RMC.
• remove: Remove suitstorage quickstore keybind (broken mess)

<!-- SPDX-FileCopyrightText: 2021 Pieter-Jan Briers <pieterjan.briers+git@gmail.com> SPDX-FileCopyrightText: 2021 Swept <sweptwastaken@protonmail.com> SPDX-FileCopyrightText: 2021 mirrorcult <lunarautomaton6@gmail.com> SPDX-FileCopyrightText: 2022 AJCM-git <60196617+AJCM-git@users.noreply.github.com> SPDX-FileCopyrightText: 2022 Kara <lunarautomaton6@gmail.com> SPDX-FileCopyrightText: 2023 DrSmugleaf <DrSmugleaf@users.noreply.github.com> SPDX-FileCopyrightText: 2023 Kevin Zheng <kevinz5000@gmail.com> SPDX-FileCopyrightText: 2024 Vasilis <vasilis@pikachu.systems> SPDX-FileCopyrightText: 2024 lzk <124214523+lzk228@users.noreply.github.com> SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com> SPDX-License-Identifier: AGPL-3.0-or-later --> <!-- Guidelines: https://docs.spacestation14.io/en/getting-started/pr-guideline --> <!-- NOTE: All code submitted to this repository is ALWAYS licensed under the AGPL-3.0-or-later license. The REUSE Specification headers or separate .license files indicate a secondary license (e.g., MPL or MIT) solely to facilitate integration for projects that do not use the AGPL license. This secondary license does not replace the fact that AGPL-3.0-or-later remains the primary and binding license. Uncomment and modify the following line if you wish to change the license from the default of AGPL.--> <!--- LICENSE: AGPL --> ## About the PR <!-- What did you change? --> Ported a lot of gunplay features from RMC (namely holstering) ## Why / Balance <!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. --> ## Technical details <!-- Summary of code changes for easier review. --> ## Media <!-- Attach media if the PR makes ingame changes (clothing, items, features, etc). Small fixes/refactors are exempt. Media may be used in SS14 progress reports with credit. --> https://github.com/user-attachments/assets/a75660f4-2690-4dd7-adeb-a9097280b6c2 ## Requirements <!-- Confirm the following by placing an X in the brackets [X]: --> - [x] I have read and am following the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). - [x] I have added media to this PR or it does not require an ingame showcase. <!-- You should understand that not following the above may get your PR closed at maintainer’s discretion --> ## Breaking changes <!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be posted in #codebase-changes. --> **Changelog** <!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay. Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up. Changelog must have a :cl: symbol, so the bot recognizes the changes and adds them to the game's changelog. --> :cl: LilithArson - add: Cherrypicked gunplay changes from RMC. - remove: Remove suitstorage quickstore keybind (broken mess)

LukeZurg22 added 1 commit 2026-04-30 20:18:03 +00:00

Merge branch 'master' into ashley-graves/rmc-itemslots-20260430 bef6f96168

LukeZurg22 commented 2026-04-30 20:18:29 +00:00

Owner

Copy link

Merge conflicts are present!

Merge conflicts are present!

LukeZurg22 added 1 commit 2026-04-30 20:19:45 +00:00

Merge branch 'master' into ashley-graves/rmc-itemslots-20260430 8ed07118fd

LilithArson force-pushed ashley-graves/rmc-itemslots-20260430 from 8ed07118fd to 26b7283ddd 2026-04-30 20:23:11 +00:00 Compare

LukeZurg22 changed title from Cherrypick gunplay changes from RMC to Cherrypick Gunplay Changes from RMC 2026-04-30 20:23:52 +00:00

LilithArson commented 2026-04-30 20:28:40 +00:00

Owner

Copy link

@LukeZurg22 wrote in #74 (comment):

Merge conflicts are present!

nuh uh

@LukeZurg22 wrote in https://git.byrdstation.space/Byrd-Station/Byrd/pulls/74#issuecomment-53: > Merge conflicts are present! nuh uh

LukeZurg22 merged commit 4d7a7f4ad9 into master 2026-04-30 20:37:55 +00:00

LukeZurg22 referenced this pull request from a commit 2026-04-30 20:37:57 +00:00

Cherrypick Gunplay Changes from RMC (#74)

byrdbot referenced this pull request from a commit 2026-04-30 20:38:22 +00:00

Automatic changelog update (#74)

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

bug

Something isn't working

  

Changes: Audio

  

Changes: Map

  

Changes: No C#

  

Changes: Sprites

  

Changes: UI

  

documentation

Improvements or additions to documentation

  

duplicate

This issue or pull request already exists

  

enhancement

New feature or request

  

good first issue

Good for newcomers

  

help wanted

Extra attention is needed

  

holding to vote

This is currently being voted for by the Byrds.

  

invalid

This doesn't seem right

  

question

Further information is requested

  

size/L

  

size/M

  

size/S

  

size/XL

  

size/XS

  

S: Merge Conflict

  

S: Untriaged

  

wontfix

This will not be worked on

No labels

bug

Changes: Audio

Changes: Map

Changes: No C#

Changes: Sprites

Changes: UI

documentation

duplicate

enhancement

good first issue

help wanted

holding to vote

invalid

question

size/L

size/M

size/S

size/XL

size/XS

S: Merge Conflict

S: Untriaged

wontfix

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

3 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

Byrd-Station/Byrd!74

No description provided.