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.

Sign up for GitHub

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

Jump to bottom

The Printing Press #704

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

The Printing Press #704

wants to merge 13 commits into from

Conversation

casualspacestation14enjoyer
Copy link
Contributor

@casualspacestation14enjoyer casualspacestation14enjoyer commented Sep 11, 2024 •
edited
Loading

About The Pull Request

Gives the Archivist a printing press to make newspapers.
Also gives Make Announcement a larger cooldown so people can't just instantly relay information and gives newspapers a use!

Why It's Good For The Game

Gets rid of announcement abuse/spam, gives Archivist role a use, yadda yadda. Cool, right?

Pre-Merge Checklist

  • You tested this on a local server.
  • This code did not runtime during testing.
  • You documented all of your changes.

@ThePainkiller ThePainkiller added Map This PR makes changes to one or more maps WIP This tag is to remind the contributor to SWITCH TO DRAFT! Icons This PR adds, edits or deletes icons New features This PR introduces entirely new mechanics or features labels Sep 11, 2024
@casualspacestation14enjoyer casualspacestation14enjoyer marked this pull request as ready for review September 14, 2024 20:52
@NPC1314 NPC1314 removed the WIP This tag is to remind the contributor to SWITCH TO DRAFT! label Sep 21, 2024
@NPC1314
Copy link
Contributor

NPC1314 commented Sep 21, 2024 •
edited
Loading

Aha, this ready for testing? Got a sprite conflict, once solved this would be interesting to try!
There will be more map conflicts no doubt in time

@NPC1314 NPC1314 added the Merge conflict This PR won't compile due to merge conflics label Sep 21, 2024
@casualspacestation14enjoyer casualspacestation14enjoyer added Squash me This PR should be squash-merged and removed Merge conflict This PR won't compile due to merge conflics labels Sep 22, 2024
@casualspacestation14enjoyer
Copy link
Contributor Author

Aha, this ready for testing? Got a sprite conflict, once solved this would be interesting to try! There will be more map conflicts no doubt in time

merge conflict fixed

@NPC1314 NPC1314 added the Merge conflict This PR won't compile due to merge conflics label Sep 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Icons This PR adds, edits or deletes icons Map This PR makes changes to one or more maps Merge conflict This PR won't compile due to merge conflics New features This PR introduces entirely new mechanics or features Squash me This PR should be squash-merged
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@casualspacestation14enjoyer @NPC1314 @ThePainkiller