January 2024 Upstream Merge #863
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
add materials for ores, fix iron naming
* Fix Round Restarted Announcements not playing Just make the RoundFlow manager play the funny announcement sound effect, rather than pass it through to players in an event that doesn't work. Only three round end announcements probably isn't enough. Maybe it is time for fresh memes. * Remove the handling in ClientGameTicker. * Pass in a specific filepass to broadcast. * you make one line change in vscode and the linter goes AH-HAH I CAN HELP YOU LET ME CLEAN THIS UP and I'm like 😔 and have to revert
…594) Co-authored-by: metalgearsloth <[email protected]>
Update NukeopsRuleSystem.cs Probably fix the double pick bug by removing the picked agent from the Operative list
At some point they got moved to stationsystem it seems
…23595) FIXES THE 2 PIXEL OFFSET AHHHHHHHHH
* Init coomit * meh * okay * Revert "okay" This reverts commit bb638aa4baa8dbd0e285c3435aabf83171a4806a. * enable-d * Update Content.Client/Launcher/LauncherConnectingGui.xaml.cs Co-authored-by: Kara <[email protected]> * review --------- Co-authored-by: Kara <[email protected]> Co-authored-by: metalgearsloth <[email protected]>
…r (#21077) * added more pride capes * made the capes craftable * fixed sprite names and coding errors * renamed capes to cloaks to be in line with other cloaks --------- Co-authored-by: metalgearsloth <[email protected]>
* Add port link sink in timer * Update SignalTimerSystem.cs Moving the trigger so that everything works correctly and does not conflict. Correction of remarks. * Update SignalTimerSystem.cs * a * review --------- Co-authored-by: metalgearsloth <[email protected]>
* Initial prediction * new group handling * groups for all examines that use multiple rn * compile * why was it doing this?? * handle newlines with sorting properly
* add * fix copyright * large
Update lighters.yml
* add content * u cant pickup lightning * -5 heat damage * Update battery_guns.yml
…#23489) * Added the Black Jumpsuit and various colorful gloves to the Clothesmate Considering that Black Gloves are available in the Clothesmate, it makes sense to add the various colorful gloves that are almost entirely unused currently. * Update cargo_vending.yml
* Set pAI up with a trackless map * Added a untracked map user interface class to support gps-less mapping * Added to pAI by default, expect it to be given to borgs as well in time. As the personal AI is literally immobile as a ghost, it is useful to ensure that people carry one. With that idea in mind, it is worth giving the pAI a reason to be carried that doesn't depend on the player having a cracking selection of midi files on hand. * Tried to use new ProtoId and have EntityUid on the client as commented by metalgearsloth * Review --------- Co-authored-by: metalgearsloth <[email protected]>
* marathon update * autism
add medhud to the closets
Provide non-flake solution by pinning in shell.nix Invoking `nix-shell` makes shell.nix not consume the flake. Importing `<nixpkgs>` is dependent on the user's current nixpkgs channel. This is not reproducible. Fix this by pinning nixpkgs to the same revision of the flake input.
* implement singulo attraction * add attractor syndie item * cleanup * fix name/desc * actually fix name * singulo toolbox no longer whitelisted * add custom sprite, overhaul prototype * address review * beacon real * webedit 1 * webedit 2 * webedit 3 * permalink to copyright --------- Co-authored-by: deltanedas <[email protected]>
* more balanced constructing and unscrewing for metal objects - computer frame, machine frame, rack and meatspike can be deconstructed while anchored by screwing - Computer frames now need time to be constructed. - it now takes a reasonable time to make a meatspike. If you can construct a machine frame in 2.5, surely you can make a meatspike in 2. * Fixes test
Add Diphenhydramine Co-authored-by: Jeff <[email protected]>
* barber! * 5% change to maintenance * some fixes * refactor some * ElectroJR fix merge * aoa * remvoe humanoid * Magic mirror cleanup * Cleanup * Bunch more fixes * Fix nohair + range bugs * Fixes --------- Co-authored-by: metalgearsloth <[email protected]>
* Add whitelist to centrifuge, only allowing vials. * Better Tag Name * review --------- Co-authored-by: metalgearsloth <[email protected]>
* Freeze event bus * Cleanup
* fix * oops
This reverts commit b1c3158.
…into january-vanilla-upstream-merge
…ew-frontiers-14/frontier-station-14 into january-vanilla-upstream-merge
* Scottish Accent Draft * Add Accent Component and Accent System * Fix System and Component Slightly * Fixed Accent and Component * Fixed capitalization * Added Plural Words * God given right to own bag pipes * Added Kilts * Added Scottish Clothes to Theater Vend * Updated Pricing * Fixed Pricing
Crescent, helix, and caduceus. Also moves caduceus to the NF folders.
…ew-frontiers-14/frontier-station-14 into january-vanilla-upstream-merge
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.
About the PR
big upstream merge
Why / Balance
catches us up
Technical details
fryer code ported from Delta-V DeltaV-Station/Delta-v#723
Currently only worked through the several hundreds of merge conflicts. Likely does not build or run yet.
Media
Breaking changes
Ships that are in-progress will likely need to be manually updated. Feel free to ping @Cheackraze to help manually fix them.
Changelog
🆑 Checkraze, Dvir001, MagnusCrowe