Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
2,201 workflow run results
2,201 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Adds vehicles skill to the Commanding Officer & Auxiliary Support Officer Check for merge conflicts #13321: Pull request #4140 synchronize by kirieee
August 8, 2023 15:55 2m 52s
August 8, 2023 15:55 2m 52s
Updates Yautja Plasma Rifle (#3942) Check for merge conflicts #13320: Commit 4594547 pushed by github-merge-queue bot
August 8, 2023 15:53 2m 24s master
master
August 8, 2023 15:53 2m 24s
Adds vehicles skill to the Commanding Officer & Auxiliary Support Officer Check for merge conflicts #13319: Pull request #4140 opened by kirieee
August 8, 2023 15:52 2m 52s
August 8, 2023 15:52 2m 52s
Yautja Legacy restoration & Yautja Sprite Fixes Check for merge conflicts #13318: Pull request #4033 synchronize by realforest2001
August 8, 2023 15:48 11s
August 8, 2023 15:48 11s
Toolkit Addition (#3952) Check for merge conflicts #13317: Commit 63d033d pushed by github-merge-queue bot
August 8, 2023 14:46 4m 18s master
master
August 8, 2023 14:46 4m 18s
Almayer: Dirty Up The Ship (Lower Deck) Check for merge conflicts #13316: Pull request #4089 ready_for_review by Steelpoint
August 8, 2023 14:05 14s
August 8, 2023 14:05 14s
Almayer: Dirty Up The Ship (Lower Deck) Check for merge conflicts #13315: Pull request #4089 synchronize by Steelpoint
August 8, 2023 14:05 15s
August 8, 2023 14:05 15s
Changes *some* of the cave walls in the LV624 cave system to be jungle walls instead Check for merge conflicts #13314: Pull request #4136 synchronize by spartanbobby
August 8, 2023 10:46 12s
August 8, 2023 10:46 12s
gives UPP SL normal bag with some basic loudout Check for merge conflicts #13313: Pull request #4127 ready_for_review by cuberound
August 8, 2023 09:46 14s
August 8, 2023 09:46 14s
New Icon: Red Skull for players dead from Hardcore trait/mode (#4099) Check for merge conflicts #13312: Commit a68173b pushed by github-merge-queue bot
August 8, 2023 08:30 4m 17s master
master
August 8, 2023 08:30 4m 17s
Royal Marines Commando Check for merge conflicts #13311: Pull request #4098 synchronize by spartanbobby
August 8, 2023 08:10 13s
August 8, 2023 08:10 13s
New Icon: Red Skull for players dead from Hardcore trait/mode Check for merge conflicts #13309: Pull request #4099 synchronize by blackdragonTOW
August 8, 2023 08:04 14s
August 8, 2023 08:04 14s
New Icon: Red Skull for players dead from Hardcore trait/mode Check for merge conflicts #13310: Pull request #4099 reopened by blackdragonTOW
August 8, 2023 08:04 13s
August 8, 2023 08:04 13s
New Icon: Red Skull for players dead from Hardcore trait/mode Check for merge conflicts #13308: Pull request #4099 synchronize by blackdragonTOW
August 8, 2023 08:00 13s
August 8, 2023 08:00 13s
Fix drop ships having inconsistent ceiling setting to prevent OBs (#4… Check for merge conflicts #13307: Commit 496d00c pushed by github-merge-queue bot
August 8, 2023 07:46 4m 17s master
master
August 8, 2023 07:46 4m 17s
New Icon: Red Skull for players dead from Hardcore trait/mode Check for merge conflicts #13306: Pull request #4099 synchronize by blackdragonTOW
August 8, 2023 07:43 11s
August 8, 2023 07:43 11s
Cmo research qol Check for merge conflicts #13305: Pull request #4135 ready_for_review by SupernovaXTS
August 8, 2023 07:01 14s
August 8, 2023 07:01 14s
Cmo research qol Check for merge conflicts #13304: Pull request #4135 synchronize by SupernovaXTS
August 8, 2023 07:00 11s
August 8, 2023 07:00 11s
Cmo research qol Check for merge conflicts #13303: Pull request #4135 synchronize by SupernovaXTS
August 8, 2023 07:00 11s
August 8, 2023 07:00 11s
Foxtrot cryomarines spawn as freed mobs if not taken Check for merge conflicts #13302: Pull request #4132 synchronize by ihatethisengine
August 8, 2023 06:48 13s
August 8, 2023 06:48 13s
Xeno endgame content part 1: pylons and larva (#3985) Check for merge conflicts #13301: Commit e77c994 pushed by github-merge-queue bot
August 8, 2023 05:17 4m 15s master
master
August 8, 2023 05:17 4m 15s
Xeno endgame content part 1: pylons and larva Check for merge conflicts #13300: Pull request #3985 ready_for_review by morrowwolf
August 8, 2023 04:53 2m 8s
August 8, 2023 04:53 2m 8s
Xeno endgame content part 1: pylons and larva Check for merge conflicts #13299: Pull request #3985 synchronize by morrowwolf
August 8, 2023 04:53 44s
August 8, 2023 04:53 44s
Xeno endgame content part 1: pylons and larva Check for merge conflicts #13298: Pull request #3985 synchronize by morrowwolf
August 8, 2023 04:53 48s
August 8, 2023 04:53 48s
Nerfs to defibrillators, changes to heart damage & bloodloss Check for merge conflicts #13297: Pull request #4137 synchronize by BeagleGaming1
August 8, 2023 04:52 12s
August 8, 2023 04:52 12s