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

Voreupdate [MDB IGNORE] [IDB IGNORE] #1436

Merged
merged 27 commits into from
Feb 26, 2024
Merged

Voreupdate [MDB IGNORE] [IDB IGNORE] #1436

merged 27 commits into from
Feb 26, 2024

Conversation

izac112
Copy link
Collaborator

@izac112 izac112 commented Feb 26, 2024

The unit tests will fail i just need to get the logs proper.

Kashargul and others added 26 commits February 13, 2024 16:39
* input adjustments

* .

* .
* restrictedInput fix

* adds bundle
* Update settings

* Whitespace changes

* Comment out merger hooks in gitattributes

Corrupt maps would have to be resolved in repo before hooks could be updated

* Revert "Whitespace changes"

This reverts commit afbdd1d8442973f5d570c30920d9d865b5acd479.

* Whitespace again minus example

* Gitignore example changelog

* Restore changelog merge setting

* Keep older dmi hook attribute until hooks can be updated

* update vscode settings too

* Renormalize remaining

* Revert "Gitignore example changelog"

This reverts commit de22ad375d3ee4d5930c550da2fd23a29a86e616.

* Attempt to normalize example.yml (and another file I guess)

* Try again
prevent pickup of items we are inside of
* chat Timestamps

* add bundle

* some fixes

* bundle

* some context

* moving healthbar proc to 95%

* more context

* fix Process death type

* healthbar fix

* ye if we want to export it, we should expose it

* char directory follow up

* adds bundles
* AccountsTerminal.jsx

* Autolathe.jsx

* ExosuitFrabicator.jsx

* Biogenerator.jsx

* AirAlarm.jsx and borg control fx

* SuitCycler.jsx

* small typo

* 3 more UIs

* MiningVendor.jsx

* CameraConsole.jsx

* MessageMonitor.jsx

* Nif.jsx

* localState deprecation

* ResearchConsole.jsx

* DNAModifier.jsx

* oups...

* remove vv rounding

* mob sapwner

* lineendings

* Communicator.tsx not nice to look at, but works

* adding bundle

* small chat dropdown patch

* Update tgui/packages/tgui/interfaces/AirAlarm.jsx

Co-authored-by: Selis <[email protected]>

* Update tgui/packages/tgui/interfaces/AirAlarm.jsx

Co-authored-by: Selis <[email protected]>

* Update tgui/packages/tgui/interfaces/Biogenerator.jsx

Co-authored-by: Selis <[email protected]>

* Update tgui/packages/tgui/interfaces/Biogenerator.jsx

Co-authored-by: Selis <[email protected]>

* Update tgui/packages/tgui/interfaces/Biogenerator.jsx

Co-authored-by: Selis <[email protected]>

* Update tgui/packages/tgui/interfaces/CasinoPrizeDispenser.jsx

Co-authored-by: Selis <[email protected]>

* Update tgui/packages/tgui/interfaces/CasinoPrizeDispenser.jsx

Co-authored-by: Selis <[email protected]>

* Update tgui/packages/tgui/interfaces/CasinoPrizeDispenser.jsx

Co-authored-by: Selis <[email protected]>

* Update tgui/packages/tgui/interfaces/MiningVendor.jsx

Co-authored-by: Selis <[email protected]>

* Update tgui/packages/tgui/interfaces/MiningVendor.jsx

Co-authored-by: Selis <[email protected]>

* Update tgui/packages/tgui/interfaces/MiningVendor.jsx

Co-authored-by: Selis <[email protected]>

---------

Co-authored-by: Selis <[email protected]>
@izac112 izac112 added the upstream Anything sourced from a branch higher than us label Feb 26, 2024
@izac112 izac112 changed the title Voreupdate [MDB IGNORE] [IDB IGNORE] Voreupdate [MDB IGNORE] [IDB IGNORE] [DNM] Feb 26, 2024
@izac112 izac112 changed the title Voreupdate [MDB IGNORE] [IDB IGNORE] [DNM] Voreupdate [MDB IGNORE] [IDB IGNORE] Feb 26, 2024
@izac112 izac112 merged commit df12aaf into master Feb 26, 2024
6 checks passed
@izac112 izac112 deleted the upstream-update branch February 26, 2024 03:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
upstream Anything sourced from a branch higher than us
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants