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,099 workflow run results
8,099 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Dead OOC (Large Dsay) Check for merge conflicts #20793: Pull request #5984 synchronize by Birdtalon
March 19, 2024 19:54 14s
March 19, 2024 19:54 14s
Dead OOC (Large Dsay) Check for merge conflicts #20792: Pull request #5984 synchronize by Birdtalon
March 19, 2024 19:23 12s
March 19, 2024 19:23 12s
Dead OOC (Large Dsay) Check for merge conflicts #20791: Pull request #5984 opened by Birdtalon
March 19, 2024 19:19 12s
March 19, 2024 19:19 12s
Updated XM43E1 for Sniper Spec Check for merge conflicts #20790: Pull request #5774 synchronize by Kaga-404
March 19, 2024 19:12 15s
March 19, 2024 19:12 15s
NVO no longer can be used with binoculars/optics Check for merge conflicts #20789: Pull request #5983 synchronize by ihatethisengine
March 19, 2024 19:08 11s
March 19, 2024 19:08 11s
Isaac's Lament is so back baby!! (WIP) Check for merge conflicts #20788: Pull request #5961 synchronize by BadAtThisGame302
March 19, 2024 18:22 12s
March 19, 2024 18:22 12s
NVO no longer can be used with binoculars/optics Check for merge conflicts #20787: Pull request #5983 synchronize by ihatethisengine
March 19, 2024 16:53 15s
March 19, 2024 16:53 15s
NVO no longer can be used with binoculars/optics Check for merge conflicts #20786: Pull request #5983 opened by ihatethisengine
March 19, 2024 16:40 15s
March 19, 2024 16:40 15s
Allows wardens to heal eachother again at half the health and gives a bigger message Check for merge conflicts #20785: Pull request #5982 synchronize by Red-byte3D
March 19, 2024 15:56 13s
March 19, 2024 15:56 13s
Allows wardens to heal eachother again at half the health and gives a bigger message Check for merge conflicts #20784: Pull request #5982 synchronize by Red-byte3D
March 19, 2024 15:43 15s
March 19, 2024 15:43 15s
Allows wardens to heal eachother again at half the health and gives a bigger message Check for merge conflicts #20783: Pull request #5982 synchronize by Red-byte3D
March 19, 2024 15:43 15s
March 19, 2024 15:43 15s
Allows wardens to heal eachother again at half the health and gives a bigger message Check for merge conflicts #20782: Pull request #5982 synchronize by Red-byte3D
March 19, 2024 15:43 18s
March 19, 2024 15:43 18s
Allows wardens to heal eachother again at half the health and gives a bigger message Check for merge conflicts #20781: Pull request #5982 opened by Red-byte3D
March 19, 2024 15:34 14s
March 19, 2024 15:34 14s
Isaac's Lament is so back baby!! (WIP) Check for merge conflicts #20780: Pull request #5961 synchronize by BadAtThisGame302
March 19, 2024 13:36 16s
March 19, 2024 13:36 16s
Fixes delayed launch launching lifeboat even if locked by queen Check for merge conflicts #20779: Pull request #5980 opened by ihatethisengine
March 19, 2024 13:16 14s
March 19, 2024 13:16 14s
The Corpsening Check for merge conflicts #20778: Pull request #5805 synchronize by BadAtThisGame302
March 19, 2024 11:09 12s
March 19, 2024 11:09 12s
Slightly expands weedible area to of west lZ2 T-comms area Check for merge conflicts #20777: Pull request #5979 opened by spartanbobby
March 19, 2024 10:53 12s
March 19, 2024 10:53 12s
Adds Cardboard Boxes To Squad Rooms Check for merge conflicts #20776: Pull request #5930 ready_for_review by Steelpoint
March 19, 2024 10:11 13s
March 19, 2024 10:11 13s
Adds Cardboard Boxes To Squad Rooms Check for merge conflicts #20775: Pull request #5930 synchronize by Steelpoint
March 19, 2024 10:11 16s
March 19, 2024 10:11 16s
Ports stripping menu from TG Check for merge conflicts #20774: Pull request #5914 synchronize by ihatethisengine
March 19, 2024 07:05 17s
March 19, 2024 07:05 17s
Dress Blues (#5845) Check for merge conflicts #20773: Commit bf44add pushed by github-merge-queue bot
March 19, 2024 06:34 4m 14s master
master
March 19, 2024 06:34 4m 14s
Synthetic Vendor Items Update (#5954) Check for merge conflicts #20772: Commit f300896 pushed by github-merge-queue bot
March 19, 2024 06:26 4m 15s master
master
March 19, 2024 06:26 4m 15s
fixes map ugliness and added some access restriction to some area. (#… Check for merge conflicts #20771: Commit 750601f pushed by github-merge-queue bot
March 19, 2024 06:08 4m 17s master
master
March 19, 2024 06:08 4m 17s
The Corpsening Check for merge conflicts #20770: Pull request #5805 synchronize by BadAtThisGame302
March 19, 2024 00:58 13s
March 19, 2024 00:58 13s
Cleanup role selection for various game modes Check for merge conflicts #20769: Pull request #5976 opened by Drulikar
March 19, 2024 00:26 16s
March 19, 2024 00:26 16s