Upstream (12.04.2026)#5
Closed
ReWAFFlution wants to merge 535 commits into
Closed
Conversation
* weather status effect entities * proto port + fixes * Update weather.yml * fix visuals * Update SharedWeatherSystem.cs * Update SharedWeatherSystem.cs * Update WeatherSystem.cs * Thanks Slarti, thats a much better * Update WeatherSystem.cs * Update StencilOverlay.Weather.cs * Update Content.Client/Overlays/StencilOverlay.Weather.cs Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> * Update Content.Shared/StatusEffectNew/Components/StatusEffectComponent.cs Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> * Update Content.Client/Overlays/StencilOverlay.Weather.cs Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> * Revise weather command help descriptions Updated weather command help texts for clarity. * Merge branch 'master' into ed-14-11-2025-weather-entities * Tayrtahn review apply * fixes and cleanup --------- Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Patch for engine ComponentFilter * Poke
* Add 204 more tests. * better plan.
Add 9 more tests.
* Add 416 more tests. * fixes.
Introduce 2681 more tests.
* Make TryAllReactionsTest use a scrounged reagent list. * naming * Poke
Add 561 more tests.
…sformComponent>` and `Entity<MapGridComponent>` (#37734) * Add overloads for NodeHelpers methods, obsolete old ones * Pass in SharedMapSystem instead of IEntityManager * Change GetReachableNodes signature, deal with aftermath * Allow non-grid nodes * Change GetReachableNodes to also take Entity<TransformComponent> * Remove vestigial ReSharper hint Co-authored-by: Tayrtahn <tayrtahn@gmail.com> * Formatting --------- Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
* Add a basic API to JukeboxSystem * Update Content.Shared/Audio/Jukebox/SharedJukeboxSystem.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Remove pointless Dirty * Move SetSelectedTrack Dirty inside if block * logMissing: false * Remove pointless Audio.Stop call * Poke tests --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* atmos masked flammability/API * on that oomba pac * yuuup * resolve todo and review * rename
* init * port hostiles to hordes, fakeout horde * cleaning, docs * i may be blind sometimes * i may be even blinder * remove friendly announcements * fuck it * i love microbalancing * review * review * review p2 * Update Resources/Prototypes/GameRules/pests.yml Co-authored-by: SnappingOpossum <snappingopossum@outlook.com> * review + powercreep * lower the times to account for the gamerule delay * review * review * fuck this return actually * fial --------- Co-authored-by: SnappingOpossum <snappingopossum@outlook.com>
add db config development.toml
add banning to server api
Revert "Support for melee weapon user overrides (#39633)" This reverts commit 18149db.
wrapped parcels can go into mail carts yeah, it technically allows wrapped humanoids to get in there too, but how're you gonna get something you can't pick up into inventory storage? Also YEAH technically this allows arbitrage of carrying a ton of stuff in the mail cart, but that's no so different from just carrying a ton of stuff around in a trash cart and this at least has the cost of a bit of parcel wrap. I will tolerate no dissent
tfw ur fs isn't posix compliant
scramble noises
* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA * fix the tests I broke * Remove methods that the client shouldn't be calling. Hamburger. * light cleanup for now * review * whoop * docs updates and misc changes --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* fix emitter yapping * use actual locid objects
* drop option * popup and better icon
… (#43346) * add logic to fill backpacks * updates per feedback * update naming * resolve * remove unnecessary reassign * consistency
…up (#42278) * Move food/drink related spawners to entity tables * Give RandomFoodBreakfast a different suffix * More unrelated convention stuff because I felt like it
Fix fireball sound
* Predict IngestionBlocker * Remove redundancy * undo entity mask
* posters * cobwebs * poster nerf * testfail --------- Co-authored-by: iaada <iaada@users.noreply.github.com>
…not have component (#43436) * Turn log off in MobThresholdSystem.cs * Add TryComp for MobThresholdsComponent
* remove quantum kudzu removal but add that functionality to plant B gone * Fixed to not duplicate phal effect name
* Cool down surroundings * Rework to atmos api * Remove thing i forgot to remove * cleanup --------- Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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.
Upstream from space-wizards/space-station-14 master branch.
Update RobustToolbox to 275.2.0 version (patch 437a65ffd134b76162bd8dd3f3dce3e1272b3c42)
Update Repo to actual version (12.04.2026) (patch b984f57)
My fixes:
Xenoborg antags: 0291b9e
Linter fix(loc): 4e1f44b