forked from Monkestation/Monkestation2.0
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[PORT] Giving Books More Potential (Monkestation#1363)
* Books now render Markdown, fixing paper importing (#74902) ## About The Pull Request Books didn't render markdown and instead just dumped the raw contents, (after a html encode), into the window. Changes them to use tgui and support markdown rendering. ## Why It's Good For The Game Books should should look the same as the paper used to make them. ## Changelog :cl: fix: Book's no longer take your formatting and throw it out the window. refactor: Book display and rendering /:cl: --------- Co-authored-by: GoldenAlpharex <[email protected]> Co-authored-by: Mothblocks <[email protected]> * Adjust objects to tabletop when wrenched (#75671) ![dreamseeker_2f6HEd87Kb](https://github.com/tgstation/tgstation/assets/3625094/c272df94-cdb6-427e-a3dc-c0e7d9cca4ea) ## About The Pull Request Added a variable to `/obj/` that can be set to adjust the object sprite when it mapspawns or being wrenched on top of a table. Set this variable for some popular tabletop machines, removing the default `pixel_y` offsets for some of them. Also moved the wrenching logic to /obj/. It was under machinery for some reason. ## Why It's Good For The Game Did you ever unwrench something from the table by accident and then was annoyed that you can't revet it back? ## Changelog :cl: qol: Objects have a variable to adjust them visually when they're wrenched or spawned on a table refactor: Removed redundant code that had similar purpose, moved `obj` wrenching logic into the `objs.dm` qol: food/slime processor can be moved on table and adjusts to it when wrenched /:cl: * Admin Library Moderation (in-game edition) (#75645) For the longest time, the only way admins could moderate the library was by using statbus's external tool. But a few months back statbus went down, and ever since then they've been sitting lost. Shit sucks. The whole external thing has been bugging me for a while, so let's fix all that yeah? This pr adds a new verb to the admin tab that allows admins to ban/restore books from the library. It includes expanded (ckey) search, faster response times, in tool book viewing with and without markdown rendering, and viewing of deleted books. This is accomplished with a special subtype of library consoles, stored on the admin datum. It shouldn't let you do anything without +BAN, rip my live debugging or whatever. I've also hooked into (and fixed) Ned's existing library actions log, and added viewing support to the ban/restore pages. This logs banning admin, ban time, ban reason, etc. As a part of this, I've fixed/expanded on the existing UIs. I've added ID search to all existing consoles, and fixed an existing bug with the visitor console not supporting category search (shows how many people actually use the thing) Changes to the library_action table were pretty minor. The ckey column was too small, so longer keys just caused it to fail on ban. Bad. That and the ip address column was signed, which wasted space and was non standard with other tables. * Removes line about adding a new index to the library_action table (#75808) ## About The Pull Request I ended up walking back the index since it ended up being useless in testing, just forgot to nuke the comment about it * Improves some confusing aspects of the Library (#75781) The barcode scanner now uses balloon alerts and only has 2 modes: check in and add to inventory. It used to have 4, 2 of which were useless. Added a title and author to chuuni granter so it's not broken to the Curator's console. Moves inventory ui data stuff to ui static data so we can reference it in checkout, which now uses a dropdown list of all books in checkout, instead of having you fill out the name of the book yourself. Removes sending things to a computer by scanning a book then connecting it to a computer. Just connect it to a computer first, there's no need for this copy and paste stuff. Finally, lets the book bag hold posters, since the Curator prints them and it would be nice if they can also carry them without filling a bag. Video was taken before the balloon alert stuff so just ignore that part https://github.com/tgstation/tgstation/assets/53777086/e78011af-fb23-4553-a92d-f3dcc8bb5601 The library is currently very confusing for new people to figure out, I thought this might be able to help with that. The dropdown in the UI now means it's easier to give out books in inventory, and you can no longer just type whatever the hell you wanted. :cl: qol: The Curator's barcode scanner has been simplified into 2 modes: check-in and add to inventory. qol: The Book bag can now hold posters. ui: The library console can now lend books out easier with a dropdown menu to all inventory books. /:cl: --------- Co-authored-by: MrMelbert <[email protected]> * changed a var name to be more descriptive and match TGs current name * Allows the book binder to remember font typing (#75007) use that for book binding ## About The Pull Request Closes tgstation/tgstation#74996 ## Why It's Good For The Game ## Changelog :cl: fix: Bookbinder no longer takes your pen's font and throws it out the nearest window /:cl: --------- Co-authored-by: Zephyr <[email protected]> Co-authored-by: GoldenAlpharex <[email protected]> Co-authored-by: Mothblocks <[email protected]> Co-authored-by: Andrew <[email protected]> Co-authored-by: LemonInTheDark <[email protected]> Co-authored-by: John Willard <[email protected]> Co-authored-by: MrMelbert <[email protected]>
- Loading branch information
1 parent
7d5a438
commit 110a42e
Showing
33 changed files
with
1,268 additions
and
237 deletions.
There are no files selected for viewing
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 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 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 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
#define DEFAULT_UPLOAD_CATAGORY "Fiction" | ||
#define DEFAULT_SEARCH_CATAGORY "Any" | ||
|
||
///How many books should we load per page? | ||
#define BOOKS_PER_PAGE 18 | ||
///How many checkout records should we load per page? | ||
#define CHECKOUTS_PER_PAGE 17 | ||
///How many inventory items should we load per page? | ||
#define INVENTORY_PER_PAGE 19 |
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 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 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 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 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 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 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 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 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 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 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 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
Oops, something went wrong.