Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
4,082 workflow run results
4,082 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

marine helmets no longer spawn with squad optics. Check for merge conflicts #15226: Pull request #4618 synchronize by private-tristan
October 9, 2023 23:29 14s
October 9, 2023 23:29 14s
marine helmets no longer spawn with squad optics. Check for merge conflicts #15225: Pull request #4618 opened by private-tristan
October 9, 2023 21:55 16s
October 9, 2023 21:55 16s
Adds drawing to tacmaps Check for merge conflicts #15224: Pull request #4475 synchronize by ghost
October 9, 2023 21:28 13s
October 9, 2023 21:28 13s
Adds drawing to tacmaps Check for merge conflicts #15223: Pull request #4475 synchronize by ghost
October 9, 2023 21:17 13s
October 9, 2023 21:17 13s
Adds drawing to tacmaps Check for merge conflicts #15222: Pull request #4475 synchronize by ghost
October 9, 2023 21:10 12s
October 9, 2023 21:10 12s
DFB property changes. Check for merge conflicts #15221: Pull request #4590 synchronize by kiVts
October 9, 2023 20:15 14s
October 9, 2023 20:15 14s
Adds drawing to tacmaps Check for merge conflicts #15220: Pull request #4475 synchronize by ghost
October 9, 2023 18:41 12s
October 9, 2023 18:41 12s
Adds the ability to pick up paper bins and stops fires consuming more wood when they're full Check for merge conflicts #15219: Pull request #4616 ready_for_review by Birdtalon
October 9, 2023 16:55 17s
October 9, 2023 16:55 17s
Prop gun fix (#4601) Check for merge conflicts #15218: Commit 4c7fe2d pushed by github-merge-queue bot
October 9, 2023 16:12 4m 21s master
master
October 9, 2023 16:12 4m 21s
Removes sword from XO weapon choice. (#4598) Check for merge conflicts #15217: Commit bc87c42 pushed by github-merge-queue bot
October 9, 2023 15:57 4m 18s master
master
October 9, 2023 15:57 4m 18s
Predators Rounds are no longer random Check for merge conflicts #15216: Pull request #4617 opened by BroseidonMOO
October 9, 2023 13:35 17s
October 9, 2023 13:35 17s
Adds the ability to pick up paper bins and stops fires consuming more wood when they're full Check for merge conflicts #15215: Pull request #4616 synchronize by Birdtalon
October 9, 2023 11:48 12s
October 9, 2023 11:48 12s
Adds the ability to pick up paper bins and stops fires consuming more wood when they're full Check for merge conflicts #15214: Pull request #4616 opened by Birdtalon
October 9, 2023 11:47 13s
October 9, 2023 11:47 13s
Project ARES: Hijack logging Check for merge conflicts #15213: Pull request #4471 synchronize by realforest2001
October 9, 2023 08:52 12s
October 9, 2023 08:52 12s
Project ARES: Admin Console Check for merge conflicts #15212: Pull request #4182 synchronize by realforest2001
October 9, 2023 08:52 14s
October 9, 2023 08:52 14s
Project ARES: Datacore Check for merge conflicts #15211: Pull request #4437 synchronize by realforest2001
October 9, 2023 08:52 16s
October 9, 2023 08:52 16s
Project ARES: Datacore Check for merge conflicts #15210: Pull request #4437 synchronize by realforest2001
October 9, 2023 08:37 12s
October 9, 2023 08:37 12s
Adds drawing to tacmaps Check for merge conflicts #15209: Pull request #4475 synchronize by ghost
October 9, 2023 07:50 29s
October 9, 2023 07:50 29s
Adds drawing to tacmaps Check for merge conflicts #15208: Pull request #4475 synchronize by ghost
October 9, 2023 07:49 14s
October 9, 2023 07:49 14s
M4 Synthetic Armor Sprite edit Check for merge conflicts #15207: Pull request #4614 opened by QuickLode
October 9, 2023 04:41 2m 16s
October 9, 2023 04:41 2m 16s
Synthetic internal powercell Check for merge conflicts #15206: Pull request #4559 ready_for_review by QuickLode
October 9, 2023 00:29 13s
October 9, 2023 00:29 13s
Synthetic internal powercell Check for merge conflicts #15205: Pull request #4559 synchronize by QuickLode
October 9, 2023 00:06 1m 5s
October 9, 2023 00:06 1m 5s
Synthetic internal powercell Check for merge conflicts #15204: Pull request #4559 synchronize by QuickLode
October 9, 2023 00:02 13s
October 9, 2023 00:02 13s
Fixes previous goggle pr helmet sprites Check for merge conflicts #15203: Pull request #4613 opened by irRegularGuy646
October 8, 2023 23:59 11s
October 8, 2023 23:59 11s
Adds CBRN ERT Check for merge conflicts #15202: Pull request #4337 synchronize by BeagleGaming1
October 8, 2023 23:35 15s
October 8, 2023 23:35 15s