Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
11,706 workflow run results
11,706 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

removes metal from requisitions console Check for merge conflicts #22951: Pull request #6338 synchronize by Diegoflores31
May 27, 2024 05:17 2m 12s
May 27, 2024 05:17 2m 12s
removes metal from requisitions console Check for merge conflicts #22950: Pull request #6338 opened by Diegoflores31
May 26, 2024 21:32 10s
May 26, 2024 21:32 10s
Xenomorph Endgame Check for merge conflicts #22949: Pull request #6334 synchronize by Git-Nivrak
May 26, 2024 19:10 12s
May 26, 2024 19:10 12s
Research major property rebalance Check for merge conflicts #22948: Pull request #6225 synchronize by iloveloopers
May 26, 2024 18:26 10s
May 26, 2024 18:26 10s
Research major property rebalance Check for merge conflicts #22947: Pull request #6225 synchronize by iloveloopers
May 26, 2024 18:24 11s
May 26, 2024 18:24 11s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #22946: Pull request #6248 synchronize by Zenith00000
May 26, 2024 17:52 10s
May 26, 2024 17:52 10s
STEEL DIVISON (Re-introduces 200 pop locked tank) [CODE BOUNTY] Check for merge conflicts #22945: Pull request #6304 synchronize by Red-byte3D
May 26, 2024 17:31 11s
May 26, 2024 17:31 11s
STEEL DIVISON (Re-introduces 200 pop locked tank) [CODE BOUNTY] Check for merge conflicts #22944: Pull request #6304 synchronize by Red-byte3D
May 26, 2024 17:27 12s
May 26, 2024 17:27 12s
Whiskey Outpost for burrower add the ability to make tunnel but remove the ability to burrow. Check for merge conflicts #22943: Pull request #6283 ready_for_review by Huffie56
May 26, 2024 16:01 12s
May 26, 2024 16:01 12s
Whiskey Outpost for burrower add the ability to make tunnel but remove the ability to burrow. Check for merge conflicts #22942: Pull request #6283 synchronize by Huffie56
May 26, 2024 15:45 10s
May 26, 2024 15:45 10s
Whiskey Outpost for burrower add the ability to make tunnel but remove the ability to burrow. Check for merge conflicts #22941: Pull request #6283 synchronize by Huffie56
May 26, 2024 15:37 10s
May 26, 2024 15:37 10s
dropship module given more HP accid only damages not deletes and can be repaired now Check for merge conflicts #22940: Pull request #6337 opened by cuberound
May 26, 2024 14:13 12s
May 26, 2024 14:13 12s
accessory removal menu is now radial Check for merge conflicts #22939: Pull request #6274 synchronize by AndroBetel
May 26, 2024 12:51 11s
May 26, 2024 12:51 11s
Queen qol Check for merge conflicts #22938: Pull request #6336 synchronize by Git-Nivrak
May 26, 2024 10:40 12s
May 26, 2024 10:40 12s
Queen qol Check for merge conflicts #22937: Pull request #6336 opened by Git-Nivrak
May 26, 2024 10:39 14s
May 26, 2024 10:39 14s
Adds UNO cards to the Lifeboat Supply Cabinets (#6326) Check for merge conflicts #22936: Commit 606f0ad pushed by github-merge-queue bot
May 26, 2024 08:55 4m 14s master
master
May 26, 2024 08:55 4m 14s
Adds UNO cards to the Lifeboat Supply Cabinets Check for merge conflicts #22935: Pull request #6326 synchronize by harryob
May 26, 2024 08:47 15s
May 26, 2024 08:47 15s
Fixes gibber not killing mobs (#6332) Check for merge conflicts #22934: Commit 66e3013 pushed by github-merge-queue bot
May 26, 2024 08:12 4m 15s master
master
May 26, 2024 08:12 4m 15s
Xenomorph Endgame Check for merge conflicts #22933: Pull request #6334 synchronize by Git-Nivrak
May 26, 2024 07:08 12s
May 26, 2024 07:08 12s
Xenomorph Endgame Check for merge conflicts #22932: Pull request #6334 synchronize by Git-Nivrak
May 26, 2024 07:06 13s
May 26, 2024 07:06 13s
Research major property rebalance Check for merge conflicts #22931: Pull request #6225 synchronize by iloveloopers
May 26, 2024 04:50 12s
May 26, 2024 04:50 12s
Research major property rebalance Check for merge conflicts #22930: Pull request #6225 synchronize by iloveloopers
May 26, 2024 04:49 11s
May 26, 2024 04:49 11s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #22929: Pull request #6248 synchronize by Zenith00000
May 26, 2024 04:46 10s
May 26, 2024 04:46 10s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #22928: Pull request #6248 synchronize by Zenith00000
May 26, 2024 04:07 2m 15s
May 26, 2024 04:07 2m 15s
Containers can be dumped into seed extractor Check for merge conflicts #22927: Pull request #6328 synchronize by doganesi
May 26, 2024 01:13 11s
May 26, 2024 01:13 11s