Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
16,150 workflow runs
16,150 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

(WIP) Yautja Weapon Gimmicks, Round Two Check for merge conflicts #27021: Pull request #5392 reopened by realforest2001
September 12, 2024 13:53 12s
September 12, 2024 13:53 12s
(EVENT) Cortical Borers Check for merge conflicts #27020: Pull request #5829 synchronize by realforest2001
September 12, 2024 13:39 16s
September 12, 2024 13:39 16s
Squad Prep Weapon Vendors now scale with number of marines Check for merge conflicts #27019: Pull request #7153 opened by private-tristan
September 12, 2024 13:31 10s
September 12, 2024 13:31 10s
(EVENT) Cortical Borers Check for merge conflicts #27018: Pull request #5829 synchronize by realforest2001
September 12, 2024 13:28 12s
September 12, 2024 13:28 12s
Psychic Radiance for humans Check for merge conflicts #27017: Pull request #7087 synchronize by realforest2001
September 12, 2024 12:17 14s
September 12, 2024 12:17 14s
Psychic Radiance for humans Check for merge conflicts #27016: Pull request #7087 synchronize by realforest2001
September 12, 2024 12:11 13s
September 12, 2024 12:11 13s
Psychic Radiance for humans Check for merge conflicts #27015: Pull request #7087 synchronize by realforest2001
September 12, 2024 12:08 14s
September 12, 2024 12:08 14s
Fixes shiva panic room insert presets Check for merge conflicts #27014: Pull request #7152 opened by realforest2001
September 12, 2024 11:58 13s
September 12, 2024 11:58 13s
CPR Buddy 9000 Check for merge conflicts #27013: Pull request #7092 synchronize by HIDgamer
September 12, 2024 11:19 13s
September 12, 2024 11:19 13s
Xenomorph Endgame Check for merge conflicts #27012: Pull request #6334 synchronize by Git-Nivrak
September 12, 2024 08:36 16s
September 12, 2024 08:36 16s
Decreases time required to print dropship equipment Check for merge conflicts #27011: Pull request #7151 opened by tallfission
September 12, 2024 07:07 11s
September 12, 2024 07:07 11s
Prize pool rebalance for arcade machines Check for merge conflicts #27010: Pull request #7150 synchronize by deathrobotpunch
September 12, 2024 05:20 11s
September 12, 2024 05:20 11s
Prize pool rebalance for arcade machines Check for merge conflicts #27009: Pull request #7150 synchronize by deathrobotpunch
September 12, 2024 05:16 11s
September 12, 2024 05:16 11s
Prize pool rebalance for arcade machines Check for merge conflicts #27008: Pull request #7150 synchronize by deathrobotpunch
September 12, 2024 05:16 9s
September 12, 2024 05:16 9s
Prize pool rebalance for arcade machines Check for merge conflicts #27007: Pull request #7150 synchronize by deathrobotpunch
September 12, 2024 05:10 16s
September 12, 2024 05:10 16s
Prize pool rebalance for arcade machines Check for merge conflicts #27006: Pull request #7150 opened by deathrobotpunch
September 12, 2024 05:07 11s
September 12, 2024 05:07 11s
Research Rework Part Two: The Contract System. Check for merge conflicts #27005: Pull request #7023 synchronize by kiVts
September 12, 2024 04:44 13s
September 12, 2024 04:44 13s
Pred cape and armour stuff Check for merge conflicts #27004: Pull request #7149 synchronize by Mister-moon1
September 11, 2024 23:43 9s
September 11, 2024 23:43 9s
Pred cape and armour stuff Check for merge conflicts #27003: Pull request #7149 synchronize by Mister-moon1
September 11, 2024 23:43 13s
September 11, 2024 23:43 13s
Pred cape and armour stuff Check for merge conflicts #27002: Pull request #7149 opened by Mister-moon1
September 11, 2024 23:36 12s
September 11, 2024 23:36 12s
Tweaks default staff perms Check for merge conflicts #27001: Pull request #7146 reopened by realforest2001
September 11, 2024 17:49 11s
September 11, 2024 17:49 11s
Tweaks default staff perms Check for merge conflicts #27000: Pull request #7146 synchronize by realforest2001
September 11, 2024 17:43 14s
September 11, 2024 17:43 14s
Tweaks default staff perms Check for merge conflicts #26999: Pull request #7146 reopened by realforest2001
September 11, 2024 17:43 26s
September 11, 2024 17:43 26s
SHARP Rifle Revived Check for merge conflicts #26998: Pull request #6938 synchronize by Nomoresolvalou
September 11, 2024 17:27 13s
September 11, 2024 17:27 13s
[IDB Ignore] Icons folder reorganization and cleaning Check for merge conflicts #26997: Pull request #7021 synchronize by Blundir
September 11, 2024 15:14 10s
September 11, 2024 15:14 10s