(2.0) Merge Experimental - #952
Draft
ASpoonPlaysGames wants to merge 539 commits into
Draft
Conversation
* Don't make player invulnerable if they're a titan. * Revert some changes in `_gamestate_mp.nut` * Fix playlistvars. * Fix pod anim being out of sync. * Fix classic execution overwriting. * No longer threaded. * Rename to run intro because of maps like wargames. * Some ai pathing fixes (probably actually fixed in next northstar release). * More vanilla like wargames intro and nuke rodeo for players. * Add a space here. * Add `_Delayed` to function name. * More like vanilla. * Random sweep time vanilla does this? * Some fixes. * Add 2 commented out grunts. * Remove `mp_grave` from fd list. * Remove `mp_grave` from private match rotation. * Replace `ns_private_match_map_rotation` with `GetPrivateMatchMapsForMode` if empty. * clone action only if `classic_executions` are enabled.
* Move setting player as titan into `CodeCallback_OnPlayerRespawned`. * Quick change.
#975) * Temp fix versionNum so clients won't desync. * Use `pilot_loadout_` playlistvar in coliseum for right now. * Enable fd relic as ours shouldn't have bugs. * Use vanillas versionNum we can just fix the playlists not working in launcher. * Final update to `mp_wargames.nut`. * Clear npc title in wargames intro. * Enable handlers?
Zanieon
reviewed
Jan 9, 2026
github-actions
Bot
added
the
merge conflicts
github-actions
Bot
removed
the
merge conflicts
github-actions
Bot
added
the
merge conflicts
github-actions
Bot
removed
the
merge conflicts
github-actions
Bot
added
the
merge conflicts
…, but caused other issues
Contributor
github-actions
Bot
removed
the
merge conflicts
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Closes #25
Closes #354
Closes #884
Closes #885
Closes #949