Finally, a big merge #723
Merged
Finally, a big merge #723
Conversation
This file contains 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
fix canister names (cherry picked from commit f69f3e0)
(cherry picked from commit c01b5a3)
(cherry picked from commit 5887745)
(cherry picked from commit b94265a)
(cherry picked from commit 09b3a44)
(cherry picked from commit f0b21e2)
add (cherry picked from commit 4b77d55)
* Rework wheelchairbound Fixes the save/load bug and fixes it being a singleton. * weh (cherry picked from commit 243491d)
* add * needs space for salt (cherry picked from commit 8cc24c9)
Change the station map tracking dot color to cyan Co-authored-by: iacore <[email protected]> (cherry picked from commit c35b996)
* Restarts have max player count * Now counts ingame ghosts to determine if restart can be called * consistant cvar name * Added a player count with state conditional (cherry picked from commit 7bf62f1)
(cherry picked from commit 217e865)
I thought we had it already but maybe it was an unfinished pr or something. (cherry picked from commit ad23fac)
(cherry picked from commit 8aeeacc)
Deleting non-predicted entities moment. (cherry picked from commit b535909)
(cherry picked from commit 95815c7)
* fix * blocky * glowier * darker (cherry picked from commit e3d5dc4)
SEEDS MAN (cherry picked from commit bdb1399)
* Various sounds ported * Replace wall_bonk.ogg * Metal/metalglass break sound pass * Replace metalbreak.ogg * Replace woodhit * Replcae tap.ogg n some smack uses * Fix lint * Replace bang.ogg and some instances of hit_kick.ogg * couple more * fix wood sound * i may be stupid * le attributing * bro what * standardize more destruction sounds * fix melee hit sound cutting off * window threshold sounds and remove `destroySound` it literally doesnt exist (cherry picked from commit 818b07e)
(cherry picked from commit 884c866)
* initial commit * made it emaggable * removed OnAttemptEmagEvent * moved emagging to shared * added local file to git (cherry picked from commit fd673cf)
(cherry picked from commit f44661c)
* Adds more grindables * fuc * A (cherry picked from commit 16a1f2f)
add (cherry picked from commit 08c7386)
add (cherry picked from commit a6e16d9)
* Lathe Categories * serilog my beloathed (cherry picked from commit 73e94df)
(cherry picked from commit ac809c4)
* unrevivable trait + remove unclonable remnants * cleanup * change to hascomp (cherry picked from commit 7a2e500)
(cherry picked from commit f33a3f9)
* Added animations for opening toolboxes * Fix cow toolbox (cherry picked from commit f71df97)
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
Changes: C#
|
holy shit real |
DebugOk
force-pushed
the
WizMerge-22/01
branch
from
5727544 to
f532e71
Compare
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Man I love a random merge conflict while I'm also working on the DB, very cool, thanks github |
DebugOk
force-pushed
the
WizMerge-22/01
branch
from
74aa23a to
977d070
Compare
DebugOk
force-pushed
the
WizMerge-22/01
branch
from
977d070 to
2fe4447
Compare
|
Damnit Github, what the fuck is conflicting |
# Conflicts: # Resources/Maps/hammurabi.yml
|
Time to maybe break shit, cant go back now since I'm already doing the migration |
1 task
LaryNevesPR
pushed a commit
to LaryNevesPR/Estacao-Andromeda
that referenced
this pull request
Jan 3, 2025
# Description Resolves DeltaV-Station#723 Resolves DeltaV-Station#708 Resolves DeltaV-Station#691 Resolves DeltaV-Station#671 Resolves DeltaV-Station#643 Adding/removing loadouts and categories (and trait stuff) will require disconnecting and reconnecting to the server (or anything that will reload the lobby UI) due to how I've done my caching. --- # TODO - [x] Test entity IDs from loadouts - [x] Better Tab Container - [x] Scroll props - [x] Margin props - [x] Make vertical work - [x] Merge buttons - [x] Subcategories - [x] Allow the same for traits (their tab is completely broken) - [x] Give the Job Picker tab a BoxContainer - [x] Different selected unusable color - [x] Deselect unusable button - Sort menu/Reverse sort direction button - [x] Fix scroll resetting on updating - [x] Cache loadouts - [x] Ensure everything that can affect reqs updates everything that checks reqs - [x] More Requirements - [x] Height - [x] Width - [x] Weight - [x] Gender - [x] Sex - Markings - [x] Logic - [x] And - [x] Or - [x] Xor - [x] Item groups - [x] DeltaV-Station#643 - Something better than `Exclusive` - Allow picking slots for things to go in (hands and inventories too) - [x] Add a background to the loadout spriteView - [x] Get better style colors --- - [ ] More PRs - [ ] Remove duplicate command loadouts that are outside the command folders/categories - [ ] Categorize job loadouts (By dept?) - [ ] Fix [every loadout](https://discord.com/channels/1218698320155906090/1218698321053356060/1279260210208440361)'s IDs (who reviewed them??) - [ ] Make loadout ID migrations? --- <details><summary><h1>Media</h1></summary> <p> ## New loadouts/traits UI <!--    -->   ## NeoTabContainer allows changing the tab orientation ### https://youtu.be/krg8TJoQG3I   </p> </details> --- # Changelog :cl: - fix: The loadout/trait editors' performance has been improved by 100~1000x - tweak: The character editor's tabs look, feel, and function much better - fix: Unusable loadouts/traits have an orange color when selected - tweak: Loadout previews are now inside the button - add: Added a button to remove any unusable loadouts (or traits) you have selected - add: Loadouts and traits can have subcategories, though only Command loadouts use them at the moment - fix: Fixed empty loadout categories not hiding - fix: Fixed spacing on some loadout requirements' reason text - fix: Fixed traits not updating after saving
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Breaking master any% speedrun