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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

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
🆑 (#702) Check for merge conflicts #602: Commit 5ce152d pushed by Tatarla
November 28, 2024 15:07 38s master
master
November 28, 2024 15:07 38s
Buffs sg29. (#693) Check for merge conflicts #601: Commit 3f0fbaa pushed by Helg2
November 28, 2024 11:05 44s master
master
November 28, 2024 11:05 44s
Update assembly_crafts.dm (#708) Check for merge conflicts #600: Commit f0a076c pushed by Helg2
November 28, 2024 09:32 1m 22s master
master
November 28, 2024 09:32 1m 22s
directional window (#697) Check for merge conflicts #599: Commit dfeca62 pushed by Helg2
November 28, 2024 09:32 41s master
master
November 28, 2024 09:32 41s
Removes AA from clown. (#696) Check for merge conflicts #598: Commit 1cd2a1b pushed by Helg2
November 28, 2024 09:15 2m 54s master
master
November 28, 2024 09:15 2m 54s
Fixes boosty button theme. Some adjucements to interface buttons. (#698) Check for merge conflicts #597: Commit 4e13492 pushed by Helg2
November 28, 2024 09:13 47s master
master
November 28, 2024 09:13 47s
Update living.dm (#691) Check for merge conflicts #596: Commit 299c1ff pushed by Helg2
November 28, 2024 08:57 5m 32s master
master
November 28, 2024 08:57 5m 32s
Update admin_verbs.dm (#705) Check for merge conflicts #595: Commit 653971f pushed by Helg2
November 27, 2024 14:48 44s master
master
November 27, 2024 14:48 44s
Коробки с патронами на скаутскую винтовку. (#695) Check for merge conflicts #594: Commit 303e687 pushed by Helg2
November 26, 2024 09:07 44s master
master
November 26, 2024 09:07 44s
Update castedatum_spiderling.dm (#690) Check for merge conflicts #593: Commit adcc5ea pushed by Helg2
November 25, 2024 08:32 42s master
master
November 25, 2024 08:32 42s
Adds beginner loadout vendor. (#634) Check for merge conflicts #592: Commit 76ab671 pushed by Helg2
November 24, 2024 17:00 36s master
master
November 24, 2024 17:00 36s
Нерф флаеров (#687) Check for merge conflicts #591: Commit b570b34 pushed by Tatarla
November 23, 2024 13:48 41s master
master
November 23, 2024 13:48 41s