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,736 workflow run results
11,736 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Rank Change Experiment Check for merge conflicts #23006: Pull request #6295 synchronize by realforest2001
May 29, 2024 22:47 11s
May 29, 2024 22:47 11s
Launch Alarm V3 Check for merge conflicts #23005: Pull request #6341 synchronize by hislittlecuzingames
May 29, 2024 19:15 11s
May 29, 2024 19:15 11s
Refactor of record system code and migrate all record UI to TGUI Check for merge conflicts #23004: Pull request #6266 reopened by vero5123
May 29, 2024 18:27 12s
May 29, 2024 18:27 12s
Ghost orbit refactor (#6346) Check for merge conflicts #23003: Commit 63f8286 pushed by github-merge-queue bot
May 29, 2024 17:30 4m 16s master
master
May 29, 2024 17:30 4m 16s
Reduce chem smoke logging spam (#6345) Check for merge conflicts #23002: Commit 3f88829 pushed by github-merge-queue bot
May 29, 2024 17:23 4m 14s master
master
May 29, 2024 17:23 4m 14s
Research xenomorph "dissections" Check for merge conflicts #23001: Pull request #6188 synchronize by kiVts
May 29, 2024 16:21 13s
May 29, 2024 16:21 13s
Black market ammo shop category + new ammo boxes Check for merge conflicts #23000: Pull request #6324 synchronize by Blundir
May 29, 2024 15:23 12s
May 29, 2024 15:23 12s
Fixes Burrowers being able to use corrosive acid while underground Check for merge conflicts #22999: Pull request #6348 opened by Tyranicranger4
May 29, 2024 09:08 12s
May 29, 2024 09:08 12s
Heavy Sniper Part 2 - The Heavying Check for merge conflicts #22998: Pull request #6163 synchronize by Kaga-404
May 29, 2024 04:29 2m 12s
May 29, 2024 04:29 2m 12s
STEEL DIVISON (Re-introduces 200 pop locked tank) [CODE BOUNTY] Check for merge conflicts #22997: Pull request #6304 synchronize by Red-byte3D
May 28, 2024 20:07 14s
May 28, 2024 20:07 14s
STEEL DIVISON (Re-introduces 200 pop locked tank) [CODE BOUNTY] Check for merge conflicts #22996: Pull request #6304 ready_for_review by Red-byte3D
May 28, 2024 19:41 9s
May 28, 2024 19:41 9s
Makes it possible for all Officers and all NCO's (E4+) to recommend people for medals. Check for merge conflicts #22995: Pull request #6343 synchronize by TheGamerdk
May 28, 2024 18:53 9s
May 28, 2024 18:53 9s
Makes it possible for all Officers and all NCO's (E4+) to recommend people for medals. Check for merge conflicts #22994: Pull request #6343 ready_for_review by TheGamerdk
May 28, 2024 18:50 19s
May 28, 2024 18:50 19s
Makes it possible for all Officers and all NCO's (E4+) to recommend people for medals. Check for merge conflicts #22992: Pull request #6343 reopened by TheGamerdk
May 28, 2024 18:49 15s
May 28, 2024 18:49 15s
Makes it possible for all Officers and all NCO's (E4+) to recommend people for medals. Check for merge conflicts #22993: Pull request #6343 synchronize by TheGamerdk
May 28, 2024 18:49 12s
May 28, 2024 18:49 12s
Resprites humans, gives humans a choice of 9 bodies, replaces ethnicity system Check for merge conflicts #22991: Pull request #6073 reopened by Drulikar
May 28, 2024 17:38 11s
May 28, 2024 17:38 11s
dropship module given more HP accid only damages not deletes and can be repaired now Check for merge conflicts #22990: Pull request #6337 synchronize by cuberound
May 28, 2024 15:27 13s
May 28, 2024 15:27 13s
Black market ammo shop category + new ammo boxes Check for merge conflicts #22989: Pull request #6324 synchronize by Blundir
May 28, 2024 14:42 12s
May 28, 2024 14:42 12s
accessory removal menu is now radial Check for merge conflicts #22988: Pull request #6274 ready_for_review by AndroBetel
May 28, 2024 13:33 36s
May 28, 2024 13:33 36s
accessory removal menu is now radial Check for merge conflicts #22987: Pull request #6274 synchronize by AndroBetel
May 28, 2024 13:33 10s
May 28, 2024 13:33 10s
accessory removal menu is now radial Check for merge conflicts #22986: Pull request #6274 synchronize by AndroBetel
May 28, 2024 13:30 10s
May 28, 2024 13:30 10s
Ghost orbit refactor Check for merge conflicts #22985: Pull request #6346 opened by mullenpaul
May 28, 2024 13:28 10s
May 28, 2024 13:28 10s
Xenomorph Endgame Check for merge conflicts #22984: Pull request #6334 synchronize by Git-Nivrak
May 28, 2024 11:07 12s
May 28, 2024 11:07 12s
Reduce chem smoke logging spam Check for merge conflicts #22983: Pull request #6345 synchronize by Drulikar
May 28, 2024 08:14 19s
May 28, 2024 08:14 19s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #22982: Pull request #6248 synchronize by Drulikar
May 28, 2024 07:45 10s
May 28, 2024 07:45 10s