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.

Sign up for GitHub

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

Jump to bottom

Adds a Toy Which Makes Bwoink Sound #759

Merged
merged 8 commits into from
Sep 8, 2024
Merged

Adds a Toy Which Makes Bwoink Sound #759

merged 8 commits into from
Sep 8, 2024

Conversation

BlueHNT
Copy link
Contributor

@BlueHNT BlueHNT commented Aug 20, 2024 •
edited
Loading

Description

This adds a toy hammer based on the old BanHammer from ss13 which was a joke toy that made a bwoink sound. It also had a really old description which made minor fun of the russian translation changing it to 'bangammer' and 'reisin' which I decided to keep for the veterans.

Media

image
image

Changelog

🆑

  • add: Added bwoink hammer with bwoink sound

@github-actions github-actions bot added Changes: Audio Changes any ogg files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Aug 20, 2024
@SimpleStation14 SimpleStation14 changed the title Adds a toy which makes bwoink sound Adds a Toy Which Makes Bwoink Sound Aug 20, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 20, 2024 •
edited
Loading

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

Resources/Textures/Objects/Fun/bwoink_hammer.rsi

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

Edit: diff updated after aba2761

DangerRevolution
DangerRevolution suggested changes Aug 21, 2024
View reviewed changes
Copy link
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix credit
Remove the comment yapping
Add this into the toy vendor as a mega-rare spawn

Resources/Prototypes/Entities/Objects/Fun/toys.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Objects/Fun/toys.yml Outdated Show resolved Hide resolved
Resources/Textures/Objects/Fun/bwoink_hammer.rsi/meta.json Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Objects/Fun/toys.yml Outdated Show resolved Hide resolved
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Aug 21, 2024
@BlueHNT
Copy link
Contributor Author

BlueHNT commented Aug 22, 2024

Build and Test Debug just hates me

@DEATHB4DEFEAT
Copy link
Member

Build and Test Debug just hates me

Hates everyone

@FoxxoTrystan FoxxoTrystan added Size: 4-Small For small issues/PRs Priority: 5-Whenever Doesn't matter when this gets resolved labels Aug 30, 2024
stellar-novas
stellar-novas suggested changes Aug 30, 2024
View reviewed changes
Copy link
Contributor

@stellar-novas stellar-novas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to add attribution for adminhelp_old.ogg or whatever it's going to be called now.

Resources/Audio/Admin/adminhelp_old.ogg Outdated
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe rename to bwoink.ogg and move it? Since it isn't used for admin stuff now

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Sep 3, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Sep 3, 2024

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

DEATHB4DEFEAT
DEATHB4DEFEAT approved these changes Sep 8, 2024
View reviewed changes
Resources/Prototypes/Entities/Objects/Fun/prizeticket.yml Outdated
- id: BwoinkHammer
prob: 0.30
orGroup: Prize
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
orGroup: Prize
orGroup: Prize

Resources/Prototypes/Entities/Objects/Fun/toys.yml Outdated Show resolved Hide resolved
Resources/Textures/Objects/Fun/bwoink_hammer.rsi/meta.json Outdated Show resolved Hide resolved
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Sep 8, 2024
@VMSolidus @DEATHB4DEFEAT
Apply suggestions from code review
aba2761 
Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
@VMSolidus VMSolidus merged commit 7fc3c07 into Simple-Station:master Sep 8, 2024
13 checks passed
SimpleStation14 added a commit that referenced this pull request Sep 8, 2024
@SimpleStation14
Automatic Changelog Update (#759)
7235684
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stellar-novas stellar-novas stellar-novas requested changes

@DEATHB4DEFEAT DEATHB4DEFEAT DEATHB4DEFEAT approved these changes

@FoxxoTrystan FoxxoTrystan FoxxoTrystan approved these changes

@DangerRevolution DangerRevolution Awaiting requested review from DangerRevolution

Assignees

@BlueHNT BlueHNT

Labels
Changes: Audio Changes any ogg files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 5-Whenever Doesn't matter when this gets resolved Size: 4-Small For small issues/PRs Status: Needs Review Someone please review this
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@BlueHNT @DEATHB4DEFEAT @FoxxoTrystan @DangerRevolution @stellar-novas @VMSolidus