This repository was archived by the owner on May 22, 2025. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 457
Fixes several bugs with Paper, buffs/nerfs photocopiers #7433
Merged
Conversation
This file contains hidden or 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
Previously, the fading of toner would not affect copies, since they already had an inner dark span gained from the last copy. This fixes that.
alexkar598
suggested changes
Dec 30, 2019
| * Photocopier | ||
| */ | ||
|
|
||
| #define MAX_TONER 40 // The maximum amount of toner in the photocopier, as well as the amount of toner given by toner cartridges. |
Member
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.
Absolutly no need for a define here
| var/obj/item/documents/doccopy = null | ||
| var/copies = 1 //how many copies to print! | ||
| var/toner = 40 //how much toner is left! woooooo~ | ||
| var/toner = MAX_TONER //how much toner is left! woooooo~ |
Member
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.
Suggested change
| var/toner = MAX_TONER //how much toner is left! woooooo~ | |
| var/toner = 40//how much toner is left! woooooo~ |
| return | ||
| qdel(O) | ||
| toner = 40 | ||
| toner = MAX_TONER |
Member
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.
Suggested change
| toner = MAX_TONER | |
| toner = initial(toner) |
Contributor
Author
|
@alexkar598 It's a magic number used in more than one place. That's enough to merit a |
Member
|
Its usage can be reduced to a single place and that would allow to make subtypes with more toner without having to change code |
AsV9
suggested changes
Jan 13, 2020
Co-Authored-By: AsV9 <andreaslv99@hotmail.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Altoids releases Paperwork: 2!
Overview
This fixes a bunch of bugs created by the recent language overhaul with paper (#7268), especially with how it interacts with photocopiers.
Coder Warnings
While I was in there I made the maximum toner amount in photocopiers a #define called
MAX_TONER, so, there's that.This also involved the creation of a new var in all paper called
color_overridewhich lathers a new font color over the whole paper (provided all font color spans within have been already neutered), so that's a thing too. It doesn't automatically kill all fontcolor'd things on the paper to allow for clowns to write in crayon on copied pieces of paper.Changelog
🆑 Altoids
bugfix: The paper icon should now update when it's written onto.
bugfix: Fixes photocopiers failing to copy paper with only player-written text.
bugfix: Fixes bug with handwritten paperfields always writing to bottom.
bugfix: Copies of copies of copies of copies of paper should now be capable of being faded out.
bugfix: Player-written text will now actually be printed black in photocopiers.
/:cl: