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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Updates dropship ammo names to be more "accurate" Check for merge conflicts #15151: Pull request #4579 synchronize by blackdragonTOW
October 6, 2023 03:44 11s
October 6, 2023 03:44 11s
Updates dropship ammo names to be more "accurate" Check for merge conflicts #15150: Pull request #4579 synchronize by blackdragonTOW
October 6, 2023 03:43 14s
October 6, 2023 03:43 14s
Updates dropship ammo names to be more "accurate" Check for merge conflicts #15149: Pull request #4579 synchronize by blackdragonTOW
October 6, 2023 03:26 16s
October 6, 2023 03:26 16s
Adds drawing to tacmaps Check for merge conflicts #15148: Pull request #4475 synchronize by ghost
October 6, 2023 02:33 12s
October 6, 2023 02:33 12s
Adds drawing to tacmaps Check for merge conflicts #15147: Pull request #4475 synchronize by ghost
October 6, 2023 02:26 2m 16s
October 6, 2023 02:26 2m 16s
tgui research desktop fix Check for merge conflicts #15146: Pull request #4592 synchronize by kiVts
October 5, 2023 23:56 13s
October 5, 2023 23:56 13s
Adds drawing to tacmaps Check for merge conflicts #15145: Pull request #4475 synchronize by ghost
October 5, 2023 23:31 15s
October 5, 2023 23:31 15s
Adds drawing to tacmaps Check for merge conflicts #15144: Pull request #4475 synchronize by ghost
October 5, 2023 23:31 16s
October 5, 2023 23:31 16s
Adds drawing to tacmaps Check for merge conflicts #15143: Pull request #4475 synchronize by ghost
October 5, 2023 23:29 11s
October 5, 2023 23:29 11s
DFB property changes. Check for merge conflicts #15142: Pull request #4590 synchronize by kiVts
October 5, 2023 22:46 13s
October 5, 2023 22:46 13s
tgui research desktop fix Check for merge conflicts #15141: Pull request #4592 opened by kiVts
October 5, 2023 21:29 13s
October 5, 2023 21:29 13s
DFB property changes. Check for merge conflicts #15140: Pull request #4590 synchronize by kiVts
October 5, 2023 21:13 16s
October 5, 2023 21:13 16s
DFB property changes. Check for merge conflicts #15139: Pull request #4590 synchronize by kiVts
October 5, 2023 21:11 12s
October 5, 2023 21:11 12s
DFB property changes. Check for merge conflicts #15138: Pull request #4590 synchronize by kiVts
October 5, 2023 21:01 12s
October 5, 2023 21:01 12s
DFB property changes. Check for merge conflicts #15137: Pull request #4590 synchronize by kiVts
October 5, 2023 20:55 14s
October 5, 2023 20:55 14s
Updates dropship ammo names to be more "accurate" Check for merge conflicts #15136: Pull request #4579 synchronize by blackdragonTOW
October 5, 2023 20:20 15s
October 5, 2023 20:20 15s
DFB property changes. Check for merge conflicts #15135: Pull request #4590 synchronize by kiVts
October 5, 2023 17:57 33s
October 5, 2023 17:57 33s
DFB property changes. Check for merge conflicts #15134: Pull request #4590 opened by kiVts
October 5, 2023 17:57 16s
October 5, 2023 17:57 16s
Dropship turf direction sprites Check for merge conflicts #15133: Pull request #3642 synchronize by mullenpaul
October 5, 2023 16:57 30s
October 5, 2023 16:57 30s
Dropship turf direction sprites Check for merge conflicts #15132: Pull request #3642 synchronize by mullenpaul
October 5, 2023 16:57 15s
October 5, 2023 16:57 15s
Dropship turf direction sprites Check for merge conflicts #15131: Pull request #3642 synchronize by mullenpaul
October 5, 2023 16:00 15s
October 5, 2023 16:00 15s
Hydroponics minor fixes Check for merge conflicts #15130: Pull request #4589 opened by kiVts
October 5, 2023 14:11 18s
October 5, 2023 14:11 18s
Fixes grab delay after performing an action Check for merge conflicts #15129: Pull request #4494 ready_for_review by Git-Nivrak
October 5, 2023 11:43 14s
October 5, 2023 11:43 14s
Nerfs sticky resin Check for merge conflicts #15128: Pull request #4588 ready_for_review by Mister-moon1
October 5, 2023 08:38 14s
October 5, 2023 08:38 14s
Nerfs sticky resin Check for merge conflicts #15127: Pull request #4588 synchronize by Mister-moon1
October 5, 2023 08:38 12s
October 5, 2023 08:38 12s