Skip to content

Actions: cmss13-devs/cmss13-pve

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
3,539 workflow runs
3,539 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Makes Dogtags removable on death immediately Check for merge conflicts #3540: Pull request #514 synchronize by GriffinMan4455
October 24, 2024 08:48 13s
October 24, 2024 08:48 13s
Makes Dogtags removable on death immediately Check for merge conflicts #3539: Pull request #514 synchronize by GriffinMan4455
October 24, 2024 08:48 2m 14s
October 24, 2024 08:48 2m 14s
Makes Dogtags removable on death immediately Check for merge conflicts #3538: Pull request #514 synchronize by GriffinMan4455
October 24, 2024 07:18 1m 58s
October 24, 2024 07:18 1m 58s
UGL rounds expansion Check for merge conflicts #3537: Pull request #517 synchronize by BonniePandora
October 24, 2024 07:11 3m 43s
October 24, 2024 07:11 3m 43s
Makes Dogtags removable on death immediately Check for merge conflicts #3536: Pull request #514 synchronize by GriffinMan4455
October 24, 2024 07:06 44s
October 24, 2024 07:06 44s
Gives the new shades a mask-slot sprite Check for merge conflicts #3535: Pull request #519 synchronize by BonniePandora
October 24, 2024 07:05 1m 53s
October 24, 2024 07:05 1m 53s
Gives the new shades a mask-slot sprite Check for merge conflicts #3534: Pull request #519 opened by BonniePandora
October 24, 2024 07:03 2m 14s
October 24, 2024 07:03 2m 14s
UGL rounds expansion Check for merge conflicts #3533: Pull request #517 synchronize by BonniePandora
October 24, 2024 00:22 11s
October 24, 2024 00:22 11s
UGL rounds expansion Check for merge conflicts #3532: Pull request #517 synchronize by BonniePandora
October 24, 2024 00:18 11s
October 24, 2024 00:18 11s
[TM] Adds a wide-area Clusterbomb to FS menu Check for merge conflicts #3531: Pull request #518 opened by GriffinMan4455
October 23, 2024 23:35 9m 13s
October 23, 2024 23:35 9m 13s
UPP Overhaul Check for merge conflicts #3530: Pull request #385 synchronize by AmoryBlaine
October 23, 2024 23:30 2m 8s
October 23, 2024 23:30 2m 8s
Materials crate in the garrow is empty, now we must SANDBAG. Also adds an IMP Ammocrate backpack to prep. Singular. Carries 3 ammocans just like PvP for now. Check for merge conflicts #3529: Pull request #509 synchronize by GriffinMan4455
October 23, 2024 23:29 2m 59s
October 23, 2024 23:29 2m 59s
(TM Only for now) OD's much more dangerous, Tric bottles in Weymed, Bottle enhancements Check for merge conflicts #3528: Pull request #487 synchronize by GriffinMan4455
October 23, 2024 23:28 3m 4s
October 23, 2024 23:28 3m 4s
[TM] Tougher Airlocks + Airlock Assemblies on Destruction Check for merge conflicts #3527: Pull request #508 synchronize by GriffinMan4455
October 23, 2024 23:28 12s
October 23, 2024 23:28 12s
UPP Overhaul Check for merge conflicts #3526: Pull request #385 synchronize by AmoryBlaine
October 23, 2024 23:07 12s
October 23, 2024 23:07 12s
UPP Overhaul Check for merge conflicts #3525: Pull request #385 synchronize by AmoryBlaine
October 23, 2024 22:52 14s
October 23, 2024 22:52 14s
Makes Dogtags removable on death immediately Check for merge conflicts #3524: Pull request #514 synchronize by GriffinMan4455
October 23, 2024 22:43 19s
October 23, 2024 22:43 19s
Customizable Armor Check for merge conflicts #3523: Pull request #430 synchronize by Max-023
October 23, 2024 22:19 10s
October 23, 2024 22:19 10s
Customizable Armor Check for merge conflicts #3522: Pull request #430 synchronize by Max-023
October 23, 2024 22:17 13s
October 23, 2024 22:17 13s
Customizable Armor Check for merge conflicts #3521: Pull request #430 synchronize by Max-023
October 23, 2024 22:14 17s
October 23, 2024 22:14 17s
[TM Ready] Chemical Weapons (CN20) in the FS Menu Check for merge conflicts #3520: Pull request #510 synchronize by GriffinMan4455
October 23, 2024 21:37 11s
October 23, 2024 21:37 11s
UPP Overhaul Check for merge conflicts #3519: Pull request #385 synchronize by AmoryBlaine
October 23, 2024 21:30 12s
October 23, 2024 21:30 12s
UPP Overhaul Check for merge conflicts #3518: Pull request #385 synchronize by AmoryBlaine
October 23, 2024 21:28 15s
October 23, 2024 21:28 15s
[TM Ready] Chemical Weapons (CN20) in the FS Menu Check for merge conflicts #3517: Pull request #510 synchronize by GriffinMan4455
October 23, 2024 21:11 15s
October 23, 2024 21:11 15s
[TM Ready] Chemical Weapons (CN20) in the FS Menu Check for merge conflicts #3516: Pull request #510 synchronize by GriffinMan4455
October 23, 2024 20:49 3m 25s
October 23, 2024 20:49 3m 25s