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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

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
Dead Spider Sprite Fix (#4585) Check for merge conflicts #15126: Commit 68a487a pushed by github-merge-queue bot
October 5, 2023 05:06 4m 16s master
master
October 5, 2023 05:06 4m 16s
New goggle sprite Check for merge conflicts #15125: Pull request #4557 synchronize by irRegularGuy646
October 5, 2023 04:46 13s
October 5, 2023 04:46 13s
New goggle sprite Check for merge conflicts #15124: Pull request #4557 synchronize by irRegularGuy646
October 5, 2023 04:30 12s
October 5, 2023 04:30 12s
New goggle sprite Check for merge conflicts #15123: Pull request #4557 synchronize by irRegularGuy646
October 5, 2023 04:30 2m 14s
October 5, 2023 04:30 2m 14s
Hijack objectives Check for merge conflicts #15122: Pull request #4391 synchronize by morrowwolf
October 4, 2023 22:26 15s
October 4, 2023 22:26 15s
Nerfs sticky resin Check for merge conflicts #15121: Pull request #4588 opened by Mister-moon1
October 4, 2023 22:10 42s
October 4, 2023 22:10 42s
Hedge rav tweaks Check for merge conflicts #15120: Pull request #4587 opened by morrowwolf
October 4, 2023 22:05 18s
October 4, 2023 22:05 18s
added a file to handle the fridges in kitchen on almayer and added a bunch of food boxes. Check for merge conflicts #15119: Pull request #4586 opened by Huffie56
October 4, 2023 19:00 14s
October 4, 2023 19:00 14s
Adds drawing to tacmaps Check for merge conflicts #15118: Pull request #4475 synchronize by ghost
October 4, 2023 14:02 21s
October 4, 2023 14:02 21s
Adds drawing to tacmaps Check for merge conflicts #15117: Pull request #4475 synchronize by ghost
October 4, 2023 14:02 16s
October 4, 2023 14:02 16s
Refactor gun cabinet code adding subtype for all the secure guncabinet/safes Check for merge conflicts #15116: Pull request #4574 ready_for_review by Huffie56
October 4, 2023 11:44 16s
October 4, 2023 11:44 16s
Refactor gun cabinet code adding subtype for all the secure guncabinet/safes Check for merge conflicts #15115: Pull request #4574 synchronize by Huffie56
October 4, 2023 10:36 15s
October 4, 2023 10:36 15s