Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
7,305 workflow run results
7,305 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Seperating every port and starboard hallway areas into three areas ea… Check for merge conflicts #19916: Commit 530b749 pushed by github-merge-queue bot
February 22, 2024 13:46 4m 17s master
master
February 22, 2024 13:46 4m 17s
Increase repeated weed expansion delay for the same tile (#5772) Check for merge conflicts #19915: Commit 7dbf26c pushed by github-merge-queue bot
February 22, 2024 13:32 4m 15s master
master
February 22, 2024 13:32 4m 15s
MOPP Desc tism Check for merge conflicts #19914: Pull request #5782 opened by TopHatPenguin
February 22, 2024 12:52 12s
February 22, 2024 12:52 12s
TGUI input list search fix (#5775) Check for merge conflicts #19913: Commit d72106f pushed by github-merge-queue bot
February 22, 2024 10:25 4m 17s master
master
February 22, 2024 10:25 4m 17s
Fixes xeno tacklestrength (#5773) Check for merge conflicts #19912: Commit 1675e4e pushed by github-merge-queue bot
February 22, 2024 10:14 4m 16s master
master
February 22, 2024 10:14 4m 16s
Abomination rework and predator plasma rifle buff. (#5432) Check for merge conflicts #19911: Commit dc412e4 pushed by github-merge-queue bot
February 22, 2024 09:26 4m 15s master
master
February 22, 2024 09:26 4m 15s
Tactical Compact Nailgun Check for merge conflicts #19910: Pull request #5746 ready_for_review by MobiusWon
February 22, 2024 02:07 13s
February 22, 2024 02:07 13s
Tactical Compact Nailgun Check for merge conflicts #19909: Pull request #5746 synchronize by MobiusWon
February 22, 2024 01:18 2m 12s
February 22, 2024 01:18 2m 12s
Tactical Compact Nailgun Check for merge conflicts #19908: Pull request #5746 synchronize by MobiusWon
February 22, 2024 00:47 12s
February 22, 2024 00:47 12s
Tactical Compact Nailgun Check for merge conflicts #19907: Pull request #5746 synchronize by MobiusWon
February 21, 2024 23:29 10s
February 21, 2024 23:29 10s
Spawn verb no longer DDOSes the server/user when called with nothing Check for merge conflicts #19906: Pull request #5781 opened by PhantomEpicness
February 21, 2024 23:09 11s
February 21, 2024 23:09 11s
Réorganisation des Pilotes et assistants Check for merge conflicts #19905: Pull request #5619 synchronize by LC4492
February 21, 2024 22:49 11s
February 21, 2024 22:49 11s
Closets now dense themselves based on pixel offset when being reclosed Check for merge conflicts #19904: Pull request #5780 opened by PhantomEpicness
February 21, 2024 22:26 12s
February 21, 2024 22:26 12s
makes marking more effective for admins Check for merge conflicts #19903: Pull request #5779 opened by harryob
February 21, 2024 21:18 14s
February 21, 2024 21:18 14s
Gun action (and equip) buttons refactor (#5750) Check for merge conflicts #19902: Commit 06eebf0 pushed by github-merge-queue bot
February 21, 2024 20:48 4m 55s master
master
February 21, 2024 20:48 4m 55s
Fix CMB ERT & Path Based ERT Calling (#5755) Check for merge conflicts #19901: Commit c15e764 pushed by github-merge-queue bot
February 21, 2024 20:34 4m 16s master
master
February 21, 2024 20:34 4m 16s
Ports Mapping Backend updates Check for merge conflicts #19900: Pull request #5165 synchronize by harryob
February 21, 2024 20:20 13s
February 21, 2024 20:20 13s
Ports Mapping Backend updates Check for merge conflicts #19899: Pull request #5165 ready_for_review by harryob
February 21, 2024 19:33 1m 34s
February 21, 2024 19:33 1m 34s
Ports Mapping Backend updates Check for merge conflicts #19898: Pull request #5165 synchronize by harryob
February 21, 2024 19:31 16s
February 21, 2024 19:31 16s
Ports Mapping Backend updates Check for merge conflicts #19897: Pull request #5165 synchronize by harryob
February 21, 2024 19:30 13s
February 21, 2024 19:30 13s
Ports Mapping Backend updates Check for merge conflicts #19896: Pull request #5165 reopened by harryob
February 21, 2024 19:30 11s
February 21, 2024 19:30 11s
Dropship turf direction sprites Check for merge conflicts #19895: Pull request #3642 ready_for_review by mullenpaul
February 21, 2024 19:27 1m 46s
February 21, 2024 19:27 1m 46s
Dropship turf direction sprites Check for merge conflicts #19894: Pull request #3642 synchronize by mullenpaul
February 21, 2024 19:26 13s
February 21, 2024 19:26 13s
Fix burrower lifeboat tunneling Check for merge conflicts #19893: Pull request #5778 opened by Drulikar
February 21, 2024 17:20 11s
February 21, 2024 17:20 11s
[WORK IN PROGRESS] Drone tier three [reaper is a placeholder name] Check for merge conflicts #19892: Pull request #5776 synchronize by Red-byte3D
February 21, 2024 16:41 10s
February 21, 2024 16:41 10s