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
336 workflow run results
336 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Last Hair fix (#5198) Check for merge conflicts #2293: Commit 6927a66 pushed by Trilbyspaceclone
April 21, 2024 04:53 36s master
master
April 21, 2024 04:53 36s
lockpick o matic rework (#5190) Check for merge conflicts #2292: Commit ee92fbc pushed by Trilbyspaceclone
April 21, 2024 00:14 42s master
master
April 21, 2024 00:14 42s
Fixes humans being unable to upgrade borgs (#5191) Check for merge conflicts #2291: Commit 338ebae pushed by Trilbyspaceclone
April 21, 2024 00:13 49s master
master
April 21, 2024 00:13 49s
hair (#5197) Check for merge conflicts #2290: Commit 71b2f56 pushed by Trilbyspaceclone
April 20, 2024 19:09 38s master
master
April 20, 2024 19:09 38s
Hair (#5196) Check for merge conflicts #2289: Commit c11611b pushed by Trilbyspaceclone
April 20, 2024 15:54 38s master
master
April 20, 2024 15:54 38s
Nanogate Overhaul Part 1: The Powercreepining (#5152) Check for merge conflicts #2288: Commit e5ba807 pushed by Trilbyspaceclone
April 20, 2024 03:23 47s master
master
April 20, 2024 03:23 47s
Crimson Cross Arsenal (#5128) Check for merge conflicts #2287: Commit 067edc4 pushed by Trilbyspaceclone
April 20, 2024 03:20 39s master
master
April 20, 2024 03:20 39s
atmos_canpass = CANPASS_PROC (#5189) Check for merge conflicts #2286: Commit db6db14 pushed by Trilbyspaceclone
April 20, 2024 03:18 37s master
master
April 20, 2024 03:18 37s
CE_BLOODCLOT no longer lethal (#5192) Check for merge conflicts #2285: Commit f3dea75 pushed by Trilbyspaceclone
April 20, 2024 03:16 37s master
master
April 20, 2024 03:16 37s
Kepler 21b - A new world awaits! (#5193) Check for merge conflicts #2284: Commit a8296b5 pushed by Trilbyspaceclone
April 19, 2024 17:09 38s master
master
April 19, 2024 17:09 38s
stranger doom shooting (#5179) Check for merge conflicts #2283: Commit 9d8d0da pushed by Trilbyspaceclone
April 17, 2024 23:33 35s master
master
April 17, 2024 23:33 35s
Guild burn engine and extra mapping (#5155) Check for merge conflicts #2282: Commit ced60f3 pushed by Trilbyspaceclone
April 17, 2024 23:30 39s master
master
April 17, 2024 23:30 39s
Greyson Offices Map Rework (#5164) Check for merge conflicts #2281: Commit f6efcb8 pushed by Trilbyspaceclone
April 17, 2024 23:29 37s master
master
April 17, 2024 23:29 37s
Updates weather_effects.dmi with new snow effects (#5188) Check for merge conflicts #2280: Commit 86c5af1 pushed by Trilbyspaceclone
April 17, 2024 15:40 38s master
master
April 17, 2024 15:40 38s
Fruit volume fix (#5182) Check for merge conflicts #2279: Commit d23eee4 pushed by Trilbyspaceclone
April 17, 2024 02:11 37s master
master
April 17, 2024 02:11 37s
Marshal borgs (part 1 ?) (#5181) Check for merge conflicts #2278: Commit af93de8 pushed by Trilbyspaceclone
April 17, 2024 02:09 44s master
master
April 17, 2024 02:09 44s
Update cardgame_2.dm Check for merge conflicts #2277: Commit 00b2b53 pushed by Trilbyspaceclone
April 16, 2024 22:35 36s master
master
April 16, 2024 22:35 36s
recolors the police bowlers (#5178) Check for merge conflicts #2276: Commit eb32576 pushed by Trilbyspaceclone
April 13, 2024 21:26 38s master
master
April 13, 2024 21:26 38s
Adds Pain Infliction Psionic Power (#5156) Check for merge conflicts #2275: Commit 82bf6db pushed by Trilbyspaceclone
April 12, 2024 19:18 37s master
master
April 12, 2024 19:18 37s
AP base and PDM base tweaks (#5163) Check for merge conflicts #2274: Commit e504584 pushed by Trilbyspaceclone
April 12, 2024 19:17 37s master
master
April 12, 2024 19:17 37s
Psionic Swarm + Psionic Spark Fix (#5161) Check for merge conflicts #2273: Commit b8474e8 pushed by Trilbyspaceclone
April 12, 2024 19:14 29s master
master
April 12, 2024 19:14 29s
Le gun in my le colony (#5169) Check for merge conflicts #2272: Commit 1c166bd pushed by Trilbyspaceclone
April 12, 2024 19:14 36s master
master
April 12, 2024 19:14 36s
panacea fixes and adjustment (#5170) Check for merge conflicts #2271: Commit a02356b pushed by Trilbyspaceclone
April 12, 2024 19:11 37s master
master
April 12, 2024 19:11 37s
Slimelight restored: QOL changes and re-added recipes (#5165) Check for merge conflicts #2270: Commit 599b9b6 pushed by Trilbyspaceclone
April 12, 2024 19:10 37s master
master
April 12, 2024 19:10 37s
Bump tar from 6.1.8 to 6.2.1 in /tgui (#5172) Check for merge conflicts #2269: Commit 65bff1d pushed by Trilbyspaceclone
April 12, 2024 19:09 38s master
master
April 12, 2024 19:09 38s