Fork Reset to latest wizden upstream #170
Closed
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
* Update base_clothingouter.yml * Update coats.yml * Change Flipped to Opened * labcoat * coat * Update meta.json * Update meta.json * Update meta.json * Update meta.json * Update meta.json * Update meta.json * Update meta.json * cmo * gene * rd * robo * sci * viro * Locale zip-unzip * Missing meta * Fix wrong sprites
Fix itemslots prediction
* Fixed pulled items spinning when moved * edited out others issues * more reverts * requested fix * Removed "Optional:"
* Hyposprays Draw from Jugs * Fix last onlyMobs usage in yml * Some Suggested Changes * Remove unnecessary datafield name declarations * Remove unnecessary dirtying of component * Same line parentheses * Added client-side HypospraySystem * Cache UI values and only updates if values change * empty line * Update label * Label change * Reimplement ReactionMixerSystem * Remove DataField from Hypospray Toggle Mode * Change ToggleMode from enum to Bool OnlyAffectsMobs * Add DataField required back since it's required for replays...? * update EligibleEntity and uses of it * Add user argument back * Adds newline Co-authored-by: metalgearsloth <[email protected]> * Guard for dirty entity * Adds summary tag --------- Co-authored-by: Plykiya <[email protected]> Co-authored-by: metalgearsloth <[email protected]>
* Balancing? Balancing!!! * Additional changes
* Atmos device performance improvements * AtmosDirection perf improvements * Fix errors * Add GasTileOverlayComponent arguments * Make excite no longer invalidate a tile
hardbomb tweaks
* up stimulants (no sleep) * Update SharedSleepingSystem.cs
* Fix GasMixers/Filters not working * OKAY GAS FILTERS TOO --------- Co-authored-by: Plykiya <[email protected]>
adds a check if the store belongs to the user
* Fix round start crash * Make `TryCreateObjective` more error tolerant
* Make timer ignore client predict setting * making tests run --------- Co-authored-by: wrexbe <[email protected]>
* Make advertise system survive no map inits * Add comment to try prevent future bugs
Co-authored-by: PJBot <[email protected]>
Co-authored-by: wrexbe <[email protected]>
* removes scaf armor * replace maint loot spawner spot with basic helmet
* Update ashtray to allow all cigarettes / cigars This also includes joints (as they are technically cigarettes) * ?
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Apparently rebasing / pushing is going to be better due to conflicts. |
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.
About the PR
Our code was in a sorry state so this brings us up to par with upstream as of April 2024.
All prototypes have been converted to work and anything that relies on out of date code has been commented out. See issue #168
Media