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.

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

Merged
merged 29 commits into from
Apr 1, 2023

Conversation

DrDiasyl
Copy link
Contributor

@DrDiasyl DrDiasyl commented Mar 28, 2023

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:

  • Bridge
  • HoP office
  • Warden office
  • Cargo

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.
image

The confidential biscuit is blue and has "NT" on it.
image

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.
image

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)

image
image

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:

  • Being able to fax the paper biscuits
  • Make it impossible to cut paper slips into paper slips
  • Make corporate paper slips craftable or printable
  • Make confidential biscuits craftable or printable
  • Make paper cutters orderable at the cargo

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:

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.
@tgstation-server tgstation-server added Sprites A bikeshed full of soulless bikes. Merge Conflict Adding upstream files to your repo via drag and drop won't resolve conflicts Feature Exposes new bugs in interesting ways Fix Rewrites a bug so it appears in different circumstances Map Edit Thank you for your tile-placing service. It's always appreciated. labels Mar 28, 2023
@DrDiasyl
Copy link
Contributor Author

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?)

@Jacquerel
Copy link
Contributor

It's conflicting with #74202 because your branch is old and out of date, the same reason there are conflicts in map files.
Fix the code conflict through whatever your preferred git workflow is but make sure to install the map githooks before pulling and it might be able to automatically fix that for you (otherwise it's not too hard to fix in sdmm, look for merge conflict markers)

@DATA-xPUNGED
Copy link
Contributor

Is there a way to craft these?

@DrDiasyl
Copy link
Contributor Author

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.

@DrDiasyl
Copy link
Contributor Author

It's conflicting with #74202 because your branch is old and out of date, the same reason there are conflicts in map files.
Fix the code conflict through whatever your preferred git workflow is but make sure to install the map githooks before pulling and it might be able to automatically fix that for you (otherwise it's not too hard to fix in sdmm, look for merge conflict markers)

How you do this?

@Wallemations
Copy link
Contributor

It being named a "biscuit card" made me want these to be used in fortune cookie recipes.
I'm genuinely surprised we don't have fortune cookies.

@DrDiasyl
Copy link
Contributor Author

It being named a "biscuit card" made me want these to be used in fortune cookie recipes.
I'm genuinely surprised we don't have fortune cookies.

There is fortune cookies in game.

Copy link
Member

@san7890 san7890 left a 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)

code/modules/paperwork/paper_biscuit.dm Outdated Show resolved Hide resolved
code/modules/paperwork/paper_biscuit.dm Outdated Show resolved Hide resolved
code/modules/paperwork/paper_biscuit.dm Outdated Show resolved Hide resolved
code/modules/paperwork/paper_biscuit.dm Outdated Show resolved Hide resolved
code/modules/paperwork/paper_biscuit.dm Outdated Show resolved Hide resolved
code/modules/paperwork/paper_biscuit.dm Outdated Show resolved Hide resolved
code/modules/paperwork/paper_biscuit.dm Outdated Show resolved Hide resolved
code/modules/paperwork/paper_biscuit.dm Outdated Show resolved Hide resolved
code/modules/paperwork/paper_biscuit.dm Outdated Show resolved Hide resolved
code/modules/paperwork/paper_biscuit.dm Outdated Show resolved Hide resolved
@san7890 san7890 marked this pull request as draft March 29, 2023 05:37
@DrDiasyl
Copy link
Contributor Author

Okay, as this was turned into a draft I think I will make some tweaks while fixing merge conflicts and reviews.
I want to make corporate paper slips made out of plastic cards and be a "card".
Also, I slightly changed the biscuit sprite so it will look more cracked then torn apart, maybe also change it from brown cardboard colour into a plastic one as well.

@DrDiasyl
Copy link
Contributor Author

A lot of those requested changes broke the code, damn.
Are we need them?

@DrDiasyl
Copy link
Contributor Author

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.
@tgstation-server tgstation-server removed the Map Edit Thank you for your tile-placing service. It's always appreciated. label Mar 29, 2023
@DrDiasyl
Copy link
Contributor Author

DrDiasyl commented Mar 30, 2023

what
image

@DrDiasyl
Copy link
Contributor Author

FUCK, I MADE A SINGLE TYPO IN CODE

@DrDiasyl DrDiasyl marked this pull request as ready for review March 30, 2023 18:23
@DrDiasyl
Copy link
Contributor Author

@san7890 what with the changes? Is this fine now?

code/datums/components/crafting/misc.dm Outdated Show resolved Hide resolved
code/datums/components/crafting/misc.dm Outdated Show resolved Hide resolved
code/modules/paperwork/paper_biscuit.dm Outdated Show resolved Hide resolved
code/modules/paperwork/paper_biscuit.dm Outdated Show resolved Hide resolved
code/modules/paperwork/paper_biscuit.dm Outdated Show resolved Hide resolved
code/modules/paperwork/paper_biscuit.dm Show resolved Hide resolved
code/modules/paperwork/paper_biscuit.dm Outdated Show resolved Hide resolved
code/modules/paperwork/paper_biscuit.dm Outdated Show resolved Hide resolved
@san7890 san7890 marked this pull request as draft March 30, 2023 22:35
DrDiasyl and others added 2 commits March 31, 2023 16:39
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"
@DrDiasyl DrDiasyl requested a review from san7890 March 31, 2023 11:17
Copy link
Member

@san7890 san7890 left a 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

code/modules/paperwork/paper_biscuit.dm Outdated Show resolved Hide resolved
code/modules/paperwork/paper_biscuit.dm Outdated Show resolved Hide resolved
DrDiasyl and others added 2 commits March 31, 2023 23:39
Last grammar staff from san7890

Co-authored-by: san7890 <the@san7890.com>
@DrDiasyl DrDiasyl requested a review from san7890 March 31, 2023 17:42
@DrDiasyl DrDiasyl marked this pull request as ready for review March 31, 2023 18:02
@san7890 san7890 added this to the Mega-Mega-Map-Reworks milestone Apr 1, 2023
@san7890 san7890 merged commit bf37597 into tgstation:master Apr 1, 2023
18 checks passed
github-actions bot added a commit that referenced this pull request Apr 1, 2023
comfyorange added a commit that referenced this pull request Apr 1, 2023
Jolly-66 added a commit to TaleStation/TaleStation that referenced this pull request Apr 2, 2023
…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>
github-merge-queue bot pushed a commit to shiptest-ss13/Shiptest that referenced this pull request Mar 12, 2024
<!-- 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. -->
github-merge-queue bot pushed a commit to shiptest-ss13/Shiptest that referenced this pull request Mar 12, 2024
<!-- 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. -->
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Mar 23, 2024
<!-- 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. -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Exposes new bugs in interesting ways Fix Rewrites a bug so it appears in different circumstances Map Edit Thank you for your tile-placing service. It's always appreciated. Sprites A bikeshed full of soulless bikes. Tools We pretend to be a real development community
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants