Merge Upstream 01.02.2025 #1119
Merged
Conversation
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
## About The Pull Request Added UI for the forensic scanner. <details><summary>UI</summary> <img alt="gRO2mae3E4" src="https://github.com/user-attachments/assets/360832de-0485-4827-a4e1-957541cbf002" /> </details> <details><summary>Report</summary> <img alt="99Y5ierj24" src="https://github.com/user-attachments/assets/e14d221d-d5d0-42b1-8054-902f19780f1a" /> </details> ## Why It's Good For The Game Less things printing bunch of data in chat and using a proper UI instead. ## Changelog :cl: qol: Added forensic scanner UI qol: Made forensic scanner report format cleaner /:cl: --------- Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
…tation#88864) ## About The Pull Request Buffed how much power solars make, and made them upgradeable! ## Why It's Good For The Game Currently as it stands, its almost never worth the effort to set up solars. 1. They take to long to set up. You can easily spend 10-20 minutes setting up solars by yourself. You can setup the SM in less then 3. 2. The power they make is lackluster. A fully setup solar array on meta station is around 240 solar panels. About 60 per array. For all the effort required to set them up, you get (240 panels x 1.5kw) 360kw of power. That's anywhere from 1/3 to 1/5th of the SMs power (about 1 - 1.5 mw). This is assuming they are all running at full power, because they fluctuate depending on where the sun is. All this is to say that cant power the station with only solars. Therefore I'm buffing each solar panel to give 2.5kw instead of 1.5kw. This means, by setting up the default amount of solars, you get (240 panels x 2.5kw) 600kw at best. About half of the SM. You can now use different types of glass on solars to get more power off them. Glass gives 2.5kw, titanium glass gives 5kw, plasma glass gives 7.5kw, plastitanium glass gives 10kw. 👍 ## Changelog :cl: balance: solars now make 2.5kw each instead of 1.5kw feature: you can upgrade solars using different non-reinforced glass to get more power out of them (glass, titaniumglass, plasmaglass, plastitaniumglass) (they also have sprites so you can tell which is which) /:cl:
Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
…ow) (tgstation#89160) ## About The Pull Request Added preference for layout selection in some interfaces such as SmartFridge and Vending, where there is an option to switch between grid view and list view This should cut out the default layout selection dilemma in UI's, since the selection will now be available to the user forever, not just until the interface closes and resetting the selection Also, Vending UI now use Grid layout by default ### How do i implement that to my UI? Simple, just import all required stuff into your UI: `import { getLayoutState, LAYOUT, LayoutToggle } from './common/LayoutToggle';` Next, create state: `const [toggleLayout, setToggleLayout] = useState(getLayoutState());` `getLayoutState()` can accept value, Make sure you fill it, if have no plans to handle layouts through DM, like in SmartFridge `getLayoutState(LAYOUT.Grid)`. Returns LAYOUT.Default... by default And finally, put a layout switch somewhere, for example in Section buttons: `<LayoutToggle state={toggleLayout} setState={setToggleLayout} />` Where `state` is the actual value of useState, and `setState` is the function to set the state After all theese little manipulations, you can finally dEsIgN your beautifull UI with 2 layouts. Don't forget to use enum for this: `<Button fluid={LAYOUT.List) />` for example. Seems pretty simple ## Why It's Good For The Game No more arguing what is better and what is more convenient, everyone is free to choose for themselves ## Demo <details><summary> Video </summary> https://github.com/user-attachments/assets/5752e354-81b4-4bdb-acb2-7e228be0f90c </details> ## Changelog :cl: qol: You can choose in preferences what layout use into the Smartfridge or Vending machines: Grid or List. Default TGUI Layout preference. In the future there may be more interfaces where there will be 2 layout options. Also Vending UI now use Grid layout by default. /:cl:
## About The Pull Request fixes rebuild button i broke in tgstation#89280 turns out it is case sensitive my mistake ## Why It's Good For The Game good for debugging ## Changelog none
Gaxeer
approved these changes
Feb 1, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This pull request merges upstream/master. Resolve possible conflicts manually and make sure all the changes are applied correctly.
Changelog
🆑 tgstation
qol: Добавлен интерфейс сканера криминалистики.
qol: Формат отчёта криминалистического сканера сделан более читаемым.
image: У персонажа станции с чертой "Премиум коробочки первой необходимости" теперь уникальные спрайты коробок.
balance: Солнечные панели теперь вырабатывают 2.5 кВт каждая вместо 1.5 кВт.
add: Вы можете улучшать солнечные панели, используя различные виды стекла (обычное стекло, титановое стекло, плазмовое стекло, пластитанговое стекло) для увеличения выхода энергии. (Кроме того, у этих видов стекла теперь есть спрайты, позволяющие различать их.)
fix: Крепление дефибриллятора PENLITE теперь действительно заряжает батарею.
qol: В настройках теперь можно выбрать макет интерфейса (Grid или List) для умного холодильника (Smartfridge) и торговых автоматов. По умолчанию выбран макет TGUI (Grid). В будущем могут появиться другие интерфейсы с двумя вариантами макета. Также интерфейс торговых автоматов теперь по умолчанию использует макет Grid.
/:cl:
Summary by Sourcery
Update the forensic scanner UI, increase solar panel power generation, and add the option to upgrade solar panels with different glass types. Allow users to choose between grid and list layouts for the smart fridge and vending machines. Fix an issue with PENLITE defibrillator mounts not charging, and add unique box sprites for the "Premium Internals Boxes" station trait.
New Features: