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,303 workflow run results
1,303 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Crashed UPP Survivors Insert Tweaks Check for merge conflicts #13965: Pull request #4123 synchronize by Steelpoint
August 28, 2023 04:11 14s
August 28, 2023 04:11 14s
IO/FTL Can Buy Welding Visor + M12 Helm Holds 2 Visors Check for merge conflicts #13964: Pull request #4263 ready_for_review by Steelpoint
August 28, 2023 04:03 14s
August 28, 2023 04:03 14s
IO/FTL Can Buy Welding Visor + M12 Helm Holds 2 Visors Check for merge conflicts #13963: Pull request #4263 synchronize by Steelpoint
August 28, 2023 04:02 14s
August 28, 2023 04:02 14s
Fixes camera console not closing if you move away Check for merge conflicts #13962: Pull request #4276 opened by MikeKuwait
August 28, 2023 01:23 18s
August 28, 2023 01:23 18s
Zone de commandement général - 2 - Mapping CIC Rework / Part 2 Check for merge conflicts #13961: Pull request #4251 synchronize by LC4492
August 27, 2023 22:22 15s
August 27, 2023 22:22 15s
Add flanking possiblities to the lifeboat by adding two clamp with doors on each exterior side. Check for merge conflicts #13960: Pull request #4274 synchronize by Huffie56
August 27, 2023 18:51 18s
August 27, 2023 18:51 18s
Add flanking possiblities to the lifeboat by adding two clamp with doors on each exterior side. Check for merge conflicts #13959: Pull request #4274 synchronize by Huffie56
August 27, 2023 18:44 13s
August 27, 2023 18:44 13s
Antag Accesses Fix Check for merge conflicts #13958: Pull request #4275 opened by realforest2001
August 27, 2023 17:30 13s
August 27, 2023 17:30 13s
M707 "Vulture" Anti-Materiel Rifle Check for merge conflicts #13957: Pull request #4253 synchronize by Zonespace27
August 27, 2023 16:39 14s
August 27, 2023 16:39 14s
Zone de commandement général - 2 - Mapping CIC Rework / Part 2 Check for merge conflicts #13956: Pull request #4251 synchronize by LC4492
August 27, 2023 16:16 28s
August 27, 2023 16:16 28s
Zone de commandement général - 2 - Mapping CIC Rework / Part 2 Check for merge conflicts #13955: Pull request #4251 synchronize by LC4492
August 27, 2023 16:15 13s
August 27, 2023 16:15 13s
M707 "Vulture" Anti-Materiel Rifle Check for merge conflicts #13954: Pull request #4253 synchronize by Zonespace27
August 27, 2023 16:03 16s
August 27, 2023 16:03 16s
Add flanking possiblities to the lifeboat by adding two clamp with doors on each exterior side. Check for merge conflicts #13953: Pull request #4274 ready_for_review by Huffie56
August 27, 2023 15:05 21s
August 27, 2023 15:05 21s
Add flanking possiblities to the lifeboat by adding two clamp with doors on each exterior side. Check for merge conflicts #13952: Pull request #4274 synchronize by Huffie56
August 27, 2023 15:02 10s
August 27, 2023 15:02 10s
LV-624 Move Position of Hidden Floor Safe Check for merge conflicts #13951: Pull request #4269 synchronize by Steelpoint
August 27, 2023 14:48 10s
August 27, 2023 14:48 10s
Add flanking possiblities to the lifeboat by adding two clamp with doors on each exterior side. Check for merge conflicts #13950: Pull request #4274 opened by Huffie56
August 27, 2023 13:29 16s
August 27, 2023 13:29 16s
IO/FTL Can Buy Welding Visor + M12 Helm Holds 2 Visors Check for merge conflicts #13949: Pull request #4263 synchronize by Steelpoint
August 27, 2023 12:54 12s
August 27, 2023 12:54 12s
Added 3 to hypospray transfer amount option Check for merge conflicts #13948: Pull request #4272 opened by morrowwolf
August 27, 2023 11:23 12s
August 27, 2023 11:23 12s
ERT Request QOL (#4267) Check for merge conflicts #13947: Commit 680b63c pushed by github-merge-queue bot
August 27, 2023 11:05 2m 35s master
master
August 27, 2023 11:05 2m 35s
fix teleporting canister pouch to chemical dispenser (#4258) Check for merge conflicts #13946: Commit 093bae5 pushed by github-merge-queue bot
August 27, 2023 10:43 5m 12s master
master
August 27, 2023 10:43 5m 12s
3291 - Fixes the ability to manipulate a dummy from a distance using the tablet Check for merge conflicts #13945: Pull request #4268 synchronize by Xufysz
August 27, 2023 10:40 3m 19s
August 27, 2023 10:40 3m 19s
3291 - Fixes the ability to manipulate a dummy from a distance using the tablet Check for merge conflicts #13944: Pull request #4268 ready_for_review by Xufysz
August 27, 2023 10:40 3m 35s
August 27, 2023 10:40 3m 35s
3291 - Fixes the ability to manipulate a dummy from a distance using the tablet Check for merge conflicts #13943: Pull request #4268 synchronize by Xufysz
August 27, 2023 10:23 2m 15s
August 27, 2023 10:23 2m 15s
3324 - Fixes kitchen soda fountain being wrenchable (#4266) Check for merge conflicts #13942: Commit 2c71ad4 pushed by github-merge-queue bot
August 27, 2023 10:22 2m 13s master
master
August 27, 2023 10:22 2m 13s
3291 - Fixes the ability to manipulate a dummy from a distance using the tablet Check for merge conflicts #13941: Pull request #4268 synchronize by Xufysz
August 27, 2023 10:20 11s
August 27, 2023 10:20 11s