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,605 workflow run results
7,605 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fixes the pulling of trading cards out of a pack message being visible to other people Check for merge conflicts #20239: Pull request #5852 opened by Warfan1815
February 29, 2024 18:54 11s
February 29, 2024 18:54 11s
adds stun to exiting maintenance stations Check for merge conflicts #20238: Pull request #5822 synchronize by LOK-1SmartRifleEnjoyer
February 29, 2024 18:50 15s
February 29, 2024 18:50 15s
adds stun to exiting maintenance stations Check for merge conflicts #20237: Pull request #5822 synchronize by LOK-1SmartRifleEnjoyer
February 29, 2024 18:48 14s
February 29, 2024 18:48 14s
Vehicle bay elevator stuff Check for merge conflicts #20236: Pull request #5851 opened by SabreML
February 29, 2024 18:11 13s
February 29, 2024 18:11 13s
Fixes traps triggering when shuttlecrushed Check for merge conflicts #20235: Pull request #5820 ready_for_review by Vicacrov
February 29, 2024 17:17 13s
February 29, 2024 17:17 13s
Changes overwatch consoles to useSharedState to prevent losing state information upon closing the UI Check for merge conflicts #20234: Pull request #5850 opened by TheGamerdk
February 29, 2024 17:09 11s
February 29, 2024 17:09 11s
Refactors totalXenos, tweaks some tier 0 things, adds a xeno anti-delay warning Check for merge conflicts #20233: Pull request #5847 ready_for_review by Vicacrov
February 29, 2024 17:07 1m 0s
February 29, 2024 17:07 1m 0s
Refactors totalXenos, tweaks some tier 0 things, adds a xeno anti-delay warning Check for merge conflicts #20232: Pull request #5847 synchronize by Vicacrov
February 29, 2024 17:07 12s
February 29, 2024 17:07 12s
(EVENT) Cortical Borers Check for merge conflicts #20231: Pull request #5829 synchronize by realforest2001
February 29, 2024 16:33 10s
February 29, 2024 16:33 10s
New Chinook Check for merge conflicts #20230: Pull request #5849 opened by nauticall
February 29, 2024 16:24 1m 14s
February 29, 2024 16:24 1m 14s
(EVENT) Cortical Borers Check for merge conflicts #20229: Pull request #5829 synchronize by realforest2001
February 29, 2024 16:23 14s
February 29, 2024 16:23 14s
Nightmare Insert Fixes & Elevated Nightmare Errors (#5796) Check for merge conflicts #20228: Commit 5bdc65d pushed by github-merge-queue bot
February 29, 2024 16:16 4m 19s master
master
February 29, 2024 16:16 4m 19s
Refactors totalXenos, tweaks some tier 0 things, adds a xeno anti-delay warning Check for merge conflicts #20227: Pull request #5847 opened by Vicacrov
February 29, 2024 15:56 12s
February 29, 2024 15:56 12s
fixes custom chemicals not working on the flamer nozzle Check for merge conflicts #20226: Pull request #5687 synchronize by iloveloopers
February 29, 2024 15:39 14s
February 29, 2024 15:39 14s
fixes custom chemicals not working on the flamer nozzle Check for merge conflicts #20225: Pull request #5687 synchronize by iloveloopers
February 29, 2024 15:39 2m 12s
February 29, 2024 15:39 2m 12s
fixes custom chemicals not working on the flamer nozzle Check for merge conflicts #20224: Pull request #5687 synchronize by iloveloopers
February 29, 2024 15:39 19s
February 29, 2024 15:39 19s
fixes custom chemicals not working on the flamer nozzle Check for merge conflicts #20223: Pull request #5687 synchronize by iloveloopers
February 29, 2024 15:39 15s
February 29, 2024 15:39 15s
Balance: adding option to buy more ammunition type and change how fuel tank pouch is destributed Check for merge conflicts #20222: Pull request #5839 ready_for_review by Huffie56
February 29, 2024 14:09 33s
February 29, 2024 14:09 33s
M42 Spotter Sight now requires pamphlet. Check for merge conflicts #20221: Pull request #5846 opened by realforest2001
February 29, 2024 14:07 14s
February 29, 2024 14:07 14s
(EVENT) Cortical Borers Check for merge conflicts #20220: Pull request #5829 synchronize by realforest2001
February 29, 2024 14:00 16s
February 29, 2024 14:00 16s
Balance: adding option to buy more ammunition type and change how fuel tank pouch is destributed Check for merge conflicts #20219: Pull request #5839 synchronize by Huffie56
February 29, 2024 13:15 15s
February 29, 2024 13:15 15s
Dress Blues Check for merge conflicts #20218: Pull request #5845 opened by realforest2001
February 29, 2024 11:08 17s
February 29, 2024 11:08 17s
Refactor stage three of black goo and added stage four. (#5739) Check for merge conflicts #20217: Commit 0deeaf6 pushed by github-merge-queue bot
February 29, 2024 10:22 5m 44s master
master
February 29, 2024 10:22 5m 44s
Adds UA 45-F, UA 60-FP, M2C, M56D ammo to req (#5816) Check for merge conflicts #20216: Commit bcfee27 pushed by github-merge-queue bot
February 29, 2024 10:13 4m 22s master
master
February 29, 2024 10:13 4m 22s
Refactor stage three of black goo and added stage four. Check for merge conflicts #20215: Pull request #5739 synchronize by Drulikar
February 29, 2024 10:07 34s
February 29, 2024 10:07 34s