Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
8,933 workflow run results
8,933 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Faction frequences Check for merge conflicts #20134: Pull request #5833 opened by Segrain
February 27, 2024 00:44 13s
February 27, 2024 00:44 13s
(EVENT) Cortical Borers Check for merge conflicts #20133: Pull request #5829 synchronize by realforest2001
February 27, 2024 00:24 10s
February 27, 2024 00:24 10s
Moves current UPP/CLF combat synths into a support role Check for merge conflicts #20132: Pull request #5830 ready_for_review by Nanu308
February 27, 2024 00:09 2m 0s
February 27, 2024 00:09 2m 0s
Fixes the M707 spotting scope teleporting its user and M707 attachment camo Check for merge conflicts #20131: Pull request #5832 synchronize by Zonespace27
February 27, 2024 00:08 50s
February 27, 2024 00:08 50s
Moves current UPP/CLF combat synths into a support role Check for merge conflicts #20130: Pull request #5830 synchronize by Nanu308
February 27, 2024 00:07 10s
February 27, 2024 00:07 10s
(EVENT) Cortical Borers Check for merge conflicts #20129: Pull request #5829 synchronize by realforest2001
February 27, 2024 00:01 10s
February 27, 2024 00:01 10s
Reenables Prison station Check for merge conflicts #20128: Pull request #5801 ready_for_review by Greg-Joffer
February 26, 2024 23:52 57s
February 26, 2024 23:52 57s
(EVENT) Cortical Borers Check for merge conflicts #20127: Pull request #5829 synchronize by realforest2001
February 26, 2024 23:50 21s
February 26, 2024 23:50 21s
Fixes the M707 spotting scope teleporting its user and M707 attachment camo Check for merge conflicts #20126: Pull request #5832 opened by Zonespace27
February 26, 2024 23:44 1m 40s
February 26, 2024 23:44 1m 40s
Reenables Prison station Check for merge conflicts #20125: Pull request #5801 synchronize by Greg-Joffer
February 26, 2024 23:42 46s
February 26, 2024 23:42 46s
Reenables Prison station Check for merge conflicts #20124: Pull request #5801 synchronize by Greg-Joffer
February 26, 2024 23:42 10s
February 26, 2024 23:42 10s
(EVENT) Cortical Borers Check for merge conflicts #20123: Pull request #5829 synchronize by realforest2001
February 26, 2024 23:38 1m 50s
February 26, 2024 23:38 1m 50s
Names for nodes and traps. Check for merge conflicts #20122: Pull request #5831 opened by Segrain
February 26, 2024 23:38 14s
February 26, 2024 23:38 14s
Moves current UPP/CLF combat synths into a support role Check for merge conflicts #20121: Pull request #5830 opened by Nanu308
February 26, 2024 23:17 13s
February 26, 2024 23:17 13s
(EVENT) Cortical Borers Check for merge conflicts #20120: Pull request #5829 synchronize by realforest2001
February 26, 2024 23:09 12s
February 26, 2024 23:09 12s
(EVENT) Cortical Borers Check for merge conflicts #20119: Pull request #5829 synchronize by realforest2001
February 26, 2024 23:02 10s
February 26, 2024 23:02 10s
(EVENT) Cortical Borers Check for merge conflicts #20118: Pull request #5829 opened by realforest2001
February 26, 2024 23:00 13s
February 26, 2024 23:00 13s
Fix for survivor hostility message. Check for merge conflicts #20117: Pull request #5828 opened by Segrain
February 26, 2024 22:48 14s
February 26, 2024 22:48 14s
Fix runtime since HAS_TRAIT doesn't null test (#5811) Check for merge conflicts #20116: Commit d88ed23 pushed by github-merge-queue bot
February 26, 2024 22:28 4m 18s master
master
February 26, 2024 22:28 4m 18s
Project ARES: AI Core Makeover Check for merge conflicts #20115: Pull request #5821 synchronize by realforest2001
February 26, 2024 22:09 14s
February 26, 2024 22:09 14s
Brig Area Update/Refactor Check for merge conflicts #20114: Pull request #5723 synchronize by ItsVyzo
February 26, 2024 22:08 11s
February 26, 2024 22:08 11s
Admin Verbs - Hide now hides Control Mob verb Check for merge conflicts #20113: Pull request #5827 opened by Birdtalon
February 26, 2024 22:04 12s
February 26, 2024 22:04 12s
Project ARES TM Holder (v4) Check for merge conflicts #20112: Pull request #5007 synchronize by realforest2001
February 26, 2024 21:34 41s
February 26, 2024 21:34 41s
Project ARES: AI Core Makeover Check for merge conflicts #20111: Pull request #5821 synchronize by realforest2001
February 26, 2024 21:33 11s
February 26, 2024 21:33 11s
Fix cas ammo consumption logic Check for merge conflicts #20110: Pull request #5824 opened by mullenpaul
February 26, 2024 20:16 11s
February 26, 2024 20:16 11s