Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
10,341 workflow run results
10,341 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Resprites humans, gives humans a choice of 9 bodies, replaces ethnicity system Check for merge conflicts #23027: Pull request #6073 ready_for_review by GrrrKitten
May 30, 2024 18:30 11s
May 30, 2024 18:30 11s
Resprites humans, gives humans a choice of 9 bodies, replaces ethnicity system Check for merge conflicts #23026: Pull request #6073 synchronize by GrrrKitten
May 30, 2024 18:18 12s
May 30, 2024 18:18 12s
Black market ammo shop category + new ammo boxes Check for merge conflicts #23025: Pull request #6324 synchronize by Blundir
May 30, 2024 17:59 13s
May 30, 2024 17:59 13s
Resprites humans, gives humans a choice of 9 bodies, replaces ethnicity system Check for merge conflicts #23024: Pull request #6073 synchronize by GrrrKitten
May 30, 2024 17:54 13s
May 30, 2024 17:54 13s
Resprites humans, gives humans a choice of 9 bodies, replaces ethnicity system Check for merge conflicts #23023: Pull request #6073 ready_for_review by GrrrKitten
May 30, 2024 17:22 11s
May 30, 2024 17:22 11s
Resprites humans, gives humans a choice of 9 bodies, replaces ethnicity system Check for merge conflicts #23022: Pull request #6073 synchronize by GrrrKitten
May 30, 2024 17:18 13s
May 30, 2024 17:18 13s
Resprites humans, gives humans a choice of 9 bodies, replaces ethnicity system Check for merge conflicts #23021: Pull request #6073 synchronize by GrrrKitten
May 30, 2024 17:16 12s
May 30, 2024 17:16 12s
Resprites humans, gives humans a choice of 9 bodies, replaces ethnicity system Check for merge conflicts #23020: Pull request #6073 synchronize by GrrrKitten
May 30, 2024 16:15 10s
May 30, 2024 16:15 10s
Resprites humans, gives humans a choice of 9 bodies, replaces ethnicity system Check for merge conflicts #23019: Pull request #6073 synchronize by GrrrKitten
May 30, 2024 16:01 9s
May 30, 2024 16:01 9s
Fixes Burrowers being able to use corrosive acid while underground (#… Check for merge conflicts #23018: Commit 681e522 pushed by github-merge-queue bot
May 30, 2024 15:47 4m 14s master
master
May 30, 2024 15:47 4m 14s
Project ARES TM Holder (v5) Check for merge conflicts #23017: Pull request #6039 synchronize by realforest2001
May 30, 2024 15:40 10s
May 30, 2024 15:40 10s
(WIP) Project ARES: AI Service Technician Check for merge conflicts #23016: Pull request #6191 synchronize by realforest2001
May 30, 2024 15:01 1m 14s
May 30, 2024 15:01 1m 14s
Project ARES TM Holder (v5) Check for merge conflicts #23015: Pull request #6039 synchronize by realforest2001
May 30, 2024 15:01 44s
May 30, 2024 15:01 44s
(WIP) Project ARES: AI Service Technician Check for merge conflicts #23014: Pull request #6191 synchronize by realforest2001
May 30, 2024 15:00 14s
May 30, 2024 15:00 14s
Project ARES TM Holder (v5) Check for merge conflicts #23013: Pull request #6039 synchronize by realforest2001
May 30, 2024 12:10 11s
May 30, 2024 12:10 11s
Project ARES: Print ASRS Log Check for merge conflicts #23012: Pull request #6333 synchronize by realforest2001
May 30, 2024 12:08 16s
May 30, 2024 12:08 16s
Rank Change Experiment Check for merge conflicts #23011: Pull request #6295 synchronize by realforest2001
May 30, 2024 12:01 13s
May 30, 2024 12:01 13s
Heavy Sniper Part 2 - The Heavying (#6163) Check for merge conflicts #23010: Commit 6bfac7c pushed by github-merge-queue bot
May 30, 2024 08:37 4m 13s master
master
May 30, 2024 08:37 4m 13s
Allows lifeboat surgery Check for merge conflicts #23009: Pull request #6349 opened by Zonespace27
May 30, 2024 04:24 13s
May 30, 2024 04:24 13s
Refactor of record system code and migrate all record UI to TGUI Check for merge conflicts #23008: Pull request #6266 synchronize by vero5123
May 30, 2024 04:14 9s
May 30, 2024 04:14 9s
Launch Alarm V3 Check for merge conflicts #23007: Pull request #6341 synchronize by hislittlecuzingames
May 30, 2024 03:47 2m 10s
May 30, 2024 03:47 2m 10s
Rank Change Experiment Check for merge conflicts #23006: Pull request #6295 synchronize by realforest2001
May 29, 2024 22:47 11s
May 29, 2024 22:47 11s
Launch Alarm V3 Check for merge conflicts #23005: Pull request #6341 synchronize by hislittlecuzingames
May 29, 2024 19:15 11s
May 29, 2024 19:15 11s
Refactor of record system code and migrate all record UI to TGUI Check for merge conflicts #23004: Pull request #6266 reopened by vero5123
May 29, 2024 18:27 12s
May 29, 2024 18:27 12s
Ghost orbit refactor (#6346) Check for merge conflicts #23003: Commit 63f8286 pushed by github-merge-queue bot
May 29, 2024 17:30 4m 16s master
master
May 29, 2024 17:30 4m 16s