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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Cmo research qol Check for merge conflicts #13271: Pull request #4135 synchronize by SupernovaXTS
August 7, 2023 15:59 11s
August 7, 2023 15:59 11s
Cmo research qol Check for merge conflicts #13270: Pull request #4135 opened by SupernovaXTS
August 7, 2023 15:51 13s
August 7, 2023 15:51 13s
updating MP and warden vendors. adding handgun case. Check for merge conflicts #13269: Pull request #4007 synchronize by Huffie56
August 7, 2023 15:29 13s
August 7, 2023 15:29 13s
updating MP and warden vendors. adding handgun case. Check for merge conflicts #13268: Pull request #4007 synchronize by Huffie56
August 7, 2023 14:59 14s
August 7, 2023 14:59 14s
updating MP and warden vendors. adding handgun case. Check for merge conflicts #13267: Pull request #4007 synchronize by Huffie56
August 7, 2023 14:56 14s
August 7, 2023 14:56 14s
fix prevent belt flare being filled by dump in action leaving no space for flare gun. Check for merge conflicts #13266: Pull request #4110 ready_for_review by Huffie56
August 7, 2023 14:51 16s
August 7, 2023 14:51 16s
fix prevent belt flare being filled by dump in action leaving no space for flare gun. Check for merge conflicts #13265: Pull request #4110 synchronize by Huffie56
August 7, 2023 14:48 12s
August 7, 2023 14:48 12s
Auxiliary Support Officer (#4081) Check for merge conflicts #13264: Commit 583911a pushed by github-merge-queue bot
August 7, 2023 13:56 10m 32s master
master
August 7, 2023 13:56 10m 32s
Almayer: Dirty Up The Ship (Lower Deck) Check for merge conflicts #13263: Pull request #4089 ready_for_review by Steelpoint
August 7, 2023 13:07 12s
August 7, 2023 13:07 12s
Almayer: Dirty Up The Ship (Lower Deck) Check for merge conflicts #13262: Pull request #4089 synchronize by Steelpoint
August 7, 2023 13:05 17s
August 7, 2023 13:05 17s
Almayer: Dirty Up The Ship (Lower Deck) Check for merge conflicts #13261: Pull request #4089 synchronize by Steelpoint
August 7, 2023 12:55 17s
August 7, 2023 12:55 17s
gives UPP SL normal bag with some basic loudout Check for merge conflicts #13260: Pull request #4127 synchronize by cuberound
August 7, 2023 11:25 14s
August 7, 2023 11:25 14s
gives UPP SL normal bag with some basic loudout Check for merge conflicts #13259: Pull request #4127 synchronize by cuberound
August 7, 2023 11:21 12s
August 7, 2023 11:21 12s
CL Storage Room Change (#4118) Check for merge conflicts #13258: Commit 6c3cbb8 pushed by github-merge-queue bot
August 7, 2023 11:08 4m 16s master
master
August 7, 2023 11:08 4m 16s
CL Storage Room Change Check for merge conflicts #13257: Pull request #4118 synchronize by HeresKozmos
August 7, 2023 10:06 14s
August 7, 2023 10:06 14s
Fix Unnesting Mob Density Check for merge conflicts #13256: Pull request #4134 opened by Drulikar
August 7, 2023 09:41 14s
August 7, 2023 09:41 14s
Fix drop ships having inconsistent ceiling setting to prevent OBs Check for merge conflicts #13255: Pull request #4133 opened by Drulikar
August 7, 2023 08:55 15s
August 7, 2023 08:55 15s
Foxtrot cryomarines spawn as freed mobs if not taken Check for merge conflicts #13254: Pull request #4132 opened by ihatethisengine
August 7, 2023 08:09 14s
August 7, 2023 08:09 14s
Fix for synths' default language. (#4115) Check for merge conflicts #13253: Commit 5a5183d pushed by github-merge-queue bot
August 7, 2023 03:45 4m 16s master
master
August 7, 2023 03:45 4m 16s
Telephones Networking Check for merge conflicts #13252: Pull request #4131 synchronize by realforest2001
August 7, 2023 02:55 13s
August 7, 2023 02:55 13s
Telephones Networking Check for merge conflicts #13251: Pull request #4131 opened by realforest2001
August 7, 2023 02:37 17s
August 7, 2023 02:37 17s
Changes person cap on pod from hardcoded to var Check for merge conflicts #13250: Pull request #4130 opened by BeagleGaming1
August 7, 2023 02:20 12s
August 7, 2023 02:20 12s
Lights turn on at roundstart Check for merge conflicts #13249: Pull request #4129 synchronize by BeagleGaming1
August 7, 2023 02:15 1m 22s
August 7, 2023 02:15 1m 22s
Lights turn on at roundstart Check for merge conflicts #13248: Pull request #4129 opened by BeagleGaming1
August 7, 2023 02:14 2m 13s
August 7, 2023 02:14 2m 13s
fix: snowing inside walls on Sorokyne Strata map. (#4088) Check for merge conflicts #13247: Commit adf591e pushed by github-merge-queue bot
August 7, 2023 01:11 4m 19s master
master
August 7, 2023 01:11 4m 19s