Re-PR HoP Expansion Pack #8821
Merged
Re-PR HoP Expansion Pack #8821
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 d4c54bf.
This reverts commit d753b6e.
…tion-Hornet into PaperworkTorture
…the TG codebase, as nobody has commented about it for 4 months
…tion-Hornet into PaperworkTorture
Crossedfall
approved these changes
Apr 8, 2023
PestoVerde322
approved these changes
Apr 8, 2023
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
PowerfulBacon
approved these changes
May 17, 2023
|
DNM downstream without #9297 |
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.
Re-PR of #8113
This PR was near perfect, it just needed a merge conflict fix and some more reviews. My review on it was basically complete, it turns out %s signing works fine in fields, so that's good. I've fixed the merge conflict and Re-PR'd it as is. I think it's good to merge now, we've testmerged it and it worked well. I would like to see better blanks and it seems there is a bit of community interest as I've seen some threads with them, so we can implement those via config change later.
About The Pull Request
Updates the Paperwork Module to the current version used by TG
This is accomplished by porting the Following PRs from TGstation
Papercode
Photocopier
Fax Machine
Stamp
Sanitize.js
Issues
Why It's Good For The Game
A more up to date version of the Paperwork Module, allows people to see the result of what they're entering on a paper, fax machines to annoy admins with and other fun stuff!
Testing Photographs and Procedure
Screenshots&Videos
2022-11-30.08-55-23.mp4
Changelog
🆑 Bobbanz1, Timberpoes, SteelSlayer, twilightwanderer, ShizCalev, timothymtorres, Imaginos16, dragomagol, Jacquerel, Mothblocks, ThePotato97, LemonInTheDark
del: Removed the ability to scan paper directly into the modular computer notes app as part of paper code rewrite.
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 broken command report formatting for station goals.
fix: Fixes markdown paragraphing not working in paper code.
refactor: Photocopiers now use TGUI
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
fix: Photocopier paperforms
add: Fax Machine
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.
refactor: Rotating stamps on paper by holding shift and moving your mouse.
fix: You can no longer remove the toner cartridge from a printer while it's busy printing.
/:cl: