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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fixes a DIFFERENT error in welding code. (#4995) Check for merge conflicts #2130: Commit 482736e pushed by cdb-is-not-good
January 31, 2024 22:33 35s master
master
January 31, 2024 22:33 35s
reduces welding damage by half. (#4994) Check for merge conflicts #2129: Commit f073c06 pushed by cdb-is-not-good
January 31, 2024 22:24 39s master
master
January 31, 2024 22:24 39s
fixes the ears i made ten minutes ago, oops./ (#4991) Check for merge conflicts #2128: Commit 78ae957 pushed by cdb-is-not-good
January 31, 2024 22:17 36s master
master
January 31, 2024 22:17 36s
Allows event ops and mods to make votes. (#4993) Check for merge conflicts #2127: Commit c2db70e pushed by cdb-is-not-good
January 31, 2024 22:17 40s master
master
January 31, 2024 22:17 40s
Gives Mods BST perms. (#4992) Check for merge conflicts #2126: Commit f346b61 pushed by cdb-is-not-good
January 31, 2024 21:59 37s master
master
January 31, 2024 21:59 37s
new ear option. (#4989) Check for merge conflicts #2125: Commit 4f3d8d8 pushed by cdb-is-not-good
January 31, 2024 20:34 40s master
master
January 31, 2024 20:34 40s
Description Fix (#4988) Check for merge conflicts #2124: Commit 397b7bd pushed by cdb-is-not-good
January 31, 2024 17:45 43s master
master
January 31, 2024 17:45 43s
more_layered_shielding (#4986) Check for merge conflicts #2123: Commit 805e0b1 pushed by cdb-is-not-good
January 31, 2024 17:39 42s master
master
January 31, 2024 17:39 42s
UI's that you desire (#4934) Check for merge conflicts #2122: Commit 84a234d pushed by cdb-is-not-good
January 31, 2024 17:37 37s master
master
January 31, 2024 17:37 37s
Liberty slime + atmos junk. (#4930) Check for merge conflicts #2121: Commit a25ab0a pushed by cdb-is-not-good
January 31, 2024 17:36 39s master
master
January 31, 2024 17:36 39s
Sensible Benzin roaches (#4987) Check for merge conflicts #2120: Commit 8a1090e pushed by cdb-is-not-good
January 31, 2024 17:30 39s master
master
January 31, 2024 17:30 39s
More church gun balance and small fixes. (#4975) Check for merge conflicts #2119: Commit bfd86ec pushed by cdb-is-not-good
January 29, 2024 21:29 36s master
master
January 29, 2024 21:29 36s
bugfixes. (#4983) Check for merge conflicts #2118: Commit 516fa83 pushed by cdb-is-not-good
January 29, 2024 21:16 41s master
master
January 29, 2024 21:16 41s
Rapiers (#4968) Check for merge conflicts #2117: Commit 9f78d09 pushed by cdb-is-not-good
January 29, 2024 12:57 41s master
master
January 29, 2024 12:57 41s
Landen ABK fix (#4979) Check for merge conflicts #2116: Commit 26712fb pushed by cdb-is-not-good
January 28, 2024 12:22 37s master
master
January 28, 2024 12:22 37s
Update _internal_wound.dm (#4978) Check for merge conflicts #2115: Commit f5b7267 pushed by cdb-is-not-good
January 28, 2024 08:24 37s master
master
January 28, 2024 08:24 37s
Makes the WO's window tinter work (#4977) Check for merge conflicts #2114: Commit 7b99a57 pushed by cdb-is-not-good
January 28, 2024 07:36 37s master
master
January 28, 2024 07:36 37s
genes and blood fussion (#4976) Check for merge conflicts #2113: Commit 64e9cd1 pushed by cdb-is-not-good
January 28, 2024 07:35 37s master
master
January 28, 2024 07:35 37s
Powercrovel (#4974) Check for merge conflicts #2112: Commit 0bf6630 pushed by cdb-is-not-good
January 27, 2024 14:51 36s master
master
January 27, 2024 14:51 36s
Makes maintenance areas make sense (#4973) Check for merge conflicts #2111: Commit 5017988 pushed by cdb-is-not-good
January 27, 2024 09:14 28s master
master
January 27, 2024 09:14 28s
Buffs download speeds (#4972) Check for merge conflicts #2110: Commit 8d35758 pushed by cdb-is-not-good
January 27, 2024 09:13 37s master
master
January 27, 2024 09:13 37s
maps in my mini-inhibitors (AKA nerfing myself) (#4971) Check for merge conflicts #2109: Commit 34c87a1 pushed by cdb-is-not-good
January 27, 2024 09:13 35s master
master
January 27, 2024 09:13 35s
Adds generic implant and known_cybernetics to adv medscanner (#4970) Check for merge conflicts #2108: Commit d90475b pushed by cdb-is-not-good
January 27, 2024 09:12 37s master
master
January 27, 2024 09:12 37s
Fractals are invited (#4957) Check for merge conflicts #2107: Commit 2fdbcfd pushed by cdb-is-not-good
January 24, 2024 05:58 39s master
master
January 24, 2024 05:58 39s
Head Office upgrades and other things (#4947) Check for merge conflicts #2106: Commit a74ce66 pushed by cdb-is-not-good
January 24, 2024 05:57 26s master
master
January 24, 2024 05:57 26s