Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
2,363 workflow run results
2,363 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Restore stat panel options to change font size Check for merge conflicts #15025: Pull request #4514 ready_for_review by Drulikar
October 2, 2023 04:04 45s
October 2, 2023 04:04 45s
Restore stat panel options to change font size Check for merge conflicts #15024: Pull request #4514 synchronize by Drulikar
October 2, 2023 04:04 12s
October 2, 2023 04:04 12s
Restore stat panel options to change font size Check for merge conflicts #15023: Pull request #4514 synchronize by Drulikar
October 2, 2023 03:57 12s
October 2, 2023 03:57 12s
Pylon tweaks Check for merge conflicts #15022: Pull request #4571 opened by morrowwolf
October 2, 2023 03:55 13s
October 2, 2023 03:55 13s
Resin Fruits now contain enough fruit resin to be scanned. Alacrit no… Check for merge conflicts #15021: Commit c362eda pushed by github-merge-queue bot
October 2, 2023 03:21 4m 15s master
master
October 2, 2023 03:21 4m 15s
Surgical Drop Pouch Revival (#4481) Check for merge conflicts #15020: Commit 2f8c654 pushed by github-merge-queue bot
October 2, 2023 02:55 2m 43s master
master
October 2, 2023 02:55 2m 43s
Operation time logging Check for merge conflicts #15019: Pull request #4570 opened by morrowwolf
October 2, 2023 02:54 2m 56s
October 2, 2023 02:54 2m 56s
Keycard authenticator can call ERT winout admin intervention Check for merge conflicts #15018: Pull request #4477 ready_for_review by Diegoflores31
October 2, 2023 02:54 1m 0s
October 2, 2023 02:54 1m 0s
Keycard authenticator can call ERT winout admin intervention Check for merge conflicts #15017: Pull request #4477 synchronize by Diegoflores31
October 2, 2023 02:51 15s
October 2, 2023 02:51 15s
Candle box nerf 😭 Check for merge conflicts #15016: Pull request #4569 opened by morrowwolf
October 2, 2023 01:24 2m 17s
October 2, 2023 01:24 2m 17s
Fixes storage depth for internal storages Check for merge conflicts #15015: Pull request #4568 opened by morrowwolf
October 2, 2023 00:40 14s
October 2, 2023 00:40 14s
Underbarrel extinguisher no longer requires wield Check for merge conflicts #15014: Pull request #4567 opened by morrowwolf
October 1, 2023 23:47 13s
October 1, 2023 23:47 13s
Fixes machinery coming out of largecrates not updating power Check for merge conflicts #15013: Pull request #4566 opened by morrowwolf
October 1, 2023 23:42 12s
October 1, 2023 23:42 12s
remove welding google from squad comtech vendor to avoid him to waste point. Check for merge conflicts #15012: Pull request #4565 opened by Huffie56
October 1, 2023 21:37 15s
October 1, 2023 21:37 15s
Project ARES: TM Holder v3 Check for merge conflicts #15011: Pull request #4564 opened by realforest2001
October 1, 2023 18:29 46s
October 1, 2023 18:29 46s
Egg runtime fix Check for merge conflicts #15010: Pull request #4563 synchronize by JackieEstegado
October 1, 2023 18:27 14s
October 1, 2023 18:27 14s
Fixes distress signal manual calls and a WO distress signal announcem… Check for merge conflicts #15009: Commit dc9eb1d pushed by github-merge-queue bot
October 1, 2023 18:14 4m 19s master
master
October 1, 2023 18:14 4m 19s
Egg runtime fix Check for merge conflicts #15008: Pull request #4563 opened by JackieEstegado
October 1, 2023 18:10 16s
October 1, 2023 18:10 16s
Working Joe Voiceline FIx (#4544) Check for merge conflicts #15007: Commit 66f4562 pushed by github-merge-queue bot
October 1, 2023 17:59 4m 16s master
master
October 1, 2023 17:59 4m 16s
Fixes fake incomplete surgery (#4552) Check for merge conflicts #15006: Commit 21d51c5 pushed by github-merge-queue bot
October 1, 2023 17:45 4m 14s master
master
October 1, 2023 17:45 4m 14s
Disease protection Check for merge conflicts #15005: Pull request #4524 ready_for_review by kiVts
October 1, 2023 17:34 1m 1s
October 1, 2023 17:34 1m 1s
Tool Pouch Allowed Items Change (#4554) Check for merge conflicts #15004: Commit a5d81fc pushed by github-merge-queue bot
October 1, 2023 17:30 4m 15s master
master
October 1, 2023 17:30 4m 15s
Eggs No Longer Have Melee Resistance (#4555) Check for merge conflicts #15003: Commit 49e12b5 pushed by github-merge-queue bot
October 1, 2023 17:16 4m 13s master
master
October 1, 2023 17:16 4m 13s
TGUI: Microwave (#4523) Check for merge conflicts #15002: Commit bc7c578 pushed by github-merge-queue bot
October 1, 2023 17:02 4m 17s master
master
October 1, 2023 17:02 4m 17s
Rebalances Yautja bracer power (#4154) Check for merge conflicts #15001: Commit 3e50dd4 pushed by github-merge-queue bot
October 1, 2023 16:48 4m 17s master
master
October 1, 2023 16:48 4m 17s