Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
9,937 workflow run results
9,937 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Map: Bigred change south lambda padlock and turned it into a checkpoint. Check for merge conflicts #21084: Pull request #5763 synchronize by SabreML
March 31, 2024 13:54 11s
March 31, 2024 13:54 11s
gives proper light armor slowdown to goon armor Check for merge conflicts #21083: Pull request #6059 opened by Red-byte3D
March 31, 2024 13:52 13s
March 31, 2024 13:52 13s
Fixes Marine Minor (Hive collapse) (#6028) Check for merge conflicts #21082: Commit dd4e0ae pushed by github-merge-queue bot
March 31, 2024 09:34 4m 18s master
master
March 31, 2024 09:34 4m 18s
Move holocards to the squad hud (#6029) Check for merge conflicts #21081: Commit ad5daf7 pushed by github-merge-queue bot
March 31, 2024 09:26 4m 22s master
master
March 31, 2024 09:26 4m 22s
Removes unused camera var (#6038) Check for merge conflicts #21080: Commit 43eb463 pushed by github-merge-queue bot
March 31, 2024 09:18 4m 14s master
master
March 31, 2024 09:18 4m 14s
Fixes a few runtimes from HUD cycling (#6025) Check for merge conflicts #21079: Commit a50f6b4 pushed by github-merge-queue bot
March 31, 2024 09:10 4m 13s master
master
March 31, 2024 09:10 4m 13s
'movable_pre_move overridden' runtime fix (#6024) Check for merge conflicts #21078: Commit 0adaad6 pushed by github-merge-queue bot
March 31, 2024 09:02 4m 14s master
master
March 31, 2024 09:02 4m 14s
Opens up FORECON crashsite to regular play while maintaining the surv… Check for merge conflicts #21077: Commit 6104da6 pushed by github-merge-queue bot
March 31, 2024 08:31 4m 16s master
master
March 31, 2024 08:31 4m 16s
Cryo Tube Rework Check for merge conflicts #21076: Pull request #6058 synchronize by Drulikar
March 31, 2024 08:18 12s
March 31, 2024 08:18 12s
Cryo Tube Rework Check for merge conflicts #21075: Pull request #6058 synchronize by Drulikar
March 31, 2024 07:38 9s
March 31, 2024 07:38 9s
Cryo Tube Rework Check for merge conflicts #21074: Pull request #6058 synchronize by Drulikar
March 31, 2024 07:24 11s
March 31, 2024 07:24 11s
Cryo Tube Rework Check for merge conflicts #21073: Pull request #6058 synchronize by Drulikar
March 31, 2024 07:09 10s
March 31, 2024 07:09 10s
Cryo Tube Rework Check for merge conflicts #21072: Pull request #6058 opened by Drulikar
March 31, 2024 06:14 11s
March 31, 2024 06:14 11s
Adds 2 new flamer fuels for OT/Chemistry to make. Check for merge conflicts #21071: Pull request #6057 synchronize by iloveloopers
March 31, 2024 03:41 24s
March 31, 2024 03:41 24s
Adds 2 new flamer fuels for OT/Chemistry to make. Check for merge conflicts #21070: Pull request #6057 opened by iloveloopers
March 31, 2024 03:41 13s
March 31, 2024 03:41 13s
Fix,update CLF ERT Station. fix space tile and missing platform. (#5992) Check for merge conflicts #21069: Commit 51fb331 pushed by github-merge-queue bot
March 31, 2024 03:22 6m 43s master
master
March 31, 2024 03:22 6m 43s
XM43E1 in regular gameplay Check for merge conflicts #21068: Pull request #5724 synchronize by Releasethesea
March 31, 2024 03:21 11s
March 31, 2024 03:21 11s
XM43E1 in regular gameplay Check for merge conflicts #21067: Pull request #5724 synchronize by Releasethesea
March 31, 2024 02:28 11s
March 31, 2024 02:28 11s
XM43E1 in regular gameplay Check for merge conflicts #21066: Pull request #5724 synchronize by Releasethesea
March 31, 2024 01:59 2m 16s
March 31, 2024 01:59 2m 16s
[s] Temporary client image fix Check for merge conflicts #21065: Pull request #6056 opened by Drulikar
March 31, 2024 01:59 12s
March 31, 2024 01:59 12s
fixes backpacks not showing up in hands on chance's claim Check for merge conflicts #21064: Pull request #6055 opened by sleepynecrons
March 31, 2024 01:40 2m 15s
March 31, 2024 01:40 2m 15s
XM43E1 in regular gameplay Check for merge conflicts #21063: Pull request #5724 synchronize by Releasethesea
March 30, 2024 21:12 13s
March 30, 2024 21:12 13s
Ports stripping menu from TG Check for merge conflicts #21062: Pull request #5914 synchronize by ihatethisengine
March 30, 2024 15:36 13s
March 30, 2024 15:36 13s
Fix for firing mortar. Check for merge conflicts #21061: Pull request #6054 synchronize by Segrain
March 30, 2024 15:33 11s
March 30, 2024 15:33 11s
Fix for firing mortar. Check for merge conflicts #21060: Pull request #6054 opened by Segrain
March 30, 2024 15:20 10s
March 30, 2024 15:20 10s