Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
10,341 workflow run results
10,341 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Unsorted cleanup Check for merge conflicts #23052: Pull request #6352 opened by Doubleumc
May 31, 2024 21:35 11s
May 31, 2024 21:35 11s
Refactor of record system code and migrate all record UI to TGUI Check for merge conflicts #23051: Pull request #6266 synchronize by vero5123
May 31, 2024 15:53 11s
May 31, 2024 15:53 11s
Refactor of record system code and migrate all record UI to TGUI Check for merge conflicts #23050: Pull request #6266 synchronize by vero5123
May 31, 2024 15:37 12s
May 31, 2024 15:37 12s
Refactor of record system code and migrate all record UI to TGUI Check for merge conflicts #23049: Pull request #6266 synchronize by vero5123
May 31, 2024 15:33 12s
May 31, 2024 15:33 12s
Refactor of record system code and migrate all record UI to TGUI Check for merge conflicts #23048: Pull request #6266 synchronize by vero5123
May 31, 2024 15:22 12s
May 31, 2024 15:22 12s
Refactor of record system code and migrate all record UI to TGUI Check for merge conflicts #23047: Pull request #6266 synchronize by vero5123
May 31, 2024 15:14 19s
May 31, 2024 15:14 19s
accessory removal menu is now radial Check for merge conflicts #23046: Pull request #6274 synchronize by AndroBetel
May 31, 2024 14:58 11s
May 31, 2024 14:58 11s
Adds & adjusts fireman skills for most roles. Check for merge conflicts #23045: Pull request #6339 ready_for_review by BasilHerb
May 31, 2024 13:30 12s
May 31, 2024 13:30 12s
Adds & adjusts fireman skills for most roles. Check for merge conflicts #23044: Pull request #6339 synchronize by BasilHerb
May 31, 2024 13:26 9s
May 31, 2024 13:26 9s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #23043: Pull request #6248 synchronize by Zenith00000
May 31, 2024 10:02 14s
May 31, 2024 10:02 14s
Allows lifeboat surgery (#6349) Check for merge conflicts #23042: Commit 0570a5b pushed by github-merge-queue bot
May 31, 2024 09:19 4m 14s master
master
May 31, 2024 09:19 4m 14s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #23041: Pull request #6248 synchronize by Drulikar
May 31, 2024 01:15 2m 15s
May 31, 2024 01:15 2m 15s
[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 #23040: Pull request #6071 synchronize by Venuska1117
May 31, 2024 00:31 14s
May 31, 2024 00:31 14s
Lv80 lowpop map Check for merge conflicts #23039: Pull request #6351 synchronize by hislittlecuzingames
May 30, 2024 22:47 23s
May 30, 2024 22:47 23s
Lv80 lowpop map Check for merge conflicts #23038: Pull request #6351 opened by hislittlecuzingames
May 30, 2024 22:47 10s
May 30, 2024 22:47 10s
Allow Surgery, construction small puddles. Check for merge conflicts #23037: Pull request #6340 ready_for_review by hislittlecuzingames
May 30, 2024 21:40 8s
May 30, 2024 21:40 8s
Allow Surgery, construction small puddles. Check for merge conflicts #23036: Pull request #6340 synchronize by hislittlecuzingames
May 30, 2024 21:38 9s
May 30, 2024 21:38 9s
Allow Surgery, construction small puddles. Check for merge conflicts #23035: Pull request #6340 synchronize by hislittlecuzingames
May 30, 2024 21:37 17s
May 30, 2024 21:37 17s
Allow Surgery, construction small puddles. Check for merge conflicts #23034: Pull request #6340 synchronize by hislittlecuzingames
May 30, 2024 21:36 10s
May 30, 2024 21:36 10s
Allow Surgery, construction small puddles. Check for merge conflicts #23033: Pull request #6340 synchronize by hislittlecuzingames
May 30, 2024 21:36 9s
May 30, 2024 21:36 9s
Allow Surgery, construction small puddles. Check for merge conflicts #23032: Pull request #6340 synchronize by hislittlecuzingames
May 30, 2024 21:36 9s
May 30, 2024 21:36 9s
Allow Surgery, construction small puddles. Check for merge conflicts #23031: Pull request #6340 synchronize by hislittlecuzingames
May 30, 2024 21:36 13s
May 30, 2024 21:36 13s
Allow Surgery, construction small puddles. Check for merge conflicts #23030: Pull request #6340 synchronize by hislittlecuzingames
May 30, 2024 21:36 9s
May 30, 2024 21:36 9s
1% chance for skibidi toilet sound effect when flushing Check for merge conflicts #23029: Pull request #6350 opened by iloveloopers
May 30, 2024 21:25 9s
May 30, 2024 21:25 9s
STEEL DIVISON (Re-introduces 200 pop locked tank) [CODE BOUNTY] Check for merge conflicts #23028: Pull request #6304 synchronize by Red-byte3D
May 30, 2024 19:53 10s
May 30, 2024 19:53 10s