Maintenance - Brings fork up to date as of January 17, 2024, at 10:15 PM (EST) #378
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
Update intercom.yml
The keys for admin logs were set as (log_id, round_id). This made no sense because logs are usually accessed per round.
returns the ss13 light fixture sprites
Doesn't fix the gross network spam but that's for later.
Update gemini.yml
* machine parts + power cell resprite * logic fix
* reach update * ape board * Update reach.yml * chimp + recharger * chef vend
Add missing uranium and AP magazine and box sprite layers. Add uranium and AP projectile sprites. Fix whitelist issue that made .45 pistol mags not go in secbelt.
* Update mining.yml * Update mining.yml * glaive LS is actually fine * crusher faster than glaive * Update mining.yml * Update mining.yml
* Delete Resources/Maps/Shuttles/cargo_core.yml * Update core.yml * Update base.yml * Update nanotrasen.yml
* Add doors to the navmap * tweaksies * gah * draw primitive * draw primitive? at least take me out to dinner first! * Update Content.Client/Pinpointer/UI/NavMapControl.cs * casualties --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Optimise the puddle system to reach an equilibrium quickly. * Remove use of Linq Try to be more efficient with Tuples * review --------- Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Split cargo shuttle to its own component If mappers want 1 morbillion of them this is easier to manage. * balls
fix light tube broken state
Add bluespace anomaly teleportation logs.
* Fix clumsy defib debug assert * don't need to specify null
* Respite and minor changes to mercenary items This is try number three, everything should be fine this time * Fix meta * Fix bot * Fix bot 2 * Fix meta 2 * Fix meta 3
Fix rotting messages and make them use pronouns
* pyrazine and insuzine * add recipes --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* make the bulk crate order * added space lizard plushies to bulk crate
Connects an LV to the maints west of science, powering them.
* Add black cap and some contraband * Bot fix * bot fix 2 * Price increases
* medsec hud * medsec hud * fix
Nothing burger
* Reagent grinder jittering * Fix jittering for offset sprites
* bagel update * ok a lot more
* SALVATION * Update ArtifactAnalyzerComponent.cs * Update artifact_analyzer.yml
* Add limited-reagent dispensers * Add empty versions for all dispensers * Fix lint * Set initial window size so all buttons are visible * Simplify logic, add parenthesis * Use localized name for initial labels * Adjust button style * Avoid touching items before MapInit * Remove pre-labeling * Reduce diff * Clean up YAML * Fix test * Really fix test * Document * Adjust based on review * Add labels for obnoxiously long bottles --------- Co-authored-by: AWF <you@example.com>
* fixable shuttle * nukie not repairable * fix
Do not log missing components
Add welder component to FlippoLighter
Change the slot ID back to what it was to keep old map saves with an item in the slot loading correctly. This also fixes the "You can't put this in the dispenser!" message not appearing when inserting an item without FitsInDispenserComponent because the whitelisted slot name wasn't changed.
…on-14 into 2024earlyjanuarysync
deathride58
changed the title
deathride58
merged commit 90556bb
into
Citadel-Station-13:master
13 of 14 checks passed
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.
We need to get in a habit of doing this regularly
There are currently no changes here, as changes were unnecessary.(EDIT: Mining_vessel_small.yml had to be cleaned up + resaved as a grid for it to not immediately move the map to nullspace on spawn.) It compiles, passes the smoke test, and hopefully passes unit tests! So in theory this works.