-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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
"Biscuit" cards, and also now slip papers are actually paper! #74329
Conversation
Now paper slips are paper and can be written on. Added subtype of paper slip which is fancier "corporate paper slip". Now there is a biscuit card, like the one used for the nuclear code of the US president. It's a folder which can only be opened when cracked, cracking is obvious and irreversible Now spare ID codes spawn in biscuits.
Now there is a way to make paper slips on the station. Every station has a paper cutter at Bridge, HoP office, Warden office and Cargo. Also deletes singular paper slip from maintenance at Metastation.
code/modules/paperwork/paper_cutter.dm conflicting? But with who? I don't see any PR which touches the paper_cutter.dm (Who cares about it?) |
It's conflicting with #74202 because your branch is old and out of date, the same reason there are conflicts in map files. |
Is there a way to craft these? |
Actually right now there is no way to craft these. While I fix the merge conflict I can make them craftable. |
How you do this? |
It being named a "biscuit card" made me want these to be used in fortune cookie recipes. |
There is fortune cookies in game. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i see why you did what you did but there's much better ways to accomplish it (else ..()
is pretty awk)
Okay, as this was turned into a draft I think I will make some tweaks while fixing merge conflicts and reviews. |
A lot of those requested changes broke the code, damn. |
OKAY, I somehow fixed it. Great |
Changed the code to match the review, but with some tweaking or else it won't work. Biscuits got prettier sprites. Now there is a pre-open biscuit you can print in autolathe using plastic, you can put paper in it and seal it to work as a normal biscuit. Also, an attempt to make a paper cutter not cut paper slips, as that is a literal dupe. But yet it's not successful.
This reverts commit fe83716.
FUCK, I MADE A SINGLE TYPO IN CODE |
@san7890 what with the changes? Is this fine now? |
code/modules/research/designs/autolathe/multi-department_designs.dm
Outdated
Show resolved
Hide resolved
code/modules/research/designs/autolathe/multi-department_designs.dm
Outdated
Show resolved
Hide resolved
Now description is dynamic, it will tell you that the biscuit needs cracking only if it's not cracked. Renamed "not_sealed" to "unsealed". Added early returns to paper biscuits attack_self code. Changed biscuit suicide to be more brutal. Added missing "," to multi-department-designs build paths. Made list in the corporate paper slip craft good looking. Renamed "corppaperslip" in crafting recipe into "corporate_paper_slip"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
last grammar and formatting stuff
Last grammar staff from san7890 Co-authored-by: san7890 <the@san7890.com>
…y paper! (#5187) Original PR: tgstation/tgstation#74329 --- :cl: DrDiasyl aka DrTuxedo#0931 add: Added 'biscuit' cards! They can contain documents and can only be accessed by cracking them open, you can't close them back. Nanotrasen now stores spare ID safe codes in them. add: Placed paper cutters around the station. They're in Bridge, HoP office, Warden office, and Cargo. add: Now you can order paper cutters at cargo. fix: Now the paper slip is actually paper. imageadd: The paper slips sprite was slightly tweaked to have text lay more logically, added the corporate paper slip. /:cl: Co-authored-by: DrTuxedo <42353186+DrDiasyl@users.noreply.github.com> Co-authored-by: san7890 <the@san7890.com>
<!-- 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 This pull request ports the following PRs: * tgstation/tgstation#57289 * tgstation/tgstation#57320 * tgstation/tgstation#57400 * tgstation/tgstation#60792 * tgstation/tgstation#74329 <!-- 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 cool paperwork ![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/2181a771-290a-4919-9b49-f7ff80ac00ce) ![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/600c656e-68d4-41ee-8225-2a52bd2d0925) <!-- 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: mozi_h, DrDiasyl aka DrTuxedo#0931, GoldenAlpharex add: Clipboards have a snazzy new look. refactor: Gave clipboards some purpose in life: Edit, rename and sort to your hearts' desire! Insert a pen by just clicking it in. Rapidly pick up paper by clicking on it with the clipboard. add: Folders have a snazzy new look. (Check out those colours!) qol: Rapidly pick up paper by clicking on it with a folder. Alt-click to remove an item from a folder. refactor: Split and cleaned up folder code. refactor: Tidied up folder UI code fix: Paper that's on a clipboard doesn't need to be poked to realise that its appearance has changed and to properly display it on a clipboard. fix: You finally figured that using a stamp on a clipboard was more important than using the pen that's currently attached to it. Congratulations! code: Added support for preventing a pen from being removed from a clipboard. add: Added 'biscuit' cards! They can contain documents and can only be accessed by cracking them open, you can't close them back. Nanotrasen now stores spare ID safe codes in them. add: Placed paper cutters around the station. They're in Bridge, HoP office, Warden office, and Cargo. add: Now you can order paper cutters at cargo. fix: Now the paper slip is actually paper. imageadd: The paper slips sprite was slightly tweaked to have text lay more logically, added the corporate paper slip. /: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. -->
<!-- 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 This pull request ports the following PRs: * tgstation/tgstation#57289 * tgstation/tgstation#57320 * tgstation/tgstation#57400 * tgstation/tgstation#60792 * tgstation/tgstation#74329 <!-- 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 cool paperwork ![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/2181a771-290a-4919-9b49-f7ff80ac00ce) ![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/600c656e-68d4-41ee-8225-2a52bd2d0925) <!-- 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: mozi_h, DrDiasyl aka DrTuxedo#0931, GoldenAlpharex add: Clipboards have a snazzy new look. refactor: Gave clipboards some purpose in life: Edit, rename and sort to your hearts' desire! Insert a pen by just clicking it in. Rapidly pick up paper by clicking on it with the clipboard. add: Folders have a snazzy new look. (Check out those colours!) qol: Rapidly pick up paper by clicking on it with a folder. Alt-click to remove an item from a folder. refactor: Split and cleaned up folder code. refactor: Tidied up folder UI code fix: Paper that's on a clipboard doesn't need to be poked to realise that its appearance has changed and to properly display it on a clipboard. fix: You finally figured that using a stamp on a clipboard was more important than using the pen that's currently attached to it. Congratulations! code: Added support for preventing a pen from being removed from a clipboard. add: Added 'biscuit' cards! They can contain documents and can only be accessed by cracking them open, you can't close them back. Nanotrasen now stores spare ID safe codes in them. add: Placed paper cutters around the station. They're in Bridge, HoP office, Warden office, and Cargo. add: Now you can order paper cutters at cargo. fix: Now the paper slip is actually paper. imageadd: The paper slips sprite was slightly tweaked to have text lay more logically, added the corporate paper slip. /: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. -->
<!-- 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. --> This pull request ports the following PRs: * tgstation/tgstation#57289 * tgstation/tgstation#57320 * tgstation/tgstation#57400 * tgstation/tgstation#60792 * tgstation/tgstation#74329 <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> cool paperwork ![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/2181a771-290a-4919-9b49-f7ff80ac00ce) ![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/600c656e-68d4-41ee-8225-2a52bd2d0925) <!-- 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. --> :cl: mozi_h, DrDiasyl aka DrTuxedo#0931, GoldenAlpharex add: Clipboards have a snazzy new look. refactor: Gave clipboards some purpose in life: Edit, rename and sort to your hearts' desire! Insert a pen by just clicking it in. Rapidly pick up paper by clicking on it with the clipboard. add: Folders have a snazzy new look. (Check out those colours!) qol: Rapidly pick up paper by clicking on it with a folder. Alt-click to remove an item from a folder. refactor: Split and cleaned up folder code. refactor: Tidied up folder UI code fix: Paper that's on a clipboard doesn't need to be poked to realise that its appearance has changed and to properly display it on a clipboard. fix: You finally figured that using a stamp on a clipboard was more important than using the pen that's currently attached to it. Congratulations! code: Added support for preventing a pen from being removed from a clipboard. add: Added 'biscuit' cards! They can contain documents and can only be accessed by cracking them open, you can't close them back. Nanotrasen now stores spare ID safe codes in them. add: Placed paper cutters around the station. They're in Bridge, HoP office, Warden office, and Cargo. add: Now you can order paper cutters at cargo. fix: Now the paper slip is actually paper. imageadd: The paper slips sprite was slightly tweaked to have text lay more logically, added the corporate paper slip. /: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. -->
About The Pull Request
This is not a literal biscuit which you eat. "Biscuit" is just a nickname of this kind of snap-cards.
Slip paper is now actually paper, before that, it was just literally nothing, an object which does nothing. Because of that, the paper cutter was useless as well, as it turned normal paper into useless paper slips.
Because of this now paper cutters are placed at:
Also adds biscuit cards. If you have no idea what it is, it's a kind of card placed around a piece of paper usually to conceal some document and it can be opened by cracking it with a crunchy sound (that's why it's named a biscuit). Those are usually only opened in certain situations or emergencies (The most famous example is the US president's nuclear biscuit, which contains nuclear codes)
There are 2 biscuits: Normal and Confidential.
Normal is a plain biscuit with nothing really special, can be coloured if you want as it's white.
The confidential biscuit is blue and has "NT" on it.
There is a not-sealed biscuit you can print in autolathe, it starts open so you can put paper in and seal later making it a normal crackable one.
Now spare ID safe code automatically spawns in a confidential biscuit in a new paper slip subtype - corporate slip paper. It's a plastic card which is sturdier than the normal paper clip.
You can also create the corporate paper slip paper using - normal paper slip, plastic, and captain rubber stamp (making this paper having a rare status)
Why It's Good For The Game
Paper slips being not paper is stupid and has no point in being that way. This also made the paper cutter useless; hence, it was never placed on any map (and never used).
This PR makes it paper, so it's usable when crew members need a paper slip instead of a full-size sheet.
Placing paper cutters around the station makes it so the crew can produce paper slips when they need them, this also gives it finally a use and place on the station.
The 'biscuits' are cool and give more flavour to the spare ID safe codes, as well as to other documents people might put in future PRs. This also makes those paranoid captains which are scared of their spare ID safe code being stolen and read can sleep tight, as now if someone opens it up it's really obvious. Now also you can really make sure if that head is lying about "not touching the spare ID", but not as anyone cares really.
Okay, it's draft for now just so I can add some new things, and fix the dupe bug:
CRUNCH
Changelog
🆑 DrDiasyl aka DrTuxedo#0931
add: Added 'biscuit' cards! They can contain documents and can only be accessed by cracking them open, you can't close them back. Nanotrasen now stores spare ID safe codes in them.
add: Placed paper cutters around the station. They're in Bridge, HoP office, Warden office, and Cargo.
add: Now you can order paper cutters at cargo.
fix: Now the paper slip is actually paper.
imageadd: The paper slips sprite was slightly tweaked to have text lay more logically, added the corporate paper slip.
/:cl: