Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
11,706 workflow run results
11,706 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Project ARES: Almayer Sentries Check for merge conflicts #22901: Pull request #6268 synchronize by realforest2001
May 25, 2024 12:24 14s
May 25, 2024 12:24 14s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #22900: Pull request #6248 synchronize by Drulikar
May 25, 2024 10:35 12s
May 25, 2024 10:35 12s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #22899: Pull request #6248 synchronize by Zenith00000
May 25, 2024 09:52 9s
May 25, 2024 09:52 9s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #22898: Pull request #6248 synchronize by Zenith00000
May 25, 2024 09:09 10s
May 25, 2024 09:09 10s
[V] Sorokyne Strata: Expanded Small corridors, removed 3000 unused tiles, Xenos can now weed everything except LZ's and surrounding of LZ's, allow LAZ for CAS inside structures with light blue Areas on Tacmap (glass ceiling hallways) Check for merge conflicts #22897: Pull request #6071 synchronize by Venuska1117
May 25, 2024 09:07 10s
May 25, 2024 09:07 10s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #22896: Pull request #6248 synchronize by Drulikar
May 25, 2024 08:36 16s
May 25, 2024 08:36 16s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #22895: Pull request #6248 synchronize by Drulikar
May 25, 2024 07:52 12s
May 25, 2024 07:52 12s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #22894: Pull request #6248 synchronize by Drulikar
May 25, 2024 07:45 9s
May 25, 2024 07:45 9s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #22893: Pull request #6248 synchronize by Zenith00000
May 25, 2024 07:32 13s
May 25, 2024 07:32 13s
Research major property rebalance Check for merge conflicts #22892: Pull request #6225 synchronize by Drulikar
May 25, 2024 06:43 12s
May 25, 2024 06:43 12s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #22891: Pull request #6248 synchronize by Zenith00000
May 25, 2024 06:25 11s
May 25, 2024 06:25 11s
Research major property rebalance Check for merge conflicts #22890: Pull request #6225 synchronize by iloveloopers
May 25, 2024 06:02 10s
May 25, 2024 06:02 10s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #22889: Pull request #6248 synchronize by Zenith00000
May 25, 2024 05:55 13s
May 25, 2024 05:55 13s
Fixes gibber not killing mobs Check for merge conflicts #22888: Pull request #6332 opened by vero5123
May 25, 2024 05:53 11s
May 25, 2024 05:53 11s
Research major property rebalance Check for merge conflicts #22887: Pull request #6225 synchronize by iloveloopers
May 25, 2024 05:36 11s
May 25, 2024 05:36 11s
Research major property rebalance Check for merge conflicts #22886: Pull request #6225 synchronize by iloveloopers
May 25, 2024 05:25 11s
May 25, 2024 05:25 11s
Research major property rebalance Check for merge conflicts #22885: Pull request #6225 synchronize by iloveloopers
May 25, 2024 03:43 10s
May 25, 2024 03:43 10s
Research major property rebalance Check for merge conflicts #22884: Pull request #6225 ready_for_review by iloveloopers
May 25, 2024 03:33 10s
May 25, 2024 03:33 10s
Research major property rebalance Check for merge conflicts #22883: Pull request #6225 synchronize by iloveloopers
May 25, 2024 03:32 9s
May 25, 2024 03:32 9s
Research major property rebalance Check for merge conflicts #22882: Pull request #6225 synchronize by iloveloopers
May 25, 2024 03:26 10s
May 25, 2024 03:26 10s
Vehicle projectile origin adjustment (#6245) Check for merge conflicts #22881: Commit 3624cdc pushed by github-merge-queue bot
May 25, 2024 01:11 4m 15s master
master
May 25, 2024 01:11 4m 15s
Synthetic, Compact-Nailgun Holster (#6277) Check for merge conflicts #22880: Commit 4046a39 pushed by github-merge-queue bot
May 25, 2024 00:03 4m 20s master
master
May 25, 2024 00:03 4m 20s
modernises the readme and makes it considerably prettier (#6325) Check for merge conflicts #22879: Commit 54d2675 pushed by github-merge-queue bot
May 24, 2024 23:59 2m 14s master
master
May 24, 2024 23:59 2m 14s
Refactor of record system code and migrate all record UI to TGUI Check for merge conflicts #22878: Pull request #6266 synchronize by vero5123
May 24, 2024 22:21 15s
May 24, 2024 22:21 15s
Refactor of record system code and migrate all record UI to TGUI Check for merge conflicts #22877: Pull request #6266 synchronize by vero5123
May 24, 2024 22:21 10s
May 24, 2024 22:21 10s