Merge Upstream 21.05.2024 #1241
Merged
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
* radio check - lime charlie * examine addition * oops Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: matttheficus <57759731+matttheficus@users.noreply.github.com> * oops 2 Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: matttheficus <57759731+matttheficus@users.noreply.github.com> * dgamerl review * i didnt save lul --------- Signed-off-by: matttheficus <57759731+matttheficus@users.noreply.github.com> Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
…S13#25501) * The lance now has a very clear confirmation message on it. * Update code/modules/supply/supply_console.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> --------- Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
* adds surgical abductor toolset * ..Yes. The crew needs to be able to get it somehow. Right * handle review from 1080p * Required tech should be the correct one, and not engi's * Henri's review * 1080p's review * adds surgical abductor toolset * ..Yes. The crew needs to be able to get it somehow. Right * handle review from 1080p * Required tech should be the correct one, and not engi's * Henri's review * 1080p's review
* Requests Console standardization * Update Secondary Goals to match the new Chemistry Requests Console --------- Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
github-actions
bot
added
the
🗺️ Изменение Карты
Gaxeer
approved these changes
May 21, 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.
Changelog
🆑 ParadiseSS13
add: Добавлен абдукторский тулсет
tweak: Медицинский луч тепреь имеет шанс вылечить все внутренние повреждения
fix: Прыжок больше не должен впечатывать вас в стену, буквально
/:cl: