Skip to content

Actions: PMC-Unga-Marines/Unga-Marines

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
516 workflow runs
516 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Tooling (#491) Check for merge conflicts #466: Commit f77cbfe pushed by Helg2
October 10, 2024 09:32 40s master
master
October 10, 2024 09:32 40s
Fixes pilotbunks door access so it can be opened by a pilot. (#521) Check for merge conflicts #465: Commit 540a85a pushed by Tatarla
October 9, 2024 14:21 43s master
master
October 9, 2024 14:21 43s
hmm (#522) Check for merge conflicts #464: Commit c11ee66 pushed by Tatarla
October 9, 2024 14:21 55s master
master
October 9, 2024 14:21 55s
New tad "Cargo" (#510) Check for merge conflicts #463: Commit 6843df4 pushed by Tatarla
October 9, 2024 14:20 39s master
master
October 9, 2024 14:20 39s
robot essentials (#524) Check for merge conflicts #462: Commit 35b0871 pushed by Tatarla
October 9, 2024 14:19 1m 0s master
master
October 9, 2024 14:19 1m 0s
Баф бегемота (#525) Check for merge conflicts #461: Commit c183ca0 pushed by Tatarla
October 9, 2024 14:18 49s master
master
October 9, 2024 14:18 49s
Update TGS_Talos.dmm (#519) Check for merge conflicts #460: Commit 54ca065 pushed by Tatarla
October 9, 2024 05:17 45s master
master
October 9, 2024 05:17 45s
Update marine_uniform.dm (#498) Check for merge conflicts #459: Commit 4bb5677 pushed by Tatarla
October 8, 2024 06:25 40s master
master
October 8, 2024 06:25 40s
Update abilities_shrike.dm (#511) Check for merge conflicts #458: Commit 806ba60 pushed by Tatarla
October 8, 2024 06:22 39s master
master
October 8, 2024 06:22 39s
Fixes most of vehicle fabricator bullshit. (#514) Check for merge conflicts #457: Commit 074238c pushed by Tatarla
October 8, 2024 06:22 58s master
master
October 8, 2024 06:22 58s
Fixes shrike not being able to evolve into king or queen. Deletes fir… Check for merge conflicts #456: Commit b227897 pushed by Tatarla
October 8, 2024 06:21 39s master
master
October 8, 2024 06:21 39s
structure/xeno/Destroy() now doesn't try to look for structure in c… Check for merge conflicts #455: Commit c06713b pushed by Tatarla
October 8, 2024 06:21 55s master
master
October 8, 2024 06:21 55s
adds map, sound, image changelog tag (#518) Check for merge conflicts #454: Commit 3f537df pushed by Tatarla
October 7, 2024 14:22 40s master
master
October 7, 2024 14:22 40s
Fixes pipenets on Bigred. (#516) Check for merge conflicts #453: Commit a6017fc pushed by Tatarla
October 7, 2024 13:56 41s master
master
October 7, 2024 13:56 41s
Talos hangar tweaks. (#513) Check for merge conflicts #452: Commit 1247c61 pushed by Tatarla
October 7, 2024 12:50 41s master
master
October 7, 2024 12:50 41s
buff (#287) Check for merge conflicts #451: Commit 4f77a62 pushed by Tatarla
October 6, 2024 08:39 36s master
master
October 6, 2024 08:39 36s
Increases the damage of charge crush in 3 times and running over lyin… Check for merge conflicts #450: Commit 4ebdb67 pushed by Tatarla
October 6, 2024 08:37 34s master
master
October 6, 2024 08:37 34s
Ап обычных хагеров до остальных, удаление бесполезных переопределений… Check for merge conflicts #449: Commit f27222b pushed by Tatarla
October 6, 2024 08:37 46s master
master
October 6, 2024 08:37 46s
Fixes changelog on linux, updates hyperlinks in it. (#505) Check for merge conflicts #448: Commit 1171689 pushed by Tatarla
October 6, 2024 08:27 37s master
master
October 6, 2024 08:27 37s
Updates crash for xeno side, updates teleporter desc and teleportatio… Check for merge conflicts #447: Commit 4947522 pushed by Tatarla
October 6, 2024 08:11 39s master
master
October 6, 2024 08:11 39s
Predator WIP (#497) Check for merge conflicts #446: Commit 0fb04da pushed by Tatarla
October 6, 2024 08:11 53s master
master
October 6, 2024 08:11 53s
TGUI updates (#496) Check for merge conflicts #445: Commit 066d07d pushed by Tatarla
October 6, 2024 08:09 43s master
master
October 6, 2024 08:09 43s
yea (#507) Check for merge conflicts #444: Commit b575059 pushed by Helg2
October 5, 2024 17:55 38s master
master
October 5, 2024 17:55 38s
Раннер мега шиза баф! 21 урона -> 28. (#504) Check for merge conflicts #443: Commit 85689f4 pushed by Tatarla
October 5, 2024 08:47 37s master
master
October 5, 2024 08:47 37s
Points defence fixes (#434) Check for merge conflicts #442: Commit e22b166 pushed by Tatarla
October 5, 2024 06:01 38s master
master
October 5, 2024 06:01 38s