Upstream and fixes #214
Merged
Upstream and fixes #214
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
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> This is a batch of changes I made for Floof station being ported over to the upstream branch --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: Added new neutral xenos, events, and reagent slimes --------- Signed-off-by: fenndragon <[email protected]> Signed-off-by: SleepyScarecrow <[email protected]> Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: SleepyScarecrow <[email protected]>
# Description Grrrr, I may have forgotten to remove it as a part of #733. Signed-off-by: Mnemotechnican <[email protected]>
# Conflicts: # Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
github-actions
bot
added
Изменения: C#
|
RSI Diff Bot; head commit 1fc84ca merging into 308dfa9 Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi
Resources/Textures/Mobs/Animals/patriarch.rsi
Resources/Textures/Mobs/Animals/subject7355.rsi
|
Evgencheg
merged commit 9d5ce68
into
Lost-Paradise-Project:master
11 of 12 checks passed
Lost-Paradise-Bot
added a commit
that referenced
this pull request
Sep 27, 2024
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.
VIVA LA LOST PARADISE!
Описание обновления:
Апстрим и куча фиксов.
Медиа
No media no fun
Проверки
Изменения
🆑 Evgencheg