Skip to content

Actions: sojourn-13/sojourn-station

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
675 workflow run results
675 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

fixes neuland empty sprite (#5500) Check for merge conflicts #2559: Commit 91f3c1d pushed by Trilbyspaceclone
July 1, 2024 01:13 38s master
master
July 1, 2024 01:13 38s
Fixes lack of firedoors (#5497) Check for merge conflicts #2558: Commit aff1ca6 pushed by Trilbyspaceclone
July 1, 2024 01:10 45s master
master
July 1, 2024 01:10 45s
removes defunct folder (#5496) Check for merge conflicts #2557: Commit 7dd3084 pushed by Trilbyspaceclone
July 1, 2024 01:09 40s master
master
July 1, 2024 01:09 40s
nanite RIG resprite (#5493) Check for merge conflicts #2556: Commit ea30c8b pushed by Trilbyspaceclone
June 28, 2024 01:49 36s master
master
June 28, 2024 01:49 36s
Prospector disks movement PR.2 (#5492) Check for merge conflicts #2555: Commit a5ff38e pushed by Trilbyspaceclone
June 27, 2024 23:27 38s master
master
June 27, 2024 23:27 38s
Moved foreman disks to prep (#5491) Check for merge conflicts #2554: Commit d75ee85 pushed by Trilbyspaceclone
June 27, 2024 23:25 27s master
master
June 27, 2024 23:25 27s
tile affection (#5479) Check for merge conflicts #2553: Commit 1f1ca7f pushed by Trilbyspaceclone
June 27, 2024 23:25 37s master
master
June 27, 2024 23:25 37s
Storage tweaks (#5399) Check for merge conflicts #2552: Commit 685149c pushed by Trilbyspaceclone
June 27, 2024 23:24 29s master
master
June 27, 2024 23:24 29s
Colony atmos pass + more maintenance (#5478) Check for merge conflicts #2551: Commit fdb3020 pushed by Trilbyspaceclone
June 27, 2024 23:23 45s master
master
June 27, 2024 23:23 45s
Adding oddities (#5488) Check for merge conflicts #2550: Commit ca860aa pushed by Trilbyspaceclone
June 27, 2024 23:23 27s master
master
June 27, 2024 23:23 27s
Wingbat HE Ego (#5469) Check for merge conflicts #2549: Commit 0f9b29a pushed by Trilbyspaceclone
June 27, 2024 23:22 45s master
master
June 27, 2024 23:22 45s
untested fixes to misc things (#5474) Check for merge conflicts #2548: Commit 5ed8f79 pushed by Trilbyspaceclone
June 27, 2024 23:22 37s master
master
June 27, 2024 23:22 37s
Adds utility Ivan paintjob (#5490) Check for merge conflicts #2547: Commit 333ad04 pushed by Trilbyspaceclone
June 27, 2024 23:21 36s master
master
June 27, 2024 23:21 36s
adds a new maid dress (#5487) Check for merge conflicts #2546: Commit dbc1b93 pushed by Trilbyspaceclone
June 27, 2024 02:12 35s master
master
June 27, 2024 02:12 35s
CMO Rig ( Take 2 ) (#5486) Check for merge conflicts #2545: Commit faa7dae pushed by Trilbyspaceclone
June 27, 2024 01:11 35s master
master
June 27, 2024 01:11 35s
adds comb attackverbs (#5481) Check for merge conflicts #2544: Commit 9b6b3ad pushed by Trilbyspaceclone
June 26, 2024 05:32 24s master
master
June 26, 2024 05:32 24s
missed a few HEV things. Woops! (#5484) Check for merge conflicts #2543: Commit 7fa5e86 pushed by Trilbyspaceclone
June 26, 2024 05:32 46s master
master
June 26, 2024 05:32 46s
Psion Verb Swapping (#5458) Check for merge conflicts #2542: Commit 8edb447 pushed by Trilbyspaceclone
June 25, 2024 03:46 35s master
master
June 25, 2024 03:46 35s
revert white dsay (#5466) Check for merge conflicts #2541: Commit 607f1af pushed by Trilbyspaceclone
June 25, 2024 03:43 37s master
master
June 25, 2024 03:43 37s
Refactor Disposals and remove Atmos Interactions (#5480) Check for merge conflicts #2540: Commit 43f71e2 pushed by Trilbyspaceclone
June 25, 2024 03:42 34s master
master
June 25, 2024 03:42 34s
Make nano wait till the UI loads to send updates (#5471) Check for merge conflicts #2539: Commit 73187c4 pushed by Trilbyspaceclone
June 25, 2024 00:57 38s master
master
June 25, 2024 00:57 38s
Keg based brewing system (#5421) Check for merge conflicts #2538: Commit 9f88992 pushed by Trilbyspaceclone
June 24, 2024 23:58 46s master
master
June 24, 2024 23:58 46s
fixes the HEV suit (#5477) Check for merge conflicts #2537: Commit 9f697c7 pushed by Trilbyspaceclone
June 24, 2024 19:55 35s master
master
June 24, 2024 19:55 35s
treefix (#5476) Check for merge conflicts #2536: Commit bedbe9e pushed by Trilbyspaceclone
June 24, 2024 07:48 35s master
master
June 24, 2024 07:48 35s
Soteria+ Cosmetic Upgrade (Not limited) (#5460) Check for merge conflicts #2535: Commit 3cac0a8 pushed by Trilbyspaceclone
June 24, 2024 07:11 39s master
master
June 24, 2024 07:11 39s