Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
2,722 workflow run results
2,722 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

ARES Change Holder Check for merge conflicts #13992: Pull request #4224 synchronize by realforest2001
August 28, 2023 22:44 1m 55s
August 28, 2023 22:44 1m 55s
Project ARES: Functional Access Tickets Check for merge conflicts #13991: Pull request #4111 synchronize by realforest2001
August 28, 2023 22:44 1m 44s
August 28, 2023 22:44 1m 44s
Lesser drone changes Check for merge conflicts #13990: Pull request #4280 opened by morrowwolf
August 28, 2023 22:37 1m 54s
August 28, 2023 22:37 1m 54s
Project ARES: Admin Console Check for merge conflicts #13989: Pull request #4182 synchronize by realforest2001
August 28, 2023 22:13 7m 17s
August 28, 2023 22:13 7m 17s
Project ARES: Logging tweaks & updates Check for merge conflicts #13988: Pull request #4225 synchronize by realforest2001
August 28, 2023 22:13 3m 26s
August 28, 2023 22:13 3m 26s
Project ARES: Adds more APOLLO consoles Check for merge conflicts #13987: Pull request #4208 synchronize by realforest2001
August 28, 2023 22:13 1m 42s
August 28, 2023 22:13 1m 42s
ARES Change Holder Check for merge conflicts #13986: Pull request #4224 synchronize by realforest2001
August 28, 2023 22:13 19s
August 28, 2023 22:13 19s
Project ARES: Functional Access Tickets Check for merge conflicts #13985: Pull request #4111 synchronize by realforest2001
August 28, 2023 22:12 14s
August 28, 2023 22:12 14s
Project ARES: Functional Access Tickets Check for merge conflicts #13984: Pull request #4111 synchronize by realforest2001
August 28, 2023 22:12 12s
August 28, 2023 22:12 12s
Project ARES: Functional Access Tickets Check for merge conflicts #13983: Pull request #4111 synchronize by realforest2001
August 28, 2023 22:04 13s
August 28, 2023 22:04 13s
Machete in-hand activation Check for merge conflicts #13982: Pull request #4277 ready_for_review by JackieEstegado
August 28, 2023 21:55 14s
August 28, 2023 21:55 14s
Machete in-hand activation Check for merge conflicts #13981: Pull request #4277 synchronize by JackieEstegado
August 28, 2023 21:53 11s
August 28, 2023 21:53 11s
Fixes resin areas around LZs (#4210) Check for merge conflicts #13980: Commit fbdca6d pushed by github-merge-queue bot
August 28, 2023 21:22 4m 18s master
master
August 28, 2023 21:22 4m 18s
Fixes camera console not closing if you move away (#4276) Check for merge conflicts #13979: Commit a20e09f pushed by github-merge-queue bot
August 28, 2023 21:08 4m 16s master
master
August 28, 2023 21:08 4m 16s
Antag Accesses Fix (#4275) Check for merge conflicts #13978: Commit 8ca40b9 pushed by github-merge-queue bot
August 28, 2023 20:54 4m 17s master
master
August 28, 2023 20:54 4m 17s
3291 - Fixes the ability to manipulate a dummy from a distance using … Check for merge conflicts #13977: Commit fcef7ad pushed by github-merge-queue bot
August 28, 2023 20:40 4m 14s master
master
August 28, 2023 20:40 4m 14s
Add flanking possiblities to the lifeboat by adding two clamp with doors on each exterior side. Check for merge conflicts #13976: Pull request #4274 synchronize by morrowwolf
August 28, 2023 19:22 15s
August 28, 2023 19:22 15s
Add flanking possiblities to the lifeboat by adding two clamp with doors on each exterior side. Check for merge conflicts #13975: Pull request #4274 synchronize by morrowwolf
August 28, 2023 19:21 15s
August 28, 2023 19:21 15s
fancy lighting (#4229) Check for merge conflicts #13974: Commit a020df7 pushed by github-merge-queue bot
August 28, 2023 19:11 4m 25s master
master
August 28, 2023 19:11 4m 25s
fancy lighting Check for merge conflicts #13973: Pull request #4229 synchronize by morrowwolf
August 28, 2023 14:56 16s
August 28, 2023 14:56 16s
fancy lighting Check for merge conflicts #13972: Pull request #4229 synchronize by morrowwolf
August 28, 2023 14:34 29s
August 28, 2023 14:34 29s
fancy lighting Check for merge conflicts #13971: Pull request #4229 synchronize by morrowwolf
August 28, 2023 14:32 14s
August 28, 2023 14:32 14s
IO/FTL Can Buy Welding Visor + M12 Helm Holds 2 Visors (#4263) Check for merge conflicts #13970: Commit e8a72e1 pushed by github-merge-queue bot
August 28, 2023 13:46 4m 17s master
master
August 28, 2023 13:46 4m 17s
fancy lighting Check for merge conflicts #13969: Pull request #4229 synchronize by harryob
August 28, 2023 12:54 14s
August 28, 2023 12:54 14s
fancy lighting Check for merge conflicts #13968: Pull request #4229 synchronize by harryob
August 28, 2023 12:44 11s
August 28, 2023 12:44 11s