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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fixes the 88 Mod 4's holster sprite Check for merge conflicts #19926: Pull request #5785 opened by SabreML
February 22, 2024 21:34 1m 26s
February 22, 2024 21:34 1m 26s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #19925: Pull request #5784 synchronize by GrrrKitten
February 22, 2024 21:29 9s
February 22, 2024 21:29 9s
Relay Ping Browser Check for merge conflicts #19924: Pull request #5777 synchronize by Drulikar
February 22, 2024 21:11 12s
February 22, 2024 21:11 12s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #19923: Pull request #5784 opened by GrrrKitten
February 22, 2024 20:49 12s
February 22, 2024 20:49 12s
Map: Bigred change south lambda padlock and turned it into a checkpoint. Check for merge conflicts #19922: Pull request #5763 ready_for_review by Huffie56
February 22, 2024 19:11 14s
February 22, 2024 19:11 14s
adding vendors for maintenance technician Check for merge conflicts #19921: Pull request #5749 ready_for_review by Huffie56
February 22, 2024 19:10 12s
February 22, 2024 19:10 12s
adding vendors for maintenance technician Check for merge conflicts #19920: Pull request #5749 synchronize by Huffie56
February 22, 2024 17:44 12s
February 22, 2024 17:44 12s
Map: Bigred change south lambda padlock and turned it into a checkpoint. Check for merge conflicts #19919: Pull request #5763 synchronize by Huffie56
February 22, 2024 17:41 11s
February 22, 2024 17:41 11s
Fix burrower lifeboat tunneling (#5778) Check for merge conflicts #19918: Commit 46c9c2b pushed by github-merge-queue bot
February 22, 2024 16:09 4m 18s master
master
February 22, 2024 16:09 4m 18s
Ports Mapping Backend updates (#5165) Check for merge conflicts #19917: Commit a3626a6 pushed by github-merge-queue bot
February 22, 2024 15:55 4m 14s master
master
February 22, 2024 15:55 4m 14s
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