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

Merge conflict #38

Closed
wants to merge 81 commits into from
Closed

Merge conflict #38

wants to merge 81 commits into from

Conversation

800maximum123
Copy link
Collaborator

Я криворучка, по этому решил костылями. После гляну как решать в ПРах мердж конфликты, если ты переносишь на другой билд.

SierraHelper and others added 30 commits June 9, 2024 01:37
@SierraHelper
Автоматическая компиляция чейнджлогов [ci skip]
4ddf753
@YegorKandziuba
[TWEAK] Вендоматы с контрабандой (SierraBay#2319)
a37dbe6
@SierraHelper
Чейнджлог для PR SierraBay#2319 [ci skip]
1c550a9
@SierraHelper
Автоматическая компиляция чейнджлогов [ci skip]
31e5137
@Teteshnik1
Fix mercenary and add tapes roll autolat (SierraBay#2318)
5d17026
@SierraHelper
Чейнджлог для PR SierraBay#2318 [ci skip]
9954e0d
@SierraHelper
Автоматическая компиляция чейнджлогов [ci skip]
2367b02
@AmShegars @UEDCommander
DEV-SIERRA: Colony types and runtime fixes (SierraBay#2317)
49ddad6 
Co-authored-by: UEDCommander <[email protected]>
@SierraHelper
Чейнджлог для PR SierraBay#2317 [ci skip]
5ab3809
@Lexanx
Fix ремонт позитронки (SierraBay#2336)
9c80bb1
@Teteshnik1
Фикс автолата, затяжек от сигарет. Меняем тактички на нашлемный ПНВ (S…
9a4e88a 
…ierraBay#2338)
@SierraHelper
Чейнджлог для PR SierraBay#2336 [ci skip]
ce05c41
@SierraHelper
Чейнджлог для PR SierraBay#2338 [ci skip]
c8cefb8
@SierraHelper
Автоматическая компиляция чейнджлогов [ci skip]
c924014
@SierraHelper @Spookerton @UEDCommander
[MIRROR] client_defines.dm cleanup and documentation (SierraBay#2249)
f8c1db8 
Co-authored-by: Spookerton <[email protected]>
Co-authored-by: UEDCommander <[email protected]>
@SierraHelper @cuddleandtea
[MIRROR] Play local sound volume (SierraBay#2250)
f2c7973 
Co-authored-by: cuddleandtea <[email protected]>
@SierraHelper @Spookerton
[MIRROR] toggleable accessory New -> Initialize (SierraBay#2251)
41635d4 
Co-authored-by: Spookerton <[email protected]>
@SierraHelper
Чейнджлог для PR SierraBay#2250 [ci skip]
e1e8781
@SierraHelper @Spookerton
[MIRROR] helmet visor toggle refactor (SierraBay#2252)
20054f3 
Co-authored-by: Spookerton <[email protected]>
@SierraHelper @Spookerton
[MIRROR] tweaked accessory slots to use shorter keys and better names (…
ef3bbf4 
…SierraBay#2253)

Co-authored-by: Spookerton <[email protected]>
@SierraHelper @Spookerton
[MIRROR] foreign body removal repeats until halted or there's nothing…
015e7c2 
… left (SierraBay#2254)

Co-authored-by: Spookerton <[email protected]>
@SierraHelper
Чейнджлог для PR SierraBay#2254 [ci skip]
6801b62
@SierraHelper @Sbotkin @UEDCommander
[MIRROR] QoL and immersion engineering improvements (SierraBay#2255)
44ddd99 
Co-authored-by: Sbotkin <[email protected]>
Co-authored-by: UEDCommander <[email protected]>
@SierraHelper
Чейнджлог для PR SierraBay#2255 [ci skip]
c188c17
@SierraHelper @MuckerMayhem
[MIRROR] prevent audible emote spam (SierraBay#2256)
87ce9fa 
Co-authored-by: MuckerMayhem <[email protected]>
@SierraHelper
Чейнджлог для PR SierraBay#2256 [ci skip]
63eb165
@SierraHelper @Spookerton
[MIRROR] GLOBify radial menu (SierraBay#2258)
6ec6306 
Co-authored-by: Spookerton <[email protected]>
@SierraHelper @Merlin1230
[MIRROR] Allows protolathes to actually accept chemicals (SierraBay#2263
418b6cf 
)

Co-authored-by: Merlin1230 <[email protected]>
@SierraHelper
Чейнджлог для PR SierraBay#2263 [ci skip]
46e031b
@MGWhiskers
tweaks & fixes sierra map 14.06.2024 (SierraBay#2355)
797e131
SierraHelper and others added 26 commits June 21, 2024 08:23
@SierraHelper
Чейнджлог для PR SierraBay#2320 [ci skip]
f84e70d
@Teteshnik1
[TWEAK] fix call charger and add bluespace crystal to research (Sierr…
b4ee01d 
…aBay#2375)
@SierraHelper
Чейнджлог для PR SierraBay#2375 [ci skip]
aa6158b
@SierraHelper
Автоматическая компиляция чейнджлогов [ci skip]
9888386
@AmShegars
DEV-SIERRA: Mechs by Shegar patch 1.1 (SierraBay#2380)
b443fe7
@SierraHelper
Чейнджлог для PR SierraBay#2380 [ci skip]
23390ba
@FeudeyTF
Обновление телекоммов (SierraBay#2383)
fb5fcb8
@SierraHelper
Чейнджлог для PR SierraBay#2383 [ci skip]
fb7e77a
@SierraHelper
Автоматическая компиляция чейнджлогов [ci skip]
a751fa2
@AmShegars
Доп правки для патчка 1.1 (SierraBay#2386)
d4eb61b
@SierraHelper
Чейнджлог для PR SierraBay#2386 [ci skip]
a7c2318
@Unchi-unchi-un-chi-chi
Security uniforms: setting order (SierraBay#2304)
189c325
@SierraHelper
Чейнджлог для PR SierraBay#2304 [ci skip]
6187f20
@Teteshnik1
Fix ABS and fix sprites charges OFD, fix damage rods (SierraBay#2387)
5cdf8f0
@SierraHelper
Чейнджлог для PR SierraBay#2387 [ci skip]
cf29a26
@SierraHelper
Автоматическая компиляция чейнджлогов [ci skip]
db64d0f
@Gold3729
QM Bridge access (SierraBay#2393)
d991536
@SierraHelper
Чейнджлог для PR SierraBay#2393 [ci skip]
c35860b
@Neonvolt
Fixes docking nav points and some mapping issues (SierraBay#2392)
cf3fd29
@SierraHelper
Чейнджлог для PR SierraBay#2392 [ci skip]
439b173
@BOTEeshee
Vault name fix (SierraBay#2394)
16c5fae
@SierraHelper
Чейнджлог для PR SierraBay#2394 [ci skip]
cc59ca5
@SierraHelper
Автоматическая компиляция чейнджлогов [ci skip]
90f36bd
@BOTEeshee
Add CCA patch (SierraBay#2401)
5a950b0
@SierraHelper
Чейнджлог для PR SierraBay#2401 [ci skip]
31e8f74
@800maximum123
Merge branch 'pr/37' into merge-conflict
050febb
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
⛰️ Спрайты 🔉 Звуки 🗺️ Карты
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.