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

Disable testing override maps in CI Check for merge conflicts #12342: Pull request #3946 opened by Drulikar
July 20, 2023 00:09 14s
July 20, 2023 00:09 14s
Fix the M56D ignoring collision when dismounting the user (#3929) Check for merge conflicts #12341: Commit f24a1d1 pushed by github-merge-queue bot
July 19, 2023 23:41 4m 17s master
master
July 19, 2023 23:41 4m 17s
Notify when a NPC Facehugger facehugs someone (#3884) Check for merge conflicts #12340: Commit e270f0f pushed by github-merge-queue bot
July 19, 2023 23:16 4m 17s master
master
July 19, 2023 23:16 4m 17s
Adds a new Gin Bottle design, visually different than that of the Vod… Check for merge conflicts #12339: Commit 6f0ecb3 pushed by github-merge-queue bot
July 19, 2023 23:03 4m 18s master
master
July 19, 2023 23:03 4m 18s
Pods tweaks and features, changes to pods crash chance Check for merge conflicts #12338: Pull request #3945 opened by ihatethisengine
July 19, 2023 21:49 14s
July 19, 2023 21:49 14s
AI Core APC power storage increase Check for merge conflicts #12337: Pull request #3944 opened by Ben10083
July 19, 2023 21:05 14s
July 19, 2023 21:05 14s
Fix the first prompt to ghost when nested Check for merge conflicts #12336: Pull request #3943 opened by Drulikar
July 19, 2023 20:56 15s
July 19, 2023 20:56 15s
Facehuggers now bypass time of death checks when joining as Larva Check for merge conflicts #12335: Pull request #3940 ready_for_review by Ben10083
July 19, 2023 20:15 3m 42s
July 19, 2023 20:15 3m 42s
Facehuggers now bypass time of death checks when joining as Larva Check for merge conflicts #12334: Pull request #3940 synchronize by Ben10083
July 19, 2023 20:15 31s
July 19, 2023 20:15 31s
Facehuggers now bypass time of death checks when joining as Larva Check for merge conflicts #12333: Pull request #3940 synchronize by Ben10083
July 19, 2023 20:12 10s
July 19, 2023 20:12 10s
Lesser Drones Check for merge conflicts #12332: Pull request #3939 synchronize by morrowwolf
July 19, 2023 20:05 13s
July 19, 2023 20:05 13s
Updates Yautja Plasma Rifle Check for merge conflicts #12331: Pull request #3942 opened by Steelpoint
July 19, 2023 19:37 11s
July 19, 2023 19:37 11s
Fixes doubling of gadget points for second+ synth Check for merge conflicts #12330: Pull request #3936 synchronize by Katskan
July 19, 2023 19:23 1m 20s
July 19, 2023 19:23 1m 20s
Fixes doubling of gadget points for second+ synth Check for merge conflicts #12329: Pull request #3936 synchronize by Katskan
July 19, 2023 19:22 10s
July 19, 2023 19:22 10s
Yautja armor nerf-fix Check for merge conflicts #12328: Pull request #3941 opened by realforest2001
July 19, 2023 19:01 12s
July 19, 2023 19:01 12s
Yautja Gear Recovery Changes Check for merge conflicts #12327: Pull request #3455 synchronize by realforest2001
July 19, 2023 18:49 14s
July 19, 2023 18:49 14s
Lesser Drones Check for merge conflicts #12326: Pull request #3939 synchronize by morrowwolf
July 19, 2023 17:37 12s
July 19, 2023 17:37 12s
Lesser Drones Check for merge conflicts #12325: Pull request #3939 synchronize by morrowwolf
July 19, 2023 17:04 11s
July 19, 2023 17:04 11s
Lesser Drones Check for merge conflicts #12324: Pull request #3939 synchronize by morrowwolf
July 19, 2023 16:41 23s
July 19, 2023 16:41 23s
Lesser Drones Check for merge conflicts #12323: Pull request #3939 synchronize by morrowwolf
July 19, 2023 16:40 13s
July 19, 2023 16:40 13s
Lesser Drones Check for merge conflicts #12322: Pull request #3939 synchronize by morrowwolf
July 19, 2023 16:16 13s
July 19, 2023 16:16 13s
Yautja Rework Holder Check for merge conflicts #12321: Pull request #3879 synchronize by realforest2001
July 19, 2023 16:00 10s
July 19, 2023 16:00 10s
Yautja Rework Holder Check for merge conflicts #12320: Pull request #3879 synchronize by realforest2001
July 19, 2023 15:41 3m 7s
July 19, 2023 15:41 3m 7s
Yautja Armory and Ship access changes Check for merge conflicts #12319: Pull request #3877 synchronize by realforest2001
July 19, 2023 15:41 2m 12s
July 19, 2023 15:41 2m 12s
Zone de commandement général - 1 - Mapping CIC Rework Check for merge conflicts #12318: Pull request #3903 synchronize by LC4492
July 19, 2023 15:36 1m 8s
July 19, 2023 15:36 1m 8s