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

Gives salvagers combat gloves in their locker (#4736) Check for merge conflicts #1934: Commit ef81543 pushed by cdb-is-not-good
August 21, 2023 19:45 47s master
master
August 21, 2023 19:45 47s
Ports https://github.com/discordia-space/CEV-Eris/pull/8095 (#4699) Check for merge conflicts #1933: Commit 88d6d33 pushed by cdb-is-not-good
August 21, 2023 19:44 36s master
master
August 21, 2023 19:44 36s
Makes low blood more lethal. (#4719) Check for merge conflicts #1932: Commit b5c456c pushed by cdb-is-not-good
August 21, 2023 19:44 56s master
master
August 21, 2023 19:44 56s
Typos in sanity messages (#4742) Check for merge conflicts #1931: Commit b9c2fc9 pushed by cdb-is-not-good
August 15, 2023 14:24 1m 5s master
master
August 15, 2023 14:24 1m 5s
Im so sick of bugs. (#4739) Check for merge conflicts #1930: Commit 1895bd5 pushed by cdb-is-not-good
August 8, 2023 02:17 48s master
master
August 8, 2023 02:17 48s
ports (#4735) Check for merge conflicts #1929: Commit 9c64c31 pushed by cdb-is-not-good
August 5, 2023 22:17 48s master
master
August 5, 2023 22:17 48s
Re-adding the baroque rifle (test merge recommended) (#4686) Check for merge conflicts #1928: Commit 4572a9a pushed by cdb-is-not-good
August 2, 2023 23:19 1m 0s master
master
August 2, 2023 23:19 1m 0s
fixes #4690: update icon of mop bucket in cart when it goes empty (#4… Check for merge conflicts #1927: Commit 660d0ba pushed by cdb-is-not-good
July 31, 2023 21:51 1m 12s master
master
July 31, 2023 21:51 1m 12s
Caustic shotgun rounds. (#4723) Check for merge conflicts #1926: Commit 48305d3 pushed by cdb-is-not-good
July 26, 2023 08:07 1m 0s master
master
July 26, 2023 08:07 1m 0s
Fixes dress selection. (#4721) Check for merge conflicts #1925: Commit 1149811 pushed by cdb-is-not-good
July 24, 2023 06:46 1m 11s master
master
July 24, 2023 06:46 1m 11s
Fixes caustic bullets (#4722) Check for merge conflicts #1924: Commit 19e9382 pushed by cdb-is-not-good
July 24, 2023 06:28 1m 1s master
master
July 24, 2023 06:28 1m 1s
Ports (#4711) Check for merge conflicts #1923: Commit 9fa3a73 pushed by cdb-is-not-good
July 22, 2023 01:32 1m 5s master
master
July 22, 2023 01:32 1m 5s
Merge pull request #4701 from sojourn-13/dependabot/npm_and_yarn/tgui… Check for merge conflicts #1922: Commit caf2c6a pushed by king5327
July 22, 2023 00:45 59s master
master
July 22, 2023 00:45 59s
Merge pull request #4717 from sojourn-13/dependabot/npm_and_yarn/tgui… Check for merge conflicts #1921: Commit 0720cfc pushed by king5327
July 22, 2023 00:44 59s master
master
July 22, 2023 00:44 59s
Carpediem buff, recommended by Rain Chule (#4707) Check for merge conflicts #1920: Commit f78609e pushed by cdb-is-not-good
July 22, 2023 00:42 53s master
master
July 22, 2023 00:42 53s
Merge pull request #4696 from cdb-is-not-good/gunfixes Check for merge conflicts #1919: Commit 2ae57eb pushed by king5327
July 22, 2023 00:29 43s master
master
July 22, 2023 00:29 43s
Merge pull request #4684 from AysheDaArtist/PsionRegen Check for merge conflicts #1918: Commit 074253b pushed by king5327
July 22, 2023 00:29 1m 1s master
master
July 22, 2023 00:29 1m 1s
i hate exploits (#4714) Check for merge conflicts #1917: Commit 9b5638f pushed by cdb-is-not-good
July 16, 2023 23:46 1m 9s master
master
July 16, 2023 23:46 1m 9s
Small lil bandaid. (#4703) Check for merge conflicts #1916: Commit 1af57f2 pushed by cdb-is-not-good
July 14, 2023 18:52 1m 4s master
master
July 14, 2023 18:52 1m 4s
Fixed lemni hat turning into tesselate veil visually (#4708) Check for merge conflicts #1915: Commit 8bc43d9 pushed by cdb-is-not-good
July 13, 2023 22:24 1m 0s master
master
July 13, 2023 22:24 1m 0s
fixes the bluespace scanner oddity (#4698) Check for merge conflicts #1914: Commit 0125f89 pushed by cdb-is-not-good
July 13, 2023 20:33 56s master
master
July 13, 2023 20:33 56s
Merge pull request #4700 from cdb-is-not-good/Vanity-truly Check for merge conflicts #1913: Commit e4f5fdb pushed by king5327
July 11, 2023 20:03 1m 13s master
master
July 11, 2023 20:03 1m 13s
Merge pull request #4682 from AysheDaArtist/HexCookFixAdd Check for merge conflicts #1912: Commit 2d9509a pushed by king5327
July 10, 2023 20:04 59s master
master
July 10, 2023 20:04 59s
Merge pull request #4681 from du-top/survivalbox Check for merge conflicts #1911: Commit dfe060b pushed by king5327
July 10, 2023 20:03 1m 2s master
master
July 10, 2023 20:03 1m 2s
Bugfixes. (#4685) Check for merge conflicts #1910: Commit 94b32aa pushed by cdb-is-not-good
July 10, 2023 19:03 58s master
master
July 10, 2023 19:03 58s
ProTip! You can narrow down the results and go further in time using created:<2023-07-10 or the other filters available.