Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
2,361 workflow run results
2,361 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

USS Almayer, CL & CC Hypersleep bay, fixes symmetry issue in CIC hallway (that I broke), adds some warning stripes around for detailing, re-gigs the PO bunk area to get rid of horrible 1x3 hallway Check for merge conflicts #14875: Pull request #4510 synchronize by morrowwolf
September 28, 2023 02:09 2m 14s
September 28, 2023 02:09 2m 14s
Additional Working Joe Voicelines Check for merge conflicts #14874: Pull request #4501 synchronize by Ben10083
September 28, 2023 00:50 10s
September 28, 2023 00:50 10s
Additional Working Joe Voicelines Check for merge conflicts #14873: Pull request #4501 ready_for_review by Ben10083
September 28, 2023 00:50 2m 13s
September 28, 2023 00:50 2m 13s
Additional Working Joe Voicelines Check for merge conflicts #14872: Pull request #4501 synchronize by Ben10083
September 28, 2023 00:47 14s
September 28, 2023 00:47 14s
USS Almayer, CL & CC Hypersleep bay, fixes symmetry issue in CIC hallway (that I broke), adds some warning stripes around for detailing, re-gigs the PO bunk area to get rid of horrible 1x3 hallway Check for merge conflicts #14871: Pull request #4510 synchronize by spartanbobby
September 28, 2023 00:29 11s
September 28, 2023 00:29 11s
no more anchorpoint pvt Check for merge conflicts #14870: Pull request #4492 ready_for_review by QuickLode
September 28, 2023 00:21 14s
September 28, 2023 00:21 14s
External webbing can hold firearms Check for merge conflicts #14869: Pull request #4482 ready_for_review by QuickLode
September 28, 2023 00:14 2m 46s
September 28, 2023 00:14 2m 46s
External webbing can hold firearms Check for merge conflicts #14868: Pull request #4482 synchronize by QuickLode
September 28, 2023 00:14 13s
September 28, 2023 00:14 13s
no more anchorpoint pvt Check for merge conflicts #14867: Pull request #4492 synchronize by QuickLode
September 28, 2023 00:09 28s
September 28, 2023 00:09 28s
Tutorial System Check for merge conflicts #14866: Pull request #4442 synchronize by Zonespace27
September 28, 2023 00:08 16s
September 28, 2023 00:08 16s
External webbing can hold firearms Check for merge conflicts #14865: Pull request #4482 synchronize by QuickLode
September 28, 2023 00:06 12s
September 28, 2023 00:06 12s
USS Almayer, CL & CC Hypersleep bay, fixes symmetry issue in CIC hallway (that I broke), adds some warning stripes around for detailing, re-gigs the PO bunk area to get rid of horrible 1x3 hallway Check for merge conflicts #14864: Pull request #4510 synchronize by spartanbobby
September 27, 2023 23:42 16s
September 27, 2023 23:42 16s
Bugfix: Unorderable Black Market Crate (#4495) Check for merge conflicts #14863: Commit f915178 pushed by github-merge-queue bot
September 27, 2023 23:31 4m 19s master
master
September 27, 2023 23:31 4m 19s
Adds drawing to tacmaps Check for merge conflicts #14862: Pull request #4475 synchronize by ghost
September 27, 2023 23:14 14s
September 27, 2023 23:14 14s
Bugfix: Flashlights now correct their icon when disabled by a xeno sl… Check for merge conflicts #14861: Commit c7c5190 pushed by github-merge-queue bot
September 27, 2023 21:31 4m 17s master
master
September 27, 2023 21:31 4m 17s
Fixes distress signal manual calls and a WO distress signal announcement Check for merge conflicts #14860: Pull request #4533 opened by morrowwolf
September 27, 2023 21:17 15s
September 27, 2023 21:17 15s
Optional Squad Briefing Rooms: Or, why I learnt to stop req queuing and love the squad Check for merge conflicts #14859: Pull request #4531 synchronize by Warfan1815
September 27, 2023 21:08 12s
September 27, 2023 21:08 12s
Optional Squad Briefing Rooms: Or, why I learnt to stop req queuing and love the squad Check for merge conflicts #14858: Pull request #4531 synchronize by Warfan1815
September 27, 2023 20:54 49s
September 27, 2023 20:54 49s
USS Almayer, CL & CC Hypersleep bay, fixes symmetry issue in CIC hallway (that I broke), adds some warning stripes around for detailing, re-gigs the PO bunk area to get rid of horrible 1x3 hallway Check for merge conflicts #14857: Pull request #4510 synchronize by spartanbobby
September 27, 2023 20:53 13s
September 27, 2023 20:53 13s
Adds drawing to tacmaps Check for merge conflicts #14856: Pull request #4475 synchronize by ghost
September 27, 2023 20:42 11s
September 27, 2023 20:42 11s
Removes more clown gear Check for merge conflicts #14855: Pull request #4532 opened by morrowwolf
September 27, 2023 20:35 16s
September 27, 2023 20:35 16s
Tutorial System Check for merge conflicts #14854: Pull request #4442 synchronize by Zonespace27
September 27, 2023 19:29 13s
September 27, 2023 19:29 13s
Tutorial System Check for merge conflicts #14853: Pull request #4442 synchronize by Zonespace27
September 27, 2023 19:26 13s
September 27, 2023 19:26 13s
Adds drawing to tacmaps Check for merge conflicts #14852: Pull request #4475 synchronize by ghost
September 27, 2023 19:08 2m 18s
September 27, 2023 19:08 2m 18s
Adds drawing to tacmaps Check for merge conflicts #14851: Pull request #4475 synchronize by ghost
September 27, 2023 19:08 12s
September 27, 2023 19:08 12s