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,881 workflow run results
2,881 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

fixes some vehicle stuff, and some random code that ended up commented Check for merge conflicts #14001: Pull request #4281 synchronize by harryob
August 29, 2023 09:17 15s
August 29, 2023 09:17 15s
General Quarters via ARES no longer cares if Red alert or not (#4227) Check for merge conflicts #14000: Commit a6ed272 pushed by github-merge-queue bot
August 29, 2023 09:07 4m 17s master
master
August 29, 2023 09:07 4m 17s
fixes some vehicle stuff, and some random code that ended up commented Check for merge conflicts #13999: Pull request #4281 synchronize by harryob
August 29, 2023 08:36 11s
August 29, 2023 08:36 11s
fixes some vehicle stuff, and some random code that ended up commented Check for merge conflicts #13998: Pull request #4281 opened by harryob
August 29, 2023 08:32 16s
August 29, 2023 08:32 16s
Add flanking possiblities to the lifeboat by adding two clamp with doors on each exterior side. Check for merge conflicts #13997: Pull request #4274 synchronize by Huffie56
August 29, 2023 08:10 13s
August 29, 2023 08:10 13s
fix give back marksman ammo to MP's because i remove it in a previous… Check for merge conflicts #13996: Commit a5ab501 pushed by github-merge-queue bot
August 29, 2023 07:26 4m 16s master
master
August 29, 2023 07:26 4m 16s
Added 3 to hypospray transfer amount option (#4272) Check for merge conflicts #13995: Commit 2710dfa pushed by github-merge-queue bot
August 29, 2023 07:11 4m 18s master
master
August 29, 2023 07:11 4m 18s
Fixed funny invisible vines (#4278) Check for merge conflicts #13994: Commit cab4aee pushed by github-merge-queue bot
August 29, 2023 06:57 4m 14s master
master
August 29, 2023 06:57 4m 14s
notify ghosts Check for merge conflicts #13993: Pull request #4241 synchronize by harryob
August 29, 2023 06:42 2m 17s
August 29, 2023 06:42 2m 17s
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