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

Guild borg buffs mostly (so they can do their job) (#4809) Check for merge conflicts #1993: Commit aa4d22d pushed by cdb-is-not-good
October 30, 2023 00:37 51s master
master
October 30, 2023 00:37 51s
balances self surgery + fixes farmbots (#4808) Check for merge conflicts #1992: Commit 7965fce pushed by cdb-is-not-good
October 30, 2023 00:37 51s master
master
October 30, 2023 00:37 51s
Ports some erismed tweaks (#4709) Check for merge conflicts #1991: Commit 11e804f pushed by cdb-is-not-good
October 30, 2023 00:37 1m 16s master
master
October 30, 2023 00:37 1m 16s
Soil crafting crafting time reduction (#4829) Check for merge conflicts #1990: Commit d141764 pushed by cdb-is-not-good
October 29, 2023 20:43 47s master
master
October 29, 2023 20:43 47s
Joseph atton found the ids! (#4826) Check for merge conflicts #1989: Commit a4e1e09 pushed by cdb-is-not-good
October 28, 2023 15:24 48s master
master
October 28, 2023 15:24 48s
Better descriptions for ''non-lethal'' ballistics (#4824) Check for merge conflicts #1988: Commit d263347 pushed by cdb-is-not-good
October 27, 2023 22:09 48s master
master
October 27, 2023 22:09 48s
When putting a bedsheet on a bed, remove pixel shift (#4820) Check for merge conflicts #1987: Commit 5dbc92f pushed by cdb-is-not-good
October 27, 2023 22:08 1m 5s master
master
October 27, 2023 22:08 1m 5s
Don't show "contents of [bottle] smash all over [target]" message if … Check for merge conflicts #1986: Commit 2f3610c pushed by cdb-is-not-good
October 27, 2023 22:07 1m 0s master
master
October 27, 2023 22:07 1m 0s
Update - Loot & Mines (#4818) Check for merge conflicts #1985: Commit facbc78 pushed by cdb-is-not-good
October 27, 2023 22:06 48s master
master
October 27, 2023 22:06 48s
Add files via upload (#4817) Check for merge conflicts #1984: Commit d26f299 pushed by cdb-is-not-good
October 24, 2023 10:00 57s master
master
October 24, 2023 10:00 57s
Update origin_synthetic.dm (#4806) Check for merge conflicts #1983: Commit c93535b pushed by cdb-is-not-good
October 24, 2023 09:45 38s master
master
October 24, 2023 09:45 38s
Onlooker fixes, robot-gun buffs and warcrimebots (#4803) Check for merge conflicts #1982: Commit a16bdc8 pushed by cdb-is-not-good
October 24, 2023 09:45 39s master
master
October 24, 2023 09:45 39s
Janibuffs (#4800) Check for merge conflicts #1981: Commit 19e8cb2 pushed by cdb-is-not-good
October 24, 2023 09:44 1m 9s master
master
October 24, 2023 09:44 1m 9s
yet another outsider buff (#4795) Check for merge conflicts #1980: Commit 0c599a4 pushed by cdb-is-not-good
October 17, 2023 04:07 36s master
master
October 17, 2023 04:07 36s
Addon - Excel Fortress (Fixed maybe) (#4792) Check for merge conflicts #1979: Commit 1de2165 pushed by cdb-is-not-good
October 17, 2023 04:07 49s master
master
October 17, 2023 04:07 49s
sprite fix (#4805) Check for merge conflicts #1978: Commit 23eee2a pushed by cdb-is-not-good
October 14, 2023 20:42 51s master
master
October 14, 2023 20:42 51s
Update noticeboard.dm (#4804) Check for merge conflicts #1977: Commit cca75f3 pushed by cdb-is-not-good
October 14, 2023 02:45 52s master
master
October 14, 2023 02:45 52s
Update robot.dm (#4802) Check for merge conflicts #1976: Commit a1e2b3b pushed by cdb-is-not-good
October 13, 2023 19:21 52s master
master
October 13, 2023 19:21 52s
Update toxic_biomass.dm (#4801) Check for merge conflicts #1975: Commit 5c5c1fb pushed by cdb-is-not-good
October 13, 2023 16:13 57s master
master
October 13, 2023 16:13 57s
Gladstone (#4799) Check for merge conflicts #1974: Commit 482a0da pushed by cdb-is-not-good
October 12, 2023 20:05 53s master
master
October 12, 2023 20:05 53s
Another megaPR looming on the horizon (#4797) Check for merge conflicts #1973: Commit f768307 pushed by cdb-is-not-good
October 12, 2023 19:21 50s master
master
October 12, 2023 19:21 50s
Trilby asked me to port this (#4782) Check for merge conflicts #1972: Commit 814a8e1 pushed by cdb-is-not-good
October 12, 2023 16:24 58s master
master
October 12, 2023 16:24 58s
So much for that small PR i was working on. (#4790) Check for merge conflicts #1971: Commit 41f8387 pushed by cdb-is-not-good
October 12, 2023 16:22 51s master
master
October 12, 2023 16:22 51s
Im having trouble holding all these borg icons (#4793) Check for merge conflicts #1970: Commit 39b00cf pushed by cdb-is-not-good
October 12, 2023 01:47 47s master
master
October 12, 2023 01:47 47s
Reverts the DB shotgun sprite to it's pre-fallout glory days. (#4794) Check for merge conflicts #1969: Commit 9cb4559 pushed by cdb-is-not-good
October 12, 2023 01:33 50s master
master
October 12, 2023 01:33 50s
ProTip! You can narrow down the results and go further in time using created:<2023-10-12 or the other filters available.