Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
4,168 workflow run results
4,168 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

New brig remap revive Check for merge conflicts #16754: Pull request #4931 ready_for_review by ItsVyzo
November 23, 2023 02:38 14s
November 23, 2023 02:38 14s
New brig remap revive Check for merge conflicts #16753: Pull request #4931 synchronize by ItsVyzo
November 23, 2023 02:38 12s
November 23, 2023 02:38 12s
Fixes Burst Corporate Supervisor landmark Check for merge conflicts #16752: Pull request #5012 opened by BadAtThisGame302
November 23, 2023 01:45 2m 23s
November 23, 2023 01:45 2m 23s
New brig remap revive Check for merge conflicts #16751: Pull request #4931 synchronize by ItsVyzo
November 23, 2023 00:58 11s
November 23, 2023 00:58 11s
New brig remap revive Check for merge conflicts #16750: Pull request #4931 ready_for_review by ItsVyzo
November 23, 2023 00:57 9s
November 23, 2023 00:57 9s
LV624 Fog Removal + River Change V2 Check for merge conflicts #16749: Pull request #4997 synchronize by Steelpoint
November 23, 2023 00:53 14s
November 23, 2023 00:53 14s
Synthetic internal powercell (#4559) Check for merge conflicts #16748: Commit 170f3cd pushed by github-merge-queue bot
November 22, 2023 23:57 4m 16s master
master
November 22, 2023 23:57 4m 16s
Dropship weapons console TGUI Check for merge conflicts #16747: Pull request #4812 synchronize by mullenpaul
November 22, 2023 23:41 10s
November 22, 2023 23:41 10s
Système d'énergie de commandement - 1 Check for merge conflicts #16746: Pull request #5011 synchronize by LC4492
November 22, 2023 23:22 2m 0s
November 22, 2023 23:22 2m 0s
Système d'énergie de commandement - 1 Check for merge conflicts #16745: Pull request #5011 synchronize by LC4492
November 22, 2023 23:21 1m 50s
November 22, 2023 23:21 1m 50s
Système d'énergie de commandement - 1 Check for merge conflicts #16744: Pull request #5011 synchronize by LC4492
November 22, 2023 23:20 2m 28s
November 22, 2023 23:20 2m 28s
Fixes runtime with fire extinguisher cabinets on lifeboats Check for merge conflicts #16743: Pull request #5009 synchronize by Birdtalon
November 22, 2023 23:19 10s
November 22, 2023 23:19 10s
Système d'énergie de commandement - 1 Check for merge conflicts #16742: Pull request #5011 opened by LC4492
November 22, 2023 23:18 12s
November 22, 2023 23:18 12s
Allow playing uploaded sounds through the music player w/ Webroot (#4… Check for merge conflicts #16741: Commit 15086ae pushed by github-merge-queue bot
November 22, 2023 22:32 4m 24s master
master
November 22, 2023 22:32 4m 24s
check_grep.sh part ??: adds all global vars to the global controller Check for merge conflicts #16740: Pull request #4940 synchronize by harryob
November 22, 2023 22:11 13s
November 22, 2023 22:11 13s
More readable colour for the 'Maintainer' section in staffwho Check for merge conflicts #16739: Pull request #5010 opened by SabreML
November 22, 2023 22:06 13s
November 22, 2023 22:06 13s
Differentiates pylons in same area when spawning as lesser drone (#4985) Check for merge conflicts #16738: Commit 1230191 pushed by github-merge-queue bot
November 22, 2023 21:49 4m 20s master
master
November 22, 2023 21:49 4m 20s
Adds explosion handling to experimental sensor tower (#4984) Check for merge conflicts #16737: Commit 81f55a3 pushed by github-merge-queue bot
November 22, 2023 21:36 4m 20s master
master
November 22, 2023 21:36 4m 20s
Lesser drones now die upon ghosting (#4978) Check for merge conflicts #16736: Commit 148a189 pushed by github-merge-queue bot
November 22, 2023 21:19 4m 16s master
master
November 22, 2023 21:19 4m 16s
/tg/ Status effects part 1 - fluid status updates Check for merge conflicts #16735: Pull request #4828 synchronize by fira
November 22, 2023 21:08 7m 2s
November 22, 2023 21:08 7m 2s
Location name standardization (#4980) Check for merge conflicts #16734: Commit b28e9e5 pushed by github-merge-queue bot
November 22, 2023 21:01 2m 16s master
master
November 22, 2023 21:01 2m 16s
Project ARES TM Holder (v4) Check for merge conflicts #16733: Pull request #5007 synchronize by realforest2001
November 22, 2023 20:57 10s
November 22, 2023 20:57 10s
Oppressor XvX nerf (#4981) Check for merge conflicts #16732: Commit 7e7db48 pushed by github-merge-queue bot
November 22, 2023 20:48 4m 18s master
master
November 22, 2023 20:48 4m 18s
Fix buried larva spawn grace period at start of round (#4988) Check for merge conflicts #16731: Commit fa3745b pushed by github-merge-queue bot
November 22, 2023 20:35 4m 20s master
master
November 22, 2023 20:35 4m 20s
Fix resin doors not closing on mob/living if they are merged with wee… Check for merge conflicts #16730: Commit c2aeb60 pushed by github-merge-queue bot
November 22, 2023 20:18 2m 16s master
master
November 22, 2023 20:18 2m 16s