Upstream20241201 #221
Merged
Upstream20241201 #221
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
… which also uses IonStormSystem. Added StartIonStormedComponent. Changed stuff related to the Derelict Cyborg. Derelict Cyborg now spawns with a randomized lawset.
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
…ture Cyborgs and AI's, including those in subsequent rounds.
…h i didn't want to.
…screen. It still appears in the Player Manifest.
…relict Cyborg right now) not showing up as 'antag' in the admin player overlay.
* Add MeleeRequiresWield component * Prevent world activation
Fix makeghostroleraffle command with 4 arguments
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
* Remove usage of obsolete GetTilesIntersecting round 1 * Oop wrong uids * Remove usage of obsolete GetLocalTilesIntersecting round 2 * Remove usage of obsolete GetLocalTilesIntersecting final round * weh * Fix using `SharedMapSystem` in `StencilOverlay`
* Update Snowasis * Appease test gods * Woops had the leftward animation backwards. Fixed. * add santa suits and envelopes to chapel * It looks worse unscaled but whatever. * fix ghost role * examines
Fix wrong system using
…izards#33602) * Add check before marking event as handled * Update Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Cleanup --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
KeldWolf
requested review from
spanky-spanky,
DieselMohawk and
FluffMe
as code owners
github-actions
bot
added
S: Needs Review
|
RSI Diff Bot; head commit 34470f2 merging into 3709d59 Resources/Textures/Interface/Misc/job_icons.rsi
Resources/Textures/Interface/Misc/ai_hud.rsi
Resources/Textures/Mobs/Animals/reindeer_buck.rsi
Resources/Textures/Mobs/Animals/reindeer_doe.rsi
|
|
WOW!!! THIS IS REAL GOOD STUFF!! |
|
Let's rock and roll! |
spanky-spanky
approved these changes
Dec 2, 2024
|
Could you please add comment on line 218 of |
|
Routine upstream merge |
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.
Routine Upstream merge for Dec. 1, 2024