Skip to content

Up040826 - #358

Open
mersen-tyn wants to merge 301 commits into
mainfrom
up040826
Open

Up040826#358
mersen-tyn wants to merge 301 commits into
mainfrom
up040826

Conversation

@mersen-tyn

@mersen-tyn mersen-tyn commented Aug 4, 2026

Copy link
Copy Markdown
Collaborator

О PR

Апстрим (чтооооо)

Зачем / Баланс

Медиа

Требования

  • Я прочитал(а) релевантные гайдлайны/документацию для этого PR на нашем devwiki.
  • Я добавил(а) медиа в этот PR, либо для него не требуется демонстрация в игре.
  • Подтверждаю, что PR либо не содержит AI-сгенерированного контента, либо этот контент соответствует нашим правилам.

Как тестировать

Ломающие изменения

Changelog

monolith8319 and others added 30 commits July 14, 2026 19:16
@monolith8319
Automated Changelog (Monolith-Station#4254)
293bf19
@kasature90
90mm Flak (Monolith-Station#4278)
7a38c10 
Co-authored-by: starch <starchpersonal@gmail.com>
@monolith8319
Automated Changelog (Monolith-Station#4278)
a71a61c
@Huaqas
Miscellaneous Resomi Fixes (Monolith-Station#4109)
1488e82
@monolith8319
Automated Changelog (Monolith-Station#4109)
8038401
@kasature90
Annoying (Monolith-Station#4283)
d7771b0 
Co-authored-by: starch <starchpersonal@gmail.com>
@monolith8319
Automated Changelog (Monolith-Station#4283)
7f26055
@kasature90
Clarity (Monolith-Station#4284)
3731a17 
Co-authored-by: starch <starchpersonal@gmail.com>
@kasature90
Whatever Drillsite Fixes (Monolith-Station#4282)
ced7653 
Co-authored-by: starch <starchpersonal@gmail.com>
@monolith8319
Automated Changelog (Monolith-Station#4282)
b84a122
@thoughtlessuser
Caelestinus - Colossus Merge and Remap (Monolith-Station#4155)
5b7e64a
@monolith8319
Automated Changelog (Monolith-Station#4155)
8d217ca
@eris-webserv @kasature90
@Mrrpip @monolith8319 @thoughtlessuser @NazrinNya NazrinNya @Wuffindy @Corrupt142 @projectkepler-ru @EldritchPineapple @mnva0
Z-Level Support (Monolith-Station#4224)
27c3605 
Co-authored-by: kasature90 <kasature.asakim@gmail.com>
Co-authored-by: starch <starchpersonal@gmail.com>
Co-authored-by: Mrrpip <38842059+Mrrpip@users.noreply.github.com>
Co-authored-by: monolith8319 <195513600+monolith8319@users.noreply.github.com>
Co-authored-by: thoughtlessuser <thoughtlessuser@gmail.com>
Co-authored-by: NazrinNya <137837419+NazrinNya@users.noreply.github.com>
Co-authored-by: NazrinNya <macrohard@macrohard.localhost>
Co-authored-by: Wuffindy <71980308+Wuffindy@users.noreply.github.com>
Co-authored-by: Corrupt <compeldominik6@gmail.com>
Co-authored-by: EspeciallyStrange <99981766+projectkepler-ru@users.noreply.github.com>
Co-authored-by: EldritchPineapple <ewann3538@gmail.com>
Co-authored-by: Minerva <218184747+mnva0@users.noreply.github.com>
@eris-webserv
Grshitfix (Monolith-Station#4296)
93ca759
@NazrinNya NazrinNya
Just Another Fix Trust (Monolith-Station#4298)
f992683 
Co-authored-by: NazrinNya <macrohard@macrohard.localhost>
@thoughtlessuser
Central Station Fixes (I Hate.) (Monolith-Station#4297)
77225e6
@monolith8319
Automated Changelog (Monolith-Station#4297)
f2cc2d4
@kasature90
Fix Wielding + Attachments Making Gun Spread Go Negative (Monolith-St…
19b4830 
…ation#4301)

Co-authored-by: starch <starchpersonal@gmail.com>
@monolith8319
Automated Changelog (Monolith-Station#4301)
623fd84
@AnonyAnomaly
PLXCOR Company (Monolith-Station#4048)
7400c81
@kasature90
Shiptest Ammo Boxes & Magazines (Monolith-Station#4300)
42adb0c 
Co-authored-by: starch <starchpersonal@gmail.com>
@monolith8319
Automated Changelog (Monolith-Station#4300)
b20cd62
@projectkepler-ru @kasature90
Tier 2 TSF Bullpup Rifle (Monolith-Station#4280)
f30fed1 
Co-authored-by: kasature90 <kasature.asakim@gmail.com>
@monolith8319
Automated Changelog (Monolith-Station#4280)
2049d6d
@kasature90
Shipammo Slop (Monolith-Station#4299)
d3845fe 
Co-authored-by: starch <starchpersonal@gmail.com>
@monolith8319
Automated Changelog (Monolith-Station#4299)
bf791e5
@Corrupt142
HYPERWAR: Jupiter Tweaks (Monolith-Station#4302)
90e6af4
@monolith8319
Automated Changelog (Monolith-Station#4302)
fa225d6
@Corrupt142
Shiv Remap + Eris Tweaks (Monolith-Station#4294)
c01a935
@monolith8319
Automated Changelog (Monolith-Station#4294)
854eff4
monolith8319 and others added 16 commits August 2, 2026 22:11
@monolith8319
Automated Changelog (Monolith-Station#4435)
3e4a278
@NazrinNya naz
Ruleslop (Monolith-Station#4437)
e40ee68 
Co-authored-by: naz <naz@foid.itshim.org>
@kasature90
W Mangos (Monolith-Station#4438)
fd24629 
Co-authored-by: starch <starchpersonal@gmail.com>
@tonotom1
Medicus Touchup & Derelict (Monolith-Station#4428)
15a3896
@monolith8319
Automated Changelog (Monolith-Station#4428)
1da6dea
@ondrej008
SRD & Nanite Applicator QoL (Monolith-Station#4407)
cd13063
@monolith8319
Automated Changelog (Monolith-Station#4407)
750ab7d
@kasature90
Haha (Monolith-Station#4440)
dcea376 
Co-authored-by: starch <starchpersonal@gmail.com>
@kasature90
Someone ought to make a test-debug check for this.
d80eff5
@kasature90
Update economy.yml
9cc241b
@kasature90
Update ship_components.yml
b2c170d
@OneZerooo0 Onezero0
Flatpacker Slop (Monolith-Station#4439)
b2a874d 
Co-authored-by: Onezero0 <onezero0@outlook.com>
@monolith8319
Automated Changelog (Monolith-Station#4439)
142b50e
@mersen-tyn
Merge remote-tracking branch 'upstream/main' into up040826
eeda70b
@mersen-tyn
Первая часть фиксов от апстрима
38e6296
@mersen-tyn
Вторая пачка фиксов
a808abc
@cursor

cursor Bot commented Aug 4, 2026

Copy link
Copy Markdown

Bugbot is not enabled for your account, so this pull request was not reviewed.

Enable Bugbot in the Cursor dashboard to get automatic reviews on future PRs.

@github-actions github-actions Bot added the size/L label Aug 4, 2026
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

Audio C# Docs FTL S: Untriaged Shaders size/L Sprites UI YML

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.