Skip to content

Actions: DeltaV-Station/Delta-v

Actions

Check Merge Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflict-labeler.yml
7,527 workflow runs
7,527 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fixed pies don't drop Pie Tins after being Thrown Check Merge Conflicts #7527: Pull request #2047 opened by reesque
October 26, 2024 05:09 2m 13s
October 26, 2024 05:09 2m 13s
Made pie cannon usable by pacifists Check Merge Conflicts #7526: Pull request #2046 opened by Radezolid
October 26, 2024 00:54 10s
October 26, 2024 00:54 10s
Rules Rewrite 24OCT2024 Check Merge Conflicts #7525: Pull request #2039 synchronize by Colin-Tel
October 26, 2024 00:44 11s
October 26, 2024 00:44 11s
Rules Rewrite 24OCT2024 Check Merge Conflicts #7524: Pull request #2039 synchronize by Colin-Tel
October 26, 2024 00:42 11s
October 26, 2024 00:42 11s
add the roboticist job Check Merge Conflicts #7523: Pull request #2029 synchronize by deltanedas
October 25, 2024 13:10 2m 13s
October 25, 2024 13:10 2m 13s
early merge killpersonconditionsystem refactor (#32680) Check Merge Conflicts #7522: Pull request #2044 opened by MilonPL
October 25, 2024 10:45 2m 11s
October 25, 2024 10:45 2m 11s
add the roboticist job Check Merge Conflicts #7521: Pull request #2029 synchronize by deltanedas
October 25, 2024 10:23 15s
October 25, 2024 10:23 15s
add the roboticist job Check Merge Conflicts #7520: Pull request #2029 synchronize by deltanedas
October 25, 2024 10:15 12s
October 25, 2024 10:15 12s
Added "deltavf2" lobby screen Check Merge Conflicts #7519: Pull request #1979 synchronize by ProspectorAres
October 25, 2024 06:31 10s
October 25, 2024 06:31 10s
tweak: Remove 'nuke' replacement from Italian accent Check Merge Conflicts #7518: Pull request #2043 opened by DisposableCrewmember42
October 25, 2024 05:22 15s
October 25, 2024 05:22 15s
Rules Rewrite 24OCT2024 Check Merge Conflicts #7517: Pull request #2039 synchronize by Colin-Tel
October 25, 2024 00:47 2m 20s
October 25, 2024 00:47 2m 20s
Solaris midi fix Check Merge Conflicts #7516: Pull request #2041 opened by Solaris7518
October 24, 2024 18:26 13s
October 24, 2024 18:26 13s
Rules Rewrite 24OCT2024 Check Merge Conflicts #7515: Pull request #2039 synchronize by Colin-Tel
October 24, 2024 17:16 11s
October 24, 2024 17:16 11s
Rules Rewrite 24OCT2024 Check Merge Conflicts #7514: Pull request #2039 opened by Colin-Tel
October 24, 2024 16:59 17s
October 24, 2024 16:59 17s
fix playtime formatting (#32974) Check Merge Conflicts #7513: Pull request #2038 opened by MilonPL
October 24, 2024 16:56 2m 16s
October 24, 2024 16:56 2m 16s
make martyr module disarmable Check Merge Conflicts #7512: Pull request #1960 synchronize by deltanedas
October 24, 2024 12:46 13s
October 24, 2024 12:46 13s
use LocalizedJobTitle in crew manifest Check Merge Conflicts #7511: Pull request #2037 synchronize by deltanedas
October 24, 2024 12:32 12s
October 24, 2024 12:32 12s
use LocalizedJobTitle in crew manifest Check Merge Conflicts #7510: Pull request #2037 opened by deltanedas
October 24, 2024 12:28 2m 19s
October 24, 2024 12:28 2m 19s
upstream merge 24/10 Check Merge Conflicts #7509: Pull request #2036 synchronize by deltanedas
October 24, 2024 08:26 12s
October 24, 2024 08:26 12s
upstream merge 24/10 Check Merge Conflicts #7508: Pull request #2036 synchronize by deltanedas
October 24, 2024 08:25 14s
October 24, 2024 08:25 14s
upstream merge 24/10 Check Merge Conflicts #7507: Pull request #2036 synchronize by deltanedas
October 24, 2024 08:18 13s
October 24, 2024 08:18 13s
upstream merge 24/10 Check Merge Conflicts #7506: Pull request #2036 synchronize by deltanedas
October 24, 2024 08:10 15s
October 24, 2024 08:10 15s
upstream merge 24/10 Check Merge Conflicts #7505: Pull request #2036 synchronize by deltanedas
October 24, 2024 03:29 11s
October 24, 2024 03:29 11s
upstream merge 24/10 Check Merge Conflicts #7504: Pull request #2036 opened by deltanedas
October 24, 2024 01:39 2m 14s
October 24, 2024 01:39 2m 14s
Adding clerk access to evidence lockers and brig timers. Check Merge Conflicts #7503: Pull request #2034 opened by PPooch
October 23, 2024 06:52 11s
October 23, 2024 06:52 11s