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,683 workflow run results
5,683 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

adds redis handling for predator rounds Check for merge conflicts #18413: Commit 3571a17 pushed by harryob
January 5, 2024 23:27 2m 12s master
master
January 5, 2024 23:27 2m 12s
Adds a way for SLs/SOs/XOs to recommend medals that the CO can then approve/deny. Check for merge conflicts #18412: Pull request #5202 ready_for_review by TheGamerdk
January 5, 2024 21:05 51s
January 5, 2024 21:05 51s
Adds a way for SLs/SOs/XOs to recommend medals that the CO can then approve/deny. Check for merge conflicts #18411: Pull request #5202 synchronize by TheGamerdk
January 5, 2024 21:05 18s
January 5, 2024 21:05 18s
Adds a way for SLs/SOs/XOs to recommend medals that the CO can then approve/deny. Check for merge conflicts #18410: Pull request #5202 synchronize by TheGamerdk
January 5, 2024 21:03 12s
January 5, 2024 21:03 12s
removes double APC in trijent dam security and on engi east tunnel en… Check for merge conflicts #18409: Commit a88654d pushed by github-merge-queue bot
January 5, 2024 18:19 4m 16s master
master
January 5, 2024 18:19 4m 16s
Fixes the CLs office Posters and a Pinup Poster which was in the wrong category Check for merge conflicts #18408: Pull request #5386 opened by BadAtThisGame302
January 5, 2024 18:12 3m 23s
January 5, 2024 18:12 3m 23s
Fixes an exploit with Praetorian Oppressor hook (#5375) Check for merge conflicts #18407: Commit bd3c371 pushed by github-merge-queue bot
January 4, 2024 23:17 4m 15s master
master
January 4, 2024 23:17 4m 15s
'Time Since Death' hour wrapping fix (#5374) Check for merge conflicts #18406: Commit bc1dcb1 pushed by github-merge-queue bot
January 4, 2024 22:58 4m 19s master
master
January 4, 2024 22:58 4m 19s
Fixes monkey orbiting breaking the camera Check for merge conflicts #18405: Pull request #5383 opened by SabreML
January 4, 2024 22:35 11s
January 4, 2024 22:35 11s
Makes the bipod HPR switch you to full auto when deployed Check for merge conflicts #18404: Pull request #5382 opened by VileBeggar
January 4, 2024 19:23 11s
January 4, 2024 19:23 11s
Changes to bone repairing Check for merge conflicts #18403: Pull request #5280 synchronize by BeagleGaming1
January 4, 2024 18:00 12s
January 4, 2024 18:00 12s
Uncluttering Queen UI P1 Check for merge conflicts #18402: Pull request #5350 ready_for_review by Red-byte3D
January 4, 2024 17:38 15s
January 4, 2024 17:38 15s
Uncluttering Queen UI P1 Check for merge conflicts #18401: Pull request #5350 synchronize by Red-byte3D
January 4, 2024 16:10 13s
January 4, 2024 16:10 13s
Uncluttering Queen UI P1 Check for merge conflicts #18400: Pull request #5350 synchronize by Red-byte3D
January 4, 2024 16:10 12s
January 4, 2024 16:10 12s
Fixes runtime in fruit.dm Check for merge conflicts #18399: Pull request #5381 opened by Birdtalon
January 4, 2024 15:39 15s
January 4, 2024 15:39 15s
fix and small refactor of Areas in lower deck on almayer part2 Check for merge conflicts #18398: Pull request #5373 ready_for_review by Huffie56
January 4, 2024 14:36 15s
January 4, 2024 14:36 15s
fix and small refactor of Areas in lower deck on almayer part2 Check for merge conflicts #18397: Pull request #5373 synchronize by Huffie56
January 4, 2024 14:31 13s
January 4, 2024 14:31 13s
Fixes donor helmets not having an accessory slot Check for merge conflicts #18396: Pull request #5380 opened by Waseemq1235
January 4, 2024 14:20 12s
January 4, 2024 14:20 12s
Splits hivemind messages into their own chat category (#5360) Check for merge conflicts #18395: Commit 2fd3f62 pushed by github-merge-queue bot
January 4, 2024 11:44 4m 15s master
master
January 4, 2024 11:44 4m 15s
refactor part1 change define in coulours.dm from COULOUR to COLOR (#5… Check for merge conflicts #18394: Commit 723e9bd pushed by github-merge-queue bot
January 4, 2024 11:31 4m 15s master
master
January 4, 2024 11:31 4m 15s
Makes the do_after() icon render above everything else Check for merge conflicts #18393: Pull request #5379 opened by SabreML
January 4, 2024 11:04 13s
January 4, 2024 11:04 13s
Adds the XM51 Breaching Scattergun Check for merge conflicts #18392: Pull request #5086 synchronize by VileBeggar
January 4, 2024 10:08 1m 15s
January 4, 2024 10:08 1m 15s
fix and small refactor of Areas in lower deck on almayer part2 Check for merge conflicts #18391: Pull request #5373 synchronize by Huffie56
January 4, 2024 10:03 1m 29s
January 4, 2024 10:03 1m 29s
Adds the XM51 Breaching Scattergun Check for merge conflicts #18390: Pull request #5086 synchronize by VileBeggar
January 4, 2024 10:02 14s
January 4, 2024 10:02 14s
removes double APC in trijent dam security and on engi east tunnel entrance Check for merge conflicts #18389: Pull request #5377 synchronize by private-tristan
January 4, 2024 01:45 12s
January 4, 2024 01:45 12s