Upstream20241204 #225
Merged
Upstream20241204 #225
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
* 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 <188926747+dylanstrategie@users.noreply.github.com~>
* 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 <99158783+Emisse@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
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!
* Various changes (see PR) * variantized, fixedgridatmos, tiledwalls
* Fix AutoDrain Per the system comments, AutoDrain is designed to automatically move puddles into the drain (like a floor drain). Drains without AutoDrain are still supposed to gradually empty the buffer, but not remove puddles (like sinks and toilets). However, a logic error in the original implementation causes drains with AutoDrain set to false to simply not work. Hence sinks never emptied. * Update documentation
Layout would break for machines with >6 lights because the column count was hardcoded. Uncap the UI width and fix the rows count instead. Lights with less than 4 characters of text weren't aligned right, now they are.
Added a delay to cleaning with the towel
* Adds wand of locker and locker projectile * Adds IsOpen method to check if storage is open * Adds store on collide * Adds Store On Collide to Wizard Locker * Adds Lock API * Adds locking support * Adds resist override and custom visual layers * Fixes decursed states, adds comment for a future visualizer * adds locker wand visuals and descriptions * shrinks locker radius, moves TODO for throw support * Adds whitelist and moves storage and lock logic into their own methods * Adds support to disable store on collide after the first open. Fixes prediction issues with disabling. * Adds wand of locker to the grimoire * Adds wizard access prototype * Adds Wizard to universal access * Moves Lock on collide to on collide method * Comments * Changes layer order * Fixes prediction issues when locking. * Adds Wiz access to universal ID
Removed Vox Box
* bagel update * remove invalid * remove invalid
* Removed vox box and removed nearby fuel tank as well * made all dirt decals consistent
removed vox box ggggggggggggg
KeldWolf
requested review from
spanky-spanky,
DieselMohawk and
FluffMe
as code owners
|
RSI Diff Bot; head commit db3c93a merging into 5893397 Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi
|
Added missing , Signed-off-by: Kelderan <66748890+KeldWolf@users.noreply.github.com>
|
The power of one , |
spanky-spanky
approved these changes
Dec 5, 2024
|
Speed meeting because the power has gone to my head |
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.
Routine upstream merge for December 4, 2024