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,882 workflow run results
2,882 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Overwatch Skill + All USCM Officers Can Now Overwatch Check for merge conflicts #14126: Pull request #4318 synchronize by Steelpoint
September 2, 2023 17:13 18s
September 2, 2023 17:13 18s
Overwatch Skill + All USCM Officers Can Now Overwatch Check for merge conflicts #14125: Pull request #4318 opened by Steelpoint
September 2, 2023 16:42 14s
September 2, 2023 16:42 14s
On-screen messages sounds Check for merge conflicts #14124: Pull request #4301 synchronize by ihatethisengine
September 2, 2023 08:26 15s
September 2, 2023 08:26 15s
Brain damage tweaks Check for merge conflicts #14123: Pull request #4316 opened by morrowwolf
September 2, 2023 05:39 15s
September 2, 2023 05:39 15s
Adds synthetic night vision (#4300) Check for merge conflicts #14122: Commit f4d9a56 pushed by github-merge-queue bot
September 2, 2023 05:18 4m 18s master
master
September 2, 2023 05:18 4m 18s
Adds synthetic night vision Check for merge conflicts #14121: Pull request #4300 ready_for_review by morrowwolf
September 2, 2023 05:05 14s
September 2, 2023 05:05 14s
Possible fix for double dropship landing sound Check for merge conflicts #14120: Pull request #4315 opened by morrowwolf
September 2, 2023 05:03 14s
September 2, 2023 05:03 14s
Crashable lifeboats and early launch Check for merge conflicts #14119: Pull request #4314 synchronize by morrowwolf
September 2, 2023 04:50 15s
September 2, 2023 04:50 15s
Crashable lifeboats and early launch Check for merge conflicts #14118: Pull request #4314 synchronize by morrowwolf
September 2, 2023 04:31 16s
September 2, 2023 04:31 16s
Crashable lifeboats and early launch Check for merge conflicts #14117: Pull request #4314 opened by morrowwolf
September 2, 2023 04:28 17s
September 2, 2023 04:28 17s
Fix UPP Hostile ERT Not Spawning With Gun Check for merge conflicts #14116: Pull request #4313 opened by Steelpoint
September 2, 2023 04:02 13s
September 2, 2023 04:02 13s
Unbreaks camo Check for merge conflicts #14115: Pull request #4312 opened by morrowwolf
September 2, 2023 03:23 15s
September 2, 2023 03:23 15s
Surgical drop pouch Check for merge conflicts #14114: Pull request #4311 opened by Sulaboy
September 2, 2023 02:12 2m 15s
September 2, 2023 02:12 2m 15s
Working Joe restriction bypass toggle Check for merge conflicts #14113: Pull request #4310 opened by Ben10083
September 1, 2023 23:21 9s
September 1, 2023 23:21 9s
Adds synthetic night vision Check for merge conflicts #14112: Pull request #4300 synchronize by Katskan
September 1, 2023 19:55 17s
September 1, 2023 19:55 17s
Fix Research Disposal Pipe Check for merge conflicts #14111: Pull request #4307 synchronize by Steelpoint
September 1, 2023 18:05 4m 3s
September 1, 2023 18:05 4m 3s
Donut Spelling Error Fix Check for merge conflicts #14110: Pull request #4308 opened by Steelpoint
September 1, 2023 18:04 3m 54s
September 1, 2023 18:04 3m 54s
Fix Research Disposal Pipe Check for merge conflicts #14109: Pull request #4307 opened by Steelpoint
September 1, 2023 18:01 21s
September 1, 2023 18:01 21s
overlay limbs for improved client performance Check for merge conflicts #14108: Pull request #4290 synchronize by harryob
September 1, 2023 17:59 16s
September 1, 2023 17:59 16s
Adds Helmets + Visor To Synth Vendor | Grey M10 Helmet Addition Check for merge conflicts #14107: Pull request #4306 opened by Steelpoint
September 1, 2023 17:44 14s
September 1, 2023 17:44 14s
bumps the default fps (#4297) Check for merge conflicts #14106: Commit 64fa33f pushed by github-merge-queue bot
September 1, 2023 17:44 2m 14s master
master
September 1, 2023 17:44 2m 14s
Removes debuffs from the folded M39 stock Check for merge conflicts #14105: Pull request #4305 opened by VileBeggar
September 1, 2023 17:37 27s
September 1, 2023 17:37 27s
overlay limbs for improved client performance Check for merge conflicts #14104: Pull request #4290 synchronize by harryob
September 1, 2023 15:47 16s
September 1, 2023 15:47 16s
On-screen messages sounds Check for merge conflicts #14103: Pull request #4301 synchronize by ihatethisengine
September 1, 2023 15:15 14s
September 1, 2023 15:15 14s
Adds synthetic night vision Check for merge conflicts #14102: Pull request #4300 synchronize by Katskan
September 1, 2023 14:36 13s
September 1, 2023 14:36 13s