Upststream #130
Merged
Upststream #130
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
Fixes formatting of owned entity type property names. These are normally named "FooBar_Baz" by EF Core, but the snake case thing was turning them into "foo_bar__baz". The double underscore is now fixed. We don't *yet* have any EF Core owned entity in use, but I am planning to add one. I don't know if downstreams are using any so this should still be marked as a breaking change. Also fixed it creating and dropping a Compiled Regex instance for every name, the regex is now cached (and pregenerated).
This should be the primary changes for the future-proof "Modern HWID" system implemented into Robust and the auth server. HWIDs in the database have been given an additional column representing their version, legacy or modern. This is implemented via an EF Core owned entity. By manually setting the column name of the main value column, we can keep DB compatibility and the migration is just adding some type columns. This new HWID type has to be plumbed through everywhere, resulting in some breaking changes for the DB layer and such. New bans and player records are placed with the new modern HWID. Old bans are still checked against legacy HWIDs. Modern HWIDs are presented with a "V2-" prefix to admins, to allow distinguishing them. This is also integrated into the parsing logic for placing new bans. There's also some code cleanup to reduce copy pasting around the place from my changes. Requires latest engine to support ImmutableArray<byte> in NetSerializer.
[pull] dev from space-wizards:master
tweaks and fixes
…pace-wizards#33147) * Dont ensure ItemComp because it could lead to weirds, and also PickupOrDrop handles non-items already. * presents and tree * woops * reviews a
[pull] dev from space-wizards:master
* Fix approval labeler * Update labeler-review.yml * Update labeler-review.yml
[pull] dev from space-wizards:master
…ith them (space-wizards#31076) * Fix admin ghosts not being able to see items in pouches or interact with them * fix * oops --------- Co-authored-by: slarticodefast <[email protected]>
* Initial commit * Monitored pipe node is now referenced by name * Review changes * Simplified construction * Tweaked deconstruction to match other binary atmos devices * Helper function removal * Updated attribution
[pull] dev from space-wizards:master
[pull] dev from space-wizards:master
[pull] dev from space-wizards:master
Co-authored-by: PJBot <[email protected]>
* Remove usage of obsolete GetTilesIntersecting round 1 * Oop wrong uids * Remove usage of obsolete GetLocalTilesIntersecting round 2 * Remove usage of obsolete GetLocalTilesIntersecting final round * weh * Fix using `SharedMapSystem` in `StencilOverlay`
* Update Snowasis * Appease test gods * Woops had the leftward animation backwards. Fixed. * add santa suits and envelopes to chapel * It looks worse unscaled but whatever. * fix ghost role * examines
Fix wrong system using
…izards#33602) * Add check before marking event as handled * Update Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs Co-authored-by: slarticodefast <[email protected]> * Cleanup --------- Co-authored-by: slarticodefast <[email protected]>
* Touching up Bagel Security Brig * Added a few missing door names * Last door name I promise * Address feedback * Forgot to delete old shutter button --------- Co-authored-by: dylanstrategie <[email protected]~>
) * fix ghost role rules for some syndicate familiars * change from monkey rules to Team Antag rules. * Resolve reviews + Fix rules for LoneOp and Xenos * ghostrole rules --------- Co-authored-by: JIPDawg <[email protected]> Co-authored-by: Errant <[email protected]>
* Initial Commit with two departments done * Checkpointing work * Added most of service and science * Started work on medbay * Modified TEG setup and set up atmos pipes for engineering * Re-added medbay, added chapel and janitorial, started routing disposals and generally the final layout of the map is coming together * Plenty of additions, too many to list in a commit message * Major update * Nearly done with the map, just have to do decals and emergency lights * Added all decals, only thing missing is department signs * Toned back the dirt decals a bunch, added hallway signs and other decorations * Finishing touches on the map before testing. * Fixed invalids * Renamed the station to Amber, and made a couple adjustments * Completely redid cargo, added maints around sec * Added Amber to the map post init integration test * Many small updates addressing issues. * Ran a script to update all the camera names, also ran fixgridatmos, fixrotations, tilewalls, and variantize * Started addressing some of the issues brough up by Emisse and others * Addressed all issues mentioned by reviewers. Added mail system. * Wrapped up meeting all the issues raised by reviewers, also did a bunch of testing and resolved issues found during those tests * Addressed additional requested changes, and nabbed some ship designs from Frontier. Redesigned south east maints and surrounding meteor nets based off of those designs * Making a couple more requested changes * Reduced the amount of Nitrogen Closets, made several small adjustments. Ready for review again! * Removed invalids! * web edit lmao --------- Co-authored-by: Emisse <[email protected]>
Co-authored-by: Velcroboy <[email protected]>
adds extractable component to slimeball prototype
* Nacho recipes, nutrition, and trash In meal_recipes.yml: Add recipes for Nachos, Cheesy Nachos, and Cuban Nachos. In meals.yml: Add a solutions container to regular nachos so it lines up with the others, and add a small plate as trash to each one. * Volumes, nutritional tweaks, and flavor In meals.yml: Lowered maxVol on nachos to leave 5 units of space. Nachos nutriment and vitamin lowered for costing so little. A cheese wedge is 3.75 nutriment, so cheesy having 4 more total nutritional value lines up nicely to me. Cuban nachos had too little volume to fit its reagents in the first place, so increased maxVol by 10. Chili peppers are 4 nutri / 4 vitamin and ketchup has a touch of tomato, so bumped to 8 and 5. Capsaicin lowered partly to make it an even 20u. Ketchup dilutes I guess. Also they don't have cheese so I changed the flavor profile to tomato instead. In meal_recipes.yml: Cuban Nachos recipe tweaked to require one less pepper. Given above numbers, this fits the nutritional value imo.
Made some modifications requested by reviewers prior to and after map merge, also added holiday decorations!
[pull] dev from space-wizards:master
github-actions
bot
added
S: Untriaged
size/L
Changes: Sprites
Changes: UI
Changes: Map
and removed
size/L
S: Untriaged
labels
|
RSI Diff Bot; head commit ee7ad6c merging into fbe089a Resources/Textures/Mobs/Customization/gauze.rsi
Resources/Textures/Structures/Machines/uniform_printer.rsi
Resources/Textures/Interface/Misc/ai_hud.rsi
Resources/Textures/Mobs/Animals/reindeer_buck.rsi
Resources/Textures/Mobs/Animals/reindeer_doe.rsi
Resources/Textures/Objects/Materials/hide.rsi
Resources/Textures/Objects/Materials/materials.rsi
Resources/Textures/Objects/Materials/ore.rsi
Resources/Textures/Objects/Materials/parts.rsi
Resources/Textures/Objects/Materials/silk.rsi
Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi
Resources/Textures/Structures/Wallmounts/posters.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.
No description provided.