Adds a stamp sound effect when stamping papers #72367
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 10ec432.
## About The Pull Request This pull request adds a .ogg file of a stamp stamping a paper, a playsound function for stamping a paper, stamping a paper while blind, and stamping yourself in the head to commit suicide. In addition, it modifies the attributions.txt file to include credits to the creator of the stamp noise. ## Why It's Good For The Game Most item interactions tend to have a sound effect that plays. Putting items down, throwing them, cutting certain items with the knife, scanning bounty cubes, putting a destination tag on a package, etc. all play sounds, which makes it a bit odd that stamping papers doesn't. This PR adds audio feedback to stamping papers. ## Changelog Stamping paper now makes noise. On an unrelated note, there are reports of stamp based suicides becoming more noisy. :cl: soundadd: Added a new sound for stamping papers with a stamp. /:cl:
tgstation-server
added
the
Sound
This comment was marked as outdated.
This comment was marked as outdated.
|
I love you |
Mothblocks
approved these changes
Dec 30, 2022
code/modules/paperwork/paper.dm
Outdated
| @@ -407,6 +407,7 @@ | |||
| add_stamp(writing_stats["stamp_class"], rand(0, 400), rand(0, 500), rand(0, 360), writing_stats["stamp_icon_state"]) | |||
| user.visible_message(span_notice("[user] blindly stamps [src] with \the [attacking_item]!")) | |||
| to_chat(user, span_notice("You stamp [src] with \the [attacking_item] the best you can!")) | |||
| playsound(src, 'sound/items/handling/standard_stamp.ogg', 50, TRUE) | |||
There was a problem hiding this comment.
Suggested change
| playsound(src, 'sound/items/handling/standard_stamp.ogg', 50, TRUE) | |
| playsound(src, 'sound/items/handling/standard_stamp.ogg', 50, vary = TRUE) |
code/modules/paperwork/paper.dm
Outdated
| @@ -540,6 +541,7 @@ | |||
|
|
|||
| add_stamp(stamp_class, stamp_x, stamp_y, stamp_rotation, stamp_icon_state) | |||
| user.visible_message(span_notice("[user] stamps [src] with \the [holding.name]!"), span_notice("You stamp [src] with \the [holding.name]!")) | |||
| playsound(src, 'sound/items/handling/standard_stamp.ogg', 50, TRUE) | |||
There was a problem hiding this comment.
Suggested change
| playsound(src, 'sound/items/handling/standard_stamp.ogg', 50, TRUE) | |
| playsound(src, 'sound/items/handling/standard_stamp.ogg', 50, vary = TRUE) |
code/modules/paperwork/stamps.dm
Outdated
| @@ -15,6 +15,7 @@ | |||
|
|
|||
| /obj/item/stamp/suicide_act(mob/living/user) | |||
| user.visible_message(span_suicide("[user] stamps 'VOID' on [user.p_their()] forehead, then promptly falls over, dead.")) | |||
| playsound(src, 'sound/items/handling/standard_stamp.ogg', 50, TRUE) | |||
There was a problem hiding this comment.
Suggested change
| playsound(src, 'sound/items/handling/standard_stamp.ogg', 50, TRUE) | |
| playsound(src, 'sound/items/handling/standard_stamp.ogg', 50, vary = TRUE) |
|
Committed changes as requested. Is there any difference between TRUE and vary = TRUE? It seemed like they did the same thing regarding sound variation when an audio file is played. Unless that isn't what that does at all and I'm just silly. |
|
Prefer named arguments when the meaning is not obvious Undraft if ready BTW |
comfyorange
added a commit
that referenced
this pull request
Jan 2, 2023
meemofcourse
added a commit
to meemofcourse/Shiptest
that referenced
this pull request
Aug 3, 2023
…ll_viewers() still noticeable. just less. updates external. dm adding update_static_data_for_all_viewers. tgstation/tgstation#72367, tgstation/tgstation#73633, tgstation/tgstation#73628
23 tasks
github-merge-queue bot
pushed a commit
to shiptest-ss13/Shiptest
that referenced
this pull request
Aug 11, 2023
I'm shamelessly using [this port](BeeStation/BeeStation-Hornet#8821) as a guide. Credit to them for their great work. This PR constantly reminds me to work on it. <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Fixes #1658. Updates the papercode to be somewhat more in-line with TG's own. Objective is to port the following pull requests: * [x] Papercode * * [x] tgstation/tgstation#68612 * * [x] tgstation/tgstation#69071 * * [x] tgstation/tgstation#63879 (a small part of it. i'm not doing this) * * [x] tgstation/tgstation#73628 * * [x] tgstation/tgstation#72367 * * [x] tgstation/tgstation#73633 * [x] Photocopier Improvements (we already have this ported, we just need to get it up to date) * * [x] tgstation/tgstation#61323 * * [x] tgstation/tgstation#63287 * * [x] tgstation/tgstation#69198 * * [x] tgstation/tgstation#69005 * * ~~custom shiptest forms~~ going to be put into a different pr * [x] Fax Machines * * [x] figure out why it's broken (it's a whitesands system from oracle. i'm replacing it entirely) * * [x] tgstation/tgstation#69397 * * [x] tgstation/tgstation#69554 * * [x] tgstation/tgstation#69651 * * [x] tgstation/tgstation#70072 * * [x] tgstation/tgstation#71262 * * [x] fix issues with logging and following * * [x] make fax machines be properly named * * [x] custom admin fax recipients * [x] make it not break interviews <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Fax machines have been broken for a good while. Recent re-introduction of SolGov into the game, a very bureaucratic entity, demands better paperwork. Annoy admins, send threats, shurikens and pizza through fax. Admins don't have to use NanoPrayer:tm: anymore. Kansatsu funnies. Inteq binding contracts. Send pictures of your ass to everyone in the sector. Get hunted down by the paperwork police for sending pictures of your ass to everyone in the sector. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: Bobbanz1, Timberpoes, SteelSlayer, twilightwanderer, ShizCalev, timothymtorres, Imaginos16, dragomagol, Jacquerel, Mothblocks, ThePotato97, LemonInTheDark, ported by MeeMOfCourse qol: AIs now see the full paper interface when players show them papers through the camera, exactly what's written on the paper, fully rendered. refactor: Paper code has been completely refactored. fix: Fixes signatures not working at all. Signatures now only work when %s or %sign is put into an [___] input field. fix: Input fields are now fixed and also work again. fix: Fixes markdown paragraphing not working in paper code. tweak: You can insert any type of toner cartridge into photocopiers, and regardless of the currently inserted toner's charge level. tweak: Toner cartridges can be ejected from photocopiers at any time add: Added a system of forms and the ability to print them fix: Hints in bureaucracy forms add: Added new VOID stamp tweak: switches old oracle fax machine with tg's fax machine system fix: Fixes faxes playing the "fax_contain" animation and makes it actually use the "fax_receive" animation when receiving. imageadd: Resprites fax machines! admin: fax messages and book printings are now logged in paper.log admin: renaming fax machines is logged in game log add: You can now send photos or trading cards through the fax machine. add: You can now hack the wires of a fax machine to have it throw items harder or accept additional flat input items such as material sheets, ID cards, and pizza slices. add: Ability to send and receive administrator fax messages. admin: Panel for easy viewing and sending messages to faxes. fix: Fixes a crash of TGUI fax panel when there is no fax in the network fix: Fixes a crash of the Fax Manager panel when there is no fax machines in the network. fix: You can no longer remove the toner cartridge from a printer while it's busy printing. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Signed-off-by: meemofcourse <75212565+meemofcourse@users.noreply.github.com>
MarkSuckerberg
pushed a commit
to MarkSuckerberg/Shiptest
that referenced
this pull request
Aug 11, 2023
I'm shamelessly using [this port](BeeStation/BeeStation-Hornet#8821) as a guide. Credit to them for their great work. This PR constantly reminds me to work on it. <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Fixes shiptest-ss13#1658. Updates the papercode to be somewhat more in-line with TG's own. Objective is to port the following pull requests: * [x] Papercode * * [x] tgstation/tgstation#68612 * * [x] tgstation/tgstation#69071 * * [x] tgstation/tgstation#63879 (a small part of it. i'm not doing this) * * [x] tgstation/tgstation#73628 * * [x] tgstation/tgstation#72367 * * [x] tgstation/tgstation#73633 * [x] Photocopier Improvements (we already have this ported, we just need to get it up to date) * * [x] tgstation/tgstation#61323 * * [x] tgstation/tgstation#63287 * * [x] tgstation/tgstation#69198 * * [x] tgstation/tgstation#69005 * * ~~custom shiptest forms~~ going to be put into a different pr * [x] Fax Machines * * [x] figure out why it's broken (it's a whitesands system from oracle. i'm replacing it entirely) * * [x] tgstation/tgstation#69397 * * [x] tgstation/tgstation#69554 * * [x] tgstation/tgstation#69651 * * [x] tgstation/tgstation#70072 * * [x] tgstation/tgstation#71262 * * [x] fix issues with logging and following * * [x] make fax machines be properly named * * [x] custom admin fax recipients * [x] make it not break interviews <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Fax machines have been broken for a good while. Recent re-introduction of SolGov into the game, a very bureaucratic entity, demands better paperwork. Annoy admins, send threats, shurikens and pizza through fax. Admins don't have to use NanoPrayer:tm: anymore. Kansatsu funnies. Inteq binding contracts. Send pictures of your ass to everyone in the sector. Get hunted down by the paperwork police for sending pictures of your ass to everyone in the sector. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: Bobbanz1, Timberpoes, SteelSlayer, twilightwanderer, ShizCalev, timothymtorres, Imaginos16, dragomagol, Jacquerel, Mothblocks, ThePotato97, LemonInTheDark, ported by MeeMOfCourse qol: AIs now see the full paper interface when players show them papers through the camera, exactly what's written on the paper, fully rendered. refactor: Paper code has been completely refactored. fix: Fixes signatures not working at all. Signatures now only work when %s or %sign is put into an [___] input field. fix: Input fields are now fixed and also work again. fix: Fixes markdown paragraphing not working in paper code. tweak: You can insert any type of toner cartridge into photocopiers, and regardless of the currently inserted toner's charge level. tweak: Toner cartridges can be ejected from photocopiers at any time add: Added a system of forms and the ability to print them fix: Hints in bureaucracy forms add: Added new VOID stamp tweak: switches old oracle fax machine with tg's fax machine system fix: Fixes faxes playing the "fax_contain" animation and makes it actually use the "fax_receive" animation when receiving. imageadd: Resprites fax machines! admin: fax messages and book printings are now logged in paper.log admin: renaming fax machines is logged in game log add: You can now send photos or trading cards through the fax machine. add: You can now hack the wires of a fax machine to have it throw items harder or accept additional flat input items such as material sheets, ID cards, and pizza slices. add: Ability to send and receive administrator fax messages. admin: Panel for easy viewing and sending messages to faxes. fix: Fixes a crash of TGUI fax panel when there is no fax in the network fix: Fixes a crash of the Fax Manager panel when there is no fax machines in the network. fix: You can no longer remove the toner cartridge from a printer while it's busy printing. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Signed-off-by: meemofcourse <75212565+meemofcourse@users.noreply.github.com>
MarkSuckerberg
pushed a commit
to MarkSuckerberg/Shiptest
that referenced
this pull request
Sep 13, 2023
I'm shamelessly using [this port](BeeStation/BeeStation-Hornet#8821) as a guide. Credit to them for their great work. This PR constantly reminds me to work on it. <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Fixes shiptest-ss13#1658. Updates the papercode to be somewhat more in-line with TG's own. Objective is to port the following pull requests: * [x] Papercode * * [x] tgstation/tgstation#68612 * * [x] tgstation/tgstation#69071 * * [x] tgstation/tgstation#63879 (a small part of it. i'm not doing this) * * [x] tgstation/tgstation#73628 * * [x] tgstation/tgstation#72367 * * [x] tgstation/tgstation#73633 * [x] Photocopier Improvements (we already have this ported, we just need to get it up to date) * * [x] tgstation/tgstation#61323 * * [x] tgstation/tgstation#63287 * * [x] tgstation/tgstation#69198 * * [x] tgstation/tgstation#69005 * * ~~custom shiptest forms~~ going to be put into a different pr * [x] Fax Machines * * [x] figure out why it's broken (it's a whitesands system from oracle. i'm replacing it entirely) * * [x] tgstation/tgstation#69397 * * [x] tgstation/tgstation#69554 * * [x] tgstation/tgstation#69651 * * [x] tgstation/tgstation#70072 * * [x] tgstation/tgstation#71262 * * [x] fix issues with logging and following * * [x] make fax machines be properly named * * [x] custom admin fax recipients * [x] make it not break interviews <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Fax machines have been broken for a good while. Recent re-introduction of SolGov into the game, a very bureaucratic entity, demands better paperwork. Annoy admins, send threats, shurikens and pizza through fax. Admins don't have to use NanoPrayer:tm: anymore. Kansatsu funnies. Inteq binding contracts. Send pictures of your ass to everyone in the sector. Get hunted down by the paperwork police for sending pictures of your ass to everyone in the sector. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: Bobbanz1, Timberpoes, SteelSlayer, twilightwanderer, ShizCalev, timothymtorres, Imaginos16, dragomagol, Jacquerel, Mothblocks, ThePotato97, LemonInTheDark, ported by MeeMOfCourse qol: AIs now see the full paper interface when players show them papers through the camera, exactly what's written on the paper, fully rendered. refactor: Paper code has been completely refactored. fix: Fixes signatures not working at all. Signatures now only work when %s or %sign is put into an [___] input field. fix: Input fields are now fixed and also work again. fix: Fixes markdown paragraphing not working in paper code. tweak: You can insert any type of toner cartridge into photocopiers, and regardless of the currently inserted toner's charge level. tweak: Toner cartridges can be ejected from photocopiers at any time add: Added a system of forms and the ability to print them fix: Hints in bureaucracy forms add: Added new VOID stamp tweak: switches old oracle fax machine with tg's fax machine system fix: Fixes faxes playing the "fax_contain" animation and makes it actually use the "fax_receive" animation when receiving. imageadd: Resprites fax machines! admin: fax messages and book printings are now logged in paper.log admin: renaming fax machines is logged in game log add: You can now send photos or trading cards through the fax machine. add: You can now hack the wires of a fax machine to have it throw items harder or accept additional flat input items such as material sheets, ID cards, and pizza slices. add: Ability to send and receive administrator fax messages. admin: Panel for easy viewing and sending messages to faxes. fix: Fixes a crash of TGUI fax panel when there is no fax in the network fix: Fixes a crash of the Fax Manager panel when there is no fax machines in the network. fix: You can no longer remove the toner cartridge from a printer while it's busy printing. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Signed-off-by: meemofcourse <75212565+meemofcourse@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
This pull request adds a .ogg file of a stamp stamping a paper, a playsound function for stamping a paper, stamping a paper while blind, and stamping yourself in the head to commit suicide.
In addition, it modifies the attributions.txt file to include credits to the creator of the stamp noise.
Why It's Good For The Game
Most item interactions tend to have a sound effect that plays. Putting most items down, throwing them, cutting certain items with the knife, scanning bounty cubes, putting a destination tag on a package, etc. all play sounds, which makes it a bit odd that stamping papers doesn't. This PR adds audio feedback to stamping papers.
StampDemo.mp4
Changelog
Stamping paper now makes noise.
🆑
soundadd: Added a new sound for stamping papers with a stamp. On an unrelated note, there are reports of stamp-based suicides becoming more noisy.
/:cl: