Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
13,854 workflow run results
13,854 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Comtech Stuff Check for merge conflicts #25123: Pull request #6650 synchronize by Git-Nivrak
July 28, 2024 21:57 11s
July 28, 2024 21:57 11s
Minimap/orbit icons resprite and remake Check for merge conflicts #25122: Pull request #6791 synchronize by Blundir
July 28, 2024 19:10 11s
July 28, 2024 19:10 11s
autoclimbable handrails on harm intent Check for merge conflicts #25121: Pull request #6652 ready_for_review by cuberound
July 28, 2024 19:04 9s
July 28, 2024 19:04 9s
New "Bulky" computers, small bug fixes also related to computers, addition of altitude controller to the CIC Check for merge conflicts #25120: Pull request #6783 synchronize by LC4492
July 28, 2024 17:07 13s
July 28, 2024 17:07 13s
(EVENT) Cortical Borers Check for merge conflicts #25119: Pull request #5829 synchronize by realforest2001
July 28, 2024 17:03 25s
July 28, 2024 17:03 25s
(EVENT) Cortical Borers Check for merge conflicts #25118: Pull request #5829 synchronize by realforest2001
July 28, 2024 16:59 53s
July 28, 2024 16:59 53s
New "Bulky" computers, small bug fixes also related to computers, addition of altitude controller to the CIC Check for merge conflicts #25117: Pull request #6783 ready_for_review by LC4492
July 28, 2024 16:41 10s
July 28, 2024 16:41 10s
[WIP] Roombas are coming... Add Roombas as Playable Ghost Role. Check for merge conflicts #25116: Pull request #6812 opened by Venuska1117
July 28, 2024 16:35 9s
July 28, 2024 16:35 9s
New "Bulky" computers, small bug fixes also related to computers, addition of altitude controller to the CIC Check for merge conflicts #25115: Pull request #6783 synchronize by LC4492
July 28, 2024 16:32 9s
July 28, 2024 16:32 9s
(EVENT) Cortical Borers Check for merge conflicts #25114: Pull request #5829 synchronize by realforest2001
July 28, 2024 16:26 13s
July 28, 2024 16:26 13s
New "Bulky" computers, small bug fixes also related to computers, addition of altitude controller to the CIC Check for merge conflicts #25113: Pull request #6783 synchronize by LC4492
July 28, 2024 16:12 15s
July 28, 2024 16:12 15s
New "Bulky" computers, small bug fixes also related to computers, addition of altitude controller to the CIC Check for merge conflicts #25112: Pull request #6783 synchronize by LC4492
July 28, 2024 16:05 11s
July 28, 2024 16:05 11s
(EVENT) Cortical Borers Check for merge conflicts #25111: Pull request #5829 synchronize by realforest2001
July 28, 2024 15:40 10s
July 28, 2024 15:40 10s
(WIP) Project ARES: AI Service Technician Check for merge conflicts #25110: Pull request #6191 synchronize by realforest2001
July 28, 2024 15:32 11s
July 28, 2024 15:32 11s
(EVENT) Cortical Borers Check for merge conflicts #25109: Pull request #5829 synchronize by realforest2001
July 28, 2024 15:31 11s
July 28, 2024 15:31 11s
Rank Change Experiment Check for merge conflicts #25108: Pull request #6295 ready_for_review by realforest2001
July 28, 2024 15:20 11s
July 28, 2024 15:20 11s
(EVENT) Cortical Borers Check for merge conflicts #25107: Pull request #5829 synchronize by realforest2001
July 28, 2024 15:15 10s
July 28, 2024 15:15 10s
(EVENT) Cortical Borers Check for merge conflicts #25106: Pull request #5829 synchronize by realforest2001
July 28, 2024 15:15 10s
July 28, 2024 15:15 10s
stops people from buckling others when they shouldn't be able to Check for merge conflicts #25105: Pull request #6807 synchronize by zzzmike
July 28, 2024 14:45 11s
July 28, 2024 14:45 11s
Hold my Beer (Fix of hi intellligent data lookup in TGUI Who/Staff Who Check for merge conflicts #25104: Pull request #6786 synchronize by blackcrystall
July 28, 2024 14:40 10s
July 28, 2024 14:40 10s
autoclimbable handrails on harm intent Check for merge conflicts #25103: Pull request #6652 synchronize by cuberound
July 28, 2024 14:29 20s
July 28, 2024 14:29 20s
autoclimbable handrails on harm intent Check for merge conflicts #25102: Pull request #6652 synchronize by cuberound
July 28, 2024 14:24 1m 40s
July 28, 2024 14:24 1m 40s
autoclimbable handrails on harm intent Check for merge conflicts #25101: Pull request #6652 synchronize by cuberound
July 28, 2024 14:22 44s
July 28, 2024 14:22 44s
Re: Add Directional APC's sprites, reduces lines of code by adding and using Updatepaths.txt file. Check for merge conflicts #25100: Pull request #6686 ready_for_review by Venuska1117
July 28, 2024 14:19 1m 31s
July 28, 2024 14:19 1m 31s
Solar Devils ERT [PvE Marines] Check for merge conflicts #25099: Pull request #6811 synchronize by Steelpoint
July 28, 2024 14:19 10s
July 28, 2024 14:19 10s