Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
1,535 workflow run results
1,535 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

balance and fix to reduce the potentiel of requisiton players to get Carpal tunnel syndrome Check for merge conflicts #14096: Pull request #4303 opened by Huffie56
September 1, 2023 10:00 13s
September 1, 2023 10:00 13s
lowers GAU spread by one and makes it able to hit resting mobs Check for merge conflicts #14095: Pull request #4302 opened by cuberound
September 1, 2023 09:54 12s
September 1, 2023 09:54 12s
On-screen messages sounds Check for merge conflicts #14094: Pull request #4301 opened by ihatethisengine
September 1, 2023 09:43 16s
September 1, 2023 09:43 16s
Royal Marines Commando Check for merge conflicts #14093: Pull request #4098 synchronize by spartanbobby
September 1, 2023 09:43 14s
September 1, 2023 09:43 14s
Royal Marines Commando Check for merge conflicts #14092: Pull request #4098 synchronize by spartanbobby
September 1, 2023 09:40 19s
September 1, 2023 09:40 19s
Adds Provost radio & radio channel (#4160) Check for merge conflicts #14091: Commit a767d44 pushed by github-merge-queue bot
September 1, 2023 09:01 4m 18s master
master
September 1, 2023 09:01 4m 18s
Royal Marines Commando Check for merge conflicts #14089: Pull request #4098 ready_for_review by spartanbobby
September 1, 2023 07:26 14s
September 1, 2023 07:26 14s
Royal Marines Commando Check for merge conflicts #14090: Pull request #4098 synchronize by spartanbobby
September 1, 2023 07:26 11s
September 1, 2023 07:26 11s
Royal Marines Commando Check for merge conflicts #14088: Pull request #4098 synchronize by spartanbobby
September 1, 2023 07:14 14s
September 1, 2023 07:14 14s
Adds synthetic night vision Check for merge conflicts #14087: Pull request #4300 opened by Katskan
September 1, 2023 05:28 15s
September 1, 2023 05:28 15s
Intel Chute From Hanger To Computer Lab/Research Check for merge conflicts #14086: Pull request #4299 synchronize by Steelpoint
September 1, 2023 04:02 2m 15s
September 1, 2023 04:02 2m 15s
Fix UPP Survivor Armour Spawn (#4296) Check for merge conflicts #14085: Commit 6eed96c pushed by github-merge-queue bot
September 1, 2023 00:37 4m 16s master
master
September 1, 2023 00:37 4m 16s
Machete in-hand activation (#4277) Check for merge conflicts #14084: Commit e7f0bec pushed by github-merge-queue bot
August 31, 2023 20:54 4m 13s master
master
August 31, 2023 20:54 4m 13s
refactor : clean dmi file extract spritten hiden inside other sprites… Check for merge conflicts #14083: Commit b67fb9b pushed by github-merge-queue bot
August 31, 2023 20:36 4m 21s master
master
August 31, 2023 20:36 4m 21s
Fixes pylon lesser drone numbers (#4294) Check for merge conflicts #14082: Commit 72b9c48 pushed by github-merge-queue bot
August 31, 2023 20:21 4m 17s master
master
August 31, 2023 20:21 4m 17s
Infinite Flare bugfix! (#4293) Check for merge conflicts #14081: Commit b37d4c1 pushed by github-merge-queue bot
August 31, 2023 20:06 4m 16s master
master
August 31, 2023 20:06 4m 16s
Fix carrier mutation sprite update Check for merge conflicts #14080: Pull request #4298 synchronize by Birdtalon
August 31, 2023 19:37 12s
August 31, 2023 19:37 12s
Fix carrier mutation sprite update Check for merge conflicts #14079: Pull request #4298 synchronize by Birdtalon
August 31, 2023 19:32 53s
August 31, 2023 19:32 53s
Intel Chute From Hanger To Computer Lab/Research Check for merge conflicts #14078: Pull request #4299 opened by Steelpoint
August 31, 2023 19:29 12s
August 31, 2023 19:29 12s
Fix carrier mutation sprite update Check for merge conflicts #14077: Pull request #4298 synchronize by Birdtalon
August 31, 2023 19:28 13s
August 31, 2023 19:28 13s
Fix carrier mutation sprite update Check for merge conflicts #14076: Pull request #4298 synchronize by Birdtalon
August 31, 2023 19:11 12s
August 31, 2023 19:11 12s
Fix carrier mutation sprite update Check for merge conflicts #14075: Pull request #4298 opened by Birdtalon
August 31, 2023 19:00 16s
August 31, 2023 19:00 16s
Project ARES: Logging tweaks & updates Check for merge conflicts #14074: Pull request #4225 synchronize by realforest2001
August 31, 2023 18:06 5m 32s
August 31, 2023 18:06 5m 32s
ARES Change Holder Check for merge conflicts #14073: Pull request #4224 synchronize by realforest2001
August 31, 2023 18:05 5m 30s
August 31, 2023 18:05 5m 30s
ARES Change Holder Check for merge conflicts #14072: Pull request #4224 synchronize by realforest2001
August 31, 2023 18:04 15s
August 31, 2023 18:04 15s