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

Supermatter now tied to radiationSS (#5462) Check for merge conflicts #2534: Commit 35f9e1a pushed by Trilbyspaceclone
June 24, 2024 07:09 38s master
master
June 24, 2024 07:09 38s
Misc. Fixes (#5475) Check for merge conflicts #2533: Commit 9aad7bb pushed by Trilbyspaceclone
June 24, 2024 07:05 50s master
master
June 24, 2024 07:05 50s
Added the Uni-Horn to the Markings section under the name "Unicorn Ho… Check for merge conflicts #2532: Commit 58971f7 pushed by Trilbyspaceclone
June 22, 2024 05:09 39s master
master
June 22, 2024 05:09 39s
Bump braces from 3.0.2 to 3.0.3 in /tgui (#5470) Check for merge conflicts #2531: Commit cc56be9 pushed by Trilbyspaceclone
June 20, 2024 22:37 42s master
master
June 20, 2024 22:37 42s
TGUI Medical (Part 1) + TGUI Say (#5459) Check for merge conflicts #2530: Commit 03d3d7c pushed by Trilbyspaceclone
June 20, 2024 22:35 51s master
master
June 20, 2024 22:35 51s
more gameifed hud (#5450) Check for merge conflicts #2529: Commit 443b7b4 pushed by Trilbyspaceclone
June 20, 2024 19:23 38s master
master
June 20, 2024 19:23 38s
bees (#5455) Check for merge conflicts #2528: Commit 59f41dd pushed by Trilbyspaceclone
June 20, 2024 19:22 41s master
master
June 20, 2024 19:22 41s
robotic_aberrants (#5456) Check for merge conflicts #2527: Commit 6b94bd2 pushed by Trilbyspaceclone
June 20, 2024 19:21 32s master
master
June 20, 2024 19:21 32s
Remove a handful of native BYOND procs we redefine for no reason (#5464) Check for merge conflicts #2526: Commit 7f77e54 pushed by Trilbyspaceclone
June 20, 2024 19:21 44s master
master
June 20, 2024 19:21 44s
Make faxes log to a place we can actually see as admins (#5468) Check for merge conflicts #2525: Commit f822546 pushed by Trilbyspaceclone
June 20, 2024 19:20 41s master
master
June 20, 2024 19:20 41s
look around yourself data, the fault is yours! (#5465) Check for merge conflicts #2524: Commit 31edb24 pushed by Trilbyspaceclone
June 20, 2024 19:18 38s master
master
June 20, 2024 19:18 38s
Fix misnamed spawner (#5461) Check for merge conflicts #2523: Commit 219da57 pushed by Trilbyspaceclone
June 18, 2024 19:03 36s master
master
June 18, 2024 19:03 36s
fixes some omni tool intractions (#5432) Check for merge conflicts #2522: Commit 51a7c58 pushed by Trilbyspaceclone
June 18, 2024 00:35 44s master
master
June 18, 2024 00:35 44s
[Spellcheck] Fixes various typos and grammar on diving messages (#5453) Check for merge conflicts #2521: Commit 11350e0 pushed by Trilbyspaceclone
June 18, 2024 00:30 28s master
master
June 18, 2024 00:30 28s
gun scope hotkey (#5454) Check for merge conflicts #2520: Commit bdaaf07 pushed by Trilbyspaceclone
June 18, 2024 00:30 38s master
master
June 18, 2024 00:30 38s
Fix nanoui throwing errors when moving away (#5457) Check for merge conflicts #2519: Commit 08cfbbf pushed by Trilbyspaceclone
June 17, 2024 00:03 38s master
master
June 17, 2024 00:03 38s
Deadsay chat color fixes (#5452) Check for merge conflicts #2518: Commit f02cb40 pushed by Trilbyspaceclone
June 15, 2024 13:56 38s master
master
June 15, 2024 13:56 38s
Update cleanbot.dm (#5451) Check for merge conflicts #2517: Commit b30e032 pushed by Trilbyspaceclone
June 15, 2024 05:09 35s master
master
June 15, 2024 05:09 35s
examination room to upper soteria medical (#5444) Check for merge conflicts #2516: Commit 6985a67 pushed by Trilbyspaceclone
June 14, 2024 01:47 34s master
master
June 14, 2024 01:47 34s
fixing map troubles (copypasting) (#5440) Check for merge conflicts #2515: Commit 4592601 pushed by Trilbyspaceclone
June 14, 2024 00:49 43s master
master
June 14, 2024 00:49 43s
Adds Paradise's Click Catcher & Misc. Fixes (#5429) Check for merge conflicts #2514: Commit 5dc4948 pushed by Trilbyspaceclone
June 13, 2024 20:57 35s master
master
June 13, 2024 20:57 35s
TGUI NTOS (Part 1) (#5438) Check for merge conflicts #2513: Commit 411c917 pushed by Trilbyspaceclone
June 13, 2024 20:56 39s master
master
June 13, 2024 20:56 39s
flesh sacs no longer dump their stuff into the area's loc (#5448) Check for merge conflicts #2512: Commit 6474463 pushed by Trilbyspaceclone
June 13, 2024 20:55 36s master
master
June 13, 2024 20:55 36s
tanker helmet path fix (#5446) Check for merge conflicts #2511: Commit 9aac7dc pushed by Trilbyspaceclone
June 13, 2024 20:54 36s master
master
June 13, 2024 20:54 36s
Armor surgery difficulty tweaks (#5393) Check for merge conflicts #2510: Commit 75b1b6a pushed by cdb-is-not-good
June 12, 2024 03:08 37s master
master
June 12, 2024 03:08 37s