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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fixes the wire cutter bug on the plants (#4259) Check for merge conflicts #13940: Commit a2ba537 pushed by github-merge-queue bot
August 27, 2023 10:08 4m 15s master
master
August 27, 2023 10:08 4m 15s
Fixes pointblanks (#4261) Check for merge conflicts #13939: Commit d8d712d pushed by github-merge-queue bot
August 27, 2023 09:53 4m 16s master
master
August 27, 2023 09:53 4m 16s
Fixes medbay door buttons (#4264) Check for merge conflicts #13938: Commit 3fd4dd5 pushed by github-merge-queue bot
August 27, 2023 09:39 4m 16s master
master
August 27, 2023 09:39 4m 16s
actually fixes m4ra custom barrel offset (#4265) Check for merge conflicts #13937: Commit 71afcf7 pushed by github-merge-queue bot
August 27, 2023 09:25 4m 19s master
master
August 27, 2023 09:25 4m 19s
fancy lighting Check for merge conflicts #13936: Pull request #4229 synchronize by harryob
August 27, 2023 08:39 15s
August 27, 2023 08:39 15s
Zone de commandement général - 2 - Mapping CIC Rework / Part 2 Check for merge conflicts #13935: Pull request #4251 synchronize by LC4492
August 27, 2023 01:13 2m 16s
August 27, 2023 01:13 2m 16s
whispering should use the correct new icon (#4257) Check for merge conflicts #13934: Commit b90ff08 pushed by github-merge-queue bot
August 26, 2023 23:23 4m 18s master
master
August 26, 2023 23:23 4m 18s
adds install steps for rustg to the autowiki.yml Check for merge conflicts #13933: Commit c64f86b pushed by harryob
August 26, 2023 20:47 2m 15s master
master
August 26, 2023 20:47 2m 15s
M707 "Vulture" Anti-Materiel Rifle Check for merge conflicts #13932: Pull request #4253 synchronize by Zonespace27
August 26, 2023 19:06 12s
August 26, 2023 19:06 12s
Khami Barrens Check for merge conflicts #13931: Pull request #4221 synchronize by Warfan1815
August 26, 2023 17:44 2m 8s
August 26, 2023 17:44 2m 8s
Khami Barrens Check for merge conflicts #13930: Pull request #4221 synchronize by Warfan1815
August 26, 2023 17:43 11s
August 26, 2023 17:43 11s
LV-624 Move Position of Hidden Floor Safe Check for merge conflicts #13929: Pull request #4269 opened by Steelpoint
August 26, 2023 17:39 12s
August 26, 2023 17:39 12s
3291 - Fixes the ability to manipulate a dummy from a distance using the tablet Check for merge conflicts #13928: Pull request #4268 opened by Xufysz
August 26, 2023 17:20 15s
August 26, 2023 17:20 15s
Zone de commandement général - 2 - Mapping CIC Rework / Part 2 Check for merge conflicts #13927: Pull request #4251 synchronize by LC4492
August 26, 2023 16:59 14s
August 26, 2023 16:59 14s
Zone de commandement général - 2 - Mapping CIC Rework / Part 2 Check for merge conflicts #13926: Pull request #4251 synchronize by LC4492
August 26, 2023 16:14 13s
August 26, 2023 16:14 13s
ERT Request QOL Check for merge conflicts #13925: Pull request #4267 synchronize by realforest2001
August 26, 2023 15:49 12s
August 26, 2023 15:49 12s
Zone de commandement général - 2 - Mapping CIC Rework / Part 2 Check for merge conflicts #13924: Pull request #4251 synchronize by LC4492
August 26, 2023 15:44 13s
August 26, 2023 15:44 13s
ERT Request QOL Check for merge conflicts #13923: Pull request #4267 opened by realforest2001
August 26, 2023 15:40 13s
August 26, 2023 15:40 13s
Khami Barrens Check for merge conflicts #13922: Pull request #4221 synchronize by Warfan1815
August 26, 2023 15:33 12s
August 26, 2023 15:33 12s
Khami Barrens Check for merge conflicts #13921: Pull request #4221 synchronize by Warfan1815
August 26, 2023 15:22 12s
August 26, 2023 15:22 12s
3324 - Fixes kitchen soda fountain being wrenchable Check for merge conflicts #13920: Pull request #4266 opened by Xufysz
August 26, 2023 13:33 14s
August 26, 2023 13:33 14s
actually fixes m4ra custom barrel offset Check for merge conflicts #13919: Pull request #4265 opened by CapCamIII
August 26, 2023 13:14 12s
August 26, 2023 13:14 12s
Fixes medbay door buttons Check for merge conflicts #13918: Pull request #4264 opened by morrowwolf
August 26, 2023 12:32 2m 14s
August 26, 2023 12:32 2m 14s
eyecheck fix (#4212) Check for merge conflicts #13917: Commit 72d4396 pushed by github-merge-queue bot
August 26, 2023 12:30 2m 13s master
master
August 26, 2023 12:30 2m 13s
fancy lighting Check for merge conflicts #13916: Pull request #4229 synchronize by morrowwolf
August 26, 2023 11:27 13s
August 26, 2023 11:27 13s