Upstream sync #496
Merged
Upstream sync #496
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
* NPC steering blending Significantly more stable than using LastSteerDirection and also AntiStuck never got tripped locally when I was running around. I also left future notes for me to cleanup the pathfinder in future. * Remove index
* it works halilujeah * toggleable lights removes a redundant flashlight since you can turn on the balloons to cast light * final touches syndicate decoys* touches it works now * minor spelling mistake ⭐ * minor spelling mistake 2 darn * adds whistle commanders now spawn with a whistle around their neck * yaml linter luv you linter baby * smallify the whistle it was way too big, this has been addressed * sprite fix am dummy 👍 * netsync errors wouldn't compile properly * forgor * i suck at yaml smh * decoys for all now both syndicate and traitors can use the decoys, yippee! * Update meta.json credit my discord username * Update uplink-catalog.ftl * Update decoys.yml base decoy no longer shows in the entity browser * immortal gone balloons have gained mortality
rebalance
* Fix iron being overtuned due to oversight * fix copper too
* Makes the e-sword light plasma fires, as intended. * remove blank line
Added it to cargo pallet and the ATS puter. Small steps. Also moved the log until the anchoring is actually confirmed to prevent dummy logs.
* Remake cargo orders to contains flatpacks * whoop * grounging plamsa
stray pixel annihilation
… (#24991) * fix cryo removed minds of players who entered ghost role Signed-off-by: c4llv07e <[email protected]> * better way to handle cryo with mind in it Signed-off-by: c4llv07e <[email protected]> --------- Signed-off-by: c4llv07e <[email protected]>
* Initial Pass, Rev, Thief * Zombie initial pass * Rebase, Traitor * Nukeops, More overloads * Revert RevolutionaryRuleComponent * Use TryRoundStartAttempt, Rewrite nukie spawning * Comments, Add task scheduler to GameRuleSystem * Zombie initial testing done * Sort methods, rework GameRuleTask * Add CCVar, Initial testing continues * Might as well get rid of the obsolete logging * Oops, i dont know how to log apparently * Suggested formatting fixes * Suggested changes * Fix merge issues * Minor optimisation * Allowed thief to choose other antags * Review changes * Spawn items on floor first, then inserting * minor tweaks * Shift as much as possible to ProtoId<> * Remove unneeded * Add exclusive antag attribute * Fix merge issues * Minor formatting fix * Convert to struct * Cleanup * Review cleanup (need to test a lot) * Some fixes, (mostly) tested * oop * Pass tests (for real) --------- Co-authored-by: Rainfall <[email protected]> Co-authored-by: AJCM <[email protected]>
# Conflicts: # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Resources/Prototypes/Datasets/tips.yml # Resources/ServerInfo/Guidebook/Jobs.xml # Resources/Textures/Structures/Windows/directional.rsi/meta.json
initial commit
* move space heaters into cargo * AAA!!! the indentation1!!! * remove crate
Co-authored-by: poeMota <[email protected]>
Co-authored-by: poeMota <[email protected]>
…25743) * fix(research): Fix `ResearchSystem.Client` `UpdateClientInterface` preconditions. Fixes a paradox where selecting a research server requires a research server to already be selected. This would softlock the research client until it is reconstructed. * style: Discards the discard operator Co-authored-by: Nemanja <[email protected]> --------- Co-authored-by: Nemanja <[email protected]>
Co-authored-by: poeMota <[email protected]>
Weight based delay, retuned average, fixed comments
* Alert autoremove v0 * Code cleanup and timing * comment * Tritium, code compression * not resolving manually * reduced lookups, new comp * fix-fix yes * use RemCompDeferred, handle OnUnpaused * missed a todo * entitysystem resolve * remove unnecessary component updates * remove AlertState from comp, move EntityUnpausedEvent actions to AlertStateComponent's Timespan * Code cleanup * comments * combines AutoRemove input into Clear * minor logic adjustment that does not really change anything but is less ambiguous
This is a trash item for the most part, and should get picked up by the janitor's trash bag
* add SubGamemodes comp/sys * remove RuleChance from thief rule * use SubGamemodes for adding thief rule instead of adding ThiefRule component to random gamemodes * clean up thief rule prototype * add better logging + end rule if it fails to start * march 1st incident * preset ops * the dreaded --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
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.
No description provided.