Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
3,553 workflow run results
3,553 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

makes LZ detector work while landed Check for merge conflicts #14773: Pull request #4516 synchronize by cuberound
September 26, 2023 13:13 13s
September 26, 2023 13:13 13s
Disallows taking control of crit xenos Check for merge conflicts #14772: Pull request #4517 opened by TheGamerdk
September 26, 2023 12:53 12s
September 26, 2023 12:53 12s
makes LZ detector work while landed Check for merge conflicts #14771: Pull request #4516 synchronize by cuberound
September 26, 2023 12:49 15s
September 26, 2023 12:49 15s
makes LZ detector work while landed Check for merge conflicts #14770: Pull request #4516 synchronize by cuberound
September 26, 2023 12:44 12s
September 26, 2023 12:44 12s
makes LZ detector work while landed Check for merge conflicts #14769: Pull request #4516 opened by cuberound
September 26, 2023 12:38 13s
September 26, 2023 12:38 13s
Minor Item Additions To Synth Vendor Check for merge conflicts #14768: Pull request #4515 opened by Steelpoint
September 26, 2023 12:20 15s
September 26, 2023 12:20 15s
Adds Sensor Towers To All Maps Check for merge conflicts #14767: Pull request #4416 synchronize by Steelpoint
September 26, 2023 12:18 14s
September 26, 2023 12:18 14s
Bugfix: Reagent Canister Nullspace (#4491) Check for merge conflicts #14766: Commit e8b8481 pushed by github-merge-queue bot
September 26, 2023 12:13 4m 18s master
master
September 26, 2023 12:13 4m 18s
UPP Survivors Use Player Names + Radio Change Check for merge conflicts #14765: Pull request #4461 ready_for_review by Steelpoint
September 26, 2023 12:12 10s
September 26, 2023 12:12 10s
Adds Sensor Towers To All Maps Check for merge conflicts #14764: Pull request #4416 ready_for_review by Steelpoint
September 26, 2023 12:12 16s
September 26, 2023 12:12 16s
Bugfix: Reagent Canister Nullspace Check for merge conflicts #14763: Pull request #4491 ready_for_review by morrowwolf
September 26, 2023 11:58 1m 33s
September 26, 2023 11:58 1m 33s
UPP Survivors Use Player Names + Radio Change Check for merge conflicts #14762: Pull request #4461 synchronize by Steelpoint
September 26, 2023 11:53 37s
September 26, 2023 11:53 37s
Adds Sensor Towers To All Maps Check for merge conflicts #14761: Pull request #4416 synchronize by Steelpoint
September 26, 2023 11:52 13s
September 26, 2023 11:52 13s
Adds Sensor Towers To All Maps Check for merge conflicts #14760: Pull request #4416 synchronize by Steelpoint
September 26, 2023 11:23 2m 18s
September 26, 2023 11:23 2m 18s
Makes Dropship Pilot Two Dropship Crew Chief hours, instead of Five M… Check for merge conflicts #14759: Commit 825d7dd pushed by github-merge-queue bot
September 26, 2023 11:22 2m 17s master
master
September 26, 2023 11:22 2m 17s
Adds CBRN ERT Check for merge conflicts #14758: Pull request #4337 ready_for_review by morrowwolf
September 26, 2023 11:16 47s
September 26, 2023 11:16 47s
Adds Sensor Towers To All Maps Check for merge conflicts #14757: Pull request #4416 synchronize by Steelpoint
September 26, 2023 11:15 18s
September 26, 2023 11:15 18s
Adds Sensor Towers To All Maps Check for merge conflicts #14756: Pull request #4416 synchronize by Steelpoint
September 26, 2023 11:14 1m 42s
September 26, 2023 11:14 1m 42s
Zone de commandement général - 2 - Mapping CIC Rework / Part 2 Check for merge conflicts #14755: Pull request #4251 synchronize by morrowwolf
September 26, 2023 11:08 12s
September 26, 2023 11:08 12s
Bugfix: Small wording fix (#4490) Check for merge conflicts #14754: Commit 05c8329 pushed by github-merge-queue bot
September 26, 2023 10:51 4m 15s master
master
September 26, 2023 10:51 4m 15s
Removes alpha egg on LV522 (#4508) Check for merge conflicts #14753: Commit 4b523c7 pushed by github-merge-queue bot
September 26, 2023 10:30 4m 15s master
master
September 26, 2023 10:30 4m 15s
Natural Fiorina SciAnnex Tunnels (#4465) Check for merge conflicts #14752: Commit 45d8f17 pushed by github-merge-queue bot
September 26, 2023 10:18 4m 19s master
master
September 26, 2023 10:18 4m 19s
Natural Trijent Dam Tunnels (#4458) Check for merge conflicts #14751: Commit 3322c02 pushed by github-merge-queue bot
September 26, 2023 10:03 4m 17s master
master
September 26, 2023 10:03 4m 17s
kills hardcoded rule defines (#4449) Check for merge conflicts #14750: Commit 8b33a88 pushed by github-merge-queue bot
September 26, 2023 09:54 2m 14s master
master
September 26, 2023 09:54 2m 14s
HEFA Knights spawn with their armor + small buff (#4418) Check for merge conflicts #14749: Commit 9918e77 pushed by github-merge-queue bot
September 26, 2023 09:40 4m 22s master
master
September 26, 2023 09:40 4m 22s