Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
12,588 workflow run results
12,588 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Alter Xeno Evolution: Larva -> Drone Mandatory Check for merge conflicts #23858: Pull request #6298 ready_for_review by Venuska1117
June 20, 2024 23:03 11s
June 20, 2024 23:03 11s
Alter Xeno Evolution: Larva -> Drone Mandatory Check for merge conflicts #23857: Pull request #6298 synchronize by Venuska1117
June 20, 2024 23:03 12s
June 20, 2024 23:03 12s
Allow Surgery, construction small puddles. Check for merge conflicts #23856: Pull request #6340 ready_for_review by hislittlecuzingames
June 20, 2024 16:17 10s
June 20, 2024 16:17 10s
Allow Surgery, construction small puddles. Check for merge conflicts #23855: Pull request #6340 synchronize by hislittlecuzingames
June 20, 2024 16:12 11s
June 20, 2024 16:12 11s
Added Vendables to Staff Officer Closet Check for merge conflicts #23854: Pull request #6496 ready_for_review by hislittlecuzingames
June 20, 2024 15:56 13s
June 20, 2024 15:56 13s
Added Vendables to Staff Officer Closet Check for merge conflicts #23853: Pull request #6496 synchronize by hislittlecuzingames
June 20, 2024 15:46 14s
June 20, 2024 15:46 14s
Added Vendables to Staff Officer Closet Check for merge conflicts #23852: Pull request #6496 synchronize by hislittlecuzingames
June 20, 2024 15:35 13s
June 20, 2024 15:35 13s
Added Vendables to Staff Officer Closet Check for merge conflicts #23851: Pull request #6496 synchronize by hislittlecuzingames
June 20, 2024 15:29 14s
June 20, 2024 15:29 14s
Fix humans seeing lesser drone information when examining the core (#… Check for merge conflicts #23850: Commit 09324a0 pushed by github-merge-queue bot
June 20, 2024 12:49 4m 18s master
master
June 20, 2024 12:49 4m 18s
Update CONTRIBUTING.md (#6519) Check for merge conflicts #23849: Commit 3fd9a4f pushed by github-merge-queue bot
June 20, 2024 12:43 2m 14s master
master
June 20, 2024 12:43 2m 14s
Update CONTRIBUTING.md Check for merge conflicts #23848: Pull request #6519 synchronize by Drulikar
June 20, 2024 12:24 13s
June 20, 2024 12:24 13s
Update CONTRIBUTING.md Check for merge conflicts #23847: Pull request #6519 opened by Drulikar
June 20, 2024 12:21 11s
June 20, 2024 12:21 11s
Larva aesthetic update Check for merge conflicts #23846: Pull request #6439 synchronize by Blundir
June 20, 2024 10:37 12s
June 20, 2024 10:37 12s
Remove self-extinguishing with acid spray (#6508) Check for merge conflicts #23845: Commit 048a671 pushed by github-merge-queue bot
June 20, 2024 09:02 4m 18s master
master
June 20, 2024 09:02 4m 18s
Better Queen shove (#6457) Check for merge conflicts #23844: Commit 14549f7 pushed by github-merge-queue bot
June 20, 2024 08:54 4m 17s master
master
June 20, 2024 08:54 4m 17s
fence nerf + fuel cell recycler + showcase is now destroyable (#6471) Check for merge conflicts #23843: Commit fde6a94 pushed by github-merge-queue bot
June 20, 2024 08:47 4m 14s master
master
June 20, 2024 08:47 4m 14s
Better Queen shove Check for merge conflicts #23842: Pull request #6457 synchronize by Drulikar
June 20, 2024 08:44 40s
June 20, 2024 08:44 40s
makes xenos take damage when patting fire on ground (#6484) Check for merge conflicts #23841: Commit 5f6a8e6 pushed by github-merge-queue bot
June 20, 2024 08:23 4m 16s master
master
June 20, 2024 08:23 4m 16s
fixes observe menu bug (#6391) Check for merge conflicts #23840: Commit 24632ad pushed by github-merge-queue bot
June 20, 2024 08:17 4m 15s master
master
June 20, 2024 08:17 4m 15s
Fix hiding in the LZ walls Check for merge conflicts #23839: Pull request #6517 opened by Drulikar
June 20, 2024 08:06 15s
June 20, 2024 08:06 15s
makes xenos take damage when patting fire on ground Check for merge conflicts #23838: Pull request #6484 synchronize by cuberound
June 20, 2024 06:23 13s
June 20, 2024 06:23 13s
removes macho sauce and water recipe Check for merge conflicts #23837: Pull request #6513 opened by iloveloopers
June 20, 2024 01:41 2m 12s
June 20, 2024 01:41 2m 12s
iron teeth character trait Check for merge conflicts #23836: Pull request #6512 opened by AndroBetel
June 20, 2024 00:04 11s
June 20, 2024 00:04 11s
Show facehugger limit when examining eggs/morphers (#6386) Check for merge conflicts #23835: Commit 6864722 pushed by github-merge-queue bot
June 19, 2024 23:48 4m 13s master
master
June 19, 2024 23:48 4m 13s
Show facehugger limit when examining eggs/morphers Check for merge conflicts #23834: Pull request #6386 ready_for_review by zzzmike
June 19, 2024 23:27 11s
June 19, 2024 23:27 11s