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.

Sign up for GitHub

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

Jump to bottom

Upstream merge 18 #280

Merged
merged 35 commits into from
Aug 28, 2023
Merged

Upstream merge 18 #280

merged 35 commits into from
Aug 28, 2023

Conversation

TheArturZh
Copy link
Member

Описание PR

Мерж обновлений от оффов

Медиа

Проверки

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

Изменения

🆑 TheArturZh

  • add: Добавлены обновления от оффов

liltenhead and others added 30 commits August 26, 2023 21:33
@liltenhead
Allow ore bags to pickup artifact fragments (space-wizards#19562)
c6de69e
@PJBot
Automatic changelog update
6def8c8
@Partmedia
Support number of uses starting at zero (space-wizards#19452)
ccd0e8b 
This allows peelable bananas without replicating the entire YAML
structure to remove this one component.
@potato1234x @Partmedia
Add peeled state for bananas (space-wizards#19393)
77711de 
Co-authored-by: Kevin Zheng <[email protected]>
@PJBot
Automatic changelog update
b439aad
@HerCoyote23
Meleespeech Action, Holoparasite Meleespeech (space-wizards#19504)
407d45c
@PJBot
Automatic changelog update
e5ee7c6
@qwerltaz
add board container to wallmounts (space-wizards#19565)
0c58a1e
@PJBot
Automatic changelog update
d3ed36d
@DrSmugleaf
Update RobustToolbox to 01546f3 (space-wizards#19569)
0bd48a5
@brainfood1183
Origin Station Update 26.08.2023 (jrpacman, borg roles) (space-wizard…
8195690 
…s#19568)
@metalgearsloth
Remove ActiveLagComp (space-wizards#19572)
33e1514
@metalgearsloth
Use AllEntityQuery for lagcomp (space-wizards#19574)
b311bf3
@metalgearsloth
Remove some erroneous compadd subs (space-wizards#19576)
d40f478
@mirrorcult
Watchers (space-wizards#19367)
70e0520
@EmoGarbage404
Add support for custom controls in the character menu (space-wizards#…
3e93e96 
…19567)
@PJB3005
Make bound-UI range checks consistent with interaction. (space-wizard…
3a72747 
…s#19461)
@PJBot
Automatic changelog update
e6b413f
@TsjipTsjip
Run variantize on barratry (space-wizards#19527)
e79c39b 
* Run variantize on barratry

Also use new asteroid plating tile in sci

* Requested changes
@Morb0
Localize wires window title (space-wizards#19577)
56a49ba 
* Localize wires window title

* Reset
@HerCoyote23
northstar glove 8->7 dmg (space-wizards#19570)
2dad30c
@PJBot
Automatic changelog update
0ec8daa
@PixelTheKermit
Projectile and damage events now include the origin (space-wizards#19322
9fef38a 
)
@hord-brayden
Reduce uplink combat medipen cost (space-wizards#19556)
f15eb08
@lzk228 @metalgearsloth
make SpawnItemsOnUseComponent not require sound field (space-wizards#…
43ddd24 
…19583)

* Update SpawnItemsOnUseComponent.cs

* Update Content.Server/Storage/Components/SpawnItemsOnUseComponent.cs

Co-authored-by: metalgearsloth <[email protected]>

---------

Co-authored-by: metalgearsloth <[email protected]>
@JustCone14
Jr Pacmen around Omega (space-wizards#19587)
3c6ccba
@EmoGarbage404
fix recycler (space-wizards#19590)
235da38
@PJBot
Automatic changelog update
cae28d7
@JustCone14
Cluster Pacmans (space-wizards#19592)
29a2f7f
@Nairodian
Shift Sec HUD To The Right Side (space-wizards#19597)
f0f920c
@github-actions github-actions bot added Changes: Localization Изменение затронуло файлы ".ftl" Changes: Map Изменение затронуло файлы ".yml" в неймспейсе "maps" Changes: Sprites Изменение затронуло файлы ".rsu / .png" Changes: UI Изменение затронуло файлы ".xaml" labels Aug 28, 2023
@github-actions
Copy link

RSI Diff Bot; head commit 57a46de merging into 4f41521
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Mobs/Aliens/Lavaland/watcher.rsi

State Old New Status
base Added
dead-unshaded Added
dead Added
unshaded Added

Resources/Textures/Objects/Specific/Hydroponics/banana.rsi

State Old New Status
peeled Added

Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi

State Old New Status
impact_laser_greyscale Added
omnilaser_greyscale Added

@TheArturZh TheArturZh merged commit cc367c5 into SerbiaStrong-220:master Aug 28, 2023
17 of 18 checks passed
@TheArturZh TheArturZh deleted the upstream-merge-18 branch October 4, 2023 22:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Changes: Localization Изменение затронуло файлы ".ftl" Changes: Map Изменение затронуло файлы ".yml" в неймспейсе "maps" Changes: Sprites Изменение затронуло файлы ".rsu / .png" Changes: UI Изменение затронуло файлы ".xaml"
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.