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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Door kill (#614) Check for merge conflicts #572: Commit c3d58e2 pushed by Tatarla
November 15, 2024 06:04 11m 35s master
master
November 15, 2024 06:04 11m 35s
Rebalance xeno HP and armor (#594) Check for merge conflicts #571: Commit a531d21 pushed by Tatarla
November 14, 2024 05:56 4m 38s master
master
November 14, 2024 05:56 4m 38s
Rebalance ammo (#591) Check for merge conflicts #570: Commit f38638e pushed by Tatarla
November 14, 2024 05:56 5m 5s master
master
November 14, 2024 05:56 5m 5s
jetpackWithStagger (#645) Check for merge conflicts #569: Commit 0bad8bc pushed by Tatarla
November 14, 2024 05:53 42s master
master
November 14, 2024 05:53 42s
this should do it (#650) Check for merge conflicts #568: Commit 0a52985 pushed by Tatarla
November 14, 2024 03:37 44s master
master
November 14, 2024 03:37 44s
Cargo optimization! (#648) Check for merge conflicts #567: Commit 8d92fe0 pushed by Helg2
November 13, 2024 15:05 52s master
master
November 13, 2024 15:05 52s
proper layering for offhands (#637) Check for merge conflicts #566: Commit 509f29f pushed by Helg2
November 13, 2024 09:12 6m 53s master
master
November 13, 2024 09:12 6m 53s
Update projectile.dm (#640) Check for merge conflicts #565: Commit 0fa6e25 pushed by Helg2
November 13, 2024 09:12 6m 25s master
master
November 13, 2024 09:12 6m 25s
Update vending.dm (#639) Check for merge conflicts #564: Commit 77aaa32 pushed by Helg2
November 13, 2024 09:12 1m 25s master
master
November 13, 2024 09:12 1m 25s
Update ammo.dmi (#641) Check for merge conflicts #563: Commit 3cd0e41 pushed by Helg2
November 13, 2024 09:11 42s master
master
November 13, 2024 09:11 42s
Update flashlight.dm (#644) Check for merge conflicts #562: Commit 165411b pushed by Helg2
November 13, 2024 09:11 56s master
master
November 13, 2024 09:11 56s
Convert some spawn() to timers and asyncs. (#630) Check for merge conflicts #561: Commit 34035dd pushed by Helg2
November 11, 2024 07:21 37s master
master
November 11, 2024 07:21 37s
Tgas cargofix (#635) Check for merge conflicts #560: Commit cffba3b pushed by Helg2
November 9, 2024 22:13 3m 58s master
master
November 9, 2024 22:13 3m 58s
Update bigred.dm (#636) Check for merge conflicts #559: Commit 1323323 pushed by Helg2
November 9, 2024 21:54 34s master
master
November 9, 2024 21:54 34s
oops (#632) Check for merge conflicts #558: Commit c36b27e pushed by Helg2
November 8, 2024 17:18 2m 18s master
master
November 8, 2024 17:18 2m 18s
Нерф спрей-насадки (#623) Check for merge conflicts #557: Commit 80ce38f pushed by Tatarla
November 8, 2024 11:50 44s master
master
November 8, 2024 11:50 44s
Бафф подствольного гранатомета (#618) Check for merge conflicts #556: Commit 1035700 pushed by Tatarla
November 8, 2024 11:48 1m 16s master
master
November 8, 2024 11:48 1m 16s
Удаление кишки лавового озера на Магмуре (#625) Check for merge conflicts #555: Commit 2b047eb pushed by Helg2
November 7, 2024 12:47 53s master
master
November 7, 2024 12:47 53s
Tip of the Round, но по Русски (#494) Check for merge conflicts #554: Commit 520a4f5 pushed by Helg2
November 7, 2024 11:08 1m 38s master
master
November 7, 2024 11:08 1m 38s
Proper telecomms for crash. Repaths telecomms. (#628) Check for merge conflicts #553: Commit 73c6d8b pushed by Helg2
November 7, 2024 10:52 2m 26s master
master
November 7, 2024 10:52 2m 26s
Update storage.dm (#629) Check for merge conflicts #552: Commit beee884 pushed by Helg2
November 7, 2024 10:52 2m 49s master
master
November 7, 2024 10:52 2m 49s
Fixes colored fire not working properly. Fixes xenomorph revive not r… Check for merge conflicts #551: Commit 45fe6a9 pushed by Helg2
November 6, 2024 12:57 38s master
master
November 6, 2024 12:57 38s
Update projectile.dm (#617) Check for merge conflicts #550: Commit fa64ea3 pushed by Helg2
November 6, 2024 08:35 30s master
master
November 6, 2024 08:35 30s
Update energy.dm (#621) Check for merge conflicts #549: Commit e62bca5 pushed by Helg2
November 6, 2024 08:34 47s master
master
November 6, 2024 08:34 47s
Nerfs explosion throw. (#605) Check for merge conflicts #548: Commit 76ea68e pushed by Helg2
November 6, 2024 00:56 41s master
master
November 6, 2024 00:56 41s