Photocopier paperforms fix #69005
Merged
Photocopier paperforms fix #69005
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
twilightwanderer
requested review from
Imaginos16,
Krysonism and
Twaticus
as code owners
tgstation-server
added
Config Update
|
You currently have a negative Fix/Feature pull request delta of -5. Maintainers may close this PR at will. Fixing issues or improving the codebase will improve this score. |
|
This solves this bug. #65831 |
|
I am not gonna lie, I didn't even realise this was a feature! That explains the printing blank part I updated in the original PR. I'll check this out on local and make sure it all works. Seems you've done that yourself, but I want to make sure I didn't fuck up anything else in the background. Very cool of you to update it all. If it all checks out and I merge this, I'll also make sure to update the configs on our servers when I am able. |
|
Right, checked the branch out and all seems gucci gucci. Gonna slam this into the repo and then update our servers with the updated json. Thanks again! |
Timberpoes
approved these changes
Aug 8, 2022
tgstation-server
added a commit
that referenced
this pull request
Aug 8, 2022
|
Your Fix/Feature pull request is currently below zero (-8). Maintainers may close future Feature/Balance PRs. Fixing issues or helping to improve the codebase will raise this score. |
You're welcome. At the time I implemented these forms, I was using HTML code to its full potential and was unaware that it itself causes huge security problems. I don't exclude that this fix may have to be redone in the future as well. Perhaps I should prepare some README on editing blanks.json so that server hosts based on the tgstation build can easily edit it for their needs. |
26 tasks
26 tasks
26 tasks
23 tasks
meemofcourse
added a commit
to meemofcourse/Shiptest
that referenced
this pull request
Jul 30, 2023
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.
For upstream builds tgstation.
Please read this carefully. This PR updates the broken config/blanks.json configuration. Before incorporating these changes into your build, make sure that you have not made any changes to match the specifics of your builds. Otherwise, fix the configuration yourself or contact me.
About The Pull Request
Fixes #65831
In this PR I added a system of pre-prepared paper forms for the printer. This system worked for a while and because of security problems in the papers was completely broken by quick fixes to the holes. I did not try to fix the forms, because at the time because of the broken papers it was pointless, and I decided to wait until the code papers are fully recycled. Waiting for a fix, I rewrote the config and now the system blanks again normally print forms. In addition, this fix allowed to bring the configuration of the forms in a more readable form.
As a bonus, I decided to add a "VOID" stamp. I was going to do it back when the system of forms was introduced, but because the stamps at the time did not work properly I did not do it.
Why It's Good For The Game
The system of prepared forms again works to the delight of fans of bureaucracy.
Changelog
馃啈
add: Added new VOID stamp
fix: Photocopier paperforms
/:cl: