Marmonica port from upstream #1074

Open
Macawesome75 wants to merge 5 commits from Macawesome75/Byrd:mar into master
Contributor

Short description

Adds the marmonica from upstream to the maints pool.

Why we need to add this

wlarrulwrurrlwlarrul.
Its just a fun instrument, and I see it wanted occasionally on the discord

Media (Video/Screenshots)

Checklist

Breaking changes

Ingame Changelog

🆑

  • add: Added the marmonica, which can now be found in maintanence.
<!-- Link definitions, do not edit --> [guidelines]: https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html [ruleset]: https://rules.byrdstation.space/#h.vigrxrnffwji ## Short description <!-- What do you propose to change with your PR? --> Adds the marmonica from upstream to the maints pool. ## Why we need to add this <!-- What is the reason for adding these changes? Please post links to Discussions as well as Bug Reports here. Please describe how this will change the game balance. --> wlarrulwrurrlwlarrul. Its just a fun instrument, and I see it wanted occasionally on the discord ## Media (Video/Screenshots) <!--If your PR contains in-game changes you must provide screenshots/videos of the changes.--> <video src="/attachments/0838bb2f-7ceb-4c67-8e1a-852b6df36ec7" title="MyServer _ 5 Days since the last Nuclear meltdown - Space Station 14 2026-10-14 13-07-45" controls></video> ## Checklist <!-- Check boxes for faster reviewing of your PR --> - [X] I do not require assistance to complete the PR. - [X] I have verified that the changes work before posting/requesting review of my PR. - [X] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [X] I have read the [Pull Request and Changelog Guidelines][guidelines] and [Byrd Station's Contributor Ruleset][ruleset]. ## 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. --> ### Ingame Changelog <!--If you want the players to know about changes made in this PR, specify them using the template outside the comment. Short and informative.--> :cl: - add: Added the marmonica, which can now be found in maintanence.
* Manifested the Mar-pet

* Created assets for the instrument

* Renamed it to the Marmonica

* It's maints loot.

It's possible for it to be added as something a dedicated musician could get in their loadout, but that can be saved until after it's no longer using developer art

* Changed the sprite to be based on a harmonica

* Normalized and increased volume of the mar sample

* Made it more like a harmonica than the trumpet it used to be

* Added the Marmonica as a loadout reward for Musician

---------

Co-authored-by: feistyfedora <12000170+feistyfedora@users.noreply.github.com>
Co-authored-by: Thesia <78412554+Thesia000@users.noreply.github.com>
Removed more loadout stuff
Some checks failed
Close PRs on master / run (pull_request_target) Has been skipped
Labels: PR / labeler (pull_request_target) Successful in 53s
Labels: Size / size-label (pull_request_target) Failing after 3s
CRLF Check / CRLF Check (pull_request) Successful in 38s
Diff RSIs / Diff (pull_request) Failing after 13s
Test Packaging / Test Packaging (pull_request) Successful in 15m4s
RGA schema validator / YAML RGA schema validator (pull_request) Successful in 46s
RSI Validator / Validate RSIs (pull_request) Successful in 44s
Map file schema validator / YAML map schema validator (pull_request) Successful in 5m48s
YAML Linter / YAML Linter (pull_request) Failing after 5m13s
d78fb2225a
Some checks failed
Close PRs on master / run (pull_request_target) Has been skipped
Labels: PR / labeler (pull_request_target) Successful in 53s
Labels: Size / size-label (pull_request_target) Failing after 3s
CRLF Check / CRLF Check (pull_request) Successful in 38s
Diff RSIs / Diff (pull_request) Failing after 13s
Test Packaging / Test Packaging (pull_request) Successful in 15m4s
RGA schema validator / YAML RGA schema validator (pull_request) Successful in 46s
RSI Validator / Validate RSIs (pull_request) Successful in 44s
Map file schema validator / YAML map schema validator (pull_request) Successful in 5m48s
YAML Linter / YAML Linter (pull_request) Failing after 5m13s
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u "mar:Macawesome75-mar"
git switch "Macawesome75-mar"
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
1 participant
Notifications
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!1074
No description provided.