Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
3,753 workflow run results
3,753 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

/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
Should fix pumpkins, PUMPKINS EVERYWHERE Check for merge conflicts #16294: Pull request #4881 opened by fira
November 8, 2023 21:16 14s
November 8, 2023 21:16 14s
Hotfix for missing Traitbound Elements Handlers Check for merge conflicts #16293: Pull request #4879 synchronize by fira
November 8, 2023 19:53 5m 40s
November 8, 2023 19:53 5m 40s
Hotfix for missing Traitbound Elements Handlers Check for merge conflicts #16292: Pull request #4879 opened by fira
November 8, 2023 19:50 17s
November 8, 2023 19:50 17s
Added Ability for Looping Sounds to be heard from further away. Check for merge conflicts #16291: Pull request #4857 ready_for_review by hislittlecuzingames
November 8, 2023 19:46 18s
November 8, 2023 19:46 18s
Added Ability for Looping Sounds to be heard from further away. Check for merge conflicts #16290: Pull request #4857 synchronize by hislittlecuzingames
November 8, 2023 19:45 11s
November 8, 2023 19:45 11s
QoL addition and adjustment to squad role vendors. Check for merge conflicts #16289: Pull request #4876 synchronize by Huffie56
November 8, 2023 18:12 18s
November 8, 2023 18:12 18s
QoL addition and adjustment to squad role vendors. Check for merge conflicts #16288: Pull request #4876 synchronize by Huffie56
November 8, 2023 17:57 12s
November 8, 2023 17:57 12s
Adds possibility to customize crates (#4868) Check for merge conflicts #16287: Commit 704600a pushed by github-merge-queue bot
November 8, 2023 17:41 4m 21s master
master
November 8, 2023 17:41 4m 21s
/tg/ Status Effects Prelude C - Mob Density Refactor (#4871) Check for merge conflicts #16286: Commit 9df8fd1 pushed by github-merge-queue bot
November 8, 2023 17:04 4m 17s master
master
November 8, 2023 17:04 4m 17s
/tg/ Status Effects Prelude D - Mob Freeze Refactor Check for merge conflicts #16285: Pull request #4878 opened by fira
November 8, 2023 16:57 32s
November 8, 2023 16:57 32s
/tg/ Status Effects Prelude A - Updated Trait Backend (#4869) Check for merge conflicts #16284: Commit fa2c2b7 pushed by github-merge-queue bot
November 8, 2023 16:54 2m 17s master
master
November 8, 2023 16:54 2m 17s
/tg/ Status Effects Prelude B - Fixed VV Transform Stacking (#4870) Check for merge conflicts #16283: Commit 3178fa2 pushed by github-merge-queue bot
November 8, 2023 16:35 2m 21s master
master
November 8, 2023 16:35 2m 21s
Functional bedrolls Check for merge conflicts #16282: Pull request #4874 synchronize by Releasethesea
November 8, 2023 16:34 13s
November 8, 2023 16:34 13s
QoL addition and adjustment to squad role vendors. Check for merge conflicts #16281: Pull request #4876 synchronize by Huffie56
November 8, 2023 13:08 18s
November 8, 2023 13:08 18s
QoL addition and adjustment to squad role vendors. Check for merge conflicts #16280: Pull request #4876 opened by Huffie56
November 8, 2023 11:15 12s
November 8, 2023 11:15 12s
Fixes colliding keybinds for asay/mentorsay (#4860) Check for merge conflicts #16279: Commit d509236 pushed by github-merge-queue bot
November 8, 2023 08:51 4m 17s master
master
November 8, 2023 08:51 4m 17s
Functional bedrolls Check for merge conflicts #16278: Pull request #4874 synchronize by Releasethesea
November 8, 2023 03:58 15s
November 8, 2023 03:58 15s