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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Auto Delete Foodless MREs Check for merge conflicts #19816: Pull request #5761 opened by Steelpoint
February 20, 2024 09:00 2m 18s
February 20, 2024 09:00 2m 18s
Adds holo-targetting Vulture rounds Check for merge conflicts #19815: Pull request #5719 synchronize by VileBeggar
February 20, 2024 08:56 10s
February 20, 2024 08:56 10s
Jumping out of a dropship heading towards an LZ now throws your body … Check for merge conflicts #19814: Commit f9ed344 pushed by github-merge-queue bot
February 20, 2024 08:54 4m 16s master
master
February 20, 2024 08:54 4m 16s
adding vendors for maintenance technician Check for merge conflicts #19813: Pull request #5749 ready_for_review by Huffie56
February 20, 2024 08:44 2m 8s
February 20, 2024 08:44 2m 8s
adding vendors for maintenance technician Check for merge conflicts #19812: Pull request #5749 synchronize by Huffie56
February 20, 2024 08:41 11s
February 20, 2024 08:41 11s
Correct Vampire Lurker Strain Damage Modifications (#5753) Check for merge conflicts #19811: Commit 8f0424e pushed by github-merge-queue bot
February 20, 2024 08:36 4m 14s master
master
February 20, 2024 08:36 4m 14s
adding vendors for maintenance technician Check for merge conflicts #19810: Pull request #5749 synchronize by Huffie56
February 20, 2024 08:31 15s
February 20, 2024 08:31 15s
Seperating every port and starboard hallway areas into three areas each (fore midship aft) Check for merge conflicts #19809: Pull request #5699 ready_for_review by Huffie56
February 20, 2024 08:23 13s
February 20, 2024 08:23 13s
Fix CMB ERT & Path Based ERT Calling Check for merge conflicts #19808: Pull request #5755 synchronize by Drulikar
February 20, 2024 08:14 15s
February 20, 2024 08:14 15s
Seperating every port and starboard hallway areas into three areas each (fore midship aft) Check for merge conflicts #19807: Pull request #5699 synchronize by Huffie56
February 20, 2024 07:57 10s
February 20, 2024 07:57 10s
Seperating every port and starboard hallway areas into three areas each (fore midship aft) Check for merge conflicts #19806: Pull request #5699 synchronize by Huffie56
February 20, 2024 07:51 9s
February 20, 2024 07:51 9s
Adds more harsher time locks and restrictions for multiple marine and shipside roles. Check for merge conflicts #19805: Pull request #5760 synchronize by HumiliatedGoblin
February 20, 2024 07:33 11s
February 20, 2024 07:33 11s
Adds more harsher time locks and restrictions for multiple marine and shipside roles. Check for merge conflicts #19804: Pull request #5760 synchronize by HumiliatedGoblin
February 20, 2024 07:29 10s
February 20, 2024 07:29 10s
Adds more harsher time locks and restrictions for multiple marine and shipside roles. Check for merge conflicts #19803: Pull request #5760 synchronize by HumiliatedGoblin
February 20, 2024 07:14 13s
February 20, 2024 07:14 13s
Adds more harsher time locks and restrictions for multiple marine and shipside roles. Check for merge conflicts #19802: Pull request #5760 synchronize by HumiliatedGoblin
February 20, 2024 07:08 10s
February 20, 2024 07:08 10s
Adds more harsher time locks and restrictions for multiple marine and shipside roles. Check for merge conflicts #19801: Pull request #5760 opened by HumiliatedGoblin
February 20, 2024 06:58 14s
February 20, 2024 06:58 14s
Tweaks oppressor Check for merge conflicts #19800: Pull request #5759 opened by Red-byte3D
February 20, 2024 06:20 11s
February 20, 2024 06:20 11s
Abomination rework and predator plasma rifle buff. Check for merge conflicts #19799: Pull request #5432 synchronize by Red-byte3D
February 20, 2024 06:14 16s
February 20, 2024 06:14 16s
Updates Outdated Entry Text, Requires CMO to play researcher Check for merge conflicts #19798: Pull request #5742 synchronize by Crimsonerva
February 20, 2024 02:48 14s
February 20, 2024 02:48 14s
Updates Outdated Entry Text, Requires CMO to play researcher Check for merge conflicts #19797: Pull request #5742 synchronize by Crimsonerva
February 20, 2024 02:41 11s
February 20, 2024 02:41 11s
Fix Select Equipment Presets Check for merge conflicts #19796: Pull request #5758 opened by Kaga-404
February 20, 2024 02:17 11s
February 20, 2024 02:17 11s
Fix broken Almayer access edits (#5752) Check for merge conflicts #19795: Commit 95c9a60 pushed by github-merge-queue bot
February 20, 2024 01:56 4m 13s master
master
February 20, 2024 01:56 4m 13s
Adds Flank Route & Choke Point West of Eastern Lab Trijent Dam (#5645) Check for merge conflicts #19794: Commit b05372b pushed by github-merge-queue bot
February 20, 2024 01:33 4m 14s master
master
February 20, 2024 01:33 4m 14s
Reopens #4583 (Experimental Tackle Changes) Check for merge conflicts #19793: Pull request #5712 synchronize by Staykeu
February 19, 2024 21:46 9s
February 19, 2024 21:46 9s
Reopens #4583 (Experimental Tackle Changes) Check for merge conflicts #19792: Pull request #5712 synchronize by Staykeu
February 19, 2024 21:43 19s
February 19, 2024 21:43 19s