Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
1,162 workflow run results
1,162 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Pouch availability nerfs Check for merge conflicts #12267: Pull request #3934 synchronize by morrowwolf
July 19, 2023 09:29 26s
July 19, 2023 09:29 26s
Pouch availability nerfs Check for merge conflicts #12266: Pull request #3934 opened by morrowwolf
July 19, 2023 09:27 12s
July 19, 2023 09:27 12s
[Fix] Xenos scuttle + Allied Xenos Using Doors (#3915) Check for merge conflicts #12265: Commit b0f6dcf pushed by github-merge-queue bot
July 19, 2023 09:23 4m 17s master
master
July 19, 2023 09:23 4m 17s
Dizziness status QOL/tweaks Check for merge conflicts #12264: Pull request #3933 opened by GoldenDarkness55
July 19, 2023 09:04 11s
July 19, 2023 09:04 11s
prevents bad vars being touched Check for merge conflicts #12263: Pull request #3932 opened by harryob
July 19, 2023 08:54 2m 16s
July 19, 2023 08:54 2m 16s
Gives Sprite To Predator Toolbelt (#3889) Check for merge conflicts #12262: Commit 42b6ea5 pushed by github-merge-queue bot
July 19, 2023 08:37 2m 22s master
master
July 19, 2023 08:37 2m 22s
Sweeping LV522 Changes + FORECON GL replaced by FORECON Sniper (Without the sniper) Check for merge conflicts #12261: Pull request #3917 synchronize by spartanbobby
July 19, 2023 08:27 3m 1s
July 19, 2023 08:27 3m 1s
Lurkers don't lose invisibility when bumping into invisible mobs (#3921) Check for merge conflicts #12260: Commit 9be34af pushed by github-merge-queue bot
July 19, 2023 08:18 3m 1s master
master
July 19, 2023 08:18 3m 1s
Nightmare Insert: Trijent Dam - Crashed UPP Survivors Check for merge conflicts #12259: Pull request #3845 synchronize by Steelpoint
July 19, 2023 08:05 5m 52s
July 19, 2023 08:05 5m 52s
Starshell Typo Fix (#3924) Check for merge conflicts #12258: Commit 751fafe pushed by github-merge-queue bot
July 19, 2023 07:59 2m 14s master
master
July 19, 2023 07:59 2m 14s
Nightmare Insert: Trijent Dam - Crashed UPP Survivors Check for merge conflicts #12257: Pull request #3845 synchronize by Steelpoint
July 19, 2023 07:53 19s
July 19, 2023 07:53 19s
Trijent Weed Tile Addition (#3890) Check for merge conflicts #12256: Commit a646381 pushed by github-merge-queue bot
July 19, 2023 07:44 4m 18s master
master
July 19, 2023 07:44 4m 18s
Map fix adding missing apc to all the areas that didn't have one (#3905) Check for merge conflicts #12255: Commit 75862f1 pushed by github-merge-queue bot
July 19, 2023 07:28 4m 18s master
master
July 19, 2023 07:28 4m 18s
Increases default window sizes for paper and desc_lore windows (#3833) Check for merge conflicts #12254: Commit 2b04794 pushed by github-merge-queue bot
July 19, 2023 06:57 3m 53s master
master
July 19, 2023 06:57 3m 53s
Gives Sprite To Predator Toolbelt Check for merge conflicts #12253: Pull request #3889 synchronize by morrowwolf
July 19, 2023 06:56 4m 46s
July 19, 2023 06:56 4m 46s
SMG Gun+Mag Holster Check for merge conflicts #12252: Pull request #3825 ready_for_review by Steelpoint
July 19, 2023 06:53 9m 51s
July 19, 2023 06:53 9m 51s
SMG Gun+Mag Holster Check for merge conflicts #12251: Pull request #3825 synchronize by Steelpoint
July 19, 2023 06:52 6m 43s
July 19, 2023 06:52 6m 43s
Gives Sprite To Predator Toolbelt Check for merge conflicts #12250: Pull request #3889 synchronize by morrowwolf
July 19, 2023 06:48 33s
July 19, 2023 06:48 33s
Tones down some ERT skills (#3822) Check for merge conflicts #12249: Commit 3c40d8e pushed by github-merge-queue bot
July 19, 2023 06:42 4m 18s master
master
July 19, 2023 06:42 4m 18s
Big Red PMC Crash Changes (feat. Surv Goon M41 Fix) (#3777) Check for merge conflicts #12248: Commit 39cf164 pushed by github-merge-queue bot
July 19, 2023 06:23 2m 16s master
master
July 19, 2023 06:23 2m 16s
Additional dmi testing for duplicates and quantity Check for merge conflicts #12247: Pull request #3867 synchronize by Drulikar
July 19, 2023 06:03 11m 52s
July 19, 2023 06:03 11m 52s
New Varadero revamp (#3676) Check for merge conflicts #12246: Commit 126ef45 pushed by github-merge-queue bot
July 19, 2023 05:58 2m 43s master
master
July 19, 2023 05:58 2m 43s
General Pouches Tweaks & Fixes Check for merge conflicts #12245: Pull request #3764 synchronize by ghostsheet
July 19, 2023 05:51 9m 43s
July 19, 2023 05:51 9m 43s
Experimental: Bump rust_g to 2.1.0 Check for merge conflicts #12244: Pull request #3931 synchronize by Drulikar
July 19, 2023 05:48 2m 36s
July 19, 2023 05:48 2m 36s
Buffs trashbags (#3817) Check for merge conflicts #12243: Commit 5600768 pushed by github-merge-queue bot
July 19, 2023 05:39 2m 19s master
master
July 19, 2023 05:39 2m 19s