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
652 workflow run results
652 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Kutjevo adjustments and fixes. (#734) Check for merge conflicts #627: Commit 8efca76 pushed by Helg2
December 4, 2024 08:51 3m 1s master
master
December 4, 2024 08:51 3m 1s
Update abilities_widow.dm (#739) Check for merge conflicts #626: Commit fa016b2 pushed by Tatarla
December 3, 2024 13:24 46s master
master
December 3, 2024 13:24 46s
Update supply_export.dm (#736) Check for merge conflicts #625: Commit 0e53258 pushed by Helg2
December 2, 2024 18:55 5m 56s master
master
December 2, 2024 18:55 5m 56s
Mutation qol (#675) Check for merge conflicts #624: Commit eb87b92 pushed by Helg2
December 2, 2024 13:42 6m 20s master
master
December 2, 2024 13:42 6m 20s
Species.dm and emote.dm cleaning up. (#732) Check for merge conflicts #623: Commit c695a3d pushed by Helg2
December 2, 2024 13:41 7m 3s master
master
December 2, 2024 13:41 7m 3s
Xeno turrets now scan surroundings every tick. Buffs hugger turret. S… Check for merge conflicts #622: Commit 6ee3992 pushed by Helg2
December 2, 2024 13:40 7m 25s master
master
December 2, 2024 13:40 7m 25s
hm (#723) Check for merge conflicts #621: Commit 683b552 pushed by Helg2
December 2, 2024 13:39 8m 4s master
master
December 2, 2024 13:39 8m 4s
Getflaticon optimisation (#724) Check for merge conflicts #620: Commit 3316ee9 pushed by Helg2
December 2, 2024 13:39 45s master
master
December 2, 2024 13:39 45s
Supply.dm reorg. (#735) Check for merge conflicts #619: Commit 3a91983 pushed by Helg2
December 2, 2024 13:18 4m 18s master
master
December 2, 2024 13:18 4m 18s
king (#728) Check for merge conflicts #618: Commit c2d2cdd pushed by Helg2
December 1, 2024 20:22 44s master
master
December 1, 2024 20:22 44s
Хайвмайнд шарит за язык маров (#726) Check for merge conflicts #617: Commit 2269e03 pushed by Helg2
December 1, 2024 18:27 6m 50s master
master
December 1, 2024 18:27 6m 50s
Defib rechargers (#729) Check for merge conflicts #616: Commit a4e12bb pushed by Helg2
December 1, 2024 18:27 7m 32s master
master
December 1, 2024 18:27 7m 32s
prime>primal (#721) Check for merge conflicts #615: Commit 2c3eb03 pushed by Helg2
December 1, 2024 18:25 36s master
master
December 1, 2024 18:25 36s
Adjusts webhook processor. (#725) Check for merge conflicts #614: Commit 0669a3b pushed by Helg2
November 30, 2024 20:17 1m 44s master
master
November 30, 2024 20:17 1m 44s
Ammo.dmi reorganization. (#704) Check for merge conflicts #613: Commit 019ecae pushed by Helg2
November 30, 2024 16:45 4m 2s master
master
November 30, 2024 16:45 4m 2s
Xeno leader death timer fix (#15868) (#718) Check for merge conflicts #612: Commit 2237d96 pushed by Helg2
November 29, 2024 15:05 39s master
master
November 29, 2024 15:05 39s
Перевод анонсов, запуск ОБ и по мелочи. (#270) Check for merge conflicts #611: Commit dfcb2ec pushed by Helg2
November 29, 2024 14:03 4m 38s master
master
November 29, 2024 14:03 4m 38s
Fix King ability "Petrify" (#712) Check for merge conflicts #610: Commit 114d163 pushed by Helg2
November 29, 2024 13:53 39s master
master
November 29, 2024 13:53 39s
Mimir great again V2 (#670) Check for merge conflicts #609: Commit 0fa494f pushed by Tatarla
November 29, 2024 10:07 42s master
master
November 29, 2024 10:07 42s
Ports action code improvements. (#689) Check for merge conflicts #608: Commit 869fb95 pushed by Helg2
November 29, 2024 07:10 2m 44s master
master
November 29, 2024 07:10 2m 44s
Update marine_vending.dm (#710) Check for merge conflicts #607: Commit 81f83be pushed by Helg2
November 29, 2024 07:02 3m 44s master
master
November 29, 2024 07:02 3m 44s
Removes evolution fade in. Xeno ruler announcement is now correct. So… Check for merge conflicts #606: Commit d75befc pushed by Helg2
November 29, 2024 06:57 53s master
master
November 29, 2024 06:57 53s
SG-85 goes BRRR (#671) Check for merge conflicts #605: Commit 31081c0 pushed by Tatarla
November 28, 2024 15:16 59s master
master
November 28, 2024 15:16 59s
Adds keycard authenticators to command rooms. (#692) Check for merge conflicts #604: Commit e56b9b3 pushed by Tatarla
November 28, 2024 15:14 2m 17s master
master
November 28, 2024 15:14 2m 17s
Steel crest (#654) Check for merge conflicts #603: Commit ce5e263 pushed by Tatarla
November 28, 2024 15:08 7m 48s master
master
November 28, 2024 15:08 7m 48s