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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

more robust fix for flyby timer issue Check for merge conflicts #15553: Pull request #4653 synchronize by mullenpaul
October 17, 2023 20:08 14s
October 17, 2023 20:08 14s
Combines standard apparel into one button for every squad prep vendor Check for merge conflicts #15552: Pull request #4710 opened by VileBeggar
October 17, 2023 19:38 13s
October 17, 2023 19:38 13s
Zone de commandement général - 2 - Mapping CIC Rework / Part 2 Check for merge conflicts #15551: Pull request #4251 synchronize by LC4492
October 17, 2023 18:57 14s
October 17, 2023 18:57 14s
Adds a popup when attempting to do a flyby from the ground Check for merge conflicts #15550: Pull request #4709 ready_for_review by TheGamerdk
October 17, 2023 18:54 33s
October 17, 2023 18:54 33s
Adds a popup when attempting to do a flyby from the ground Check for merge conflicts #15549: Pull request #4709 synchronize by TheGamerdk
October 17, 2023 18:54 12s
October 17, 2023 18:54 12s
Zone de commandement général - 2 - Mapping CIC Rework / Part 2 Check for merge conflicts #15548: Pull request #4251 synchronize by LC4492
October 17, 2023 18:47 21s
October 17, 2023 18:47 21s
Makes dartboards functional Check for merge conflicts #15547: Pull request #4677 synchronize by VileBeggar
October 17, 2023 17:32 15s
October 17, 2023 17:32 15s
Adds a popup when attempting to do a flyby from the ground Check for merge conflicts #15546: Pull request #4709 opened by TheGamerdk
October 17, 2023 16:45 17s
October 17, 2023 16:45 17s
Expands LV Fog To Most Maps Check for merge conflicts #15545: Pull request #4708 opened by Steelpoint
October 17, 2023 15:10 19s
October 17, 2023 15:10 19s
Project ARES: Datacore (#4437) Check for merge conflicts #15544: Commit c46e9d2 pushed by github-merge-queue bot
October 17, 2023 14:24 10m 29s master
master
October 17, 2023 14:24 10m 29s
Hijack Objectives & Self Destruct Check for merge conflicts #15543: Pull request #4699 synchronize by Zonespace27
October 17, 2023 14:05 17s
October 17, 2023 14:05 17s
SO CIC vendor quality of life tweaks Check for merge conflicts #15542: Pull request #4707 synchronize by SpypigDev
October 17, 2023 13:05 17s
October 17, 2023 13:05 17s
SO CIC vendor quality of life tweaks Check for merge conflicts #15541: Pull request #4707 synchronize by SpypigDev
October 17, 2023 12:55 16s
October 17, 2023 12:55 16s
SO CIC vendor quality of life tweaks Check for merge conflicts #15540: Pull request #4707 opened by SpypigDev
October 17, 2023 12:24 14s
October 17, 2023 12:24 14s
Revolver Heavy Ammo Effect Change Check for merge conflicts #15539: Pull request #4706 opened by Steelpoint
October 17, 2023 11:55 19s
October 17, 2023 11:55 19s
Fixes minor runtime in CAS Guidance system Check for merge conflicts #15538: Pull request #4705 opened by fira
October 17, 2023 10:46 15s
October 17, 2023 10:46 15s
Refactor ammo_datums file. Check for merge conflicts #15537: Pull request #4682 synchronize by Huffie56
October 17, 2023 10:09 12s
October 17, 2023 10:09 12s
Refactor ammo_datums file. Check for merge conflicts #15536: Pull request #4682 synchronize by Huffie56
October 17, 2023 10:03 20s
October 17, 2023 10:03 20s
Adds Synthetic Manufacturers Check for merge conflicts #15535: Pull request #4685 synchronize by Steelpoint
October 17, 2023 08:23 14s
October 17, 2023 08:23 14s
Allows MT, CT, and Nurse to take the "Bad Leg" trait. Check for merge conflicts #15534: Pull request #4704 opened by neeshacark
October 17, 2023 08:10 15s
October 17, 2023 08:10 15s
Renames UPP survivor synth from combat to support synth Check for merge conflicts #15533: Pull request #4703 opened by CapCamIII
October 17, 2023 03:56 15s
October 17, 2023 03:56 15s
Sprites changes for old donator kit Check for merge conflicts #15532: Pull request #4702 opened by SASoperative
October 17, 2023 03:41 15s
October 17, 2023 03:41 15s
Almayer Maintenance, Fixes for the USS Almayers recent change(s) Check for merge conflicts #15531: Pull request #4701 opened by spartanbobby
October 17, 2023 01:52 15s
October 17, 2023 01:52 15s
Bandaid the null clients in GLOB.clients Check for merge conflicts #15530: Pull request #4700 synchronize by Drulikar
October 17, 2023 01:37 12s
October 17, 2023 01:37 12s
Bandaid the null clients in GLOB.clients Check for merge conflicts #15529: Pull request #4700 opened by Drulikar
October 17, 2023 01:19 2m 15s
October 17, 2023 01:19 2m 15s