Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
4,429 workflow run results
4,429 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fixes non normal hive nickname numbering Check for merge conflicts #17100: Pull request #5098 synchronize by Birdtalon
December 2, 2023 00:24 26s
December 2, 2023 00:24 26s
Fixes non normal hive nickname numbering Check for merge conflicts #17099: Pull request #5098 opened by Birdtalon
December 2, 2023 00:19 5m 33s
December 2, 2023 00:19 5m 33s
ASRS Supply Pools -- Crates Carryover and MessTech supply Check for merge conflicts #17098: Pull request #5018 synchronize by fira
December 2, 2023 00:16 12s
December 2, 2023 00:16 12s
fix skull facepaint, masks Check for merge conflicts #17097: Pull request #5091 synchronize by irakligabunia
December 2, 2023 00:16 14s
December 2, 2023 00:16 14s
fix skull facepaint, masks Check for merge conflicts #17096: Pull request #5091 synchronize by irakligabunia
December 2, 2023 00:16 15s
December 2, 2023 00:16 15s
fix skull facepaint, masks Check for merge conflicts #17095: Pull request #5091 synchronize by irakligabunia
December 2, 2023 00:16 2m 11s
December 2, 2023 00:16 2m 11s
Ckey check verb Check for merge conflicts #17094: Pull request #5073 ready_for_review by realforest2001
December 1, 2023 23:40 2m 17s
December 1, 2023 23:40 2m 17s
Ckey check verb Check for merge conflicts #17093: Pull request #5073 synchronize by realforest2001
December 1, 2023 23:40 10s
December 1, 2023 23:40 10s
Project ARES: Added Tech Unlock logs Check for merge conflicts #17092: Pull request #5006 synchronize by realforest2001
December 1, 2023 23:34 51s
December 1, 2023 23:34 51s
(EVENT) Palatines & Xeno Flight Check for merge conflicts #17091: Pull request #5075 synchronize by realforest2001
December 1, 2023 23:33 9s
December 1, 2023 23:33 9s
Adds Latejoin scaling to Vendors and ASRS Check for merge conflicts #17090: Pull request #4939 synchronize by fira
December 1, 2023 23:19 13s
December 1, 2023 23:19 13s
Keycard authenticator can call ERT winout admin intervention Check for merge conflicts #17089: Pull request #4477 synchronize by Diegoflores31
December 1, 2023 23:04 13s
December 1, 2023 23:04 13s
Keycard authenticator can call ERT winout admin intervention Check for merge conflicts #17088: Pull request #4477 synchronize by Diegoflores31
December 1, 2023 22:59 11s
December 1, 2023 22:59 11s
More HPR ammo in req Check for merge conflicts #17087: Pull request #5097 opened by CapCamIII
December 1, 2023 22:12 11s
December 1, 2023 22:12 11s
Radio TGUI backend Tidy-up & Adds Listening Devices (#4866) Check for merge conflicts #17086: Commit ee43d8d pushed by github-merge-queue bot
December 1, 2023 22:08 6m 19s master
master
December 1, 2023 22:08 6m 19s
Fixes ocassional observer minimap desync Check for merge conflicts #17085: Pull request #5095 synchronize by Das15
December 1, 2023 21:19 9s
December 1, 2023 21:19 9s
Fix vending_products register continue check (#4962) Check for merge conflicts #17084: Commit 0772939 pushed by github-merge-queue bot
December 1, 2023 20:57 4m 20s master
master
December 1, 2023 20:57 4m 20s
Weeds are conserved under walls being upgraded and destroyed Check for merge conflicts #17083: Pull request #5096 opened by Birdtalon
December 1, 2023 20:40 11s
December 1, 2023 20:40 11s
New Radial Menu for Xeno Evolve Check for merge conflicts #17082: Pull request #5022 synchronize by Birdtalon
December 1, 2023 20:35 15s
December 1, 2023 20:35 15s
L'évacuation - 1 Check for merge conflicts #17081: Pull request #5052 synchronize by LC4492
December 1, 2023 20:31 10s
December 1, 2023 20:31 10s
/tg/ Status Effects Part 2 - datum, KD, KO, Stuns Check for merge conflicts #17080: Pull request #4842 synchronize by realforest2001
December 1, 2023 20:06 2m 17s
December 1, 2023 20:06 2m 17s
Brown Gloves/Boots Surplus Vendors (#4996) Check for merge conflicts #17079: Commit da9f6e7 pushed by github-merge-queue bot
December 1, 2023 20:04 3m 51s master
master
December 1, 2023 20:04 3m 51s
L'évacuation - 1 Check for merge conflicts #17078: Pull request #5052 synchronize by LC4492
December 1, 2023 20:03 12s
December 1, 2023 20:03 12s
Refactors Xeno name generation and set hive and update (#4992) Check for merge conflicts #17077: Commit 354e9b8 pushed by github-merge-queue bot
December 1, 2023 19:50 4m 20s master
master
December 1, 2023 19:50 4m 20s
Sanitizes burrower tunnel names to alphanumeric only (#4911) Check for merge conflicts #17076: Commit 8e7a704 pushed by github-merge-queue bot
December 1, 2023 19:31 4m 19s master
master
December 1, 2023 19:31 4m 19s