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

Fix purchase shuttle and add loadout mercenary #1528

Closed
wants to merge 2,533 commits into from
Closed

Fix purchase shuttle and add loadout mercenary #1528

wants to merge 2,533 commits into from

Conversation

NEirotoXiN00
Copy link

Changelog

  • Add military medical mask to loadout's mercenary
  • Fix purchase suttles

Zekins3366 and others added 30 commits May 26, 2024 12:53
@Zekins3366
Fix audio
b643eb2
@Zekins3366
Mini fix translate
a45491f
@Vonsant
Исправление мерджконфликтов
58fa455
@Vonsant
Merge pull request #212 from mersen-tyn/maps_mersen
c19e2f2 
Add shuttle Hercules and fix's Pot
@Vonsant
Merge pull request #155 from FireNameFN/EarlyFinishFix
5b00b4b 
Expedition early finish fix
@Vonsant
Merge pull request #191 from FireNameFN/RespawnFix
882f50e 
Respawn timer fix
@Sh1ntra
Fix errors after mergeconflict
5a498f1
Add equipped-BELT.png
527997b
@Vonsant
Delete Content.Shared/SpaceDebrisComponent.cs
d6e3993
@Vonsant
Фикс ObjectsTab.xaml.cs
b045493
@Zekins3366
Mew
534239d
@Zekins3366
Mew
061ffe0 
Add new weapon
@Sh1ntra
fix errors
20b5d35
@Vonsant
Merge pull request #216 from Corvax-Frontier/Up2605
5d05d73 
Апстрим до 26.05.2024
@Vonsant
Убрать вл у коппи
36f8ddb
@Zekins3366
Update slime.yml
83cd9b4
@Succuberry
hotfix translation and description
508d49e
Added Vector ammo to AmmoTechFab
c3ecd65
FixPrototype
d588c6c
@Vonsant
Merge pull request #218 from new-frontiers-14/master
92a9b98 
Fix BluespaceArcIndDataCarrier bluespace-event (#1430)
@Vonsant
Merge pull request #217 from Succuberry/Resources
8381905 
Hotfix Translation&Description
Add Vector and ammo to VendingMachineAmmo
0878f51
Fix Prototype
3dc57f8
@Vonsant
Merge pull request #219 from NEirotoXiN00/Vector
4da9a77 
Added Vector ammo to AmmoTechFab
@Vonsant
Вернуть ивенты
bfaac24
@Succuberry
Fixes, add ammo variables
7e698e0
@Vonsant
Фикс events_bluespace.yml
7a9a8bf
@Vonsant
Ладно, пока без них, чот там сломано
93f3d4f
@Succuberry
Fix ammo in pulemat
763ffaa
@Succuberry
Fix price
04efa11
Vonsant and others added 24 commits June 15, 2024 00:19
@Vonsant
Merge pull request #298 from new-frontiers-14/master
d181543 
Ап
@Vonsant
Всякое неинтересное (#299)
7a44b78 
Ну такое
@Vonsant
Аванпост улетел в космос
17dc4a3
@Vonsant
Update FrictionRemoverSystem.cs
3181b63
@Sh1ntra
Смена обозначения ключа для канала пиратов (удобно) (#301)
c0f75c9 
* Update radio_channels.yml

Изменение кода ключа шифрования фрилансеров (пиратов) с 'f' на 'ф'

* Update radio_channels.yml
@Vonsant
Фиксы полетов аванпоста (#303)
7c31f66 
* Update anomalouslab.yml

* Update arena.yml

* Update beacon.yml

* Update cargodepot.yml

* Update caseyscasino.yml

* Update courthouse.yml

* Update cove.yml

* Update grifty.yml

* Update lodge.yml

* Update lpbravo.yml

* Update nfsd.yml

* Update tinnia.yml

* Update trade.yml

* Update FrictionRemoverSystem.cs

* Update MovementSpeedModifierComponent.cs
@mersen-tyn
add shuttles, epsilon and minor fixes
7517407
@Vonsant
Merge pull request #304 from mersen-tyn/maps_mersen
d557283 
add shuttles, epsilon and minor fixes
@Vonsant
Revert "Фиксы полетов аванпоста (#303)"
e67a12e 
This reverts commit 7c31f66.
@Vonsant
Merge pull request #305 from Corvax-Frontier/revert-303-mehtest
b95751f 
Revert "Фиксы полетов аванпоста"
@Vonsant
Фикс
84d2c4a
@Vonsant
Update mailDeliveries.yml
46fd51f
@Vonsant
Update mailDeliveries.yml
9cd31a3
@Vonsant
Merge pull request #308 from Corvax-Frontier/Up150624
a6acf75 
Up150624
@Vonsant
Эмоциональный дракончик
d0d39d9
Add Old Mail to New Mail
ad36f44
XDD
2b46e0b
@Vonsant
Merge pull request #310 from new-frontiers-14/master
a31dcbd 
Upfix
@Vonsant
Merge pull request #309 from NEirotoXiN00/NFMail
c0a3fb7 
Почта-почта-почта
@mersen-tyn
add destroyed shuttles for the event
eec1a54
@mersen-tyn
delete atmos
91a6724
@Vonsant
Merge pull request #311 from mersen-tyn/maps_mersen
ddd3449 
add destroyed shuttles for the event
Fix purchase and add loadout
5c0c095
fix prototypes
2cab272
@github-actions GitHub Actions
Copy link
Contributor

RSI Diff Bot; head commit 2cab272 merging into 16ada9e
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

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
C# FTL UI YML
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@NEirotoXiN00 @Zekins3366 @Vonsant @Sh1ntra @Succuberry @mersen-tyn @user424242420 @Terrka