Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Brings automatic weaponry to the marine and surv arsenal Check for merge conflicts #13564: Pull request #4003 synchronize by Zonespace27
August 16, 2023 18:24 13s
August 16, 2023 18:24 13s
Fix solaris ridge map link and refactor current_map Check for merge conflicts #13563: Pull request #4192 synchronize by Drulikar
August 16, 2023 15:46 14s
August 16, 2023 15:46 14s
Fix solaris ridge map link and refactor current_map Check for merge conflicts #13562: Pull request #4192 synchronize by Drulikar
August 16, 2023 15:37 12s
August 16, 2023 15:37 12s
stops not being signed into byond from being a major pain during development Check for merge conflicts #13561: Pull request #4193 opened by harryob
August 16, 2023 15:30 15s
August 16, 2023 15:30 15s
Fix solaris ridge map link and refactor current_map Check for merge conflicts #13560: Pull request #4192 opened by Drulikar
August 16, 2023 15:15 16s
August 16, 2023 15:15 16s
fix and small balance change to the utility vendor. Check for merge conflicts #13559: Pull request #4169 ready_for_review by Huffie56
August 16, 2023 14:29 12s
August 16, 2023 14:29 12s
fix and small balance change to the utility vendor. Check for merge conflicts #13558: Pull request #4169 synchronize by Huffie56
August 16, 2023 14:16 13s
August 16, 2023 14:16 13s
fix and small balance change to the utility vendor. Check for merge conflicts #13557: Pull request #4169 synchronize by Huffie56
August 16, 2023 14:12 15s
August 16, 2023 14:12 15s
Overwatch Console TGUI Refactor Check for merge conflicts #13556: Pull request #4178 synchronize by TheGamerdk
August 16, 2023 13:21 14s
August 16, 2023 13:21 14s
Overwatch Console TGUI Refactor Check for merge conflicts #13555: Pull request #4178 synchronize by TheGamerdk
August 16, 2023 10:36 15s
August 16, 2023 10:36 15s
Fixes WJ Latejoin (#4185) Check for merge conflicts #13554: Commit 1376b49 pushed by github-merge-queue bot
August 16, 2023 07:12 4m 15s master
master
August 16, 2023 07:12 4m 15s
fix remove and exploit that allow someone to take multiple sample from a plant and increasing it's growths. Check for merge conflicts #13553: Pull request #4187 ready_for_review by Huffie56
August 15, 2023 20:50 15s
August 15, 2023 20:50 15s
Admin Proc for Distress Signal TGUI and Fix Check for merge conflicts #13552: Pull request #4175 synchronize by Ben10083
August 15, 2023 17:08 16s
August 15, 2023 17:08 16s
Admin Proc for Distress Signal TGUI and Fix Check for merge conflicts #13551: Pull request #4175 ready_for_review by Ben10083
August 15, 2023 17:08 16s
August 15, 2023 17:08 16s
Admin Proc for Distress Signal TGUI and Fix Check for merge conflicts #13550: Pull request #4175 synchronize by Ben10083
August 15, 2023 17:08 13s
August 15, 2023 17:08 13s
fix remove and exploit that allow someone to take multiple sample from a plant and increasing it's growths. Check for merge conflicts #13549: Pull request #4187 opened by Huffie56
August 15, 2023 16:28 2m 12s
August 15, 2023 16:28 2m 12s
fixes the redis bridge (#4181) Check for merge conflicts #13548: Commit bb424db pushed by github-merge-queue bot
August 14, 2023 18:57 2m 16s master
master
August 14, 2023 18:57 2m 16s
Crashed UPP Survivors Insert Tweaks Check for merge conflicts #13547: Pull request #4123 ready_for_review by Steelpoint
August 14, 2023 18:26 12s
August 14, 2023 18:26 12s
Crashed UPP Survivors Insert Tweaks Check for merge conflicts #13546: Pull request #4123 synchronize by Steelpoint
August 14, 2023 18:26 15s
August 14, 2023 18:26 15s
Crashed UPP Survivors Insert Tweaks Check for merge conflicts #13545: Pull request #4123 synchronize by Steelpoint
August 14, 2023 17:52 13s
August 14, 2023 17:52 13s
Crashed UPP Survivors Insert Tweaks Check for merge conflicts #13544: Pull request #4123 synchronize by Steelpoint
August 14, 2023 16:23 15s
August 14, 2023 16:23 15s
Crashed UPP Survivors Insert Tweaks Check for merge conflicts #13543: Pull request #4123 synchronize by Steelpoint
August 14, 2023 16:22 13s
August 14, 2023 16:22 13s
LV522 Maint Tunnel now useable by xenos as tunnels Check for merge conflicts #13542: Pull request #4186 opened by spartanbobby
August 14, 2023 15:31 11s
August 14, 2023 15:31 11s
Project ARES: Admin Console Check for merge conflicts #13541: Pull request #4182 synchronize by realforest2001
August 14, 2023 13:42 13s
August 14, 2023 13:42 13s
Project ARES: Functional Access Tickets Check for merge conflicts #13540: Pull request #4111 synchronize by realforest2001
August 14, 2023 12:14 13s
August 14, 2023 12:14 13s