Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
3,255 workflow run results
3,255 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Sprites changes for old donator kit (#4702) Check for merge conflicts #15910: Commit 38ced94 pushed by github-merge-queue bot
October 27, 2023 00:43 4m 19s master
master
October 27, 2023 00:43 4m 19s
Sprites changes for old donator kit Check for merge conflicts #15909: Pull request #4702 synchronize by Zonespace27
October 27, 2023 00:25 12s
October 27, 2023 00:25 12s
Adds CBRN ERT Check for merge conflicts #15908: Pull request #4337 synchronize by BeagleGaming1
October 26, 2023 21:59 14s
October 26, 2023 21:59 14s
Vanguard Prae Pierce Refactor + Bugfix (#4641) Check for merge conflicts #15907: Commit 4b641b9 pushed by github-merge-queue bot
October 26, 2023 21:44 4m 16s master
master
October 26, 2023 21:44 4m 16s
Fixes custom ERT calling (#4783) Check for merge conflicts #15906: Commit aafa426 pushed by github-merge-queue bot
October 26, 2023 21:28 4m 18s master
master
October 26, 2023 21:28 4m 18s
Rewrite Xeno Acid processing (#4759) Check for merge conflicts #15905: Commit e7caf52 pushed by github-merge-queue bot
October 26, 2023 21:13 4m 19s master
master
October 26, 2023 21:13 4m 19s
Adds ~50 tips (#4772) Check for merge conflicts #15904: Commit 982baa8 pushed by github-merge-queue bot
October 26, 2023 20:58 4m 19s master
master
October 26, 2023 20:58 4m 19s
Re-removes bridge coats (#4784) Check for merge conflicts #15903: Commit df7dfce pushed by github-merge-queue bot
October 26, 2023 20:43 4m 15s master
master
October 26, 2023 20:43 4m 15s
reset CAS direct camera on change to avoid duplicated signal handlers… Check for merge conflicts #15902: Commit 08aef2a pushed by github-merge-queue bot
October 26, 2023 20:34 2m 15s master
master
October 26, 2023 20:34 2m 15s
Add Item & Footprints offsets (#4762) Check for merge conflicts #15901: Commit e120ab7 pushed by github-merge-queue bot
October 26, 2023 20:19 4m 18s master
master
October 26, 2023 20:19 4m 18s
fixes reqs emergency doors (#4763) Check for merge conflicts #15900: Commit ce4d481 pushed by github-merge-queue bot
October 26, 2023 20:03 4m 24s master
master
October 26, 2023 20:03 4m 24s
Add Item & Footprints offsets Check for merge conflicts #15899: Pull request #4762 synchronize by fira
October 26, 2023 19:35 16s
October 26, 2023 19:35 16s
Remove Direct Hit Limb Penalty against Xenos Check for merge conflicts #15898: Pull request #4788 opened by fira
October 26, 2023 19:04 17s
October 26, 2023 19:04 17s
Renames var/final Check for merge conflicts #15897: Pull request #4787 opened by BeagleGaming1
October 26, 2023 18:52 24s
October 26, 2023 18:52 24s
Xeno landmark changes Check for merge conflicts #15896: Pull request #4711 synchronize by BeagleGaming1
October 26, 2023 18:24 28s
October 26, 2023 18:24 28s
Foxtrot and intel squad berets and headband Check for merge conflicts #15895: Pull request #4781 synchronize by Blundir
October 26, 2023 16:52 14s
October 26, 2023 16:52 14s
mistake Check for merge conflicts #15894: Pull request #4786 opened by Patternseeker
October 26, 2023 09:28 14s
October 26, 2023 09:28 14s
Fixes Smartfridge deletions + Turing/Smartfridge networking issue (#4… Check for merge conflicts #15893: Commit 2507b46 pushed by github-merge-queue bot
October 26, 2023 07:29 4m 18s master
master
October 26, 2023 07:29 4m 18s
Automatic TGS DMAPI Update (#4779) Check for merge conflicts #15892: Commit c1563b8 pushed by harryob
October 26, 2023 07:05 2m 17s master
master
October 26, 2023 07:05 2m 17s
Xeno landmark changes Check for merge conflicts #15891: Pull request #4711 ready_for_review by BeagleGaming1
October 26, 2023 03:01 12s
October 26, 2023 03:01 12s
Xeno landmark changes Check for merge conflicts #15890: Pull request #4711 synchronize by BeagleGaming1
October 26, 2023 02:52 13s
October 26, 2023 02:52 13s
Xeno landmark changes Check for merge conflicts #15889: Pull request #4711 synchronize by BeagleGaming1
October 26, 2023 02:36 16s
October 26, 2023 02:36 16s
Xeno landmark changes Check for merge conflicts #15888: Pull request #4711 synchronize by BeagleGaming1
October 26, 2023 01:20 13s
October 26, 2023 01:20 13s
Xeno landmark changes Check for merge conflicts #15887: Pull request #4711 synchronize by BeagleGaming1
October 26, 2023 01:15 2m 19s
October 26, 2023 01:15 2m 19s
4 New Haircuts (#4728) Check for merge conflicts #15886: Commit dec69dd pushed by github-merge-queue bot
October 25, 2023 23:32 4m 16s master
master
October 25, 2023 23:32 4m 16s