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

Bulk combat changes; Armor Divisors, bullet balance, mob health/armor… Check for merge conflicts #2584: Commit 418a060 pushed by cdb-is-not-good
July 12, 2024 02:25 39s master
master
July 12, 2024 02:25 39s
Makes the Church vendor no longer custom (#5387) Check for merge conflicts #2583: Commit a405073 pushed by cdb-is-not-good
July 10, 2024 02:35 38s master
master
July 10, 2024 02:35 38s
Memory Reduction - Lists + Murder Virus2 (#5527) Check for merge conflicts #2582: Commit 4f6f1e1 pushed by Trilbyspaceclone
July 10, 2024 01:41 40s master
master
July 10, 2024 01:41 40s
CWJ Oven overhaul (#5515) Check for merge conflicts #2581: Commit 8034ded pushed by Trilbyspaceclone
July 9, 2024 18:16 37s master
master
July 9, 2024 18:16 37s
TGUI Misc 1 (#5520) Check for merge conflicts #2580: Commit cf20cb5 pushed by Trilbyspaceclone
July 9, 2024 18:14 49s master
master
July 9, 2024 18:14 49s
Adds Security/Defence borg sprite (#5507) Check for merge conflicts #2579: Commit 9828e59 pushed by Trilbyspaceclone
July 9, 2024 18:10 37s master
master
July 9, 2024 18:10 37s
Startup optimization - 218 seconds -> 154.7 (#5524) Check for merge conflicts #2578: Commit 6979c64 pushed by Trilbyspaceclone
July 8, 2024 17:34 42s master
master
July 8, 2024 17:34 42s
Slabteehee (#5523) Check for merge conflicts #2577: Commit a9a6468 pushed by Trilbyspaceclone
July 8, 2024 06:42 45s master
master
July 8, 2024 06:42 45s
Creates a barefoot shoes that does not have a mob icon so people can … Check for merge conflicts #2576: Commit 14ebb6b pushed by Trilbyspaceclone
July 8, 2024 05:31 46s master
master
July 8, 2024 05:31 46s
Handmade Guild Cells (#5518) Check for merge conflicts #2575: Commit 65d4ee6 pushed by Trilbyspaceclone
July 8, 2024 00:56 40s master
master
July 8, 2024 00:56 40s
Disposal rework and mailing room (#5514) Check for merge conflicts #2574: Commit d384699 pushed by Trilbyspaceclone
July 8, 2024 00:01 38s master
master
July 8, 2024 00:01 38s
Update c20r.dm (#5516) Check for merge conflicts #2573: Commit a07ed97 pushed by Trilbyspaceclone
July 8, 2024 00:00 38s master
master
July 8, 2024 00:00 38s
proper jr roles (#5513) Check for merge conflicts #2572: Commit a35f6e0 pushed by Trilbyspaceclone
July 7, 2024 23:38 36s master
master
July 7, 2024 23:38 36s
rigs to be storged in the human verbs (#5519) Check for merge conflicts #2571: Commit 1501686 pushed by Trilbyspaceclone
July 6, 2024 07:59 44s master
master
July 6, 2024 07:59 44s
TGUI Chat (#5504) Check for merge conflicts #2570: Commit 2854b8a pushed by Trilbyspaceclone
July 5, 2024 18:13 44s master
master
July 5, 2024 18:13 44s
Update mod_types.dm (#5517) Check for merge conflicts #2569: Commit 0f1314c pushed by Trilbyspaceclone
July 5, 2024 18:12 38s master
master
July 5, 2024 18:12 38s
Artist bench fixes (#5511) Check for merge conflicts #2568: Commit a93292d pushed by cdb-is-not-good
July 4, 2024 18:45 37s master
master
July 4, 2024 18:45 37s
Mecha Overhaul (#5508) Check for merge conflicts #2567: Commit c04317f pushed by Trilbyspaceclone
July 4, 2024 08:05 38s master
master
July 4, 2024 08:05 38s
more robust logging (#5509) Check for merge conflicts #2566: Commit 7e2f9a3 pushed by Trilbyspaceclone
July 4, 2024 03:22 41s master
master
July 4, 2024 03:22 41s
package issue (#5512) Check for merge conflicts #2565: Commit f80a530 pushed by Trilbyspaceclone
July 3, 2024 07:40 35s master
master
July 3, 2024 07:40 35s
fixes ballistic mask (#5505) Check for merge conflicts #2564: Commit 266a00a pushed by Trilbyspaceclone
July 1, 2024 22:14 36s master
master
July 1, 2024 22:14 36s
Make BYOND 515 Work (#5489) Check for merge conflicts #2563: Commit 454e17c pushed by Trilbyspaceclone
July 1, 2024 05:19 35s master
master
July 1, 2024 05:19 35s
Ballistic Mask (#5495) Check for merge conflicts #2562: Commit 51ae8f4 pushed by Trilbyspaceclone
July 1, 2024 01:15 36s master
master
July 1, 2024 01:15 36s
Gives hud-style rig helmets no face covering (#5494) Check for merge conflicts #2561: Commit 006f46c pushed by Trilbyspaceclone
July 1, 2024 01:15 26s master
master
July 1, 2024 01:15 26s
CBO rigsuit fix (#5501) Check for merge conflicts #2560: Commit 0f6030c pushed by Trilbyspaceclone
July 1, 2024 01:14 49s master
master
July 1, 2024 01:14 49s