Skip to content

Actions: cmss13-devs/cmss13-pve

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
517 workflow run results
517 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

More slotting changes Check for merge conflicts #517: Pull request #67 opened by morrowwolf
November 18, 2023 20:53 2m 26s
November 18, 2023 20:53 2m 26s
no spawn game mode Check for merge conflicts #516: Commit ecab489 pushed by morrowwolf
November 18, 2023 20:48 2m 14s master
master
November 18, 2023 20:48 2m 14s
z handling for projectors/teleporters and multiz runtime Check for merge conflicts #515: Commit f7fe3be pushed by morrowwolf
November 18, 2023 05:22 2m 13s master
master
November 18, 2023 05:22 2m 13s
more charging Check for merge conflicts #514: Commit 39056ca pushed by morrowwolf
November 18, 2023 04:01 2m 13s master
master
November 18, 2023 04:01 2m 13s
Lurkers hiding on structures and minor xeno interactions tweaks Check for merge conflicts #513: Pull request #54 synchronize by morrowwolf
November 17, 2023 10:41 1m 32s
November 17, 2023 10:41 1m 32s
G2 Electroshock grenade Check for merge conflicts #512: Pull request #66 opened by morrowwolf
November 17, 2023 10:40 20s
November 17, 2023 10:40 20s
BAM Check for merge conflicts #511: Commit b12db06 pushed by morrowwolf
November 17, 2023 10:33 2m 14s master
master
November 17, 2023 10:33 2m 14s
acid holes Check for merge conflicts #510: Commit 173af10 pushed by morrowwolf
November 17, 2023 10:29 2m 12s master
master
November 17, 2023 10:29 2m 12s
fix runners sticking on some things while dragging Check for merge conflicts #509: Commit d55cfcb pushed by morrowwolf
November 17, 2023 09:43 2m 16s master
master
November 17, 2023 09:43 2m 16s
Brand-new crooshie AI (#51) Check for merge conflicts #508: Commit 36d4a68 pushed by morrowwolf
November 17, 2023 08:44 4m 57s master
master
November 17, 2023 08:44 4m 57s
faster stripping Check for merge conflicts #507: Commit 4e6ba72 pushed by morrowwolf
November 17, 2023 08:42 4m 13s master
master
November 17, 2023 08:42 4m 13s
tunnel ambush submenu Check for merge conflicts #506: Commit 674121a pushed by morrowwolf
November 17, 2023 08:22 2m 14s master
master
November 17, 2023 08:22 2m 14s
Narrate to ground level Check for merge conflicts #505: Commit ca4ef43 pushed by morrowwolf
November 17, 2023 05:01 2m 11s master
master
November 17, 2023 05:01 2m 11s
stops huggers/lesser drones Check for merge conflicts #504: Commit 5ad6fd8 pushed by morrowwolf
November 17, 2023 04:44 2m 10s master
master
November 17, 2023 04:44 2m 10s
Brand-new crooshie AI Check for merge conflicts #503: Pull request #51 synchronize by morrowwolf
November 17, 2023 04:39 10s
November 17, 2023 04:39 10s
Thanks unit tests Check for merge conflicts #502: Commit c7a52db pushed by morrowwolf
November 17, 2023 02:09 2m 12s master
master
November 17, 2023 02:09 2m 12s
Brand-new crooshie AI Check for merge conflicts #501: Pull request #51 synchronize by xDanilcusx
November 15, 2023 14:40 13s
November 15, 2023 14:40 13s
Brand-new crooshie AI Check for merge conflicts #500: Pull request #51 synchronize by xDanilcusx
November 15, 2023 13:09 17s
November 15, 2023 13:09 17s
Brand-new crooshie AI Check for merge conflicts #499: Pull request #51 synchronize by xDanilcusx
November 15, 2023 12:38 13s
November 15, 2023 12:38 13s
Hotfix canmove Check for merge conflicts #498: Pull request #64 opened by morrowwolf
November 15, 2023 04:04 5m 16s
November 15, 2023 04:04 5m 16s
and that Check for merge conflicts #497: Commit 7ac488b pushed by morrowwolf
November 15, 2023 04:01 5m 4s master
master
November 15, 2023 04:01 5m 4s
bullet armor but lower death threshold Check for merge conflicts #496: Commit 436fbdc pushed by morrowwolf
November 15, 2023 03:53 7m 42s master
master
November 15, 2023 03:53 7m 42s
Brand-new crooshie AI Check for merge conflicts #495: Pull request #51 synchronize by morrowwolf
November 15, 2023 03:49 2m 7s
November 15, 2023 03:49 2m 7s
increases new player menu length Check for merge conflicts #494: Commit fe1dd31 pushed by morrowwolf
November 15, 2023 03:48 3m 59s master
master
November 15, 2023 03:48 3m 59s
Brand-new crooshie AI Check for merge conflicts #493: Pull request #51 synchronize by morrowwolf
November 15, 2023 03:44 15s
November 15, 2023 03:44 15s