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 sync #1512

Merged
merged 43 commits into from
Oct 18, 2023
Merged

Upstream sync #1512

merged 43 commits into from
Oct 18, 2023

Conversation

Morb0
Copy link
Member

@Morb0 Morb0 commented Oct 18, 2023

Описание PR

Медиа

Проверки

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

Изменения

QuietlyWhisper and others added 30 commits October 15, 2023 14:06
@QuietlyWhisper
adds "idk." to the text to emote list (#21015)
e5f5a28
@ike709
Allow Hand-Prying Most Unpowered Airlocks (#21002)
d10e33c 
Co-authored-by: ike709 <[email protected]>
@PJBot
Automatic changelog update
212a892
@deltanedas
add rainbow fish (#20955)
bfb5bcd 
Co-authored-by: deltanedas <@deltanedas:kde.org>
@deltanedas
Rolling pin can be worn in belt slot (#21019)
687ceee 
* sprite swap

* rolling pin can be put in belt

* test pls

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
@ElectroJr
Fix low tickrate eye lerping (#21001)
58ae379
@iacore
Make secure crate weldable (#21007)
556e679
@PJBot
Automatic changelog update
27b9c35
@brainfood1183
fixes behonkers, they now function like spitters and will attack via …
3ecaa65 
…ai with behonk laser. (#21003)
@PJBot
Automatic changelog update
e40172e
@ShadowCommander
Fix sound on material reclaimer (#21030)
c20bf50 
* Fix saw sound error on client

The sound tried to play using shared PlayPvs which doesn't work on client. PlayPredicted handles client and server.

Fixed NextSound not playing again while continuously gibbing items.

* Fix duplicate splat sound on Recycler gibbing
@EmoGarbage404
Fix uncuffing for zombies (#21021)
b5a7af1
@ElectroJr
Update dev map (#21016)
7032a5a
@coolmankid12345
Less charges for Sci flash (#20959)
f7fbaba 
* Flash

* Okay not plant based anymore

---------

Co-authored-by: coolmankid12345 <[email protected]>
@PJBot
Automatic changelog update
1f564f0
@DrSmugleaf
Fix sorting admin player tab playtime alphabetically (#21028)
c3e303b 
* Fix sorting admin player tab playtime alphabetically

* Admin changelog
@Lomcastar
upgrade (#20997)
101cc34
@PJBot
Automatic changelog update
4225440
@ElectroJr
Default warp point names (#21017)
1f0c931
@ElectroJr
Add new entity spawn test & fix misc bugs (#19953)
00e274e
@mirrorcult @metalgearsloth
Kill SharedEntityExtensions and all popup extensions (#20909)
77964d4 
Co-authored-by: metalgearsloth <[email protected]>
@JoeHammad1844
Stun baton tweak (#20970)
a439a12
@PJBot
Automatic changelog update
2b1e4ed
@metalgearsloth
Fix item drop mispredicts (#21035)
91ea140
@PJBot
Automatic changelog update
fedc7c6
@EmoGarbage404
technology auto guidebook (#21029)
fd99451 
* technology auto guidebook

* boo-womp

* boo-womp II
@metalgearsloth
Update submodule to 167.0.0 (#21060)
d394477
@VasilisThePikachu
Restrict arrows from being used in cannons (#21067)
ebd5238
@PJBot
Automatic changelog update
c08be70
@VasilisThePikachu
Spear 1984 (#21065)
0cf28f9
PJBot and others added 13 commits October 17, 2023 19:02
@PJBot
Automatic changelog update
b33b575
@notquitehadouken
Change wide swing sprites to be that of the weapon used (#21050)
df81532 
Co-authored-by: notquitehadouken <1isthisameme>
@PJBot
Automatic changelog update
433c706
@rosieposieeee
Lockable Suit Storages (#20950)
cb1b067
@DrSmugleaf
Replace Component.OnRemove with ComponentRemove event subscriptions (…
a136616 
…#21072)
@DrSmugleaf
Replace all T : Component constraints with T : IComponent (#21073)
5934c67
@DrSmugleaf
Update RobustToolbox to 904ddea27497caa6e652eec1b9d3ff2743a79e5c (#21…
7ac3387 
…074)
@DrSmugleaf
Fix build (#21075)
13cff0e
@DrSmugleaf
Fix debug assert when shooting guns (#21070)
c72b95d
@metalgearsloth
Fix vaulting mispredict (#21082)
7a878f7
@PJBot
Automatic changelog update
6b58757
@Morb0
Merge remote-tracking branch 'upstream/master' into upstream-sync
1c61956 
# Conflicts:
#	Resources/ServerInfo/Guidebook/Science/Science.xml
@Morb0
Update locale
41096e6
@Morb0 Morb0 requested a review from ficcialfaint as a code owner October 18, 2023 10:29
@github-actions github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation 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 labels Oct 18, 2023
@github-actions
Copy link
Contributor

RSI Diff Bot; head commit 41096e6 merging into 0ed6a07
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Structures/Storage/suit_storage.rsi

State Old New Status
base Modified
welded Modified
closed Removed
door Added
locked Added
panel Added
unlocked Added

@Morb0 Morb0 merged commit 3149bcf into master Oct 18, 2023
13 of 14 checks passed
@Morb0 Morb0 deleted the upstream-sync branch October 18, 2023 12:29
Morb0 pushed a commit that referenced this pull request Oct 18, 2023
@lapatison
Translate Upstream #1512 (#1513)
94e1d37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ficcialfaint ficcialfaint Awaiting requested review from ficcialfaint ficcialfaint is a code owner

Assignees
No one assigned
Labels
Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation 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 Status: Needs Review This PR requires new reviews before it can be merged
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.