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

[MIRROR] Revert "Pre-516 tgui prep (#82473)" #2772

Merged
merged 3 commits into from
Apr 8, 2024
Merged

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1847
Original PR: tgstation/tgstation#82522

This reverts commit 34890b9d0a83e1572ffcd965fde2a28f49d9793d.

It appears my decision to merge it was a bit too liberal as it's interfering with admin functions (#82521). this is just a test mergeable PR to have for the time being to prevent it from fucking with servers

test merging TGUI PRs is a bit CBT for the record as i believe it interferes with the CDN in some ways that might break for players... so just be warned should you apply this. maybe soft stop and then TM? your call

* Revert "Pre-516 tgui prep (#82473)"

* Revert "[MIRROR] Pre-516 tgui prep (#1841)"

This reverts commit b98a95c8d3b4238c3a30450ab0f3ad67efa062d4.

---------

Co-authored-by: san7890 <[email protected]>
Co-authored-by: Mal <[email protected]>
Iajret and others added 2 commits April 8, 2024 19:44
* Revert "Pre-516 tgui prep (#82473)"

* Revert "[MIRROR] Pre-516 tgui prep (#1841)"

This reverts commit b98a95c8d3b4238c3a30450ab0f3ad67efa062d4.

---------

Co-authored-by: san7890 <[email protected]>
Co-authored-by: Mal <[email protected]>
@Iajret Iajret merged commit 7f93b6e into master Apr 8, 2024
24 checks passed
@Iajret Iajret deleted the upstream-mirror-1847 branch April 8, 2024 17:19
Iajret pushed a commit that referenced this pull request Jun 1, 2024
#2772)

* Makes the Shaft Miner's Explorer Suit sprite more consistent! (#83558)

* Makes the Shaft Miner's Explorer Suit sprite more consistent!

---------

Co-authored-by: DrAmazing343 <[email protected]>
Co-authored-by: NovaBot13 <[email protected]>
AnywayFarus pushed a commit that referenced this pull request Jun 2, 2024
#2772) (#3589)

* Makes the Shaft Miner's Explorer Suit sprite more consistent! (#83558)

* Makes the Shaft Miner's Explorer Suit sprite more consistent!

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: DrAmazing343 <[email protected]>
Co-authored-by: NovaBot13 <[email protected]>
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.

3 participants