Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
7,819 workflow run results
7,819 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Deadchat no longer gets notified about tutorial facehuggers Check for merge conflicts #18981: Pull request #5546 opened by Contrabang
January 24, 2024 23:12 11s
January 24, 2024 23:12 11s
scouts can no longer attach 2x-4x scopes on their gun Check for merge conflicts #18980: Pull request #5545 opened by Red-byte3D
January 24, 2024 22:53 10s
January 24, 2024 22:53 10s
Oppressor tailstab nerf Check for merge conflicts #18979: Pull request #5544 synchronize by Red-byte3D
January 24, 2024 22:50 10s
January 24, 2024 22:50 10s
Oppressor tailstab nerf Check for merge conflicts #18978: Pull request #5544 opened by Red-byte3D
January 24, 2024 22:44 13s
January 24, 2024 22:44 13s
M37A2 Rework Check for merge conflicts #18977: Pull request #5541 synchronize by Staykeu
January 24, 2024 22:38 14s
January 24, 2024 22:38 14s
Xeno strains refactor Check for merge conflicts #18976: Pull request #5542 synchronize by SabreML
January 24, 2024 21:02 13s
January 24, 2024 21:02 13s
Xeno strains refactor Check for merge conflicts #18975: Pull request #5542 opened by SabreML
January 24, 2024 20:57 14s
January 24, 2024 20:57 14s
Fixes xeno tunnel tracking Check for merge conflicts #18974: Pull request #5536 synchronize by SabreML
January 24, 2024 20:42 12s
January 24, 2024 20:42 12s
Project ARES: Admin Console Check for merge conflicts #18973: Pull request #4182 synchronize by realforest2001
January 24, 2024 20:39 17s
January 24, 2024 20:39 17s
M37A2 Rework Check for merge conflicts #18972: Pull request #5541 opened by Staykeu
January 24, 2024 19:38 12s
January 24, 2024 19:38 12s
scout ammo and economy nerf Check for merge conflicts #18971: Pull request #5539 opened by Red-byte3D
January 24, 2024 19:23 10s
January 24, 2024 19:23 10s
refactor multiple files concerning robot and mechs. Check for merge conflicts #18970: Pull request #5538 opened by Huffie56
January 24, 2024 18:09 11s
January 24, 2024 18:09 11s
Removes CLF synth from nightmare insert Check for merge conflicts #18969: Pull request #5534 ready_for_review by irakligabunia
January 24, 2024 16:34 12s
January 24, 2024 16:34 12s
Fixes xeno tunnel tracking Check for merge conflicts #18968: Pull request #5536 ready_for_review by SabreML
January 24, 2024 16:27 15s
January 24, 2024 16:27 15s
Fixes xeno tunnel tracking Check for merge conflicts #18967: Pull request #5536 synchronize by SabreML
January 24, 2024 16:24 14s
January 24, 2024 16:24 14s
Fix latejoin menu marine title Check for merge conflicts #18966: Pull request #5537 opened by realforest2001
January 24, 2024 16:05 12s
January 24, 2024 16:05 12s
Fixes xeno tunnel tracking Check for merge conflicts #18965: Pull request #5536 opened by SabreML
January 24, 2024 15:58 13s
January 24, 2024 15:58 13s
Removes CLF synth from nightmare insert Check for merge conflicts #18964: Pull request #5534 opened by irakligabunia
January 24, 2024 14:20 14s
January 24, 2024 14:20 14s
Civilian survs now spawn with snow gear Check for merge conflicts #18963: Pull request #5533 opened by private-tristan
January 24, 2024 12:45 14s
January 24, 2024 12:45 14s
updates sprite of intel chestrig Check for merge conflicts #18962: Pull request #5532 synchronize by PoltavskaPraca
January 24, 2024 12:11 16s
January 24, 2024 12:11 16s
updates sprite of intel chestrig Check for merge conflicts #18961: Pull request #5532 opened by PoltavskaPraca
January 24, 2024 12:06 15s
January 24, 2024 12:06 15s
refactor creating it's own file for souto mobile code instead of it b… Check for merge conflicts #18960: Commit 698a9cd pushed by github-merge-queue bot
January 24, 2024 11:53 4m 15s master
master
January 24, 2024 11:53 4m 15s
Hive collapse when less than 4 xenos is still a marine major. (#5442) Check for merge conflicts #18959: Commit e9a9ccf pushed by github-merge-queue bot
January 24, 2024 11:39 4m 14s master
master
January 24, 2024 11:39 4m 14s
refactor creating it's own file for souto mobile code instead of it being in vehicle.dm. Check for merge conflicts #18958: Pull request #5498 synchronize by Birdtalon
January 24, 2024 11:26 13s
January 24, 2024 11:26 13s
Cleans up defib code a little (#5507) Check for merge conflicts #18957: Commit 37dd2f1 pushed by github-merge-queue bot
January 24, 2024 09:26 2m 12s master
master
January 24, 2024 09:26 2m 12s