Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
413 workflow run results
413 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Sweeping LV522 Changes + FORECON GL replaced by FORECON Sniper (Without the sniper) Check for merge conflicts #12530: Pull request #3917 synchronize by spartanbobby
July 24, 2023 13:40 11s
July 24, 2023 13:40 11s
Gets rid of GBP Check for merge conflicts #12529: Pull request #3978 opened by Zonespace27
July 24, 2023 13:28 14s
July 24, 2023 13:28 14s
Fix bodybags requiring ToD even if unreviveable (#3964) Check for merge conflicts #12528: Commit b97cd09 pushed by github-merge-queue bot
July 24, 2023 13:04 4m 18s master
master
July 24, 2023 13:04 4m 18s
QOL Eggsac Carrier Changes - Sprites, Messages and Sounds (#3868) Check for merge conflicts #12527: Commit b9b353b pushed by github-merge-queue bot
July 24, 2023 12:22 10m 22s master
master
July 24, 2023 12:22 10m 22s
Sweeping LV522 Changes + FORECON GL replaced by FORECON Sniper (Without the sniper) Check for merge conflicts #12526: Pull request #3917 synchronize by spartanbobby
July 24, 2023 12:07 12s
July 24, 2023 12:07 12s
Tent Tweaks & Fixes! Check for merge conflicts #12525: Pull request #3918 ready_for_review by ghostsheet
July 24, 2023 10:05 13s
July 24, 2023 10:05 13s
Tent Tweaks & Fixes! Check for merge conflicts #12524: Pull request #3918 synchronize by ghostsheet
July 24, 2023 10:05 12s
July 24, 2023 10:05 12s
Tent Tweaks & Fixes! Check for merge conflicts #12523: Pull request #3918 synchronize by ghostsheet
July 24, 2023 09:58 13s
July 24, 2023 09:58 13s
New facehugger strain: Watcher Check for merge conflicts #12522: Pull request #3726 reopened by Hopekz
July 24, 2023 09:17 13s
July 24, 2023 09:17 13s
Lesser Drones (#3939) Check for merge conflicts #12521: Commit cbb0fc4 pushed by github-merge-queue bot
July 24, 2023 09:12 4m 17s master
master
July 24, 2023 09:12 4m 17s
Changes to disarm / CQC code Check for merge conflicts #12520: Pull request #3970 ready_for_review by BeagleGaming1
July 24, 2023 06:07 10s
July 24, 2023 06:07 10s
Changes to disarm / CQC code Check for merge conflicts #12519: Pull request #3970 synchronize by BeagleGaming1
July 24, 2023 06:05 14s
July 24, 2023 06:05 14s
Zone de commandement général - 1 - Mapping CIC Rework Check for merge conflicts #12518: Pull request #3903 synchronize by LC4492
July 24, 2023 04:40 13s
July 24, 2023 04:40 13s
beserker evil style Check for merge conflicts #12517: Pull request #3977 opened by thwompa
July 24, 2023 03:36 12s
July 24, 2023 03:36 12s
Fix Some Preferences Not Saving Check for merge conflicts #12516: Pull request #3975 opened by Drulikar
July 24, 2023 02:38 2m 19s
July 24, 2023 02:38 2m 19s
Interrupt flag fix Check for merge conflicts #12515: Pull request #3974 opened by ihatethisengine
July 24, 2023 01:08 14s
July 24, 2023 01:08 14s
Sweeping LV522 Changes + FORECON GL replaced by FORECON Sniper (Without the sniper) Check for merge conflicts #12514: Pull request #3917 synchronize by spartanbobby
July 23, 2023 23:53 11s
July 23, 2023 23:53 11s
Lesser Drones Check for merge conflicts #12513: Pull request #3939 synchronize by morrowwolf
July 23, 2023 22:32 12s
July 23, 2023 22:32 12s
Lesser Drones Check for merge conflicts #12512: Pull request #3939 synchronize by morrowwolf
July 23, 2023 22:25 12s
July 23, 2023 22:25 12s
Fixes wood window numbering (#3968) Check for merge conflicts #12511: Commit 6c8f315 pushed by github-merge-queue bot
July 23, 2023 21:33 4m 14s master
master
July 23, 2023 21:33 4m 14s
Update brig area to make more sense. Check for merge conflicts #12510: Pull request #3973 ready_for_review by Huffie56
July 23, 2023 18:42 13s
July 23, 2023 18:42 13s
Update brig area to make more sense. Check for merge conflicts #12509: Pull request #3973 opened by Huffie56
July 23, 2023 14:55 12s
July 23, 2023 14:55 12s
Update squad vendors reduce numbers of items for squad and increase it for requisition. Check for merge conflicts #12508: Pull request #3912 synchronize by Huffie56
July 23, 2023 14:45 12s
July 23, 2023 14:45 12s
Update squad vendors reduce numbers of items for squad and increase it for requisition. Check for merge conflicts #12507: Pull request #3912 synchronize by Huffie56
July 23, 2023 14:45 15s
July 23, 2023 14:45 15s
Lesser Drones Check for merge conflicts #12506: Pull request #3939 synchronize by morrowwolf
July 23, 2023 13:30 13s
July 23, 2023 13:30 13s