Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
3,744 workflow run results
3,744 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

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
Allows Xeno Hive To Ally With CMB Check for merge conflicts #15000: Pull request #4562 opened by Steelpoint
October 1, 2023 14:32 11s
October 1, 2023 14:32 11s
Réparations et réparations Check for merge conflicts #14999: Pull request #4560 synchronize by LC4492
October 1, 2023 14:20 14s
October 1, 2023 14:20 14s
Réparations et réparations Check for merge conflicts #14998: Pull request #4560 synchronize by LC4492
October 1, 2023 14:10 20s
October 1, 2023 14:10 20s
Réparations et réparations Check for merge conflicts #14997: Pull request #4560 synchronize by LC4492
October 1, 2023 01:45 22s
October 1, 2023 01:45 22s
Réparations et réparations Check for merge conflicts #14996: Pull request #4560 synchronize by LC4492
October 1, 2023 01:44 19s
October 1, 2023 01:44 19s
Réparations et réparations Check for merge conflicts #14995: Pull request #4560 synchronize by LC4492
October 1, 2023 01:43 15s
October 1, 2023 01:43 15s
Réparations et réparations Check for merge conflicts #14994: Pull request #4560 opened by LC4492
October 1, 2023 01:37 40s
October 1, 2023 01:37 40s
Synthetic internal powercell Check for merge conflicts #14993: Pull request #4559 synchronize by QuickLode
October 1, 2023 01:36 15s
October 1, 2023 01:36 15s
Synthetic internal powercell Check for merge conflicts #14992: Pull request #4559 synchronize by QuickLode
October 1, 2023 01:34 14s
October 1, 2023 01:34 14s
Synthetic internal powercell Check for merge conflicts #14991: Pull request #4559 opened by QuickLode
October 1, 2023 01:33 2m 14s
October 1, 2023 01:33 2m 14s
TGUI / Bugfixes / Improvements: Security Cleanup Check for merge conflicts #14990: Pull request #4558 opened by Crowbar764
September 30, 2023 23:21 13s
September 30, 2023 23:21 13s