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
724 workflow runs
724 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

update (#249) Check for merge conflicts #224: Commit bd24ab5 pushed by Tatarla
September 8, 2024 07:35 47s master
master
September 8, 2024 07:35 47s
Update abilities_hivemind.dm (#248) Check for merge conflicts #223: Commit c671d3c pushed by Helg2
September 7, 2024 21:38 37s master
master
September 7, 2024 21:38 37s
Фикс ГЦ ИИ (#247) Check for merge conflicts #222: Commit 47324d2 pushed by Helg2
September 7, 2024 19:27 41s master
master
September 7, 2024 19:27 41s
Merge branch 'master' of https://github.com/PMC-Unga-Marines/RuTGMC-R… Check for merge conflicts #221: Commit 01aca60 pushed by homexp13
September 7, 2024 13:24 42s master
master
September 7, 2024 13:24 42s
Update TGS_Talos.dmm (#242) Check for merge conflicts #220: Commit 4124298 pushed by Tatarla
September 7, 2024 12:55 36s master
master
September 7, 2024 12:55 36s
Profiler (#241) Check for merge conflicts #219: Commit 53587e7 pushed by Helg2
September 7, 2024 12:43 36s master
master
September 7, 2024 12:43 36s
Replaces cases of depleting on 2 and 10 on multiplying to 0.5 and 0.1… Check for merge conflicts #218: Commit eacd067 pushed by Tatarla
September 7, 2024 12:23 42s master
master
September 7, 2024 12:23 42s
Update acidwell.dm (#239) Check for merge conflicts #217: Commit 304a46b pushed by Tatarla
September 7, 2024 11:44 37s master
master
September 7, 2024 11:44 37s
Update tgmc.dme (#236) Check for merge conflicts #216: Commit e1b70d6 pushed by Tatarla
September 7, 2024 09:50 37s master
master
September 7, 2024 09:50 37s
. (#235) Check for merge conflicts #215: Commit a0b8937 pushed by Tatarla
September 7, 2024 09:23 38s master
master
September 7, 2024 09:23 38s
Applies alternative sprites from Talos to everything, except vents, s… Check for merge conflicts #214: Commit 07efdb4 pushed by Tatarla
September 7, 2024 07:12 40s master
master
September 7, 2024 07:12 40s
zagruzka (#233) Check for merge conflicts #213: Commit a9c70ec pushed by Tatarla
September 7, 2024 05:04 36s master
master
September 7, 2024 05:04 36s
Suit autodocs now check storage contents before injecting. Health ana… Check for merge conflicts #212: Commit 2c27fb2 pushed by Tatarla
September 6, 2024 15:49 37s master
master
September 6, 2024 15:49 37s
Illusion fixes and improvements (#16506) (#226) Check for merge conflicts #211: Commit 0ffcd0d pushed by Tatarla
September 6, 2024 15:49 28s master
master
September 6, 2024 15:49 28s
Tank space fix (#16492) (#230) Check for merge conflicts #210: Commit c61db61 pushed by Tatarla
September 6, 2024 15:48 46s master
master
September 6, 2024 15:48 46s
Reorgs supplies list, fixes p9mm packet typepath and p9mm incendiary … Check for merge conflicts #209: Commit 802edd1 pushed by Tatarla
September 6, 2024 15:11 38s master
master
September 6, 2024 15:11 38s
Update transit.dm (#229) Check for merge conflicts #208: Commit 0e38a37 pushed by Tatarla
September 6, 2024 15:07 39s master
master
September 6, 2024 15:07 39s
Factory fixes. (#223) Check for merge conflicts #207: Commit 0be543d pushed by Tatarla
September 6, 2024 06:54 40s master
master
September 6, 2024 06:54 40s
Some fire buffs and nerfs (#212) Check for merge conflicts #206: Commit 2a12d2e pushed by Tatarla
September 6, 2024 05:40 37s master
master
September 6, 2024 05:40 37s
Ports qols & fixes: 14677, 14822, 15793, 15814, 15855, 16153 (#209) Check for merge conflicts #205: Commit 382315c pushed by Tatarla
September 6, 2024 05:03 37s master
master
September 6, 2024 05:03 37s
Ports Gregor campaign portraits. (#15273) (#215) Check for merge conflicts #204: Commit e53f3b9 pushed by Tatarla
September 6, 2024 02:59 41s master
master
September 6, 2024 02:59 41s
Fixes tactical reload intercepting worn magazines. (#219) Check for merge conflicts #203: Commit 9c87e95 pushed by Tatarla
September 6, 2024 02:59 28s master
master
September 6, 2024 02:59 28s
Increases possible transfer amounts for hyposprays. (#216) Check for merge conflicts #202: Commit 4681c6b pushed by Tatarla
September 6, 2024 02:59 33s master
master
September 6, 2024 02:59 33s
Adds more tactical binoculars mode overlays (#16372) (#214) Check for merge conflicts #201: Commit 792d1fb pushed by Tatarla
September 6, 2024 02:58 1m 5s master
master
September 6, 2024 02:58 1m 5s
Wide chairs (#211) Check for merge conflicts #200: Commit 4ad304b pushed by Tatarla
September 6, 2024 02:58 1m 12s master
master
September 6, 2024 02:58 1m 12s
ProTip! You can narrow down the results and go further in time using created:<2024-09-06 or the other filters available.