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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Adds CLF TL to the crashed ship & updates some intro-texts for crashed ship & PMC spawns Check for merge conflicts #20059: Pull request #5813 synchronize by Foxtrot13224
February 26, 2024 01:13 48s
February 26, 2024 01:13 48s
Adds CLF TL to the crashed ship & updates some intro-texts for crashed ship & PMC spawns Check for merge conflicts #20058: Pull request #5813 synchronize by Foxtrot13224
February 26, 2024 01:12 2m 13s
February 26, 2024 01:12 2m 13s
Fix bound math on mass screenshot verb Check for merge conflicts #20057: Pull request #5814 opened by Drulikar
February 26, 2024 01:06 29s
February 26, 2024 01:06 29s
Adds CLF TL to the crashed ship & updates some intro-texts for crashed ship & PMC spawns Check for merge conflicts #20056: Pull request #5813 synchronize by Foxtrot13224
February 26, 2024 01:05 14s
February 26, 2024 01:05 14s
Reverts flare buff from #4229 (#5709) Check for merge conflicts #20055: Commit 7575f2c pushed by github-merge-queue bot
February 26, 2024 00:43 4m 14s master
master
February 26, 2024 00:43 4m 14s
Adds CLF TL to the crashed ship & updates some intro-texts for crashed ship & PMC spawns Check for merge conflicts #20054: Pull request #5813 opened by Foxtrot13224
February 26, 2024 00:40 14s
February 26, 2024 00:40 14s
Reenables Prison station Check for merge conflicts #20053: Pull request #5801 synchronize by Greg-Joffer
February 26, 2024 00:28 10s
February 26, 2024 00:28 10s
Reenables Prison station Check for merge conflicts #20052: Pull request #5801 synchronize by Greg-Joffer
February 26, 2024 00:26 15s
February 26, 2024 00:26 15s
Fixes Trading Card Descriptions Check for merge conflicts #20051: Pull request #5812 opened by Warfan1815
February 25, 2024 22:36 11s
February 25, 2024 22:36 11s
Dropship turf direction sprites Check for merge conflicts #20050: Pull request #3642 ready_for_review by mullenpaul
February 25, 2024 21:25 2m 0s
February 25, 2024 21:25 2m 0s
Dropship turf direction sprites Check for merge conflicts #20049: Pull request #3642 synchronize by mullenpaul
February 25, 2024 21:24 10s
February 25, 2024 21:24 10s
Brig Area Update/Refactor Check for merge conflicts #20048: Pull request #5723 ready_for_review by ItsVyzo
February 25, 2024 20:58 13s
February 25, 2024 20:58 13s
Brig Area Update/Refactor Check for merge conflicts #20047: Pull request #5723 synchronize by ItsVyzo
February 25, 2024 20:57 12s
February 25, 2024 20:57 12s
makes marking more effective for admins (#5779) Check for merge conflicts #20046: Commit 723b6c2 pushed by github-merge-queue bot
February 25, 2024 20:55 4m 14s master
master
February 25, 2024 20:55 4m 14s
Changes some event verb permissions around. (#5809) Check for merge conflicts #20045: Commit cf8652b pushed by github-merge-queue bot
February 25, 2024 19:49 4m 13s master
master
February 25, 2024 19:49 4m 13s
Fix runtime since HAS_TRAIT doesn't null test Check for merge conflicts #20044: Pull request #5811 opened by Drulikar
February 25, 2024 19:43 1m 10s
February 25, 2024 19:43 1m 10s
Changes some event verb permissions around. Check for merge conflicts #20043: Pull request #5809 opened by realforest2001
February 25, 2024 19:25 13s
February 25, 2024 19:25 13s
Pried dropship's hatches cannot be locked again Check for merge conflicts #20042: Pull request #5808 synchronize by ihatethisengine
February 25, 2024 18:16 9s
February 25, 2024 18:16 9s
Pried dropship's hatches cannot be locked again Check for merge conflicts #20041: Pull request #5808 ready_for_review by ihatethisengine
February 25, 2024 18:16 2m 11s
February 25, 2024 18:16 2m 11s
Pried dropship's hatches cannot be locked again Check for merge conflicts #20040: Pull request #5808 opened by ihatethisengine
February 25, 2024 18:07 13s
February 25, 2024 18:07 13s
Closets now dense themselves based on pixel offset when being reclosed Check for merge conflicts #20039: Pull request #5780 ready_for_review by PhantomEpicness
February 25, 2024 18:04 9s
February 25, 2024 18:04 9s
Reenables Prison station Check for merge conflicts #20038: Pull request #5801 synchronize by Greg-Joffer
February 25, 2024 16:56 52s
February 25, 2024 16:56 52s
Reenables Prison station Check for merge conflicts #20037: Pull request #5801 synchronize by Greg-Joffer
February 25, 2024 16:55 26s
February 25, 2024 16:55 26s
Reenables Prison station Check for merge conflicts #20036: Pull request #5801 synchronize by Greg-Joffer
February 25, 2024 16:54 10s
February 25, 2024 16:54 10s
Reenables Prison station Check for merge conflicts #20035: Pull request #5801 synchronize by Greg-Joffer
February 25, 2024 16:45 14s
February 25, 2024 16:45 14s