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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Language Adjustment: Opifexee (#5095) Check for merge conflicts #2218: Commit 548ef6e pushed by cdb-is-not-good
March 11, 2024 02:35 38s master
master
March 11, 2024 02:35 38s
Fixes perk-based damage mods, adds ablative subdermal armor (#5070) Check for merge conflicts #2217: Commit fb43f07 pushed by cdb-is-not-good
March 11, 2024 02:33 37s master
master
March 11, 2024 02:33 37s
tesla turret fix(?) (#5102) Check for merge conflicts #2216: Commit 4afe651 pushed by Trilbyspaceclone
March 10, 2024 12:24 39s master
master
March 10, 2024 12:24 39s
we comment out and call it coding (#5106) Check for merge conflicts #2215: Commit 6f2163e pushed by Trilbyspaceclone
March 10, 2024 12:21 38s master
master
March 10, 2024 12:21 38s
Stranger dreams part 0.1 (#5105) Check for merge conflicts #2214: Commit 116c9fe pushed by Trilbyspaceclone
March 10, 2024 12:20 39s master
master
March 10, 2024 12:20 39s
incoherent fox noises (#5103) Check for merge conflicts #2213: Commit b59fc8d pushed by Trilbyspaceclone
March 9, 2024 04:46 37s master
master
March 9, 2024 04:46 37s
crayon basin anti spam (#5098) Check for merge conflicts #2212: Commit 28bda36 pushed by Trilbyspaceclone
March 7, 2024 05:36 24s master
master
March 7, 2024 05:36 24s
Tames Some Exploits (#5099) Check for merge conflicts #2211: Commit b644637 pushed by Trilbyspaceclone
March 7, 2024 05:36 43s master
master
March 7, 2024 05:36 43s
New Perk Icons ( Set 1 - 42 Icons ) (#5101) Check for merge conflicts #2210: Commit f206577 pushed by Trilbyspaceclone
March 7, 2024 05:35 38s master
master
March 7, 2024 05:35 38s
Fixed Ambrosia Panacea being a freeby (#5087) Check for merge conflicts #2209: Commit 973b79e pushed by Trilbyspaceclone
March 5, 2024 09:41 40s master
master
March 5, 2024 09:41 40s
new bluecross weapon - Crimson Arc (#5089) Check for merge conflicts #2208: Commit 5c5db86 pushed by Trilbyspaceclone
March 5, 2024 09:39 35s master
master
March 5, 2024 09:39 35s
Xenoarch fix(es) and intractions (#5082) Check for merge conflicts #2207: Commit c9ab30e pushed by Trilbyspaceclone
March 5, 2024 09:37 36s master
master
March 5, 2024 09:37 36s
Update update_icons.dm (#5092) Check for merge conflicts #2206: Commit 6ba312b pushed by Trilbyspaceclone
March 5, 2024 09:36 25s master
master
March 5, 2024 09:36 25s
Maxhp via leveling cap (#5091) Check for merge conflicts #2205: Commit f10ed34 pushed by Trilbyspaceclone
March 5, 2024 09:36 47s master
master
March 5, 2024 09:36 47s
drain softcap (#5090) Check for merge conflicts #2204: Commit b1cd790 pushed by Trilbyspaceclone
February 29, 2024 23:09 39s master
master
February 29, 2024 23:09 39s
Stat balance 9.0c (#5078) Check for merge conflicts #2203: Commit 2c39b6c pushed by Trilbyspaceclone
February 29, 2024 22:02 38s master
master
February 29, 2024 22:02 38s
tweakhuntmastertitletofitinwithwiki (#5088) Check for merge conflicts #2202: Commit edb5d63 pushed by Trilbyspaceclone
February 29, 2024 22:00 38s master
master
February 29, 2024 22:00 38s
Update seed.dm (#5086) Check for merge conflicts #2201: Commit 383ea84 pushed by Trilbyspaceclone
February 28, 2024 23:52 40s master
master
February 28, 2024 23:52 40s
revert auretian nerf (#5054) Check for merge conflicts #2200: Commit ecf6891 pushed by Trilbyspaceclone
February 28, 2024 19:32 39s master
master
February 28, 2024 19:32 39s
Update eyes.dm (#5057) Check for merge conflicts #2199: Commit 6e98bc5 pushed by Trilbyspaceclone
February 28, 2024 19:30 1m 51s master
master
February 28, 2024 19:30 1m 51s
Redo with fewer telepathy changes (#5053) Check for merge conflicts #2198: Commit f1fa93a pushed by Trilbyspaceclone
February 28, 2024 19:29 49s master
master
February 28, 2024 19:29 49s
Update shuttles-nadezhda.dm (#5056) Check for merge conflicts #2197: Commit c83f578 pushed by Trilbyspaceclone
February 28, 2024 19:28 37s master
master
February 28, 2024 19:28 37s
Update _Nadezhda_Colony_New.dmm (#5076) Check for merge conflicts #2196: Commit 4036dec pushed by Trilbyspaceclone
February 28, 2024 19:27 35s master
master
February 28, 2024 19:27 35s
Renames and readds numerical clothes (#5062) Check for merge conflicts #2195: Commit 3f26d9c pushed by Trilbyspaceclone
February 28, 2024 19:26 42s master
master
February 28, 2024 19:26 42s
iwaitedoutsideforlike5hoursplayedaleaguematch (#5069) Check for merge conflicts #2194: Commit 192b309 pushed by Trilbyspaceclone
February 28, 2024 19:16 37s master
master
February 28, 2024 19:16 37s