Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
1,437 workflow run results
1,437 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fixes the wire cutter bug on the plants Check for merge conflicts #13901: Pull request #4259 opened by MikeKuwait
August 26, 2023 03:55 2m 13s
August 26, 2023 03:55 2m 13s
Zone de commandement général - 2 - Mapping CIC Rework / Part 2 Check for merge conflicts #13900: Pull request #4251 synchronize by LC4492
August 25, 2023 22:21 10s
August 25, 2023 22:21 10s
Zone de commandement général - 2 - Mapping CIC Rework / Part 2 Check for merge conflicts #13899: Pull request #4251 synchronize by LC4492
August 25, 2023 22:17 12s
August 25, 2023 22:17 12s
Zone de commandement général - 2 - Mapping CIC Rework / Part 2 Check for merge conflicts #13898: Pull request #4251 synchronize by LC4492
August 25, 2023 22:13 13s
August 25, 2023 22:13 13s
Zone de commandement général - 2 - Mapping CIC Rework / Part 2 Check for merge conflicts #13897: Pull request #4251 synchronize by LC4492
August 25, 2023 22:09 13s
August 25, 2023 22:09 13s
Zone de commandement général - 2 - Mapping CIC Rework / Part 2 Check for merge conflicts #13896: Pull request #4251 synchronize by LC4492
August 25, 2023 22:06 13s
August 25, 2023 22:06 13s
Zone de commandement général - 2 - Mapping CIC Rework / Part 2 Check for merge conflicts #13895: Pull request #4251 synchronize by LC4492
August 25, 2023 22:04 14s
August 25, 2023 22:04 14s
fix teleporting canister pouch to chemical dispenser Check for merge conflicts #13894: Pull request #4258 opened by MikeKuwait
August 25, 2023 21:27 11s
August 25, 2023 21:27 11s
fancy lighting Check for merge conflicts #13893: Pull request #4229 synchronize by harryob
August 25, 2023 20:43 12s
August 25, 2023 20:43 12s
General Quarters via ARES no longer cares if Red alert or not Check for merge conflicts #13892: Pull request #4227 synchronize by Ben10083
August 25, 2023 20:20 13s
August 25, 2023 20:20 13s
attachment obliteration (#4217) Check for merge conflicts #13891: Commit 7051fa8 pushed by github-merge-queue bot
August 25, 2023 20:07 4m 18s master
master
August 25, 2023 20:07 4m 18s
attachment obliteration Check for merge conflicts #13890: Pull request #4217 synchronize by Diegoflores31
August 25, 2023 18:39 15s
August 25, 2023 18:39 15s
Changes nutrition with blood loss (#4231) Check for merge conflicts #13889: Commit 75cea37 pushed by github-merge-queue bot
August 25, 2023 17:59 4m 19s master
master
August 25, 2023 17:59 4m 19s
eyecheck fix Check for merge conflicts #13888: Pull request #4212 ready_for_review by Diegoflores31
August 25, 2023 17:44 6m 14s
August 25, 2023 17:44 6m 14s
eyecheck fix Check for merge conflicts #13887: Pull request #4212 synchronize by Diegoflores31
August 25, 2023 17:44 6m 15s
August 25, 2023 17:44 6m 15s
Invisible Wall collide tweak (#4247) Check for merge conflicts #13886: Commit 0e5029b pushed by github-merge-queue bot
August 25, 2023 17:43 4m 20s master
master
August 25, 2023 17:43 4m 20s
removes extraneous install steps from autowiki.yml Check for merge conflicts #13885: Commit 552a863 pushed by harryob
August 25, 2023 17:22 2m 12s master
master
August 25, 2023 17:22 2m 12s
patches autowiki to work Check for merge conflicts #13884: Commit 70947e9 pushed by harryob
August 25, 2023 17:19 2m 12s master
master
August 25, 2023 17:19 2m 12s
fancy lighting Check for merge conflicts #13883: Pull request #4229 synchronize by harryob
August 25, 2023 16:59 13s
August 25, 2023 16:59 13s
Zone de commandement général - 2 - Mapping CIC Rework / Part 2 Check for merge conflicts #13882: Pull request #4251 synchronize by LC4492
August 25, 2023 16:42 11s
August 25, 2023 16:42 11s
whispering should use the correct new icon Check for merge conflicts #13881: Pull request #4257 opened by harryob
August 25, 2023 16:29 12s
August 25, 2023 16:29 12s
fancy lighting Check for merge conflicts #13880: Pull request #4229 synchronize by morrowwolf
August 25, 2023 15:19 12s
August 25, 2023 15:19 12s
Telephones Networking (#4131) Check for merge conflicts #13879: Commit 869b543 pushed by github-merge-queue bot
August 25, 2023 15:11 4m 19s master
master
August 25, 2023 15:11 4m 19s
Helmet Visors/Optics and built-in HUDs (#4156) Check for merge conflicts #13878: Commit d0b549f pushed by github-merge-queue bot
August 25, 2023 14:03 4m 24s master
master
August 25, 2023 14:03 4m 24s
Royal Marines Commando Check for merge conflicts #13877: Pull request #4098 synchronize by morrowwolf
August 25, 2023 12:38 15s
August 25, 2023 12:38 15s
ProTip! You can narrow down the results and go further in time using created:<2023-08-25 or the other filters available.