Skip to content

Actions: cmss13-devs/cmss13-pve

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
2,529 workflow run results
2,529 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

10x28 changes Check for merge conflicts #2429: Pull request #376 synchronize by AmoryBlaine
August 17, 2024 18:31 14s
August 17, 2024 18:31 14s
Update WeaponStats TGUI Check for merge conflicts #2428: Pull request #386 opened by Doubleumc
August 17, 2024 17:24 13s
August 17, 2024 17:24 13s
Dropship roster expansion Check for merge conflicts #2427: Pull request #339 synchronize by DexterDude
August 17, 2024 07:28 11s
August 17, 2024 07:28 11s
10x28 changes Check for merge conflicts #2426: Pull request #376 synchronize by AmoryBlaine
August 17, 2024 06:51 1m 59s
August 17, 2024 06:51 1m 59s
AI door interactions fixed (#381) Check for merge conflicts #2425: Commit 5ce0752 pushed by Doubleumc
August 17, 2024 06:18 8m 21s master
master
August 17, 2024 06:18 8m 21s
Removes Synthetic whitelist requirements for synth pref menu (#380) Check for merge conflicts #2424: Commit 10952f0 pushed by Doubleumc
August 17, 2024 06:18 8m 26s master
master
August 17, 2024 06:18 8m 26s
Adds a canteen full of literally nothing. (#373) Check for merge conflicts #2423: Commit b84ecfd pushed by Doubleumc
August 17, 2024 06:18 10m 18s master
master
August 17, 2024 06:18 10m 18s
Taking the belt to SGs (#367) Check for merge conflicts #2422: Commit 2f6b21b pushed by Doubleumc
August 17, 2024 06:17 12m 32s master
master
August 17, 2024 06:17 12m 32s
Mirror '"Start Round" can start delayed round' (#365) Check for merge conflicts #2421: Commit 6932693 pushed by Doubleumc
August 17, 2024 06:17 8m 34s master
master
August 17, 2024 06:17 8m 34s
Black harness & eyepiece update (#363) Check for merge conflicts #2420: Commit 8328199 pushed by Doubleumc
August 17, 2024 06:17 8m 22s master
master
August 17, 2024 06:17 8m 22s
Game no longer freezes when spawning stuff (#361) Check for merge conflicts #2419: Commit 1952707 pushed by Doubleumc
August 17, 2024 06:16 5m 33s master
master
August 17, 2024 06:16 5m 33s
Adds quick "Command Announcement" button for Game Masters (#355) Check for merge conflicts #2418: Commit 132259a pushed by Doubleumc
August 17, 2024 06:16 6m 21s master
master
August 17, 2024 06:16 6m 21s
ATTACHMENT FLAVOR TEXT GO (#276) Check for merge conflicts #2417: Commit cf4b576 pushed by Doubleumc
August 17, 2024 06:16 4m 21s master
master
August 17, 2024 06:16 4m 21s
10x28 changes Check for merge conflicts #2416: Pull request #376 synchronize by AmoryBlaine
August 17, 2024 04:39 11s
August 17, 2024 04:39 11s
[s] [TM ONLY] Operation code Check for merge conflicts #2415: Pull request #245 synchronize by Zonespace27
August 17, 2024 04:09 36s
August 17, 2024 04:09 36s
[s] [TM ONLY] Operation code Check for merge conflicts #2414: Pull request #245 synchronize by Zonespace27
August 17, 2024 04:06 14s
August 17, 2024 04:06 14s
[s] [TM ONLY] Operation code Check for merge conflicts #2413: Pull request #245 synchronize by Zonespace27
August 17, 2024 04:05 18s
August 17, 2024 04:05 18s
[s] [TM ONLY] Operation code 2 Check for merge conflicts #2412: Pull request #330 synchronize by Zonespace27
August 17, 2024 03:52 12s
August 17, 2024 03:52 12s
UPP Overhaul Check for merge conflicts #2411: Pull request #385 opened by AmoryBlaine
August 17, 2024 01:08 16s
August 17, 2024 01:08 16s
10x28 changes Check for merge conflicts #2410: Pull request #376 synchronize by AmoryBlaine
August 17, 2024 00:45 11s
August 17, 2024 00:45 11s
New Loadout Items (And some Adjustments) Check for merge conflicts #2409: Pull request #384 synchronize by Max-023
August 16, 2024 19:10 12s
August 16, 2024 19:10 12s
New Loadout Items (And some Adjustments) Check for merge conflicts #2408: Pull request #384 opened by Max-023
August 16, 2024 17:46 10s
August 16, 2024 17:46 10s
Pistol changes Check for merge conflicts #2407: Pull request #370 synchronize by AmoryBlaine
August 16, 2024 17:01 15s
August 16, 2024 17:01 15s
Pistol changes Check for merge conflicts #2406: Pull request #370 synchronize by AmoryBlaine
August 16, 2024 16:49 13s
August 16, 2024 16:49 13s
LT prefs menu Check for merge conflicts #2405: Pull request #383 opened by AndroBetel
August 16, 2024 12:19 15s
August 16, 2024 12:19 15s