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,168 workflow run results
4,168 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

More accurate directions for trackers and messages (#4961) Check for merge conflicts #16779: Commit 622a284 pushed by github-merge-queue bot
November 24, 2023 11:56 4m 15s master
master
November 24, 2023 11:56 4m 15s
Dropship sidedoors (#4995) Check for merge conflicts #16778: Commit 0d05880 pushed by github-merge-queue bot
November 24, 2023 11:43 4m 16s master
master
November 24, 2023 11:43 4m 16s
Fixes fortified defender headbutt (#5004) Check for merge conflicts #16777: Commit 14eed0a pushed by github-merge-queue bot
November 24, 2023 11:30 4m 20s master
master
November 24, 2023 11:30 4m 20s
Phone QOL - Last Caller ID (#5008) Check for merge conflicts #16776: Commit 19c90a7 pushed by github-merge-queue bot
November 24, 2023 11:17 4m 18s master
master
November 24, 2023 11:17 4m 18s
Fixes Burst Corporate Supervisor landmark (#5012) Check for merge conflicts #16775: Commit f9510f6 pushed by github-merge-queue bot
November 24, 2023 11:04 4m 25s master
master
November 24, 2023 11:04 4m 25s
Lockdown actually closes doors on DS (#5015) Check for merge conflicts #16774: Commit e5e18a5 pushed by github-merge-queue bot
November 24, 2023 10:51 4m 20s master
master
November 24, 2023 10:51 4m 20s
Fixes runtime with fire extinguisher cabinets on lifeboats (#5009) Check for merge conflicts #16773: Commit 2b3cf3f pushed by github-merge-queue bot
November 24, 2023 10:34 4m 20s master
master
November 24, 2023 10:34 4m 20s
check_grep.sh part ??: adds all global vars to the global controller Check for merge conflicts #16772: Pull request #4940 synchronize by harryob
November 24, 2023 10:23 2m 13s
November 24, 2023 10:23 2m 13s
More readable colour for the 'Maintainer' section in staffwho (#5010) Check for merge conflicts #16771: Commit ceaec32 pushed by github-merge-queue bot
November 24, 2023 10:21 4m 18s master
master
November 24, 2023 10:21 4m 18s
Makes the squad attachments vendor vend to hand Check for merge conflicts #16770: Pull request #5021 opened by SabreML
November 24, 2023 10:01 16s
November 24, 2023 10:01 16s
ASRS Supply Pools -- Crates Carryover and MessTech supply Check for merge conflicts #16769: Pull request #5018 synchronize by fira
November 23, 2023 22:10 11s
November 23, 2023 22:10 11s
Sorokyne Tunnels Upgrade Check for merge conflicts #16768: Pull request #5020 opened by HeresKozmos
November 23, 2023 21:51 14s
November 23, 2023 21:51 14s
Fixes Trijent Mapping Error(?) Check for merge conflicts #16767: Pull request #5005 synchronize by HeresKozmos
November 23, 2023 20:57 2m 55s
November 23, 2023 20:57 2m 55s
Kutjevo Mapping Fix Check for merge conflicts #16766: Pull request #5001 synchronize by HeresKozmos
November 23, 2023 20:57 2m 14s
November 23, 2023 20:57 2m 14s
Adds Pizza to Requisitions Check for merge conflicts #16765: Pull request #4998 synchronize by HeresKozmos
November 23, 2023 20:55 10s
November 23, 2023 20:55 10s
Adds Pizza to Requisitions Check for merge conflicts #16764: Pull request #4998 ready_for_review by HeresKozmos
November 23, 2023 20:55 13s
November 23, 2023 20:55 13s
Adds Pizza to Requisitions Check for merge conflicts #16763: Pull request #4998 synchronize by HeresKozmos
November 23, 2023 20:21 16s
November 23, 2023 20:21 16s
ASRS Supply Pools -- Crates Carryover and MessTech supply Check for merge conflicts #16762: Pull request #5018 opened by fira
November 23, 2023 18:51 11s
November 23, 2023 18:51 11s
Système d'énergie de commandement - 1 Check for merge conflicts #16761: Pull request #5011 synchronize by LC4492
November 23, 2023 17:02 16s
November 23, 2023 17:02 16s
Cas sentryguns pricedown and dinamic one for omnisentryguns Check for merge conflicts #16760: Pull request #4909 synchronize by cuberound
November 23, 2023 11:08 14s
November 23, 2023 11:08 14s
Lockdown actually closes doors on DS Check for merge conflicts #16759: Pull request #5015 opened by ihatethisengine
November 23, 2023 06:38 15s
November 23, 2023 06:38 15s
Lockdown actually closes doors on DS Check for merge conflicts #16758: Pull request #5014 synchronize by ihatethisengine
November 23, 2023 06:33 10s
November 23, 2023 06:33 10s
Lockdown actually closes doors on DS Check for merge conflicts #16757: Pull request #5014 opened by ihatethisengine
November 23, 2023 06:32 21s
November 23, 2023 06:32 21s
New brig remap revive Check for merge conflicts #16756: Pull request #4931 synchronize by ItsVyzo
November 23, 2023 03:41 14s
November 23, 2023 03:41 14s
New brig remap revive Check for merge conflicts #16755: Pull request #4931 synchronize by ItsVyzo
November 23, 2023 03:00 14s
November 23, 2023 03:00 14s