Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
7,303 workflow run results
7,303 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Project ARES: Admin Console Check for merge conflicts #19866: Pull request #4182 ready_for_review by realforest2001
February 21, 2024 10:15 3m 13s
February 21, 2024 10:15 3m 13s
Project ARES: Admin Console Check for merge conflicts #19865: Pull request #4182 synchronize by realforest2001
February 21, 2024 10:15 3m 5s
February 21, 2024 10:15 3m 5s
Updated XM43E1 for Sniper Spec Check for merge conflicts #19864: Pull request #5774 opened by Kaga-404
February 21, 2024 10:11 10s
February 21, 2024 10:11 10s
Fixes xeno tacklestrength Check for merge conflicts #19863: Pull request #5773 opened by SabreML
February 21, 2024 09:57 16s
February 21, 2024 09:57 16s
Food processor can be used to remove carpotoxin and acidic blood with… Check for merge conflicts #19862: Commit 81e95e1 pushed by github-merge-queue bot
February 21, 2024 09:50 4m 13s master
master
February 21, 2024 09:50 4m 13s
Fix CMB ERT & Path Based ERT Calling Check for merge conflicts #19861: Pull request #5755 synchronize by Drulikar
February 21, 2024 09:01 14s
February 21, 2024 09:01 14s
Increase repeated weed expansion delay for the same tile Check for merge conflicts #19860: Pull request #5772 opened by Drulikar
February 21, 2024 08:56 14s
February 21, 2024 08:56 14s
Makes drone castes be able to destroy special resin buildings faster;… Check for merge conflicts #19859: Commit 27ddbc5 pushed by github-merge-queue bot
February 21, 2024 08:31 2m 17s master
master
February 21, 2024 08:31 2m 17s
Refactor stage three of black goo and added stage four. Check for merge conflicts #19858: Pull request #5739 ready_for_review by Huffie56
February 21, 2024 08:16 10s
February 21, 2024 08:16 10s
Revert "Adds Flank Route & Choke Point West of Eastern Lab Trijent Dam" Check for merge conflicts #19857: Pull request #5771 opened by hislittlecuzingames
February 21, 2024 07:58 3m 37s
February 21, 2024 07:58 3m 37s
Revert "Fixes Hijack Dropship launch announcement alarm not turning off - Bwoop is Kil" Check for merge conflicts #19856: Pull request #5770 opened by hislittlecuzingames
February 21, 2024 07:57 2m 53s
February 21, 2024 07:57 2m 53s
Revert "Added Ability for Looping Sounds to be heard from further away." Check for merge conflicts #19855: Pull request #5769 opened by hislittlecuzingames
February 21, 2024 07:57 11s
February 21, 2024 07:57 11s
Refactor stage three of black goo and added stage four. Check for merge conflicts #19854: Pull request #5739 synchronize by Huffie56
February 21, 2024 07:55 12s
February 21, 2024 07:55 12s
Updated XM43E1 for USCM Sniper Spec Check for merge conflicts #19853: Pull request #5767 synchronize by Kaga-404
February 21, 2024 06:53 10s
February 21, 2024 06:53 10s
Updated XM43E1 for USCM Sniper Spec Check for merge conflicts #19852: Pull request #5767 synchronize by Kaga-404
February 21, 2024 06:42 10s
February 21, 2024 06:42 10s
Updated XM43E1 for USCM Sniper Spec Check for merge conflicts #19851: Pull request #5767 synchronize by Kaga-404
February 21, 2024 06:38 14s
February 21, 2024 06:38 14s
Updated XM43E1 for USCM Sniper Spec Check for merge conflicts #19850: Pull request #5767 synchronize by Kaga-404
February 21, 2024 06:13 13s
February 21, 2024 06:13 13s
Updated XM43E1 for USCM Sniper Spec Check for merge conflicts #19849: Pull request #5767 opened by Kaga-404
February 21, 2024 05:47 11s
February 21, 2024 05:47 11s
M540-B Armored Recon Carrier Check for merge conflicts #19848: Pull request #5401 ready_for_review by Zonespace27
February 21, 2024 05:14 11s
February 21, 2024 05:14 11s
M540-B Armored Recon Carrier Check for merge conflicts #19847: Pull request #5401 synchronize by Zonespace27
February 21, 2024 05:12 14s
February 21, 2024 05:12 14s
M540-B Armored Recon Carrier Check for merge conflicts #19846: Pull request #5401 synchronize by Zonespace27
February 21, 2024 05:01 11s
February 21, 2024 05:01 11s
Makes it possible to view helmet cams of SOs/XOs/COs (#5433) Check for merge conflicts #19845: Commit bb79497 pushed by github-merge-queue bot
February 21, 2024 04:41 4m 13s master
master
February 21, 2024 04:41 4m 13s
autolathes printing times are now significantly faster (#5735) Check for merge conflicts #19844: Commit e99b22a pushed by github-merge-queue bot
February 21, 2024 04:27 4m 17s master
master
February 21, 2024 04:27 4m 17s
Reword facehugger temporary mute end message (#5762) Check for merge conflicts #19843: Commit 783611a pushed by github-merge-queue bot
February 21, 2024 04:13 4m 18s master
master
February 21, 2024 04:13 4m 18s
Distress beacon response messages now have a chance of being static (… Check for merge conflicts #19842: Commit 0734574 pushed by github-merge-queue bot
February 21, 2024 04:00 4m 17s master
master
February 21, 2024 04:00 4m 17s