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,081 workflow run results
5,081 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

/tg/ Status Effects Part 2 - datum, KD, KO, Stuns Check for merge conflicts #16319: Pull request #4842 synchronize by fira
November 9, 2023 21:39 18s
November 9, 2023 21:39 18s
/tg/ Status effects part 1 - fluid status updates Check for merge conflicts #16318: Pull request #4828 synchronize by fira
November 9, 2023 21:32 12s
November 9, 2023 21:32 12s
/tg/ Status effects part 1 - fluid status updates Check for merge conflicts #16317: Pull request #4828 synchronize by fira
November 9, 2023 20:48 14s
November 9, 2023 20:48 14s
Synthetic internal powercell Check for merge conflicts #16316: Pull request #4559 synchronize by QuickLode
November 9, 2023 20:34 16s
November 9, 2023 20:34 16s
Should fix pumpkins, PUMPKINS EVERYWHERE (#4881) Check for merge conflicts #16315: Commit 653208a pushed by github-merge-queue bot
November 9, 2023 19:21 4m 16s master
master
November 9, 2023 19:21 4m 16s
Le Almayer changes (#4864) Check for merge conflicts #16314: Commit 2c6fbc1 pushed by github-merge-queue bot
November 9, 2023 19:02 4m 20s master
master
November 9, 2023 19:02 4m 20s
Eggsac carrier revival Check for merge conflicts #16313: Pull request #4716 synchronize by Birdtalon
November 9, 2023 18:39 14s
November 9, 2023 18:39 14s
Eggsac carrier revival Check for merge conflicts #16312: Pull request #4716 synchronize by Birdtalon
November 9, 2023 18:36 15s
November 9, 2023 18:36 15s
Makes rear dropship doors solid again and refactors multi door filler… Check for merge conflicts #16311: Commit 4e52130 pushed by github-merge-queue bot
November 9, 2023 15:58 4m 18s master
master
November 9, 2023 15:58 4m 18s
Refactor of ammo and it's children file to clean a bit BE code. Check for merge conflicts #16310: Pull request #4886 opened by Huffie56
November 9, 2023 14:59 14s
November 9, 2023 14:59 14s
Makes rear dropship doors solid again and refactors multi door filler turf logic Check for merge conflicts #16309: Pull request #4837 synchronize by Das15
November 9, 2023 14:37 15s
November 9, 2023 14:37 15s
/tg/ Status Effects Prelude D - Mob Freeze Refactor Check for merge conflicts #16308: Pull request #4878 synchronize by fira
November 9, 2023 13:57 10s
November 9, 2023 13:57 10s
QoL addition and adjustment to squad role vendors. Check for merge conflicts #16307: Pull request #4876 ready_for_review by Huffie56
November 9, 2023 13:56 14s
November 9, 2023 13:56 14s
/tg/ Status effects part 1 - fluid status updates Check for merge conflicts #16306: Pull request #4828 synchronize by fira
November 9, 2023 13:52 13s
November 9, 2023 13:52 13s
Minor fixes for Loadout Items (#4849) Check for merge conflicts #16305: Commit d120fa7 pushed by github-merge-queue bot
November 9, 2023 13:51 2m 16s master
master
November 9, 2023 13:51 2m 16s
Componentizes power cells (#4855) Check for merge conflicts #16304: Commit 41b2e51 pushed by github-merge-queue bot
November 9, 2023 13:38 2m 20s master
master
November 9, 2023 13:38 2m 20s
/tg/ Status Effects Prelude D - Mob Freeze Refactor Check for merge conflicts #16303: Pull request #4878 synchronize by fira
November 9, 2023 13:29 12s
November 9, 2023 13:29 12s
/tg/ Status Effects Prelude E - Living Status Effects Refactor Check for merge conflicts #16302: Pull request #4885 opened by fira
November 9, 2023 13:22 13s
November 9, 2023 13:22 13s
Colonial Space Grunts Check for merge conflicts #16301: Pull request #4884 opened by Releasethesea
November 9, 2023 07:48 15s
November 9, 2023 07:48 15s
Fix imaginary friend ears and icons (#4863) Check for merge conflicts #16300: Commit 80ca798 pushed by github-merge-queue bot
November 9, 2023 05:04 4m 18s master
master
November 9, 2023 05:04 4m 18s
Fix fax template images for CDN (#4872) Check for merge conflicts #16299: Commit 79b9265 pushed by github-merge-queue bot
November 9, 2023 04:42 4m 16s master
master
November 9, 2023 04:42 4m 16s
Close-Doors-When-Lockdown-Dropship Check for merge conflicts #16298: Pull request #4883 opened by hislittlecuzingames
November 9, 2023 03:40 2m 11s
November 9, 2023 03:40 2m 11s
Fixes guns occasionally ceasing to work Check for merge conflicts #16297: Pull request #4882 synchronize by Zonespace27
November 8, 2023 22:57 15s
November 8, 2023 22:57 15s
Fixes guns occasionally ceasing to work Check for merge conflicts #16296: Pull request #4882 opened by Zonespace27
November 8, 2023 22:42 18s
November 8, 2023 22:42 18s
Dropship weapons console TGUI Check for merge conflicts #16295: Pull request #4812 synchronize by fira
November 8, 2023 21:23 13s
November 8, 2023 21:23 13s