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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Replaces Falling Falcons unit patches with Solar Devils unit patches. Check for merge conflicts #351: Pull request #48 opened by blackdragonTOW
November 4, 2023 02:45 14s
November 4, 2023 02:45 14s
epinephrine renamed to adrenaline, changes the desc of it Check for merge conflicts #350: Pull request #46 synchronize by private-tristan
November 4, 2023 02:39 15s
November 4, 2023 02:39 15s
Runner should no longer get stuck on some structures when capture dragging Check for merge conflicts #349: Pull request #47 opened by BeagleGaming1
November 4, 2023 02:33 12s
November 4, 2023 02:33 12s
epinephrine renamed to adrenaline, changes the desc of it Check for merge conflicts #348: Pull request #46 opened by private-tristan
November 4, 2023 02:07 12s
November 4, 2023 02:07 12s
Directional Lock no longer slows you Check for merge conflicts #347: Pull request #45 opened by private-tristan
November 4, 2023 00:53 21s
November 4, 2023 00:53 21s
Possible sentry message lag fixes (#43) Check for merge conflicts #346: Commit f715314 pushed by morrowwolf
November 4, 2023 00:41 4m 14s master
master
November 4, 2023 00:41 4m 14s
Xeno pathing tweak that may destroy us all (#44) Check for merge conflicts #345: Commit 1f0217a pushed by morrowwolf
November 4, 2023 00:41 4m 12s master
master
November 4, 2023 00:41 4m 12s
Facehugger AI & autodoc now can extract embryos Check for merge conflicts #344: Pull request #17 synchronize by xDanilcusx
November 4, 2023 00:25 13s
November 4, 2023 00:25 13s
Vehicle autofire Check for merge conflicts #343: Pull request #33 synchronize by Doubleumc
November 3, 2023 20:27 46s
November 3, 2023 20:27 46s
Vehicle autofire Check for merge conflicts #342: Pull request #33 synchronize by Doubleumc
November 3, 2023 20:26 15s
November 3, 2023 20:26 15s
Weighted random slashes for AI Check for merge conflicts #341: Commit a6cc6f6 pushed by morrowwolf
November 3, 2023 18:50 2m 13s master
master
November 3, 2023 18:50 2m 13s
Slotting Rework part 1 (#40) Check for merge conflicts #340: Commit 2141fcb pushed by morrowwolf
November 3, 2023 17:57 2m 10s master
master
November 3, 2023 17:57 2m 10s
Xeno pathing tweak that may destroy us all Check for merge conflicts #339: Pull request #44 synchronize by morrowwolf
November 3, 2023 17:49 13s
November 3, 2023 17:49 13s
Xeno pathing tweak that may destroy us all Check for merge conflicts #338: Pull request #44 opened by morrowwolf
November 3, 2023 17:03 18s
November 3, 2023 17:03 18s
Possible sentry message lag fixes Check for merge conflicts #337: Pull request #43 opened by morrowwolf
November 3, 2023 16:07 13s
November 3, 2023 16:07 13s
tm for a moment Check for merge conflicts #336: Pull request #42 opened by harryob
November 3, 2023 15:55 16s
November 3, 2023 15:55 16s
Please god just update your image correctly Check for merge conflicts #335: Commit 7ee43a6 pushed by morrowwolf
November 3, 2023 13:59 2m 14s master
master
November 3, 2023 13:59 2m 14s
target clear for xeno attack override Check for merge conflicts #334: Commit f905fa4 pushed by morrowwolf
November 3, 2023 13:35 2m 12s master
master
November 3, 2023 13:35 2m 12s
Let's just do this Check for merge conflicts #333: Commit e364cf8 pushed by morrowwolf
November 3, 2023 13:27 2m 14s master
master
November 3, 2023 13:27 2m 14s
lurkers should stop harassing people they shouldn't Check for merge conflicts #332: Commit c5a7f67 pushed by morrowwolf
November 3, 2023 11:58 2m 15s master
master
November 3, 2023 11:58 2m 15s
AI bug sweep 2 (#41) Check for merge conflicts #331: Commit 74a4cf1 pushed by morrowwolf
November 2, 2023 22:14 2m 13s master
master
November 2, 2023 22:14 2m 13s
Minimaps can handle items as markers now Check for merge conflicts #330: Commit 90b44d1 pushed by morrowwolf
November 2, 2023 19:53 2m 17s master
master
November 2, 2023 19:53 2m 17s
destroy on use fulton Check for merge conflicts #329: Commit 4233d34 pushed by morrowwolf
November 2, 2023 19:33 2m 10s master
master
November 2, 2023 19:33 2m 10s
now we're coding Check for merge conflicts #328: Commit a2edc2a pushed by morrowwolf
November 2, 2023 18:40 2m 15s master
master
November 2, 2023 18:40 2m 15s
WE DRIVE Check for merge conflicts #327: Commit db455fb pushed by morrowwolf
November 2, 2023 18:31 2m 11s master
master
November 2, 2023 18:31 2m 11s