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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Removes an unused variable from code Check for merge conflicts #20209: Pull request #5844 opened by private-tristan
February 28, 2024 23:41 14s
February 28, 2024 23:41 14s
G2 Electroshock Grenade "Sonic Electric Ball Breakers (SEBB)" [No Shitcode Edition] Check for merge conflicts #20208: Pull request #5697 ready_for_review by PhantomEpicness
February 28, 2024 23:16 1m 35s
February 28, 2024 23:16 1m 35s
G2 Electroshock Grenade "Sonic Electric Ball Breakers (SEBB)" [No Shitcode Edition] Check for merge conflicts #20207: Pull request #5697 synchronize by PhantomEpicness
February 28, 2024 23:15 13s
February 28, 2024 23:15 13s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20206: Pull request #5784 synchronize by GrrrKitten
February 28, 2024 18:06 11s
February 28, 2024 18:06 11s
Adds both the surv CLs and the USCM CL to the WY Faction Check for merge conflicts #20205: Pull request #5819 synchronize by BadAtThisGame302
February 28, 2024 17:42 12s
February 28, 2024 17:42 12s
Resprites - 2/2024 Edition Check for merge conflicts #20204: Pull request #5838 synchronize by nauticall
February 28, 2024 16:37 15s
February 28, 2024 16:37 15s
Resprites - 2/2024 Edition Check for merge conflicts #20203: Pull request #5838 synchronize by nauticall
February 28, 2024 16:24 12s
February 28, 2024 16:24 12s
Implement chambering from handfuls of bullets Check for merge conflicts #20202: Pull request #5843 opened by JackieEstegado
February 28, 2024 15:53 15s
February 28, 2024 15:53 15s
Resprites - 2/2024 Edition Check for merge conflicts #20201: Pull request #5838 synchronize by nauticall
February 28, 2024 15:24 1m 12s
February 28, 2024 15:24 1m 12s
Adds both the surv CLs and the USCM CL to the WY Faction Check for merge conflicts #20200: Pull request #5819 synchronize by BadAtThisGame302
February 28, 2024 15:23 17s
February 28, 2024 15:23 17s
Dynamic price for omnisentryguns round 3 (#5702) Check for merge conflicts #20199: Commit bc444a7 pushed by github-merge-queue bot
February 28, 2024 15:14 4m 15s master
master
February 28, 2024 15:14 4m 15s
AUTODOC.md updates (#5840) Check for merge conflicts #20198: Commit 85da46d pushed by github-merge-queue bot
February 28, 2024 14:41 2m 12s master
master
February 28, 2024 14:41 2m 12s
Fix for crates and traps. (#5835) Check for merge conflicts #20197: Commit 05667f4 pushed by github-merge-queue bot
February 28, 2024 14:32 4m 18s master
master
February 28, 2024 14:32 4m 18s
Automatic TGS DMAPI Update (#5841) Check for merge conflicts #20196: Commit 1415c70 pushed by github-merge-queue bot
February 28, 2024 14:26 2m 13s master
master
February 28, 2024 14:26 2m 13s
Dynamic price for omnisentryguns round 3 Check for merge conflicts #20195: Pull request #5702 ready_for_review by cuberound
February 28, 2024 14:20 37s
February 28, 2024 14:20 37s
Dynamic price for omnisentryguns round 3 Check for merge conflicts #20194: Pull request #5702 synchronize by cuberound
February 28, 2024 14:18 11s
February 28, 2024 14:18 11s
Tactical Compact Nailgun Check for merge conflicts #20193: Pull request #5746 synchronize by MobiusWon
February 28, 2024 12:15 14s
February 28, 2024 12:15 14s
Fix dropship equipment infinite loop (#5823) Check for merge conflicts #20192: Commit 187a5fc pushed by github-merge-queue bot
February 28, 2024 10:05 4m 15s master
master
February 28, 2024 10:05 4m 15s
Reverts Removal of M4 Armor From FTL (#5834) Check for merge conflicts #20191: Commit b861def pushed by github-merge-queue bot
February 28, 2024 09:50 4m 14s master
master
February 28, 2024 09:50 4m 14s
Moves current UPP/CLF combat synths into a support role (#5830) Check for merge conflicts #20190: Commit 72c668b pushed by github-merge-queue bot
February 28, 2024 09:32 4m 22s master
master
February 28, 2024 09:32 4m 22s
Lowers Renegade hive number Check for merge conflicts #20189: Pull request #5842 opened by ihatethisengine
February 28, 2024 07:55 13s
February 28, 2024 07:55 13s
Updated XM43E1 for Sniper Spec Check for merge conflicts #20188: Pull request #5774 ready_for_review by Kaga-404
February 28, 2024 02:15 12s
February 28, 2024 02:15 12s
Updated XM43E1 for Sniper Spec Check for merge conflicts #20187: Pull request #5774 synchronize by Kaga-404
February 28, 2024 01:56 13s
February 28, 2024 01:56 13s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20186: Pull request #5784 synchronize by GrrrKitten
February 28, 2024 01:39 11s
February 28, 2024 01:39 11s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20185: Pull request #5784 synchronize by GrrrKitten
February 28, 2024 01:35 10s
February 28, 2024 01:35 10s