Early merge #878
Merged
Early merge #878
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
* added more foodstuff breakdowns * Calcium doesn't exist; moved phosphorus to protein * tested reactions- some should be centrifuged * more testing tweaks (cherry picked from commit d8e99cc)
(cherry picked from commit f137f18)
* Increase printing price * Update clothing.yml (cherry picked from commit 65d8228)
* add icons for drinks in Solar's fixed colors of tea * consistently use capitals for color codes * don't add extra whitespace (cherry picked from commit 64cecdd)
(cherry picked from commit 429c683)
* Emote sounds, accent & doorbump * Oops * Only non-brains can't talk (cherry picked from commit 1d7167b)
(cherry picked from commit bec96f3)
* Bump nixpkgs revision * Update nix-direnv * Remove extra nix functionalities Both nix-direnv and legacy command nix-shell fail. Reverting to flakes-only commands. * Pin nixpkgs per suggestion See space-wizards/space-station-14#25361 (comment) * Revert nix-direnv removal * Add python3 to shell.nix (cherry picked from commit 16d18abdcfe988e580a9bce3c627066a0aa7409a)
added the books (cherry picked from commit 7cf424a)
(cherry picked from commit 706b072)
* Added support for fill levels to metamorphic glasses * Fix warnings and cleanup * Don't break non-metamorphic fills! (cherry picked from commit e74f301)
* Convert to fancy window + added footer + add list spacing * margin add (cherry picked from commit 99aa72e)
(cherry picked from commit 49460f3)
Make metamorphic glasses use empty sprite for the last solution they contained. (cherry picked from commit c4c98a2)
Hope I did this properly, I might've broken the file
(cherry picked from commit 741b9b5)
* Make pills colorful and labeled * Inherit pill sprites from parent (cherry picked from commit f5cb9a0)
(cherry picked from commit d72254d)
Fikss (cherry picked from commit 1e95c70)
(cherry picked from commit 1390b0b)
Medical module merge (cherry picked from commit db809a2)
…tart instead of round end (#25394) * Hotfix * I dont think i need this now (cherry picked from commit 2548b13)
* Rejig action state handling * Fix entity arg * Fix deserialization (cherry picked from commit bd4597c)
(cherry picked from commit 2907e84)
God bloody christ. There's like three layers of shit here. So firstly, apparently we were still using Npgsql.EnableLegacyTimestampBehavior. This means that time values (which are stored UTC in the database) were converted to local time when read out. This meant they were passed around as kind Local to clients (instead of UTC in the case of SQLite). That's easy enough to fix just turn off the flag and fix the couple spots we're passing a local DateTime ez. Oh but it turns out there's a DIFFERENT problem with SQLite: See SQLite we definitely store the DateTimes as UTC, but when Microsoft.Data.Sqlite reads them it reads them as Kind Unspecified instead of Utc. Why are these so bad? Because the admin notes system passes DateTime instances from EF Core straight to the rest of the game code. And that means it's a PAIN IN THE ASS to run the necessary conversions to fix the DateTime instances. GOD DAMNIT now I have to make a whole new set of "Record" entities so we avoid leaking the EF Core model entities. WAAAAAAA. Fixes #19897 (cherry picked from commit 2e6eaa4)
* PlayerListControl fixes. Fix a button being selected by default always, which then can't be selected properly for real. This affected multiple admin UIs. This broke due to upstream RT changes but ButtonGroup was always kinda busted so whatever. Uses the new IsNoneSetAllowed to implement everything properly. Also make sure the selected player STAYS selected when filtering the list and stuff. Also this PlayerInfo record has been changed to only do equality on the User ID because otherwise it'd need to compare each field individually which would be weird. * Revert changes to ListContainer This change was made default in the engine, no longer necessary here. (cherry picked from commit 74a31ac)
(cherry picked from commit 7271d3a)
* Attempt to change structural dmg of ore crab * Made ore crabs susceptible to structural damage (cherry picked from commit 5b0a938)
(cherry picked from commit c966a22)
This just makes them look slightly better when zoomed. (cherry picked from commit bd40c0c)
…(#25412) Now we just skip duplicate "item pressed" events from the ListContainer. This caused the ahelp window to unfocus the message box after sending something. Flow is something like this: you send ahelp -> bwoink window refreshes player list due to new bwoink -> repopulated player list -> sent selection change -> repopulates right pane -> line edit gets unfocused. (cherry picked from commit 84d455b)
* some content * some next content * fixes * remove stained window * return bot message? * woah! Full map added! * map update * big update * camera server * Corvax playtest feedback * add mail system and 30$ meteor shield * update * updatik * hardwork * pipip * update * remove from mappool * fixes * sentipode * e (cherry picked from commit f64a329)
* Add animation support to status icons Animated like any other entity. Change the png to have all frames, add delays in meta.json, and you're good to go. * Dirty "fix" for the crashing. Still have no idea why files cannot be read without changing their path in the yaml. * Sloth review ig I still have no idea why it wont work with /Textures/ missing as a prefix. (cherry picked from commit 79dc4e4)
(cherry picked from commit 3117e60)
* 20kw artifact fix * Change that hopefully doesn't completely break storage artifacts without me realising (cherry picked from commit dfa59a4)
oopsy i forgor (cherry picked from commit 5170593)
Resprite of Nettle & Death Nettle. Corrected R & L hand locations for all orientations of both plants. (cherry picked from commit 114f2aa)
(cherry picked from commit 15280fa)
* update arsenal yml balance ExplosiveTechnology * small changes in arsenal research small changes in arsenal research * Update arsenal.yml (cherry picked from commit 89d0b47)
(cherry picked from commit 811858a)
github-actions
bot
added
S: Needs Review
Changes: C#
|
RSI Diff Bot; head commit fc6e184 merging into 865352b Resources/Textures/Interface/Misc/job_icons.rsi
Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi
Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi
Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi
Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi
Resources/Textures/Objects/Consumable/Drinks/teacup.rsi
|
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.
I only needed space-wizards/space-station-14#25394 but figured I might aswell
Probably fucked up the toys file but we'll see from the tests