Skip to content

Upstream - 12.07.2026#77

Open
BombasterDS2 wants to merge 344 commits into
Goob-Station:masterfrom
BombasterDS2:upstream-merge-(12.07.2026)
Open

Upstream - 12.07.2026#77
BombasterDS2 wants to merge 344 commits into
Goob-Station:masterfrom
BombasterDS2:upstream-merge-(12.07.2026)

Conversation

@BombasterDS2

Copy link
Copy Markdown

About the PR

Upstream 12.07.2026

Why / Balance

Upstreamed useful SubscribeEvent attribute, IMapManager removal and IRobustRandom refactor.

Technical details

  • Replaced current ChasmSystem with upstream ChasmSystem.
  • Removed IMapManager from lavaland system.
  • Replaced Random with IRobustRefactor in Lavaland Entity Shapes.

Test plan

  • Tested Chasms for not causing problems.
  • Tested content from modules (Lollychop) to be sure that modules work.

Yet need to test github actions since there were changes in upstream and i skipped these changes.

Requirements

  • I have read and am following the Pull Request and Changelog Guidelines.
  • I have tested this pull request and written instructions on how to test it
  • I have added media to this PR or it does not require an in-game showcase.

Changelog

riccardi48 and others added 30 commits June 15, 2026 10:27
* i think i got them all

* minor cleanup
* moproach/spider solutions with recharge

* mop mop mop roach

* more straightforward moproach solution inheritance
* Adds temperature protection to scarves

* YAML conventions say specific stuff is better at the bottom
* no mroe screaming

* if your angry and you know it scream with action grant! *clap clap*

* emote action is more generic now

* use flag instead

* Revert "if your angry and you know it scream with action grant! *clap clap*"

This reverts commit 7c40ee48

* screaming im screaming im screaming

* reversed oops
* fix

* TEST!!!!!!!!!!

* comment

* what

* im so silly

* explosion!!!!!

* i hate tests

* those can be asserts too

* i hate tests
…tem.Random warnings. (Goob-Station#32)

* Remove all uses of System.Random

* Use IRobustRandom in BinomialNumberSelector.Get

* Remove remaining ToolRefinableSystem S.Random inst
* arcade sprite & metadata cleanup

* 4 space meta.json
…ion graphs. (Goob-Station#42)

* Fix telescreen/wallmount TV dupe

* fix tagged icons
…oob-Station#6)

* Update git_helper.py

* Update git_helper.py

* Update git_helper.py
* Updated Cargo Integration Tests

* usings

* revert NoCargoOrderArbitrage

* unneeded ;

* .

* review requests

* review requests v2
* quieter server fans

* Restore individual parameter fields
…". Except microwaves. (#91)

* document the entire owl

* Apply suggestions from code review

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Make InteractionTest inherit from GameTest

* Convert MousetrapTest to use some GameTest features

* Document stubbed Setup method

* LoadTestMap now sets TestMap like CreateTestMap

* Maybe fix?

* Oh, derp
* reorganize yml

* medical and engineering marker components and mass marking

* bed

* increase cooldown

* did i leave that in
* Remove "ProtoMan" instances

* guess we're caching gases now
* microopt offset
works on my machine award

* tweaks
Remove Staff of Entrance from Magic Event Spell
Not even valid why is it NEGATIVE just use ZERO!
CroilBird and others added 20 commits July 10, 2026 12:44
filter gases with 0 moles from logs
* draf

* slime time

* ddsaasdgatagsde

* fix that shit

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
…` (#44486)

* Fix items deletion on recycling for entities with `ItemSlotsComponent`

* Make it to be dependent on `DestructionEvent` instead

* Revert testing changes

* Actual proto fix

* Fix some other recyclable prototypes with ItemSlots
* Rewrite TryFindRandomTileOnStation

* separate tile count from list

* fix comment

* Unindent, remove bug recovery, treat as a failure
fix doors shocking when rejuvenated
* Sync debug gyroscope, rename SetAngularThrust to SetAngularThrustVisualState

* inertiaThreshold and GetInertiaThresholdScale

* basePowerLoad and UpdatePowerLoad

* Re-accumulate and update during OnShuttleTileChange

* Move to subscription on MassDataChangedEvent

* Fix for IsOn if the grid loses it's shuttle component

* Fixed return

* Reuse cached thruster ids

* Missing using

* Fixed map keys must be unique

* Somehow this got pasted in

* Copied basePowerLoad for large thrusters too

* Updated default threshold

* Fixed variable case
* number 15

* evil

* borgar

* Generic Target System

* jafhfjasj

* borger

* whoops

* rename

* a

* whoop

* whoop

* thars your problem!

* asssssssssssssssssssssssssss

* fasfasfsa

* random

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
* Remove the weh injectors

* request

* fix?

* 3
* cleanup popups on client and server

* fix RDC BUI
* Fix client mispredict on some storage operations

* Actually not needed

* retry

* Review
* init

* comment

* merge

* fix

* whittespacew

* fixes

* cleanup

* fixes and docu

* method rename

* refactor: whitespaces

---------

Co-authored-by: Fildrance <fildrance@gmail.com>
* increase rapid connection limit for dev

* math

* other cvar

* More. MORE!
* Add support for filter/sort in EOR player manifest

Now using GridContainer with filtering and sortable columns

* Fix linting error

* Increase sprite size from 24px -> 32px

* Reviews

* forgor to inject

---------

Co-authored-by: AJCM-git <ajcm_mail@disroot.org>
* adding a dangerous action system to allow pacified to interject with harmful action. making the microbomb explosion a dangerous action, to stop pacified syndicats from being able to blow up themselves.

* simplified code.

* cleaning  up comments, making some slight adjustments based on feedback to performance.
…570)

PlayTimeTrackingSystem: invert check in GetDisallowedJobs
…. Replaced Random with IRobustRandom in Lavaland.

Might be github actions error? Need to check this.
@github-actions

github-actions Bot commented Jul 12, 2026

Copy link
Copy Markdown
Contributor

RSI Diff Bot; head commit c51755d merging into 90291eb
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:
Edit: diff updated after c51755d

@Roudenn

Roudenn commented Jul 14, 2026

Copy link
Copy Markdown
Contributor

Early merged space-wizards/space-station-14#43885 so the tests pass and functionality is still the same

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.