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,644 workflow run results
3,644 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Added Ability for Looping Sounds to be heard from further away. Check for merge conflicts #16219: Pull request #4857 synchronize by hislittlecuzingames
November 7, 2023 05:02 14s
November 7, 2023 05:02 14s
Added Ability to turn on and turn off a dropship alarm. (Requires pro… Check for merge conflicts #16218: Pull request #4858 synchronize by hislittlecuzingames
November 7, 2023 04:54 17s
November 7, 2023 04:54 17s
Added Ability to turn on and turn off a dropship alarm. (Requires pro… Check for merge conflicts #16217: Pull request #4858 synchronize by hislittlecuzingames
November 7, 2023 04:41 13s
November 7, 2023 04:41 13s
More minor map fixes Check for merge conflicts #16216: Pull request #4862 synchronize by Releasethesea
November 7, 2023 03:09 13s
November 7, 2023 03:09 13s
More minor map fixes Check for merge conflicts #16215: Pull request #4862 reopened by Releasethesea
November 7, 2023 02:42 9s
November 7, 2023 02:42 9s
Le Almayer changes Check for merge conflicts #16214: Pull request #4864 opened by spartanbobby
November 7, 2023 01:42 11s
November 7, 2023 01:42 11s
Fix imaginary friend ears and icons Check for merge conflicts #16213: Pull request #4863 opened by Drulikar
November 7, 2023 01:23 2m 16s
November 7, 2023 01:23 2m 16s
More minor map fixes Check for merge conflicts #16212: Pull request #4862 opened by Releasethesea
November 7, 2023 01:05 15s
November 7, 2023 01:05 15s
Minor fixes for Loadout Items Check for merge conflicts #16211: Pull request #4849 synchronize by fira
November 7, 2023 00:42 12s
November 7, 2023 00:42 12s
Shotgun tube toggle hotkey (#4794) Check for merge conflicts #16210: Commit 2bf2540 pushed by github-merge-queue bot
November 6, 2023 23:15 4m 17s master
master
November 6, 2023 23:15 4m 17s
Fixes colliding keybinds for asay/mentorsay Check for merge conflicts #16209: Pull request #4860 opened by fira
November 6, 2023 22:53 2m 37s
November 6, 2023 22:53 2m 37s
Shotgun tube toggle hotkey Check for merge conflicts #16208: Pull request #4794 synchronize by Zonespace27
November 6, 2023 22:51 14s
November 6, 2023 22:51 14s
Componentizes power cells Check for merge conflicts #16207: Pull request #4855 synchronize by Zonespace27
November 6, 2023 22:49 12s
November 6, 2023 22:49 12s
Small M3-VL Ballistics Vest Addition To Requisition Vendors Check for merge conflicts #16206: Pull request #4836 synchronize by KoishiVibe
November 6, 2023 22:32 12s
November 6, 2023 22:32 12s
Shotgun tube toggle hotkey Check for merge conflicts #16205: Pull request #4794 synchronize by Blundir
November 6, 2023 22:30 10s
November 6, 2023 22:30 10s
Fix req ammo vendor not dispensing to the table Check for merge conflicts #16204: Pull request #4856 synchronize by Drulikar
November 6, 2023 21:44 15s
November 6, 2023 21:44 15s
Makes rear dropship doors solid again and refactors multi door filler turf logic Check for merge conflicts #16203: Pull request #4837 ready_for_review by Das15
November 6, 2023 20:40 14s
November 6, 2023 20:40 14s
Makes rear dropship doors solid again and refactors multi door filler turf logic Check for merge conflicts #16202: Pull request #4837 synchronize by Das15
November 6, 2023 20:31 30s
November 6, 2023 20:31 30s
Makes rear dropship doors solid again and refactors multi door filler turf logic Check for merge conflicts #16201: Pull request #4837 synchronize by Das15
November 6, 2023 19:55 14s
November 6, 2023 19:55 14s
Fix first use of USCM equipment presets Check for merge conflicts #16200: Pull request #4859 synchronize by Drulikar
November 6, 2023 19:49 10s
November 6, 2023 19:49 10s
Fix first use of USCM equipment presets Check for merge conflicts #16199: Pull request #4859 opened by Drulikar
November 6, 2023 19:47 12s
November 6, 2023 19:47 12s
Makes rear dropship doors solid again and refactors multi door filler turf logic Check for merge conflicts #16198: Pull request #4837 synchronize by Das15
November 6, 2023 19:20 14s
November 6, 2023 19:20 14s
Makes rear dropship doors solid again and refactors multi door filler turf logic Check for merge conflicts #16197: Pull request #4837 synchronize by Das15
November 6, 2023 19:14 11s
November 6, 2023 19:14 11s
Added Ability to turn on and turn off a dropship alarm. (Requires pro… Check for merge conflicts #16196: Pull request #4858 synchronize by hislittlecuzingames
November 6, 2023 18:37 12s
November 6, 2023 18:37 12s
Added Ability for Looping Sounds to be heard from further away. Check for merge conflicts #16195: Pull request #4857 synchronize by hislittlecuzingames
November 6, 2023 18:20 11s
November 6, 2023 18:20 11s