Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
5,192 workflow run results
5,192 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Runner: replace single letter vars Check for merge conflicts #16352: Pull request #4898 opened by Birdtalon
November 11, 2023 14:23 14s
November 11, 2023 14:23 14s
Kills var/burrow replaces with trait Check for merge conflicts #16351: Pull request #4893 ready_for_review by Birdtalon
November 11, 2023 11:44 15s
November 11, 2023 11:44 15s
Boiler: replace single letter vars and removes unused code, also fixes 5th hotkey. Check for merge conflicts #16350: Pull request #4897 opened by Birdtalon
November 11, 2023 11:43 13s
November 11, 2023 11:43 13s
Dropship weapons console TGUI Check for merge conflicts #16349: Pull request #4812 synchronize by mullenpaul
November 11, 2023 10:00 13s
November 11, 2023 10:00 13s
Almayer: Turns (mostly) empty maint room into Armourer workshop with … Check for merge conflicts #16348: Commit 215b7d8 pushed by github-merge-queue bot
November 11, 2023 09:22 4m 19s master
master
November 11, 2023 09:22 4m 19s
Adds drawing to tacmaps Check for merge conflicts #16347: Pull request #4475 synchronize by Drulikar
November 11, 2023 02:39 2m 15s
November 11, 2023 02:39 2m 15s
Surface icon baking removal Check for merge conflicts #16346: Pull request #4894 opened by BeagleGaming1
November 11, 2023 00:32 33s
November 11, 2023 00:32 33s
Eggsac carrier revival Check for merge conflicts #16345: Pull request #4716 synchronize by Birdtalon
November 11, 2023 00:26 16s
November 11, 2023 00:26 16s
Fixes guns occasionally ceasing to work Check for merge conflicts #16344: Pull request #4882 ready_for_review by Zonespace27
November 10, 2023 23:49 14s
November 10, 2023 23:49 14s
Kills var/burrow replaces with trait Check for merge conflicts #16343: Pull request #4893 opened by Birdtalon
November 10, 2023 23:31 14s
November 10, 2023 23:31 14s
M4 Synthetic PMC 'armor' changes p1 (#4867) Check for merge conflicts #16342: Commit 2e8f3a3 pushed by github-merge-queue bot
November 10, 2023 23:00 4m 21s master
master
November 10, 2023 23:00 4m 21s
Fix missing delay on climbing objects Check for merge conflicts #16341: Pull request #4892 opened by fira
November 10, 2023 22:33 15s
November 10, 2023 22:33 15s
Adds observer UI button for toggling HUDs Check for merge conflicts #16340: Pull request #4891 synchronize by Birdtalon
November 10, 2023 21:23 28s
November 10, 2023 21:23 28s
Adds observer UI button for toggling HUDs Check for merge conflicts #16339: Pull request #4891 opened by Birdtalon
November 10, 2023 21:21 13s
November 10, 2023 21:21 13s
Lets observer with SecHUD enabled see sec records on examine. Check for merge conflicts #16338: Pull request #4890 synchronize by Birdtalon
November 10, 2023 19:25 10s
November 10, 2023 19:25 10s
Lets observer with SecHUD enabled see sec records on examine. Check for merge conflicts #16337: Pull request #4890 opened by Birdtalon
November 10, 2023 19:23 15s
November 10, 2023 19:23 15s
Functional bedrolls Check for merge conflicts #16336: Pull request #4874 synchronize by Releasethesea
November 10, 2023 17:56 12s
November 10, 2023 17:56 12s
Echo pad droppod fix Check for merge conflicts #16335: Pull request #4889 opened by fira
November 10, 2023 16:09 15s
November 10, 2023 16:09 15s
added a file to handle the fridges in kitchen on almayer and added a bunch of food boxes. Check for merge conflicts #16334: Pull request #4586 ready_for_review by Huffie56
November 10, 2023 13:20 7m 15s
November 10, 2023 13:20 7m 15s
added a file to handle the fridges in kitchen on almayer and added a bunch of food boxes. Check for merge conflicts #16333: Pull request #4586 synchronize by Huffie56
November 10, 2023 13:17 2m 22s
November 10, 2023 13:17 2m 22s
Almayer: Turns (mostly) empty maint room into Armourer workshop with old L42As Check for merge conflicts #16332: Pull request #4888 synchronize by spartanbobby
November 10, 2023 13:16 25s
November 10, 2023 13:16 25s
Almayer: Turns (mostly) empty maint room into Armourer workshop with old L42As Check for merge conflicts #16331: Pull request #4888 opened by spartanbobby
November 10, 2023 13:16 15s
November 10, 2023 13:16 15s
Refactor of ammo and it's children file to clean a bit BE code. Check for merge conflicts #16330: Pull request #4886 ready_for_review by Huffie56
November 10, 2023 12:29 14s
November 10, 2023 12:29 14s
Automatic Fireteams Check for merge conflicts #16329: Pull request #4714 reopened by Huffie56
November 10, 2023 12:10 15s
November 10, 2023 12:10 15s
Fixes minor mapping errors Check for merge conflicts #16328: Pull request #4873 synchronize by Releasethesea
November 10, 2023 06:56 2m 15s
November 10, 2023 06:56 2m 15s