Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
5,192 workflow run results
5,192 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Dropship weapons console TGUI Check for merge conflicts #16377: Pull request #4812 synchronize by mullenpaul
November 12, 2023 21:36 13s
November 12, 2023 21:36 13s
Vehicles can be followed by ghosts Check for merge conflicts #16376: Pull request #4904 synchronize by Doubleumc
November 12, 2023 21:25 13s
November 12, 2023 21:25 13s
Eggsac carrier revival Check for merge conflicts #16375: Pull request #4716 synchronize by Birdtalon
November 12, 2023 20:15 15s
November 12, 2023 20:15 15s
Fixes list for the vehicle computer. [NO GAMEPLAY EFFECT] Check for merge conflicts #16374: Pull request #4902 synchronize by Waseemq1235
November 12, 2023 19:43 16s
November 12, 2023 19:43 16s
Changes a confusing healthscanner reading Check for merge conflicts #16373: Pull request #4910 opened by Ediblebomb
November 12, 2023 19:37 14s
November 12, 2023 19:37 14s
Cas sentryguns pricedown and dinamic one for omnisentryguns Check for merge conflicts #16372: Pull request #4909 synchronize by cuberound
November 12, 2023 16:40 12s
November 12, 2023 16:40 12s
Cas sentryguns pricedown and dinamic one for omnisentryguns Check for merge conflicts #16371: Pull request #4909 opened by cuberound
November 12, 2023 16:31 2m 11s
November 12, 2023 16:31 2m 11s
Adds Reflection to VV Modify Transform Check for merge conflicts #16370: Pull request #4907 opened by fira
November 12, 2023 15:10 14s
November 12, 2023 15:10 14s
Adds drawing to tacmaps Check for merge conflicts #16369: Pull request #4475 synchronize by Drulikar
November 12, 2023 13:13 11s
November 12, 2023 13:13 11s
FIXES BIG RED HALLSIDEWALK Check for merge conflicts #16368: Pull request #4906 synchronize by spartanbobby
November 12, 2023 11:09 17s
November 12, 2023 11:09 17s
FIXES BIG RED HALLSIDEWALK Check for merge conflicts #16367: Pull request #4906 opened by spartanbobby
November 12, 2023 11:08 12s
November 12, 2023 11:08 12s
Alternative IFF Check for merge conflicts #16366: Pull request #4723 synchronize by ihatethisengine
November 12, 2023 07:35 2m 14s
November 12, 2023 07:35 2m 14s
Vehicles can be followed by ghosts Check for merge conflicts #16365: Pull request #4904 opened by Doubleumc
November 12, 2023 00:23 14s
November 12, 2023 00:23 14s
Fixes list for the vehicle computer. [NO GAMEPLAY EFFECT] Check for merge conflicts #16364: Pull request #4902 opened by Waseemq1235
November 11, 2023 22:34 9s
November 11, 2023 22:34 9s
VP-78 range buff Check for merge conflicts #16363: Pull request #4901 opened by nerocavalier
November 11, 2023 22:27 16s
November 11, 2023 22:27 16s
Fixes minor mapping errors Check for merge conflicts #16362: Pull request #4873 synchronize by Releasethesea
November 11, 2023 20:16 15s
November 11, 2023 20:16 15s
Alternative IFF Check for merge conflicts #16361: Pull request #4723 synchronize by ihatethisengine
November 11, 2023 19:41 14s
November 11, 2023 19:41 14s
Runner: replace single letter vars Check for merge conflicts #16360: Pull request #4898 synchronize by Birdtalon
November 11, 2023 19:32 13s
November 11, 2023 19:32 13s
Bureau du commandant - CO office Check for merge conflicts #16359: Pull request #4827 synchronize by LC4492
November 11, 2023 18:48 12s
November 11, 2023 18:48 12s
Bureau du commandant - CO office Check for merge conflicts #16358: Pull request #4827 synchronize by LC4492
November 11, 2023 18:35 14s
November 11, 2023 18:35 14s
Surface icon baking removal Check for merge conflicts #16357: Pull request #4894 synchronize by BeagleGaming1
November 11, 2023 17:31 2m 37s
November 11, 2023 17:31 2m 37s
LV624 Fog Removal + River Change Check for merge conflicts #16356: Pull request #4768 reopened by fira
November 11, 2023 17:30 13s
November 11, 2023 17:30 13s
Surface icon baking removal Check for merge conflicts #16355: Pull request #4894 synchronize by BeagleGaming1
November 11, 2023 17:26 10s
November 11, 2023 17:26 10s
Refactors a few vars on /mob/living/carbon/xenomorph Check for merge conflicts #16354: Pull request #4899 synchronize by Birdtalon
November 11, 2023 15:46 12s
November 11, 2023 15:46 12s
Refactors a few vars on /mob/living/carbon/xenomorph Check for merge conflicts #16353: Pull request #4899 opened by Birdtalon
November 11, 2023 14:55 14s
November 11, 2023 14:55 14s