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,302 workflow run results
2,302 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

refactor : Cleaning specialist.dm file Check for merge conflicts #14914: Pull request #4538 ready_for_review by Huffie56
September 28, 2023 18:40 12s
September 28, 2023 18:40 12s
refactor : Cleaning specialist.dm file Check for merge conflicts #14913: Pull request #4538 opened by Huffie56
September 28, 2023 18:32 13s
September 28, 2023 18:32 13s
Optional Squad Briefing Rooms: Or, why I learnt to stop req queuing and love the squad Check for merge conflicts #14912: Pull request #4531 synchronize by Warfan1815
September 28, 2023 17:56 17s
September 28, 2023 17:56 17s
Optional Squad Briefing Rooms: Or, why I learnt to stop req queuing and love the squad Check for merge conflicts #14911: Pull request #4531 synchronize by Warfan1815
September 28, 2023 17:33 15s
September 28, 2023 17:33 15s
Optional Squad Briefing Rooms: Or, why I learnt to stop req queuing and love the squad Check for merge conflicts #14910: Pull request #4531 synchronize by Warfan1815
September 28, 2023 17:33 14s
September 28, 2023 17:33 14s
Whiskey Outpost vote fix (#4525) Check for merge conflicts #14909: Commit 6628064 pushed by github-merge-queue bot
September 28, 2023 16:59 4m 14s master
master
September 28, 2023 16:59 4m 14s
Almayer: Dirty Up The Ship (Revival) Check for merge conflicts #14908: Pull request #4476 synchronize by Steelpoint
September 28, 2023 15:13 15s
September 28, 2023 15:13 15s
TGUI: Microwave Check for merge conflicts #14907: Pull request #4523 synchronize by Crowbar764
September 28, 2023 11:43 15s
September 28, 2023 11:43 15s
TGUI: Microwave Check for merge conflicts #14906: Pull request #4523 synchronize by Crowbar764
September 28, 2023 11:35 12s
September 28, 2023 11:35 12s
Resin Fruits now contain enough fruit resin to be scanned. Alacrit now contains catecholamine plasma Check for merge conflicts #14905: Pull request #4425 synchronize by private-tristan
September 28, 2023 10:23 19s
September 28, 2023 10:23 19s
refactor : divide survivor preset base on maps. Check for merge conflicts #14904: Pull request #4522 ready_for_review by Huffie56
September 28, 2023 09:35 13s
September 28, 2023 09:35 13s
refactor : divide survivor preset base on maps. Check for merge conflicts #14903: Pull request #4522 synchronize by Huffie56
September 28, 2023 09:35 15s
September 28, 2023 09:35 15s
"Do nothing" dual wield preference (#4504) Check for merge conflicts #14902: Commit 54cab1d pushed by github-merge-queue bot
September 28, 2023 09:29 4m 14s master
master
September 28, 2023 09:29 4m 14s
Additional Working Joe Voicelines (#4501) Check for merge conflicts #14901: Commit 8cad63f pushed by github-merge-queue bot
September 28, 2023 09:14 4m 19s master
master
September 28, 2023 09:14 4m 19s
Fixes combistick folding (#4526) Check for merge conflicts #14900: Commit d964f00 pushed by github-merge-queue bot
September 28, 2023 08:59 4m 23s master
master
September 28, 2023 08:59 4m 23s
Fixes yautja relay beacon not uncloaking correctly (#4527) Check for merge conflicts #14899: Commit 8f423c5 pushed by github-merge-queue bot
September 28, 2023 08:45 4m 19s master
master
September 28, 2023 08:45 4m 19s
Fixes yautja bracers getting stuck in-hand (#4528) Check for merge conflicts #14898: Commit 0c25c79 pushed by github-merge-queue bot
September 28, 2023 08:30 4m 17s master
master
September 28, 2023 08:30 4m 17s
Yautja can no longer mark xenoes as honorable (#4529) Check for merge conflicts #14897: Commit e1c1fc4 pushed by github-merge-queue bot
September 28, 2023 08:11 4m 19s master
master
September 28, 2023 08:11 4m 19s
Fixes taking control of crit xenos Check for merge conflicts #14896: Pull request #4536 opened by morrowwolf
September 28, 2023 08:01 2m 17s
September 28, 2023 08:01 2m 17s
Minor Item Additions To Synth Vendor (#4515) Check for merge conflicts #14895: Commit ed97c67 pushed by github-merge-queue bot
September 28, 2023 07:56 4m 19s master
master
September 28, 2023 07:56 4m 19s
Bugfix: Camera sprites (#4512) Check for merge conflicts #14894: Commit f6a8c3f pushed by github-merge-queue bot
September 28, 2023 07:42 4m 18s master
master
September 28, 2023 07:42 4m 18s
no more anchorpoint pvt (#4492) Check for merge conflicts #14893: Commit 0f25138 pushed by github-merge-queue bot
September 28, 2023 07:27 4m 15s master
master
September 28, 2023 07:27 4m 15s
External webbing can hold firearms (#4482) Check for merge conflicts #14892: Commit 9484615 pushed by github-merge-queue bot
September 28, 2023 07:13 4m 17s master
master
September 28, 2023 07:13 4m 17s
Adds drawing to tacmaps Check for merge conflicts #14891: Pull request #4475 synchronize by ghost
September 28, 2023 05:49 14s
September 28, 2023 05:49 14s
Floodlight rework Check for merge conflicts #14890: Pull request #4535 opened by morrowwolf
September 28, 2023 05:39 15s
September 28, 2023 05:39 15s