Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
10,932 workflow run results
10,932 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

changes fire color on incen OB to be blueish instead of orange Check for merge conflicts #23660: Pull request #6481 opened by ghost
June 15, 2024 21:35 13s
June 15, 2024 21:35 13s
SG can now put a weapon on their back, still no backpacks Check for merge conflicts #23659: Pull request #6480 opened by mullenpaul
June 15, 2024 20:56 13s
June 15, 2024 20:56 13s
fix gloves and map being mutually exclusive in the corpsman vendor Check for merge conflicts #23658: Pull request #6479 opened by ghost
June 15, 2024 20:47 10s
June 15, 2024 20:47 10s
adds a cool new easter-egg sound effect to berzerker ravager when 10+ humans are in the eviscerate range Check for merge conflicts #23657: Pull request #6478 synchronize by iloveloopers
June 15, 2024 17:44 9s
June 15, 2024 17:44 9s
adds a cool new easter-egg sound effect to berzerker ravager when 10+ humans are in the eviscerate range Check for merge conflicts #23656: Pull request #6478 opened by iloveloopers
June 15, 2024 17:39 14s
June 15, 2024 17:39 14s
fence nerf + fuel cell recycler + showcase is now destroyable Check for merge conflicts #23655: Pull request #6471 ready_for_review by iloveloopers
June 15, 2024 17:06 9s
June 15, 2024 17:06 9s
fence nerf + fuel cell recycler + showcase is now destroyable Check for merge conflicts #23654: Pull request #6471 synchronize by iloveloopers
June 15, 2024 17:06 5m 0s
June 15, 2024 17:06 5m 0s
Adds Sunsets to Roundstart, adds Sunrises to Marine Victories, and Survs can hear Evo Announcement Screeches now Check for merge conflicts #23653: Pull request #6400 ready_for_review by GrrrKitten
June 15, 2024 15:36 10s
June 15, 2024 15:36 10s
Adds Sunsets to Roundstart, adds Sunrises to Marine Victories, and Survs can hear Evo Announcement Screeches now Check for merge conflicts #23652: Pull request #6400 synchronize by GrrrKitten
June 15, 2024 15:34 13s
June 15, 2024 15:34 13s
Project ARES TM Holder (v5) Check for merge conflicts #23651: Pull request #6039 synchronize by realforest2001
June 15, 2024 14:52 10s
June 15, 2024 14:52 10s
Project ARES: Synthetic Sparker Check for merge conflicts #23650: Pull request #6120 synchronize by realforest2001
June 15, 2024 14:52 15s
June 15, 2024 14:52 15s
Refactor of record system code and migrate all record UI to TGUI Check for merge conflicts #23649: Pull request #6266 synchronize by vero5123
June 15, 2024 14:29 10s
June 15, 2024 14:29 10s
Refactor of record system code and migrate all record UI to TGUI Check for merge conflicts #23648: Pull request #6266 synchronize by vero5123
June 15, 2024 14:23 10s
June 15, 2024 14:23 10s
Adds niche logs to revival attempts (#6465) Check for merge conflicts #23647: Commit 64bdcc4 pushed by github-merge-queue bot
June 15, 2024 14:17 4m 15s master
master
June 15, 2024 14:17 4m 15s
Fix lots of problems with wallets as ID (#6411) Check for merge conflicts #23646: Commit 46cc54b pushed by github-merge-queue bot
June 15, 2024 14:10 4m 16s master
master
June 15, 2024 14:10 4m 16s
Adds in-game bug reports without needing a GitHub account Check for merge conflicts #23645: Pull request #6392 synchronize by vero5123
June 15, 2024 10:39 10s
June 15, 2024 10:39 10s
Adds in-game bug reports without needing a GitHub account Check for merge conflicts #23644: Pull request #6392 synchronize by vero5123
June 15, 2024 10:38 13s
June 15, 2024 10:38 13s
Adds in-game bug reports without needing a GitHub account Check for merge conflicts #23643: Pull request #6392 synchronize by vero5123
June 15, 2024 10:32 13s
June 15, 2024 10:32 13s
Improvements to box vending in Requisitions Check for merge conflicts #23642: Pull request #6397 synchronize by ThePiachu
June 15, 2024 07:17 12s
June 15, 2024 07:17 12s
fence nerf + fuel cell recycler + showcase is now destroyable Check for merge conflicts #23641: Pull request #6471 synchronize by iloveloopers
June 15, 2024 05:26 8s
June 15, 2024 05:26 8s
fence nerf + fuel cell recycler + showcase is now destroyable Check for merge conflicts #23640: Pull request #6471 opened by iloveloopers
June 15, 2024 05:17 14s
June 15, 2024 05:17 14s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #23639: Pull request #6248 ready_for_review by Zenith00000
June 15, 2024 04:34 9s
June 15, 2024 04:34 9s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #23638: Pull request #6248 synchronize by Zenith00000
June 15, 2024 02:14 12s
June 15, 2024 02:14 12s
Fixes a bug that would jam guns entirely Check for merge conflicts #23637: Pull request #6470 opened by GrrrKitten
June 15, 2024 01:21 2m 15s
June 15, 2024 01:21 2m 15s
Larva aesthetic update Check for merge conflicts #23636: Pull request #6439 synchronize by Blundir
June 14, 2024 18:54 13s
June 14, 2024 18:54 13s