Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
7,897 workflow run results
7,897 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Adds alot of new Corporate clothes and jackets, laceup shoes updates and new ties. Check for merge conflicts #19154: Pull request #5437 synchronize by BadAtThisGame302
January 30, 2024 14:38 13s
January 30, 2024 14:38 13s
refactor multiple files concerning robot and mechs. Check for merge conflicts #19153: Pull request #5538 ready_for_review by Huffie56
January 30, 2024 14:20 10s
January 30, 2024 14:20 10s
refactor : turn some "# and use the proper define from colour.dm for … Check for merge conflicts #19152: Commit b27c024 pushed by github-merge-queue bot
January 30, 2024 14:05 4m 15s master
master
January 30, 2024 14:05 4m 15s
Increase Double Throw Delay (#5526) Check for merge conflicts #19151: Commit 61f7b74 pushed by github-merge-queue bot
January 30, 2024 13:35 4m 14s master
master
January 30, 2024 13:35 4m 14s
refactor multiple files concerning robot and mechs. Check for merge conflicts #19150: Pull request #5538 synchronize by Huffie56
January 30, 2024 13:31 10s
January 30, 2024 13:31 10s
Fixes facehuggers being able to flip tables (#5580) Check for merge conflicts #19149: Commit 887d21d pushed by github-merge-queue bot
January 30, 2024 13:21 4m 14s master
master
January 30, 2024 13:21 4m 14s
Chestbursting larva no longer get hive orders when there are no hive … Check for merge conflicts #19148: Commit c7c36ae pushed by github-merge-queue bot
January 30, 2024 13:08 4m 14s master
master
January 30, 2024 13:08 4m 14s
Adds procs for applying root (immobilise) (#5551) Check for merge conflicts #19147: Commit 0a17439 pushed by github-merge-queue bot
January 30, 2024 12:54 4m 17s master
master
January 30, 2024 12:54 4m 17s
Fixes a stray pixel in the warrior 'walking' sprite. (#5590) Check for merge conflicts #19146: Commit 69db996 pushed by github-merge-queue bot
January 30, 2024 12:02 4m 12s master
master
January 30, 2024 12:02 4m 12s
Fixes Queen xenos not automatically climbing ledges (#5591) Check for merge conflicts #19145: Commit 98520da pushed by github-merge-queue bot
January 30, 2024 11:47 4m 14s master
master
January 30, 2024 11:47 4m 14s
Green Beret sprite fix Check for merge conflicts #19144: Pull request #5566 synchronize by Oyu07
January 30, 2024 10:44 12s
January 30, 2024 10:44 12s
Minor Typo Fix and Sprite Refactor (#5489) Check for merge conflicts #19143: Commit 8561810 pushed by github-merge-queue bot
January 30, 2024 08:58 4m 17s master
master
January 30, 2024 08:58 4m 17s
UPP ERT Backstory Change (#5559) Check for merge conflicts #19142: Commit 7517b8e pushed by github-merge-queue bot
January 30, 2024 08:37 4m 17s master
master
January 30, 2024 08:37 4m 17s
Dropship Fabricator UI Fix (#5585) Check for merge conflicts #19141: Commit 317e6df pushed by github-merge-queue bot
January 30, 2024 08:24 4m 13s master
master
January 30, 2024 08:24 4m 13s
Normalizes dropship_crash to -6db (#5588) Check for merge conflicts #19140: Commit 19962d6 pushed by github-merge-queue bot
January 30, 2024 08:10 4m 14s master
master
January 30, 2024 08:10 4m 14s
Metal Foam rebalance. (#5500) Check for merge conflicts #19139: Commit dba6b02 pushed by github-merge-queue bot
January 30, 2024 08:00 4m 16s master
master
January 30, 2024 08:00 4m 16s
XM4 Armor Integral Motion Detector Check for merge conflicts #19138: Pull request #5586 synchronize by MobiusWon
January 30, 2024 02:08 13s
January 30, 2024 02:08 13s
XM4 Armor Integral Motion Detector Check for merge conflicts #19137: Pull request #5586 synchronize by MobiusWon
January 30, 2024 02:02 14s
January 30, 2024 02:02 14s
Réorganisation de l'équipe médicale - 1 Check for merge conflicts #19136: Pull request #5458 synchronize by LC4492
January 30, 2024 01:20 2m 12s
January 30, 2024 01:20 2m 12s
new dummy tablet sprite Check for merge conflicts #19135: Pull request #5390 reopened by nauticall
January 30, 2024 01:05 9s
January 30, 2024 01:05 9s
Réorganisation de l'équipe médicale - 1 Check for merge conflicts #19134: Pull request #5458 synchronize by LC4492
January 30, 2024 01:03 11s
January 30, 2024 01:03 11s
Réorganisation de l'équipe médicale - 1 Check for merge conflicts #19133: Pull request #5458 synchronize by LC4492
January 30, 2024 00:13 11s
January 30, 2024 00:13 11s
Réorganisation de l'équipe médicale - 1 Check for merge conflicts #19132: Pull request #5458 synchronize by LC4492
January 29, 2024 23:01 10s
January 29, 2024 23:01 10s
Réorganisation de l'équipe médicale - 1 Check for merge conflicts #19131: Pull request #5458 synchronize by LC4492
January 29, 2024 22:34 12s
January 29, 2024 22:34 12s
Fixes Equipment Preset - Very unimportant fix indeed Check for merge conflicts #19130: Pull request #5592 opened by BadAtThisGame302
January 29, 2024 22:16 13s
January 29, 2024 22:16 13s