Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
241 workflow run results
241 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Carrier Eggsac Strain can now place eggs on Regular Weeds, Egg range Bugfix, and QOL notification for Egg generation Check for merge conflicts #12217: Pull request #3891 ready_for_review by Ben10083
July 18, 2023 22:30 1m 31s
July 18, 2023 22:30 1m 31s
Carrier Eggsac Strain can now place eggs on Regular Weeds, Egg range Bugfix, and QOL notification for Egg generation Check for merge conflicts #12216: Pull request #3891 synchronize by Ben10083
July 18, 2023 22:30 26s
July 18, 2023 22:30 26s
Carrier Eggsac Strain can now place eggs on Regular Weeds, Egg range Bugfix, and QOL notification for Egg generation Check for merge conflicts #12215: Pull request #3891 synchronize by Ben10083
July 18, 2023 22:28 13s
July 18, 2023 22:28 13s
Zone de commandement général - 1 - Mapping CIC Rework Check for merge conflicts #12214: Pull request #3903 synchronize by LC4492
July 18, 2023 21:22 11s
July 18, 2023 21:22 11s
Changes Corporate Protection Synth preset to use hvh radio (#3901) Check for merge conflicts #12213: Commit 3ec962e pushed by github-merge-queue bot
July 18, 2023 21:15 4m 19s master
master
July 18, 2023 21:15 4m 19s
Ports TGMC autofire Check for merge conflicts #12212: Pull request #3909 synchronize by harryob
July 18, 2023 20:59 10s
July 18, 2023 20:59 10s
Balance: Reduces raw damage from Tranq rounds (#3900) Check for merge conflicts #12211: Commit 1aca1dd pushed by github-merge-queue bot
July 18, 2023 20:43 10m 22s master
master
July 18, 2023 20:43 10m 22s
Bump 515 alternate test to 1610 Check for merge conflicts #12210: Pull request #3925 opened by Drulikar
July 18, 2023 20:18 13s
July 18, 2023 20:18 13s
Zone de commandement général - 1 - Mapping CIC Rework Check for merge conflicts #12209: Pull request #3903 synchronize by LC4492
July 18, 2023 19:50 6m 13s
July 18, 2023 19:50 6m 13s
Starshell Typo Fix Check for merge conflicts #12208: Pull request #3924 opened by Ben10083
July 18, 2023 19:50 6m 15s
July 18, 2023 19:50 6m 15s
Prevent Banished in Larva Queue and Set Queue Time for Cryoing (#3885) Check for merge conflicts #12207: Commit aa4988c pushed by github-merge-queue bot
July 18, 2023 19:47 10m 18s master
master
July 18, 2023 19:47 10m 18s
Ports TGMC autofire Check for merge conflicts #12206: Pull request #3909 synchronize by Zonespace27
July 18, 2023 19:27 3m 7s
July 18, 2023 19:27 3m 7s
Zone de commandement général - 1 - Mapping CIC Rework Check for merge conflicts #12205: Pull request #3903 synchronize by LC4492
July 18, 2023 19:26 12s
July 18, 2023 19:26 12s
ASO PR Alternative: CSO and Marine Accurate XO Check for merge conflicts #12204: Pull request #3923 opened by Liz-Cross
July 18, 2023 19:15 11s
July 18, 2023 19:15 11s
Ports TGMC autofire Check for merge conflicts #12203: Pull request #3909 synchronize by Zonespace27
July 18, 2023 19:06 2m 14s
July 18, 2023 19:06 2m 14s
Added preference to disallow de-activation of your current ability (#… Check for merge conflicts #12202: Commit f0873b9 pushed by github-merge-queue bot
July 18, 2023 18:47 2m 41s master
master
July 18, 2023 18:47 2m 41s
Zone de commandement général - 1 - Mapping CIC Rework Check for merge conflicts #12201: Pull request #3903 synchronize by LC4492
July 18, 2023 18:37 4m 32s
July 18, 2023 18:37 4m 32s
Ports TGMC autofire Check for merge conflicts #12200: Pull request #3909 synchronize by Zonespace27
July 18, 2023 18:19 7m 19s
July 18, 2023 18:19 7m 19s
Working Joe Death Sound and Death Message (It is so Joever) (#3798) Check for merge conflicts #12199: Commit d8c1bf9 pushed by github-merge-queue bot
July 18, 2023 18:15 13m 7s master
master
July 18, 2023 18:15 13m 7s
Changes to squad color code Check for merge conflicts #12198: Pull request #3908 synchronize by BeagleGaming1
July 18, 2023 18:13 5m 32s
July 18, 2023 18:13 5m 32s
Zone de commandement général - 1 - Mapping CIC Rework Check for merge conflicts #12197: Pull request #3903 synchronize by LC4492
July 18, 2023 18:00 8m 22s
July 18, 2023 18:00 8m 22s
Ports TGMC autofire Check for merge conflicts #12196: Pull request #3909 synchronize by Zonespace27
July 18, 2023 17:54 42s
July 18, 2023 17:54 42s
Explosive pouch size doubled (#3897) Check for merge conflicts #12195: Commit 86517f0 pushed by github-merge-queue bot
July 18, 2023 17:52 2m 14s master
master
July 18, 2023 17:52 2m 14s
Zone de commandement général - 1 - Mapping CIC Rework Check for merge conflicts #12194: Pull request #3903 synchronize by LC4492
July 18, 2023 17:42 4m 9s
July 18, 2023 17:42 4m 9s
Adds a new Gin Bottle design, visually different than that of the Vodka. Check for merge conflicts #12193: Pull request #3914 synchronize by Kaboomkat
July 18, 2023 17:29 3m 6s
July 18, 2023 17:29 3m 6s