Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
12,412 workflow run results
12,412 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Attachments resprite Check for merge conflicts #25073: Pull request #6808 opened by Blundir
July 28, 2024 01:40 16s
July 28, 2024 01:40 16s
stops people from buckling others when they shouldn't be able to Check for merge conflicts #25072: Pull request #6807 synchronize by zzzmike
July 28, 2024 00:45 10s
July 28, 2024 00:45 10s
Hold my Beer (Fix of hi intellligent data lookup in TGUI Who/Staff Who Check for merge conflicts #25071: Pull request #6786 synchronize by blackcrystall
July 27, 2024 22:43 9s
July 27, 2024 22:43 9s
Hold my Beer (Fix of hi intellligent data lookup in TGUI Who/Staff Who Check for merge conflicts #25070: Pull request #6786 synchronize by blackcrystall
July 27, 2024 22:43 10s
July 27, 2024 22:43 10s
Hold my Beer (Fix of hi intellligent data lookup in TGUI Who/Staff Who Check for merge conflicts #25069: Pull request #6786 ready_for_review by blackcrystall
July 27, 2024 22:41 22s
July 27, 2024 22:41 22s
Hold my Beer (Fix of hi intellligent data lookup in TGUI Who/Staff Who Check for merge conflicts #25068: Pull request #6786 synchronize by blackcrystall
July 27, 2024 22:40 18s
July 27, 2024 22:40 18s
Hold my Beer (Fix of hi intellligent data lookup in TGUI Who/Staff Who Check for merge conflicts #25067: Pull request #6786 synchronize by blackcrystall
July 27, 2024 22:40 28s
July 27, 2024 22:40 28s
Hold my Beer (Fix of hi intellligent data lookup in TGUI Who/Staff Who Check for merge conflicts #25066: Pull request #6786 synchronize by blackcrystall
July 27, 2024 22:39 9s
July 27, 2024 22:39 9s
Make Clusters spread hive weeds on Semi-Weedable surfaces. Check for merge conflicts #25065: Pull request #6616 ready_for_review by Venuska1117
July 27, 2024 22:39 14s
July 27, 2024 22:39 14s
Hold my Beer (Fix of hi intellligent data lookup in TGUI Who/Staff Who Check for merge conflicts #25064: Pull request #6786 synchronize by blackcrystall
July 27, 2024 22:34 12s
July 27, 2024 22:34 12s
cannot join as certain ERTs if you dont have enough relavent playtime. Check for merge conflicts #25063: Pull request #6764 ready_for_review by kiVts
July 27, 2024 22:20 40s
July 27, 2024 22:20 40s
cannot join as certain ERTs if you dont have enough relavent playtime. Check for merge conflicts #25062: Pull request #6764 synchronize by kiVts
July 27, 2024 22:20 12s
July 27, 2024 22:20 12s
Phone sounds update Check for merge conflicts #25061: Pull request #6789 synchronize by Blundir
July 27, 2024 21:43 9s
July 27, 2024 21:43 9s
stops people from buckling others when they shouldn't be able to Check for merge conflicts #25060: Pull request #6807 synchronize by zzzmike
July 27, 2024 20:21 10s
July 27, 2024 20:21 10s
stops people from buckling others when they shouldn't be able to Check for merge conflicts #25059: Pull request #6807 opened by zzzmike
July 27, 2024 20:19 13s
July 27, 2024 20:19 13s
Drone Evolution T3: The Reaper Rehaul, Pseudo-Angelic and Necromancer-esque + Other Changes Check for merge conflicts #25058: Pull request #6610 synchronize by TheKillfish
July 27, 2024 19:36 9s
July 27, 2024 19:36 9s
XM-CL ANCW: Caustic Armor for research Check for merge conflicts #25057: Pull request #6592 synchronize by TheManWithNoHands
July 27, 2024 15:08 11s
July 27, 2024 15:08 11s
new male scream Check for merge conflicts #25056: Pull request #6806 opened by halworsen
July 27, 2024 14:19 10s
July 27, 2024 14:19 10s
Make Clusters spread hive weeds on Semi-Weedable surfaces. Check for merge conflicts #25054: Pull request #6616 synchronize by Drulikar
July 27, 2024 13:42 10s
July 27, 2024 13:42 10s
Make Clusters spread hive weeds on Semi-Weedable surfaces. Check for merge conflicts #25055: Pull request #6616 reopened by Drulikar
July 27, 2024 13:42 11s
July 27, 2024 13:42 11s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #25053: Pull request #6248 synchronize by Drulikar
July 27, 2024 12:19 15s
July 27, 2024 12:19 15s
Automatic TGS DMAPI Update (#6787) Check for merge conflicts #25052: Commit caebc4d pushed by harryob
July 27, 2024 10:02 2m 16s master
master
July 27, 2024 10:02 2m 16s
Brig Detainment Cameras now have their own Console Check for merge conflicts #25051: Pull request #6762 synchronize by efzapa
July 27, 2024 03:44 8s
July 27, 2024 03:44 8s
Makes it so Burrower cannot use Burrow or Tunnel when on the Almayer Check for merge conflicts #25050: Pull request #6805 opened by efzapa
July 27, 2024 02:24 2m 15s
July 27, 2024 02:24 2m 15s
Resprite of old guns Check for merge conflicts #25049: Pull request #6804 ready_for_review by Blundir
July 26, 2024 17:49 9s
July 26, 2024 17:49 9s