Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
645 workflow run results
645 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Gun bugfixes (#4006) Check for merge conflicts #12811: Commit 43a3680 pushed by github-merge-queue bot
July 28, 2023 07:09 4m 16s master
master
July 28, 2023 07:09 4m 16s
Player controlled facehuggers no longer have a shortened stun duratio… Check for merge conflicts #12810: Commit 094b150 pushed by github-merge-queue bot
July 28, 2023 06:51 4m 16s master
master
July 28, 2023 06:51 4m 16s
Sweeping LV522 Changes + FORECON GL replaced by FORECON Sniper (Without the sniper) Check for merge conflicts #12809: Pull request #3917 synchronize by harryob
July 28, 2023 06:38 3m 24s
July 28, 2023 06:38 3m 24s
Shaking removes stuns faster (#4019) Check for merge conflicts #12808: Commit 59231f5 pushed by github-merge-queue bot
July 28, 2023 06:37 4m 14s master
master
July 28, 2023 06:37 4m 14s
Xenos can eat food to regain health (lore accurate) Check for merge conflicts #12807: Pull request #4018 synchronize by ihatethisengine
July 28, 2023 06:02 11s
July 28, 2023 06:02 11s
Xenos can eat food to regain health (lore accurate) Check for merge conflicts #12806: Pull request #4018 synchronize by ihatethisengine
July 28, 2023 05:47 14s
July 28, 2023 05:47 14s
Xenos can eat food to regain health (lore accurate) Check for merge conflicts #12805: Pull request #4018 synchronize by ihatethisengine
July 28, 2023 05:28 11s
July 28, 2023 05:28 11s
Adds a welder chestrig! Check for merge conflicts #12804: Pull request #4029 opened by Dorodomki
July 28, 2023 04:14 14s
July 28, 2023 04:14 14s
Xenos can eat food to regain health (lore accurate) Check for merge conflicts #12803: Pull request #4018 synchronize by ihatethisengine
July 28, 2023 03:58 2m 11s
July 28, 2023 03:58 2m 11s
Upgrades the External Webbing Check for merge conflicts #12802: Pull request #4027 opened by Dorodomki
July 27, 2023 23:49 12s
July 27, 2023 23:49 12s
Re-purposes a room into a Chaplain office Check for merge conflicts #12801: Pull request #3887 synchronize by theselfish
July 27, 2023 23:41 24s
July 27, 2023 23:41 24s
Adds new synthetic cosmetics Check for merge conflicts #12800: Pull request #4026 synchronize by Katskan
July 27, 2023 23:35 13s
July 27, 2023 23:35 13s
Adds new synthetic cosmetics Check for merge conflicts #12799: Pull request #4026 synchronize by Katskan
July 27, 2023 23:34 12s
July 27, 2023 23:34 12s
Re-purposes a room into a Chaplain office Check for merge conflicts #12798: Pull request #3887 synchronize by theselfish
July 27, 2023 23:32 11s
July 27, 2023 23:32 11s
Re-purposes a room into a Chaplain office Check for merge conflicts #12797: Pull request #3887 synchronize by theselfish
July 27, 2023 23:24 11s
July 27, 2023 23:24 11s
Log Updates Check for merge conflicts #12796: Pull request #4024 synchronize by realforest2001
July 27, 2023 21:13 11s
July 27, 2023 21:13 11s
Log Updates Check for merge conflicts #12795: Pull request #4024 synchronize by realforest2001
July 27, 2023 21:08 11s
July 27, 2023 21:08 11s
Adds a new jacket for the Commanding Officer (#3963) Check for merge conflicts #12794: Commit 3c06f56 pushed by github-merge-queue bot
July 27, 2023 21:01 4m 13s master
master
July 27, 2023 21:01 4m 13s
Adds new synthetic cosmetics Check for merge conflicts #12793: Pull request #4026 opened by Katskan
July 27, 2023 20:58 11s
July 27, 2023 20:58 11s
Fixes holding two guns firing both Check for merge conflicts #12792: Pull request #4025 opened by morrowwolf
July 27, 2023 20:35 15s
July 27, 2023 20:35 15s
Log Updates Check for merge conflicts #12791: Pull request #4024 opened by realforest2001
July 27, 2023 20:28 12s
July 27, 2023 20:28 12s
Adds a new jacket for the Commanding Officer Check for merge conflicts #12790: Pull request #3963 ready_for_review by BeagleGaming1
July 27, 2023 19:59 11s
July 27, 2023 19:59 11s
Adds a new jacket for the Commanding Officer Check for merge conflicts #12789: Pull request #3963 synchronize by BeagleGaming1
July 27, 2023 19:42 11s
July 27, 2023 19:42 11s
Adds a new jacket for the Commanding Officer Check for merge conflicts #12788: Pull request #3963 synchronize by BeagleGaming1
July 27, 2023 19:40 11s
July 27, 2023 19:40 11s
Sentinel buffs Check for merge conflicts #12787: Pull request #4023 opened by GoldenDarkness55
July 27, 2023 18:58 26s
July 27, 2023 18:58 26s