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

🆑 (#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
change amout of marines for hijacking (#638) Check for merge conflicts #590: Commit a1f3705 pushed by Tatarla
November 22, 2024 06:55 8m 20s master
master
November 22, 2024 06:55 8m 20s
Add carrier changes (#633) Check for merge conflicts #589: Commit 7ec6a04 pushed by Tatarla
November 22, 2024 06:42 2m 10s master
master
November 22, 2024 06:42 2m 10s
Carrier buff (#658) Check for merge conflicts #588: Commit daa1b05 pushed by Tatarla
November 22, 2024 06:40 3m 43s master
master
November 22, 2024 06:40 3m 43s
T1 Crusher (Sent) (#680) Check for merge conflicts #587: Commit dca527a pushed by Tatarla
November 22, 2024 06:37 6m 7s master
master
November 22, 2024 06:37 6m 7s
swat mask ripping reaction (#683) Check for merge conflicts #586: Commit 3451088 pushed by Tatarla
November 22, 2024 06:35 41s master
master
November 22, 2024 06:35 41s
Replaces spawn() in explosion code to addtimer and INVOKE_ASYNC… Check for merge conflicts #585: Commit 94db9ae pushed by Helg2
November 21, 2024 19:27 33s master
master
November 21, 2024 19:27 33s
skills (#674) Check for merge conflicts #584: Commit 69535fd pushed by Helg2
November 21, 2024 19:27 50s master
master
November 21, 2024 19:27 50s
Merge join and ready button. (#656) Check for merge conflicts #583: Commit c521167 pushed by Helg2
November 19, 2024 22:55 2m 50s master
master
November 19, 2024 22:55 2m 50s
Handheld Charger and MRE for Cargo. (#651) Check for merge conflicts #582: Commit a412ef7 pushed by Helg2
November 18, 2024 12:53 37s master
master
November 18, 2024 12:53 37s
Фикс отсутствия паверфиста на дистрессе (#665) Check for merge conflicts #581: Commit 551e62f pushed by Tatarla
November 15, 2024 14:21 6m 40s master
master
November 15, 2024 14:21 6m 40s
Новый спрайт БТРа (#643) Check for merge conflicts #580: Commit 741284c pushed by Tatarla
November 15, 2024 11:57 7m 39s master
master
November 15, 2024 11:57 7m 39s
Изменение иконок приказов (#642) Check for merge conflicts #579: Commit 1236df6 pushed by Tatarla
November 15, 2024 11:56 37s master
master
November 15, 2024 11:56 37s
M344 belt and pistol belt buff (#660) Check for merge conflicts #578: Commit 6a4f76f pushed by Tatarla
November 15, 2024 06:17 11m 7s master
master
November 15, 2024 06:17 11m 7s