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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

New Healer Drone Ability: Sacrifice, another go (#5173) Check for merge conflicts #17983: Commit bf41565 pushed by github-merge-queue bot
December 23, 2023 23:49 4m 15s master
master
December 23, 2023 23:49 4m 15s
Fix Crusher Pass Flags (#5266) Check for merge conflicts #17982: Commit ac2ebc8 pushed by github-merge-queue bot
December 23, 2023 23:25 4m 16s master
master
December 23, 2023 23:25 4m 16s
Dropship weapons console TGUI Check for merge conflicts #17981: Pull request #4812 synchronize by mullenpaul
December 23, 2023 23:20 2m 15s
December 23, 2023 23:20 2m 15s
adds forced scream emote after warrior lunge (#5273) Check for merge conflicts #17980: Commit 3dabf9c pushed by github-merge-queue bot
December 23, 2023 23:06 3m 55s master
master
December 23, 2023 23:06 3m 55s
New Healer Drone Ability: Sacrifice, another go Check for merge conflicts #17979: Pull request #5173 synchronize by ihatethisengine
December 23, 2023 23:06 3m 57s
December 23, 2023 23:06 3m 57s
Fixes carriers being unable to reduce their 'reserved facehuggers' number Check for merge conflicts #17978: Pull request #5286 opened by SabreML
December 23, 2023 23:05 11s
December 23, 2023 23:05 11s
New Healer Drone Ability: Sacrifice, another go Check for merge conflicts #17977: Pull request #5173 synchronize by ihatethisengine
December 23, 2023 22:59 1m 17s
December 23, 2023 22:59 1m 17s
Camera console green-ness fix (#5271) Check for merge conflicts #17976: Commit 7fa7fc7 pushed by github-merge-queue bot
December 23, 2023 22:49 4m 20s master
master
December 23, 2023 22:49 4m 20s
More WE/YOU fixes Check for merge conflicts #17975: Pull request #5276 synchronize by Red-byte3D
December 23, 2023 22:42 1m 53s
December 23, 2023 22:42 1m 53s
More WE/YOU fixes Check for merge conflicts #17974: Pull request #5276 synchronize by Red-byte3D
December 23, 2023 22:42 1m 13s
December 23, 2023 22:42 1m 13s
Fixes Flight Control Operator surv + gave him a windbreaker and one m… Check for merge conflicts #17973: Commit 84b9b7e pushed by github-merge-queue bot
December 23, 2023 22:26 9m 2s master
master
December 23, 2023 22:26 9m 2s
DS doorgun no longer drops the gun when destroyed Check for merge conflicts #17972: Pull request #5211 synchronize by Drulikar
December 23, 2023 22:23 2m 38s
December 23, 2023 22:23 2m 38s
Pylons now count only groundside marines, xenos get major boost to evo speed for 3 minutes after hijack Check for merge conflicts #17971: Pull request #5122 ready_for_review by ihatethisengine
December 23, 2023 22:18 9s
December 23, 2023 22:18 9s
Pylons now count only groundside marines, xenos get major boost to evo speed for 3 minutes after hijack Check for merge conflicts #17970: Pull request #5122 synchronize by ihatethisengine
December 23, 2023 22:17 16s
December 23, 2023 22:17 16s
Pylons now count only groundside marines, xenos get major boost to evo speed for 3 minutes after hijack Check for merge conflicts #17969: Pull request #5122 synchronize by ihatethisengine
December 23, 2023 22:15 14s
December 23, 2023 22:15 14s
DS doorgun no longer drops the gun when destroyed Check for merge conflicts #17968: Pull request #5211 synchronize by cuberound
December 23, 2023 21:52 4m 37s
December 23, 2023 21:52 4m 37s
DS doorgun no longer drops the gun when destroyed Check for merge conflicts #17967: Pull request #5211 synchronize by cuberound
December 23, 2023 21:49 14s
December 23, 2023 21:49 14s
Pylons now count only groundside marines, xenos get major boost to evo speed for 3 minutes after hijack Check for merge conflicts #17966: Pull request #5122 synchronize by ihatethisengine
December 23, 2023 21:49 12s
December 23, 2023 21:49 12s
X17 Riot Breaching Charge Check for merge conflicts #17965: Pull request #5285 synchronize by realforest2001
December 23, 2023 20:25 24s
December 23, 2023 20:25 24s
X17 Riot Breaching Charge Check for merge conflicts #17964: Pull request #5285 opened by realforest2001
December 23, 2023 20:24 10s
December 23, 2023 20:24 10s
adds timer to queen hijack Check for merge conflicts #17963: Pull request #5284 synchronize by ghost
December 23, 2023 16:47 10s
December 23, 2023 16:47 10s
adds timer to queen hijack Check for merge conflicts #17962: Pull request #5284 synchronize by ghost
December 23, 2023 16:42 13s
December 23, 2023 16:42 13s
adds timer to queen hijack Check for merge conflicts #17961: Pull request #5284 opened by ghost
December 23, 2023 16:40 16s
December 23, 2023 16:40 16s
Noticeboard refactor port + approved stamp Check for merge conflicts #17960: Pull request #5283 synchronize by Blundir
December 23, 2023 15:59 8s
December 23, 2023 15:59 8s
Noticeboard refactor port + approved stamp Check for merge conflicts #17959: Pull request #5283 synchronize by Blundir
December 23, 2023 15:50 9s
December 23, 2023 15:50 9s