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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

[Balance] Use skill tier duration multipliers for non-master engineer… Check for merge conflicts #14748: Commit 18866f4 pushed by github-merge-queue bot
September 26, 2023 09:26 4m 16s master
master
September 26, 2023 09:26 4m 16s
Yautja Rifle buff (#4222) Check for merge conflicts #14747: Commit 0b2315b pushed by github-merge-queue bot
September 26, 2023 08:57 4m 17s master
master
September 26, 2023 08:57 4m 17s
Restore stat panel options to change font size Check for merge conflicts #14746: Pull request #4514 synchronize by Drulikar
September 26, 2023 08:34 10s
September 26, 2023 08:34 10s
Fixes manifest when transferring into and out of intel squad (#4489) Check for merge conflicts #14745: Commit 6021d6a pushed by github-merge-queue bot
September 26, 2023 08:24 4m 18s master
master
September 26, 2023 08:24 4m 18s
Restore stat panel options to change font size Check for merge conflicts #14744: Pull request #4514 opened by Drulikar
September 26, 2023 08:20 11s
September 26, 2023 08:20 11s
"Do nothing" dual wield preference Check for merge conflicts #14743: Pull request #4504 synchronize by morrowwolf
September 26, 2023 07:50 13s
September 26, 2023 07:50 13s
Fixes akimbo bug (#4503) Check for merge conflicts #14742: Commit bfd1054 pushed by github-merge-queue bot
September 26, 2023 06:57 4m 21s master
master
September 26, 2023 06:57 4m 21s
Fix afk hugger conversion (#4487) Check for merge conflicts #14741: Commit 21d32ee pushed by github-merge-queue bot
September 26, 2023 06:42 4m 17s master
master
September 26, 2023 06:42 4m 17s
Fixes no-delay on m56d burst fire mode (#4509) Check for merge conflicts #14740: Commit 9afe91e pushed by github-merge-queue bot
September 26, 2023 05:44 4m 16s master
master
September 26, 2023 05:44 4m 16s
Adds drawing to tacmaps Check for merge conflicts #14739: Pull request #4475 synchronize by ghost
September 26, 2023 04:36 13s
September 26, 2023 04:36 13s
Adds drawing to tacmaps Check for merge conflicts #14738: Pull request #4475 synchronize by ghost
September 26, 2023 04:32 12s
September 26, 2023 04:32 12s
ert tweaks Check for merge conflicts #14737: Pull request #4484 synchronize by CapCamIII
September 26, 2023 02:09 15s
September 26, 2023 02:09 15s
Removes the satchel from chestrig onmob. Check for merge conflicts #14736: Pull request #4507 synchronize by CapCamIII
September 26, 2023 02:03 27s
September 26, 2023 02:03 27s
Removes the satchel from chestrig onmob. Check for merge conflicts #14735: Pull request #4507 synchronize by CapCamIII
September 26, 2023 02:02 15s
September 26, 2023 02:02 15s
USS Almayer, CL & CC Hypersleep bay, fixes symmetry issue in CIC hallway (that I broke), adds some warning stripes around for detailing, re-gigs the PO bunk area to get rid of horrible 1x3 hallway Check for merge conflicts #14734: Pull request #4510 synchronize by spartanbobby
September 25, 2023 21:58 13s
September 25, 2023 21:58 13s
Bugfix: Camera sprites Check for merge conflicts #14733: Pull request #4512 opened by Crowbar764
September 25, 2023 21:11 15s
September 25, 2023 21:11 15s
USS Almayer, CL & CC Hypersleep bay, fixes symmetry issue in CIC hallway (that I broke), adds some warning stripes around for detailing, re-gigs the PO bunk area to get rid of horrible 1x3 hallway Check for merge conflicts #14732: Pull request #4510 synchronize by spartanbobby
September 25, 2023 19:05 16s
September 25, 2023 19:05 16s
USS Almayer, CL & CC Hypersleep bay, fixes symmetry issue in CIC hallway (that I broke), adds some warning stripes around for detailing, re-gigs the PO bunk area to get rid of horrible 1x3 hallway Check for merge conflicts #14731: Pull request #4510 synchronize by spartanbobby
September 25, 2023 18:46 13s
September 25, 2023 18:46 13s
USS Almayer, CL & CC Hypersleep bay, fixes symmetry issue in CIC hallway (that I broke), adds some warning stripes around for detailing, re-gigs the PO bunk area to get rid of horrible 1x3 hallway Check for merge conflicts #14730: Pull request #4510 opened by spartanbobby
September 25, 2023 18:40 16s
September 25, 2023 18:40 16s
Fixes no-delay on m56d burst fire mode Check for merge conflicts #14729: Pull request #4509 synchronize by Git-Nivrak
September 25, 2023 18:02 15s
September 25, 2023 18:02 15s
Fixes no-delay on m56d burst fire mode Check for merge conflicts #14728: Pull request #4509 opened by Git-Nivrak
September 25, 2023 17:43 14s
September 25, 2023 17:43 14s
Removes alpha egg on LV522 Check for merge conflicts #14727: Pull request #4508 opened by morrowwolf
September 25, 2023 16:35 17s
September 25, 2023 16:35 17s
Removes the satchel from chestrig onmob. Check for merge conflicts #14726: Pull request #4507 opened by CapCamIII
September 25, 2023 15:40 16s
September 25, 2023 15:40 16s
Add cached larva queue message to observer status panel Check for merge conflicts #14725: Pull request #4506 opened by Drulikar
September 25, 2023 15:00 11s
September 25, 2023 15:00 11s
Disable join as xeno buried spawns when there is a queue Check for merge conflicts #14724: Pull request #4502 synchronize by Drulikar
September 25, 2023 14:56 12s
September 25, 2023 14:56 12s