Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
5,250 workflow run results
5,250 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Break Up Secure Storage LV-624 Check for merge conflicts #16462: Pull request #4767 synchronize by Steelpoint
November 16, 2023 16:33 35s
November 16, 2023 16:33 35s
Bigred Changes Part 2: Engineering And Reactor small touches (#4929) Check for merge conflicts #16461: Commit 1d900a0 pushed by github-merge-queue bot
November 16, 2023 16:31 2m 30s master
master
November 16, 2023 16:31 2m 30s
Adds Latejoin scaling to Vendors and ASRS Check for merge conflicts #16460: Pull request #4939 synchronize by fira
November 16, 2023 16:31 6m 22s
November 16, 2023 16:31 6m 22s
Adds Latejoin scaling to Vendors and ASRS Check for merge conflicts #16459: Pull request #4939 synchronize by fira
November 16, 2023 16:27 14s
November 16, 2023 16:27 14s
Adds Latejoin scaling to Vendors and ASRS Check for merge conflicts #16458: Pull request #4939 opened by fira
November 16, 2023 16:01 14s
November 16, 2023 16:01 14s
Add inactivity protection for mods Check for merge conflicts #16457: Pull request #4938 opened by fira
November 16, 2023 13:15 14s
November 16, 2023 13:15 14s
Fix ability to fulton revivable bodies (#4933) Check for merge conflicts #16456: Commit f5fd664 pushed by github-merge-queue bot
November 16, 2023 12:51 4m 18s master
master
November 16, 2023 12:51 4m 18s
Fixes propaganda posters in CL office (#4930) Check for merge conflicts #16455: Commit 03acf56 pushed by github-merge-queue bot
November 16, 2023 10:06 4m 21s master
master
November 16, 2023 10:06 4m 21s
Hivelord: single letter var (#4932) Check for merge conflicts #16454: Commit ad320a6 pushed by github-merge-queue bot
November 16, 2023 09:53 4m 18s master
master
November 16, 2023 09:53 4m 18s
Dropship weapons console TGUI Check for merge conflicts #16453: Pull request #4812 synchronize by mullenpaul
November 16, 2023 00:26 16s
November 16, 2023 00:26 16s
Cloaked lurker devouring now shows a message to target again Check for merge conflicts #16452: Pull request #4937 synchronize by ihatethisengine
November 15, 2023 22:53 13s
November 15, 2023 22:53 13s
Cloaked lurker devouring now shows a message to target again Check for merge conflicts #16451: Pull request #4937 synchronize by ihatethisengine
November 15, 2023 22:50 15s
November 15, 2023 22:50 15s
Cloaked lurker devouring now shows a message to target again Check for merge conflicts #16450: Pull request #4937 synchronize by ihatethisengine
November 15, 2023 22:39 11s
November 15, 2023 22:39 11s
Cloaked lurker devouring now shows a message to target again Check for merge conflicts #16449: Pull request #4937 synchronize by ihatethisengine
November 15, 2023 22:33 11s
November 15, 2023 22:33 11s
Cloaked lurker devouring now shows a message to target again Check for merge conflicts #16448: Pull request #4937 opened by ihatethisengine
November 15, 2023 22:27 15s
November 15, 2023 22:27 15s
/tg/ Status Effects Prelude D - Mob Freeze Refactor (#4878) Check for merge conflicts #16447: Commit 533e8ed pushed by github-merge-queue bot
November 15, 2023 21:32 4m 21s master
master
November 15, 2023 21:32 4m 21s
Fixes some Almayer Walls randomly changing icons when hit Check for merge conflicts #16446: Pull request #4936 opened by fira
November 15, 2023 20:42 14s
November 15, 2023 20:42 14s
Allow playing uploaded sounds through the music player w/ Webroot Check for merge conflicts #16445: Pull request #4934 synchronize by fira
November 15, 2023 17:03 13s
November 15, 2023 17:03 13s
Allow playing uploaded sounds through the music player w/ Webroot Check for merge conflicts #16444: Pull request #4934 synchronize by fira
November 15, 2023 16:46 16s
November 15, 2023 16:46 16s
New brig remap revive Check for merge conflicts #16443: Pull request #4931 synchronize by ItsVyzo
November 15, 2023 15:34 15s
November 15, 2023 15:34 15s
Dropship weapons console TGUI Check for merge conflicts #16442: Pull request #4812 synchronize by mullenpaul
November 15, 2023 01:31 2m 15s
November 15, 2023 01:31 2m 15s
Radio TGUI backend Tidy-up & Adds Listening Devices Check for merge conflicts #16441: Pull request #4866 synchronize by realforest2001
November 14, 2023 23:14 18s
November 14, 2023 23:14 18s
Radio TGUI backend Tidy-up & Adds Listening Devices Check for merge conflicts #16440: Pull request #4866 synchronize by realforest2001
November 14, 2023 23:11 11s
November 14, 2023 23:11 11s
Allow playing uploaded sounds through the music player w/ Webroot Check for merge conflicts #16439: Pull request #4934 opened by fira
November 14, 2023 22:52 1m 2s
November 14, 2023 22:52 1m 2s
Fix ability to fulton revivable bodies Check for merge conflicts #16438: Pull request #4933 opened by casperr04
November 14, 2023 22:49 13s
November 14, 2023 22:49 13s