Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
8,474 workflow run results
8,474 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Makes acid spray extinguish more consistent Check for merge conflicts #21059: Pull request #6053 opened by Git-Nivrak
March 30, 2024 15:13 12s
March 30, 2024 15:13 12s
Fix,update CLF ERT Station. fix space tile and missing platform. Check for merge conflicts #21058: Pull request #5992 ready_for_review by Huffie56
March 30, 2024 14:42 12s
March 30, 2024 14:42 12s
Revert #5940 Check for merge conflicts #21057: Pull request #6052 opened by ItsVyzo
March 30, 2024 14:28 10s
March 30, 2024 14:28 10s
XM43E1 in regular gameplay Check for merge conflicts #21056: Pull request #5724 synchronize by Releasethesea
March 30, 2024 14:06 11s
March 30, 2024 14:06 11s
Fix,update CLF ERT Station. fix space tile and missing platform. Check for merge conflicts #21055: Pull request #5992 synchronize by Huffie56
March 30, 2024 10:38 10s
March 30, 2024 10:38 10s
Opens up FORECON crashsite to regular play while maintaining the survivor democharge objective Check for merge conflicts #21054: Pull request #6051 opened by spartanbobby
March 30, 2024 09:11 13s
March 30, 2024 09:11 13s
LV522 Changes: Ledges, Sewer, Reactor Entry, East reactor (#6008) Check for merge conflicts #21053: Commit 8c675ce pushed by github-merge-queue bot
March 30, 2024 08:32 4m 14s master
master
March 30, 2024 08:32 4m 14s
Slightly expands weedible area to of west lZ2 T-comms area (#5979) Check for merge conflicts #21052: Commit 704aaa8 pushed by github-merge-queue bot
March 30, 2024 08:24 4m 15s master
master
March 30, 2024 08:24 4m 15s
Fix inconsistent number ranges for EFTPOS pin & access code Check for merge conflicts #21051: Pull request #6050 opened by Drulikar
March 30, 2024 07:40 13s
March 30, 2024 07:40 13s
You can no longer fit OT grenades in grenade launchers Check for merge conflicts #21050: Pull request #6049 opened by iloveloopers
March 30, 2024 07:23 10s
March 30, 2024 07:23 10s
OT grenades will now have their timer properly reduced when fired from grenade launchers Check for merge conflicts #21049: Pull request #6048 opened by iloveloopers
March 30, 2024 06:30 12s
March 30, 2024 06:30 12s
Renames "Round Time" to "Operation Time" and removes Round Time Check for merge conflicts #21048: Pull request #6047 opened by GrrrKitten
March 30, 2024 04:55 10s
March 30, 2024 04:55 10s
Adds a white eyepatch Check for merge conflicts #21047: Pull request #6042 ready_for_review by MOONPRINCESS17
March 30, 2024 03:24 1m 2s
March 30, 2024 03:24 1m 2s
Adds a white eyepatch Check for merge conflicts #21046: Pull request #6042 synchronize by MOONPRINCESS17
March 30, 2024 03:23 14s
March 30, 2024 03:23 14s
Adds a white eyepatch Check for merge conflicts #21045: Pull request #6042 synchronize by MOONPRINCESS17
March 30, 2024 03:21 11s
March 30, 2024 03:21 11s
Preferences for a darker crit overlay and a black flash overlay Check for merge conflicts #21044: Pull request #5997 ready_for_review by Drulikar
March 30, 2024 02:22 11s
March 30, 2024 02:22 11s
Preferences for a darker crit overlay and a black flash overlay Check for merge conflicts #21043: Pull request #5997 synchronize by Drulikar
March 30, 2024 02:22 13s
March 30, 2024 02:22 13s
Preferences for a darker crit overlay and a black flash overlay Check for merge conflicts #21042: Pull request #5997 synchronize by Drulikar
March 30, 2024 02:00 2m 13s
March 30, 2024 02:00 2m 13s
Rebalances OT rockets to be more incendiary rather than explosive Check for merge conflicts #21041: Pull request #6045 opened by iloveloopers
March 29, 2024 23:12 37s
March 29, 2024 23:12 37s
removes helmet squad sprite after removing helmet Check for merge conflicts #21040: Pull request #6044 synchronize by cuberound
March 29, 2024 23:11 20s
March 29, 2024 23:11 20s
removes helmet squad sprite after removing helmet Check for merge conflicts #21039: Pull request #6044 opened by cuberound
March 29, 2024 23:10 10s
March 29, 2024 23:10 10s
makes old cosmetic NVG unbreakable (#6036) Check for merge conflicts #21038: Commit 1af13e1 pushed by github-merge-queue bot
March 29, 2024 20:50 4m 14s master
master
March 29, 2024 20:50 4m 14s
you can now use the mortar during hijack if you are not a coward + cu… Check for merge conflicts #21037: Commit 052c09a pushed by github-merge-queue bot
March 29, 2024 20:33 4m 14s master
master
March 29, 2024 20:33 4m 14s
Adds an APOLLO maintenance controller to the Warden's Office. Check for merge conflicts #21036: Pull request #6043 opened by Waseemq1235
March 29, 2024 19:15 11s
March 29, 2024 19:15 11s
Adds a white eyepatch Check for merge conflicts #21035: Pull request #6042 opened by MOONPRINCESS17
March 29, 2024 17:59 12s
March 29, 2024 17:59 12s