Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
6,952 workflow run results
6,952 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Eggs are now properly converted to forsaken on evac Check for merge conflicts #18215: Pull request #5340 synchronize by private-tristan
December 29, 2023 22:54 9s
December 29, 2023 22:54 9s
Fixes users getting locked in simulation view / simulation refactor Check for merge conflicts #18214: Pull request #5318 synchronize by ghost
December 29, 2023 22:14 10s
December 29, 2023 22:14 10s
Fixes the Hive Status error when the Queen dies Check for merge conflicts #18213: Pull request #5316 synchronize by SabreML
December 29, 2023 22:04 15s
December 29, 2023 22:04 15s
Fixes users getting locked in simulation view / simulation refactor Check for merge conflicts #18212: Pull request #5318 synchronize by ghost
December 29, 2023 22:01 16s
December 29, 2023 22:01 16s
Fixes the failure message when trying to switch pyro fuels (#5321) Check for merge conflicts #18211: Commit 5a24a69 pushed by github-merge-queue bot
December 29, 2023 20:12 4m 20s master
master
December 29, 2023 20:12 4m 20s
Eggs are now properly converted to forsaken on evac Check for merge conflicts #18210: Pull request #5340 opened by private-tristan
December 29, 2023 20:09 10s
December 29, 2023 20:09 10s
Fixes runtime in stripping (#5320) Check for merge conflicts #18209: Commit 483f5ae pushed by github-merge-queue bot
December 29, 2023 19:57 4m 18s master
master
December 29, 2023 19:57 4m 18s
migrated js components to jsx (#5307) Check for merge conflicts #18208: Commit adb5b8e pushed by github-merge-queue bot
December 29, 2023 19:40 2m 26s master
master
December 29, 2023 19:40 2m 26s
Adds a verb to hide action buttons Check for merge conflicts #18207: Pull request #5304 synchronize by BeagleGaming1
December 29, 2023 19:33 1m 18s
December 29, 2023 19:33 1m 18s
Fixes immobilized mobs being able to buckle onto chairs (#5317) Check for merge conflicts #18206: Commit 0ff2e6f pushed by github-merge-queue bot
December 29, 2023 19:21 4m 19s master
master
December 29, 2023 19:21 4m 19s
refactor colour into color for colours.dm Check for merge conflicts #18205: Pull request #5339 opened by Huffie56
December 29, 2023 18:34 11s
December 29, 2023 18:34 11s
Fixes immobilized mobs being able to buckle onto chairs Check for merge conflicts #18204: Pull request #5317 synchronize by ghost
December 29, 2023 18:26 13s
December 29, 2023 18:26 13s
Tutorial System: Retutorializing (#5030) Check for merge conflicts #18203: Commit f377f35 pushed by github-merge-queue bot
December 29, 2023 18:04 4m 22s master
master
December 29, 2023 18:04 4m 22s
Moves around "Remove Splints" and "View playtime" (#5323) Check for merge conflicts #18202: Commit 932138e pushed by github-merge-queue bot
December 29, 2023 17:49 4m 19s master
master
December 29, 2023 17:49 4m 19s
Fixes a laser cannon bug which I added (#5319) Check for merge conflicts #18201: Commit 86914ec pushed by github-merge-queue bot
December 29, 2023 17:36 4m 20s master
master
December 29, 2023 17:36 4m 20s
Fixes Nuke failing to detonate Check for merge conflicts #18200: Pull request #5338 opened by fira
December 29, 2023 17:22 11s
December 29, 2023 17:22 11s
Fixes playing cards Check for merge conflicts #18199: Pull request #5337 opened by fira
December 29, 2023 17:00 15s
December 29, 2023 17:00 15s
A couple of M56D/M2C fixes Check for merge conflicts #18198: Pull request #5336 opened by SabreML
December 29, 2023 14:56 10s
December 29, 2023 14:56 10s
Fixes evac pods launching with more than three occupants Check for merge conflicts #18197: Pull request #5335 opened by ghost
December 29, 2023 14:40 11s
December 29, 2023 14:40 11s
Fixes evac pods launching with more than three occupants Check for merge conflicts #18196: Pull request #5334 reopened by ghost
December 29, 2023 14:32 29s
December 29, 2023 14:32 29s
Fixes evac pods launching with more than three occupants Check for merge conflicts #18195: Pull request #5334 opened by ghost
December 29, 2023 14:31 12s
December 29, 2023 14:31 12s
Fixes a grammar mistake seen in the requisitions vendor. Check for merge conflicts #18194: Pull request #5333 opened by HaultyAnonie
December 29, 2023 14:03 12s
December 29, 2023 14:03 12s
Fixes movement delay stacking when crossing weeds. Check for merge conflicts #18193: Pull request #5332 synchronize by ghost
December 29, 2023 13:41 11s
December 29, 2023 13:41 11s
Fixes movement delay stacking when crossing weeds. Check for merge conflicts #18192: Pull request #5332 opened by ghost
December 29, 2023 13:37 13s
December 29, 2023 13:37 13s
Makes the designation of a tunnel display in chat when entered (#5315) Check for merge conflicts #18191: Commit 95b52c8 pushed by github-merge-queue bot
December 29, 2023 11:10 4m 17s master
master
December 29, 2023 11:10 4m 17s