Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
8,551 workflow run results
8,551 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fixes queen not being able to spawn Check for merge conflicts #21230: Pull request #6077 ready_for_review by vero5123
April 4, 2024 17:34 13s
April 4, 2024 17:34 13s
Fixes queen not being able to spawn Check for merge conflicts #21229: Pull request #6077 synchronize by vero5123
April 4, 2024 17:27 10s
April 4, 2024 17:27 10s
Fixes queen not being able to spawn Check for merge conflicts #21228: Pull request #6077 synchronize by vero5123
April 4, 2024 17:21 12s
April 4, 2024 17:21 12s
update to specialist vendor. Check for merge conflicts #21227: Pull request #6076 ready_for_review by Huffie56
April 4, 2024 16:58 15s
April 4, 2024 16:58 15s
NVO no longer can be used with binoculars/optics (#5983) Check for merge conflicts #21226: Commit f96f331 pushed by github-merge-queue bot
April 4, 2024 16:31 4m 19s master
master
April 4, 2024 16:31 4m 19s
Fixes xenos ability to use corrosive acid after death (#6069) Check for merge conflicts #21225: Commit 505a9ab pushed by github-merge-queue bot
April 4, 2024 15:59 4m 23s master
master
April 4, 2024 15:59 4m 23s
Makes acid spray extinguish more consistent (#6053) Check for merge conflicts #21224: Commit 149d4a0 pushed by github-merge-queue bot
April 4, 2024 15:51 4m 17s master
master
April 4, 2024 15:51 4m 17s
Fixes queen not being able to spawn Check for merge conflicts #21223: Pull request #6077 ready_for_review by vero5123
April 4, 2024 15:50 14s
April 4, 2024 15:50 14s
Fix inconsistent number ranges for EFTPOS pin & access code (#6050) Check for merge conflicts #21222: Commit d3ebdee pushed by github-merge-queue bot
April 4, 2024 15:38 4m 16s master
master
April 4, 2024 15:38 4m 16s
Low effort broadcasting Check for merge conflicts #21221: Pull request #6078 synchronize by ihatethisengine
April 4, 2024 13:18 13s
April 4, 2024 13:18 13s
NVO no longer can be used with binoculars/optics Check for merge conflicts #21220: Pull request #5983 ready_for_review by ihatethisengine
April 4, 2024 12:31 13s
April 4, 2024 12:31 13s
NVO no longer can be used with binoculars/optics Check for merge conflicts #21219: Pull request #5983 synchronize by ihatethisengine
April 4, 2024 12:26 12s
April 4, 2024 12:26 12s
NVO no longer can be used with binoculars/optics Check for merge conflicts #21218: Pull request #5983 synchronize by ihatethisengine
April 4, 2024 12:19 11s
April 4, 2024 12:19 11s
(WIP) Yautja Weapon Gimmicks, Round Two Check for merge conflicts #21217: Pull request #5392 synchronize by realforest2001
April 4, 2024 11:57 13s
April 4, 2024 11:57 13s
Low effort broadcasting Check for merge conflicts #21216: Pull request #6078 synchronize by ihatethisengine
April 4, 2024 11:34 1m 54s
April 4, 2024 11:34 1m 54s
shoulderholster storage increase, small pistol magazine pouch can also hold pistol Check for merge conflicts #21215: Pull request #6081 opened by cuberound
April 4, 2024 11:32 1m 9s
April 4, 2024 11:32 1m 9s
[V] Sorokyne Strata: Expanded Small corridors, removed 3000 unused tiles, Xenos can now weed everything except LZ's and surrounding of LZ's, allow LAZ for CAS inside structures with light blue Areas on Tacmap (glass ceiling hallways) Check for merge conflicts #21214: Pull request #6071 synchronize by Venuska1117
April 4, 2024 11:26 12s
April 4, 2024 11:26 12s
Low effort broadcasting Check for merge conflicts #21213: Pull request #6078 synchronize by ihatethisengine
April 4, 2024 11:08 15s
April 4, 2024 11:08 15s
Flare Uncreepening Check for merge conflicts #21212: Pull request #6080 opened by MaximusRexCM
April 4, 2024 07:07 14s
April 4, 2024 07:07 14s
Fixes queen not being able to spawn Check for merge conflicts #21211: Pull request #6077 synchronize by vero5123
April 4, 2024 03:17 14s
April 4, 2024 03:17 14s
M540-B Armored Recon Carrier Check for merge conflicts #21210: Pull request #5401 synchronize by Zonespace27
April 4, 2024 01:37 2m 16s
April 4, 2024 01:37 2m 16s
M540-B Armored Recon Carrier Check for merge conflicts #21209: Pull request #5401 synchronize by Zonespace27
April 3, 2024 23:01 11s
April 3, 2024 23:01 11s
M540-B Armored Recon Carrier Check for merge conflicts #21208: Pull request #5401 synchronize by Zonespace27
April 3, 2024 22:48 11s
April 3, 2024 22:48 11s
Low effort broadcasting Check for merge conflicts #21207: Pull request #6078 opened by ihatethisengine
April 3, 2024 22:10 11s
April 3, 2024 22:10 11s
Fixes queen not being able to spawn Check for merge conflicts #21206: Pull request #6077 synchronize by vero5123
April 3, 2024 20:59 19s
April 3, 2024 20:59 19s