Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds the Electric guitar #14999

Merged
merged 6 commits into from Jul 22, 2023
Merged

Conversation

Mantweerp
Copy link
Contributor

[GAME-OBJECTS] [SOUND]

About the PR

Adds a new instrument, The electric guitar.
It can be bought from cargo for 2000 credits,
comes in multiple different variants and colors,
and features a range from e2 to c6.
The sprites/the notes were made by Mcdangus.

Note range:

guitartest.mp4

Why's this needed?

This allows for a lot more freedom in terms of music-playing ingame, and also instrument variation good

Changelog

(u)Mantwerp and Mcdangus
(*)Added the electric guitar, which you can get from cargo. Sprites and sounds by Mcdangus.

@boring-cyborg boring-cyborg bot added C-Sound Automatically applied on any .ogg or sound folder change. C-Sprites Automatically applied on any .dmi or icons folder change labels Jul 18, 2023
@github-actions github-actions bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 18, 2023
@Mantweerp Mantweerp changed the title Electric guitar Adds the Electric guitar Jul 18, 2023
@github-actions github-actions bot added the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Jul 19, 2023
@Mantweerp
Copy link
Contributor Author

Mantweerp commented Jul 19, 2023

i replaced all the new inhand instruments sprites from 14605 into my inhand instrument dmi file, so those won't be reverted if merged (there's probably a better way to do this but Im Stupid)

@github-actions github-actions bot removed the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Jul 19, 2023
@ZeWaka ZeWaka added the A-Game-Objects The point of this PR is to deal with a specific game object label Jul 19, 2023
@github-actions github-actions bot added the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Jul 20, 2023
@github-actions github-actions bot removed the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Jul 21, 2023
@TDHooligan
Copy link
Contributor

it's pretty darn good

8efadc5c-88dc-47e8-9f2c-c412b2e8c46d.mp4

@mcdangus
Copy link

it's pretty darn good

8efadc5c-88dc-47e8-9f2c-c412b2e8c46d.mp4

sweet jesus ice cold christ, you're shredding up that six string like it owes you money

@Gannets
Copy link
Contributor

Gannets commented Jul 21, 2023

Happy with the sprites on this. 👍

@frawhst
Copy link
Member

frawhst commented Jul 22, 2023

Brief moment of "oh god why does this touch 50 files" horror

@frawhst frawhst merged commit c4115ad into goonstation:master Jul 22, 2023
21 checks passed
github-actions bot pushed a commit that referenced this pull request Jul 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Game-Objects The point of this PR is to deal with a specific game object C-Sound Automatically applied on any .ogg or sound folder change. C-Sprites Automatically applied on any .dmi or icons folder change size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants