Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream merge #337

Merged
merged 38 commits into from
Sep 24, 2024
Merged

Upstream merge #337

merged 38 commits into from
Sep 24, 2024

Conversation

formlessnameless
Copy link
Collaborator

No description provided.

metalgearsloth and others added 30 commits September 23, 2024 14:55
Mainly for closets but if it's like a mouse in a bag they can see what's in the bag type deal.
* L6 Fits in the Suit Storage Slot

* 5x4 item
* Computer wirehacking

* Power wire now shocks

* deconstruction fix

* updated tests

* Better parenting

* maintenance panel sprite

* new sprite for maintenance panel open
* Revert "Update mechs.yml"

This reverts commit 4a44065.

* Reapply "Update mechs.yml"

This reverts commit fb5db29.

* Revert "Reapply "Update mechs.yml""

This reverts commit c845b6b.

* Reapply "Reapply "Update mechs.yml""

This reverts commit 41b8934.

* VIM Door Stuck Fix

Vim No longer gets stuck in doors.

* VIM has Passenger Access

Debug Tested on the wrong map. Much easier solution. Just give the mech Access tags.

* Moved tags to proper VIM.

Moved access tag to the non-admin VIM.
* Updated Omega armory and Warden office.

* Adjusted walls, a decal, and an air sensor.
* Don't add newlines (fixes space-wizards#32357)

* Improve UI around max paper length (Fixes space-wizards#32344)

* Display a "fill progress" indicator so users know how close they are to filling it
* Don't allow users to save a paper which went over the limit, to avoid them losing data they want to keep.

---------

Co-authored-by: Eoin Mcloughlin <[email protected]>
The ChatSystem code for re-enabling OOC only ran during PostRound, which gets skipped over when doing restartroundnow. Now it does this on PreRoundLobby too.
From what I can tell this was merged with this on accident.

Maintainers see the maint review thread on this.

The original pr also claimed this was as an example.

In my opinion wizden should not have an age requirement for command.
Adds missing LV wire in atmos burn chambers.
Adds Antimov AI Lawboard to Uplinks Automatic changelog update

Co-authored-by: PJBot <[email protected]>
* Craftable freezers

* oh i forgot that
* initial commit

* adds astronav cartridge to QM locker

* changes requested in review

* fix merge conflicts

* fixes the statuscontrol disappearing if you eject the cartridge but still have it installed

* fix notificationsenabled on salv pda proto

* fixes lingering statuscontrol on eject while held

---------

Co-authored-by: archrbx <[email protected]>
PJBot and others added 8 commits September 24, 2024 17:03
Lol .AsSingleQuery().

Some people's preferences wouldn't load on Lizard. Turns out the entire preferences set is loaded with a morbillion joins in a single query and one person had 240,000 (!!!) rows returned for their preferences query. Yeah.
@formlessnameless formlessnameless merged commit 377d13b into impstation:master Sep 24, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.