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,156 workflow run results
2,156 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 #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
Optional Squad Briefing Rooms: Or, why I learnt to stop req queuing and love the squad Check for merge conflicts #14850: Pull request #4531 synchronize by Warfan1815
September 27, 2023 19:02 20s
September 27, 2023 19:02 20s
Optional Squad Briefing Rooms: Or, why I learnt to stop req queuing and love the squad Check for merge conflicts #14849: Pull request #4531 synchronize by Warfan1815
September 27, 2023 18:52 8m 20s
September 27, 2023 18:52 8m 20s
Optional Squad Briefing Rooms: Or, why I learnt to stop req queuing and love the squad Check for merge conflicts #14848: Pull request #4531 synchronize by Warfan1815
September 27, 2023 18:52 5m 57s
September 27, 2023 18:52 5m 57s
Disallows taking control of crit xenos (#4517) Check for merge conflicts #14847: Commit f21e167 pushed by github-merge-queue bot
September 27, 2023 18:52 7m 57s master
master
September 27, 2023 18:52 7m 57s
Adds drawing to tacmaps Check for merge conflicts #14846: Pull request #4475 synchronize by ghost
September 27, 2023 18:44 3m 26s
September 27, 2023 18:44 3m 26s
Optional Squad Briefing Rooms: Or, why I learnt to stop req queuing and love the squad Check for merge conflicts #14845: Pull request #4531 synchronize by Warfan1815
September 27, 2023 18:42 3m 59s
September 27, 2023 18:42 3m 59s
Optional Squad Briefing Rooms: Or, why I learnt to stop req queuing and love the squad Check for merge conflicts #14844: Pull request #4531 synchronize by Warfan1815
September 27, 2023 18:42 4m 28s
September 27, 2023 18:42 4m 28s
Makes Pylon Alert Message Better Stress Its Danger To Marines (#4518) Check for merge conflicts #14843: Commit 573ced1 pushed by github-merge-queue bot
September 27, 2023 18:36 4m 20s master
master
September 27, 2023 18:36 4m 20s
Optional Squad Briefing Rooms: Or, why I learnt to stop req queuing and love the squad Check for merge conflicts #14842: Pull request #4531 opened by Warfan1815
September 27, 2023 18:24 13s
September 27, 2023 18:24 13s
Disease protection Check for merge conflicts #14841: Pull request #4524 synchronize by kiVts
September 27, 2023 16:10 12s
September 27, 2023 16:10 12s
refactor : divide survivor preset base on maps. Check for merge conflicts #14840: Pull request #4522 synchronize by Huffie56
September 27, 2023 11:57 16s
September 27, 2023 11:57 16s