Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
13,854 workflow run results
13,854 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Gravity generator removal Check for merge conflicts #25098: Pull request #6751 ready_for_review by cuberound
July 28, 2024 14:18 43s
July 28, 2024 14:18 43s
Re: Add Directional APC's sprites, reduces lines of code by adding and using Updatepaths.txt file. Check for merge conflicts #25097: Pull request #6686 synchronize by Venuska1117
July 28, 2024 14:18 39s
July 28, 2024 14:18 39s
Gravity generator removal Check for merge conflicts #25096: Pull request #6751 synchronize by cuberound
July 28, 2024 14:16 9s
July 28, 2024 14:16 9s
Solar Devils ERT [PvE Marines] Check for merge conflicts #25095: Pull request #6811 synchronize by Steelpoint
July 28, 2024 14:09 9s
July 28, 2024 14:09 9s
Solar Devils ERT [PvE Marines] Check for merge conflicts #25094: Pull request #6811 synchronize by Steelpoint
July 28, 2024 14:04 10s
July 28, 2024 14:04 10s
[V] Sorokyne Strata: Expanded Small corridors, removed 3000 unused tiles, Xenos can now weed everything except LZ's and surrounding of LZ's, allow LAZ for CAS inside structures with light blue Areas on Tacmap (glass ceiling hallways) Check for merge conflicts #25093: Pull request #6071 synchronize by Venuska1117
July 28, 2024 14:01 11s
July 28, 2024 14:01 11s
Solar Devils ERT [PvE Marines] Check for merge conflicts #25092: Pull request #6811 opened by Steelpoint
July 28, 2024 14:00 10s
July 28, 2024 14:00 10s
Hold my Beer (Fix of hi intellligent data lookup in TGUI Who/Staff Who Check for merge conflicts #25091: Pull request #6786 synchronize by blackcrystall
July 28, 2024 13:22 14s
July 28, 2024 13:22 14s
Hold my Beer (Fix of hi intellligent data lookup in TGUI Who/Staff Who Check for merge conflicts #25090: Pull request #6786 ready_for_review by blackcrystall
July 28, 2024 13:20 13s
July 28, 2024 13:20 13s
Make Clusters spread hive weeds on Semi-Weedable surfaces. Check for merge conflicts #25089: Pull request #6616 ready_for_review by Venuska1117
July 28, 2024 12:26 12s
July 28, 2024 12:26 12s
Hold my Beer (Fix of hi intellligent data lookup in TGUI Who/Staff Who Check for merge conflicts #25088: Pull request #6786 ready_for_review by blackcrystall
July 28, 2024 12:09 5m 2s
July 28, 2024 12:09 5m 2s
Hold my Beer (Fix of hi intellligent data lookup in TGUI Who/Staff Who Check for merge conflicts #25087: Pull request #6786 synchronize by blackcrystall
July 28, 2024 12:08 29s
July 28, 2024 12:08 29s
Hold my Beer (Fix of hi intellligent data lookup in TGUI Who/Staff Who Check for merge conflicts #25086: Pull request #6786 synchronize by blackcrystall
July 28, 2024 12:08 21s
July 28, 2024 12:08 21s
Hold my Beer (Fix of hi intellligent data lookup in TGUI Who/Staff Who Check for merge conflicts #25085: Pull request #6786 synchronize by blackcrystall
July 28, 2024 12:07 22s
July 28, 2024 12:07 22s
Hold my Beer (Fix of hi intellligent data lookup in TGUI Who/Staff Who Check for merge conflicts #25084: Pull request #6786 synchronize by blackcrystall
July 28, 2024 12:06 21s
July 28, 2024 12:06 21s
Hold my Beer (Fix of hi intellligent data lookup in TGUI Who/Staff Who Check for merge conflicts #25083: Pull request #6786 synchronize by blackcrystall
July 28, 2024 12:05 14s
July 28, 2024 12:05 14s
Rank Change Experiment Check for merge conflicts #25082: Pull request #6295 synchronize by realforest2001
July 28, 2024 11:59 10s
July 28, 2024 11:59 10s
stops attempted stripping when stunned etc. Check for merge conflicts #25081: Pull request #6810 ready_for_review by zzzmike
July 28, 2024 10:26 10s
July 28, 2024 10:26 10s
stops attempted stripping when stunned etc. Check for merge conflicts #25080: Pull request #6810 synchronize by zzzmike
July 28, 2024 10:25 9s
July 28, 2024 10:25 9s
stops attempted stripping when stunned etc. Check for merge conflicts #25079: Pull request #6810 synchronize by zzzmike
July 28, 2024 10:15 9s
July 28, 2024 10:15 9s
stops attempted stripping when stunned etc. Check for merge conflicts #25078: Pull request #6810 synchronize by zzzmike
July 28, 2024 10:14 12s
July 28, 2024 10:14 12s
stops attempted stripping when stunned etc. Check for merge conflicts #25077: Pull request #6810 synchronize by zzzmike
July 28, 2024 10:12 13s
July 28, 2024 10:12 13s
stops attempted stripping when stunned etc. Check for merge conflicts #25076: Pull request #6810 opened by zzzmike
July 28, 2024 09:39 12s
July 28, 2024 09:39 12s
More attack logs for choking and fence/window slamming Check for merge conflicts #25075: Pull request #6809 opened by Drulikar
July 28, 2024 08:50 11s
July 28, 2024 08:50 11s
Allows you to wear the warning cone (#6695) Check for merge conflicts #25074: Commit aa56e96 pushed by github-merge-queue bot
July 28, 2024 07:47 4m 18s master
master
July 28, 2024 07:47 4m 18s