Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
5,515 workflow run results
5,515 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Adds Extra Adv Med Optics To Medical + Optic Addition To Prep Vendor Check for merge conflicts #18115: Pull request #5290 ready_for_review by Steelpoint
December 27, 2023 04:36 11s
December 27, 2023 04:36 11s
Adds Extra Adv Med Optics To Medical + Optic Addition To Prep Vendor Check for merge conflicts #18114: Pull request #5290 synchronize by Steelpoint
December 27, 2023 04:33 10s
December 27, 2023 04:33 10s
Adds Extra Adv Med Optics To Medical + Optic Addition To Prep Vendor Check for merge conflicts #18113: Pull request #5290 synchronize by Steelpoint
December 27, 2023 04:13 10s
December 27, 2023 04:13 10s
Polish Dropship Weapons UI Check for merge conflicts #18112: Pull request #5298 synchronize by Drulikar
December 27, 2023 01:36 10s
December 27, 2023 01:36 10s
Adds the XM51 Breaching Scattergun Check for merge conflicts #18111: Pull request #5086 synchronize by VileBeggar
December 27, 2023 01:22 10s
December 27, 2023 01:22 10s
Polish Dropship Weapons UI Check for merge conflicts #18110: Pull request #5298 ready_for_review by Drulikar
December 27, 2023 01:18 12s
December 27, 2023 01:18 12s
Polish Dropship Weapons UI Check for merge conflicts #18109: Pull request #5298 synchronize by Drulikar
December 27, 2023 01:18 2m 18s
December 27, 2023 01:18 2m 18s
Fixes a simple race condition in XRF Setup Check for merge conflicts #18108: Pull request #5312 opened by fira
December 26, 2023 22:54 11s
December 26, 2023 22:54 11s
Fixes the Queen Eye being stuck as immature (#5299) Check for merge conflicts #18107: Commit 2958172 pushed by github-merge-queue bot
December 26, 2023 22:42 4m 16s master
master
December 26, 2023 22:42 4m 16s
Project ARES TM Holder (v4) Check for merge conflicts #18106: Pull request #5007 synchronize by realforest2001
December 26, 2023 22:33 1m 1s
December 26, 2023 22:33 1m 1s
Project ARES: Admin Console Check for merge conflicts #18105: Pull request #4182 synchronize by realforest2001
December 26, 2023 22:32 12s
December 26, 2023 22:32 12s
Fixes being able to vend infinite alcohol (#5305) Check for merge conflicts #18104: Commit 12d3107 pushed by github-merge-queue bot
December 26, 2023 20:31 4m 15s master
master
December 26, 2023 20:31 4m 15s
Fix xeno wounds layering over weeded xenos (#5289) Check for merge conflicts #18103: Commit 545b6c5 pushed by github-merge-queue bot
December 26, 2023 20:12 4m 17s master
master
December 26, 2023 20:12 4m 17s
Changes hit alerts from you to WE Check for merge conflicts #18102: Pull request #5295 synchronize by Red-byte3D
December 26, 2023 19:38 10s
December 26, 2023 19:38 10s
Changes hit alerts from you to WE Check for merge conflicts #18101: Pull request #5295 synchronize by Red-byte3D
December 26, 2023 19:38 2m 11s
December 26, 2023 19:38 2m 11s
"Fixes" predator stun durations Check for merge conflicts #18100: Pull request #5302 synchronize by Red-byte3D
December 26, 2023 17:49 10s
December 26, 2023 17:49 10s
"Fixes" predator stun durations Check for merge conflicts #18099: Pull request #5302 synchronize by Red-byte3D
December 26, 2023 17:49 10s
December 26, 2023 17:49 10s
Changes to bone repairing Check for merge conflicts #18098: Pull request #5280 synchronize by BeagleGaming1
December 26, 2023 17:31 53s
December 26, 2023 17:31 53s
Tutorial System: Retutorializing Check for merge conflicts #18097: Pull request #5030 synchronize by Zonespace27
December 26, 2023 17:28 25s
December 26, 2023 17:28 25s
Tutorial System: Retutorializing Check for merge conflicts #18096: Pull request #5030 synchronize by Zonespace27
December 26, 2023 17:26 10s
December 26, 2023 17:26 10s
Admin audio cue toggle. (#5185) Check for merge conflicts #18095: Commit 95daff2 pushed by github-merge-queue bot
December 26, 2023 16:32 4m 17s master
master
December 26, 2023 16:32 4m 17s
Status Effects - Part 3A (v2) - Daze Refactor Check for merge conflicts #18094: Pull request #5153 synchronize by fira
December 26, 2023 16:19 6m 7s
December 26, 2023 16:19 6m 7s
Fixes carriers being unable to reduce their 'reserved facehuggers' nu… Check for merge conflicts #18093: Commit 37477c3 pushed by github-merge-queue bot
December 26, 2023 16:14 4m 15s master
master
December 26, 2023 16:14 4m 15s
Steelpoint Donor Armour Update Check for merge conflicts #18092: Pull request #5252 synchronize by Steelpoint
December 26, 2023 16:11 11s
December 26, 2023 16:11 11s
camera console now uses camera manager Check for merge conflicts #18091: Pull request #5310 opened by mullenpaul
December 26, 2023 15:49 10s
December 26, 2023 15:49 10s