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,633 workflow run results
10,633 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

UPP/CLF Combat Synth Presets Check for merge conflicts #21878: Pull request #6183 synchronize by Drulikar
April 24, 2024 03:27 10s
April 24, 2024 03:27 10s
UPP/CLF Combat Synth Presets Check for merge conflicts #21877: Pull request #6183 synchronize by Steelpoint
April 24, 2024 02:22 14s
April 24, 2024 02:22 14s
UPP/CLF Combat Synth Presets Check for merge conflicts #21876: Pull request #6183 synchronize by Steelpoint
April 24, 2024 02:22 16s
April 24, 2024 02:22 16s
UPP/CLF Combat Synth Presets Check for merge conflicts #21875: Pull request #6183 synchronize by Steelpoint
April 24, 2024 02:22 2m 13s
April 24, 2024 02:22 2m 13s
Adds a bunch of material to the pred ship and slightly adjusts layout to compensate. Check for merge conflicts #21874: Pull request #6172 synchronize by s5nt
April 24, 2024 01:10 11s
April 24, 2024 01:10 11s
remote dropship computers are no longer hard coded to dropship id Check for merge conflicts #21873: Pull request #5876 ready_for_review by Drulikar
April 24, 2024 00:56 12s
April 24, 2024 00:56 12s
You can now rig custom C4 to a wheelchair and detonate it with a bell Check for merge conflicts #21872: Pull request #6185 synchronize by iloveloopers
April 24, 2024 00:19 10s
April 24, 2024 00:19 10s
You can now rig custom C4 to a wheelchair and detonate it with a bell Check for merge conflicts #21871: Pull request #6185 synchronize by iloveloopers
April 23, 2024 23:41 10s
April 23, 2024 23:41 10s
You can now rig custom C4 to a wheelchair and detonate it with a bell Check for merge conflicts #21870: Pull request #6185 synchronize by iloveloopers
April 23, 2024 23:39 12s
April 23, 2024 23:39 12s
You can now rig custom C4 to a wheelchair and detonate it with a bell Check for merge conflicts #21869: Pull request #6185 synchronize by iloveloopers
April 23, 2024 23:23 13s
April 23, 2024 23:23 13s
Project ARES: Fixes deleting flight logs. Check for merge conflicts #21868: Pull request #6186 synchronize by realforest2001
April 23, 2024 20:02 9s
April 23, 2024 20:02 9s
Project ARES: Fixes deleting flight logs. Check for merge conflicts #21867: Pull request #6186 opened by realforest2001
April 23, 2024 19:57 1m 33s
April 23, 2024 19:57 1m 33s
Project ARES TM Holder (v5) Check for merge conflicts #21866: Pull request #6039 synchronize by realforest2001
April 23, 2024 19:56 10s
April 23, 2024 19:56 10s
You can now rig custom C4 to a wheelchair and detonate it with a bell Check for merge conflicts #21865: Pull request #6185 opened by iloveloopers
April 23, 2024 19:54 14s
April 23, 2024 19:54 14s
Fixes spotlight breaking every time Check for merge conflicts #21864: Pull request #6184 opened by ihatethisengine
April 23, 2024 12:34 12s
April 23, 2024 12:34 12s
alt clicking a reagent tank will now toggle whether its dispensing or… Check for merge conflicts #21863: Commit 2e6f6dd pushed by github-merge-queue bot
April 23, 2024 05:58 4m 11s master
master
April 23, 2024 05:58 4m 11s
Fixes boilers slowing themselves (#6177) Check for merge conflicts #21862: Commit c7269ab pushed by github-merge-queue bot
April 23, 2024 05:53 4m 14s master
master
April 23, 2024 05:53 4m 14s
UPP/CLF Combat Synth Presets Check for merge conflicts #21861: Pull request #6183 opened by Steelpoint
April 23, 2024 04:03 13s
April 23, 2024 04:03 13s
Falling Falcons: Paratroopers Edition Check for merge conflicts #21860: Pull request #6150 synchronize by ihatethisengine
April 23, 2024 01:29 2m 14s
April 23, 2024 01:29 2m 14s
feeding/eating a pill of NW will now stop you and alert admins if you are not a doctor/nurse Check for merge conflicts #21859: Pull request #6182 opened by iloveloopers
April 22, 2024 23:19 13s
April 22, 2024 23:19 13s
External Bleeding Sealing in Cryo Tubes (#6175) Check for merge conflicts #21858: Commit da476e7 pushed by github-merge-queue bot
April 22, 2024 21:20 4m 13s master
master
April 22, 2024 21:20 4m 13s
Project ARES TM Holder (v5) Check for merge conflicts #21857: Pull request #6039 synchronize by realforest2001
April 22, 2024 20:41 11s
April 22, 2024 20:41 11s
Project ARES: Lockdown System Check for merge conflicts #21856: Pull request #6173 synchronize by realforest2001
April 22, 2024 20:41 10s
April 22, 2024 20:41 10s
[WO mapping] updating bunker better spawn point and prep while adding an LZ that can be used by admin. Check for merge conflicts #21855: Pull request #6181 opened by Huffie56
April 22, 2024 09:50 13s
April 22, 2024 09:50 13s
Fixes boilers slowing themselves Check for merge conflicts #21854: Pull request #6177 ready_for_review by Git-Nivrak
April 22, 2024 04:48 11s
April 22, 2024 04:48 11s