Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
8,910 workflow run results
8,910 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Disable un-resting someone when they are dizzy (#6135) Check for merge conflicts #21555: Commit ec22bae pushed by github-merge-queue bot
April 13, 2024 09:56 4m 14s master
master
April 13, 2024 09:56 4m 14s
Fix colony lights sometimes deleting after explosions (#6131) Check for merge conflicts #21554: Commit ea0fcc8 pushed by github-merge-queue bot
April 13, 2024 09:49 4m 15s master
master
April 13, 2024 09:49 4m 15s
Adds the Quebec flag (#6133) Check for merge conflicts #21553: Commit 97a12de pushed by github-merge-queue bot
April 13, 2024 09:42 4m 13s master
master
April 13, 2024 09:42 4m 13s
minimum compile version bump to 515.1627 (#6095) Check for merge conflicts #21552: Commit 4f8dc10 pushed by github-merge-queue bot
April 13, 2024 07:41 4m 14s master
master
April 13, 2024 07:41 4m 14s
Fixes Acid Ball hurting friendly xenos (and self) (#6129) Check for merge conflicts #21551: Commit df27de7 pushed by github-merge-queue bot
April 13, 2024 07:35 4m 15s master
master
April 13, 2024 07:35 4m 15s
Colony Synthetic variants with a refresh (#6015) Check for merge conflicts #21550: Commit a0a33e5 pushed by github-merge-queue bot
April 13, 2024 07:29 2m 14s master
master
April 13, 2024 07:29 2m 14s
Better throw logic (#6040) Check for merge conflicts #21549: Commit a032331 pushed by github-merge-queue bot
April 13, 2024 07:17 4m 40s master
master
April 13, 2024 07:17 4m 40s
More features and tweaks for broadcasting Check for merge conflicts #21548: Pull request #6115 synchronize by ihatethisengine
April 13, 2024 07:17 33s
April 13, 2024 07:17 33s
More features and tweaks for broadcasting Check for merge conflicts #21547: Pull request #6115 synchronize by ihatethisengine
April 13, 2024 07:15 9s
April 13, 2024 07:15 9s
M540-B Armored Recon Carrier Check for merge conflicts #21546: Pull request #5401 synchronize by Drulikar
April 13, 2024 04:15 12s
April 13, 2024 04:15 12s
More features and tweaks for broadcasting Check for merge conflicts #21545: Pull request #6115 synchronize by ihatethisengine
April 13, 2024 02:14 13s
April 13, 2024 02:14 13s
More features and tweaks for broadcasting Check for merge conflicts #21544: Pull request #6115 ready_for_review by ihatethisengine
April 13, 2024 02:08 36s
April 13, 2024 02:08 36s
More features and tweaks for broadcasting Check for merge conflicts #21543: Pull request #6115 synchronize by ihatethisengine
April 13, 2024 02:07 10s
April 13, 2024 02:07 10s
More features and tweaks for broadcasting Check for merge conflicts #21542: Pull request #6115 synchronize by ihatethisengine
April 13, 2024 01:50 32s
April 13, 2024 01:50 32s
More features and tweaks for broadcasting Check for merge conflicts #21541: Pull request #6115 synchronize by ihatethisengine
April 13, 2024 01:49 2m 12s
April 13, 2024 01:49 2m 12s
white phosphorus smoke can no longer override stronger flames Check for merge conflicts #21540: Pull request #6137 opened by iloveloopers
April 12, 2024 21:11 18s
April 12, 2024 21:11 18s
Adds new tips for Xenomorph. (#6111) Check for merge conflicts #21539: Commit 3076ab6 pushed by github-merge-queue bot
April 12, 2024 18:23 4m 17s master
master
April 12, 2024 18:23 4m 17s
Fix additional cryo reagent duplication via TOUCH reaction (#6122) Check for merge conflicts #21538: Commit 1a6e4d8 pushed by github-merge-queue bot
April 12, 2024 08:55 4m 15s master
master
April 12, 2024 08:55 4m 15s
Med Vendor Rebalance Check for merge conflicts #21537: Pull request #6103 synchronize by Drulikar
April 12, 2024 07:04 2m 17s
April 12, 2024 07:04 2m 17s
More features and tweaks for broadcasting Check for merge conflicts #21536: Pull request #6115 synchronize by ihatethisengine
April 11, 2024 22:39 10s
April 11, 2024 22:39 10s
More features and tweaks for broadcasting Check for merge conflicts #21535: Pull request #6115 synchronize by ihatethisengine
April 11, 2024 22:34 12s
April 11, 2024 22:34 12s
Helmets no longer hide ears (#6125) Check for merge conflicts #21534: Commit 0e8d5bc pushed by github-merge-queue bot
April 11, 2024 21:22 4m 16s master
master
April 11, 2024 21:22 4m 16s
Allow SOs to perform basic surgeries Check for merge conflicts #21533: Pull request #6136 opened by 567Turtle
April 11, 2024 20:38 13s
April 11, 2024 20:38 13s
Adds new tips for Xenomorph. Check for merge conflicts #21532: Pull request #6111 synchronize by HeresKozmos
April 11, 2024 19:17 11s
April 11, 2024 19:17 11s
Adds an upgraded photocopier for the CL and CC Check for merge conflicts #21531: Pull request #6126 synchronize by LC4492
April 11, 2024 17:12 10s
April 11, 2024 17:12 10s