Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream sync #840

Merged
merged 27 commits into from
Feb 19, 2023
Merged

Upstream sync #840

merged 27 commits into from
Feb 19, 2023

Conversation

Morb0
Copy link
Member

@Morb0 Morb0 commented Feb 19, 2023

Описание PR

Медиа

Проверки

  • PR полностью завершён и мне не нужна помощь чтобы его закончить.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения

metalgearsloth and others added 27 commits February 16, 2023 08:24
- Fix the direct-path so NPCs. This is most noticeable when moving diagonally on planetmaps (given the current pathfinder is cardinal)
- Reduce static collision avoidance weight and distance. This seems to reduce instances of getting stuck on railings.
* tinyfan, door power, walls, secret

* red sword + secret

* secret

* secret for real
Co-authored-by: DrSmugleaf <[email protected]>
# Conflicts:
#	Resources/Prototypes/Maps/kettle.yml
#	Resources/Prototypes/Maps/origin.yml
@github-actions github-actions bot added Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design labels Feb 19, 2023
@github-actions github-actions bot added the Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design label Feb 19, 2023
@github-actions
Copy link
Contributor

RSI Diff Bot; head commit baf8eb5 merging into 3a68642
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/OuterClothing/Coats/clownpriest.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Decals/syndlogo.rsi

State Old New Status
syndlogo1 Added
syndlogo10 Added
syndlogo11 Added
syndlogo12 Added
syndlogo13 Added
syndlogo14 Added
syndlogo15 Added
syndlogo16 Added
syndlogo17 Added
syndlogo18 Added
syndlogo19 Added
syndlogo2 Added
syndlogo3 Added
syndlogo4 Added
syndlogo5 Added
syndlogo6 Added
syndlogo7 Added
syndlogo8 Added
syndlogo9 Added

Resources/Textures/Objects/Fun/toys.rsi

State Old New Status
plushie_atmosian Added

@Morb0 Morb0 merged commit 888d957 into master Feb 19, 2023
@Morb0 Morb0 deleted the upstream-sync branch February 19, 2023 03:50
Morb0 pushed a commit that referenced this pull request Feb 19, 2023
AverageNotDoingAnythingEnjoyer pushed a commit to AverageNotDoingAnythingEnjoyer/corvax-next that referenced this pull request Nov 16, 2024
* help

* help 2

* hooray :firework:

* shitfix

* fucking renames

* no more fortnite

---------

Co-authored-by: Errant <[email protected]>
Co-authored-by: whateverusername0 <whateveremail>
KommissarRed pushed a commit to KommissarRed/space-station-14-next-komred that referenced this pull request Jan 19, 2025
* help

* help 2

* hooray :firework:

* shitfix

* fucking renames

* no more fortnite

---------

Co-authored-by: Errant <[email protected]>
Co-authored-by: whateverusername0 <whateveremail>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design
Projects
None yet
Development

Successfully merging this pull request may close these issues.