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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fix plushie/fountain pen/family photo pickup runtime (#4970) Check for merge conflicts #16679: Commit b49be8b pushed by github-merge-queue bot
November 21, 2023 22:33 10m 45s master
master
November 21, 2023 22:33 10m 45s
Location name standardization Check for merge conflicts #16678: Pull request #4980 synchronize by zzzmike
November 21, 2023 22:29 2m 22s
November 21, 2023 22:29 2m 22s
Location name standardization Check for merge conflicts #16677: Pull request #4980 synchronize by zzzmike
November 21, 2023 22:28 3m 9s
November 21, 2023 22:28 3m 9s
The return of the extra van sprites Check for merge conflicts #16676: Pull request #4993 synchronize by silencer-pl
November 21, 2023 22:24 5m 39s
November 21, 2023 22:24 5m 39s
Fix stack split & flamer fire runtime (#4965) Check for merge conflicts #16675: Commit 3eb9786 pushed by github-merge-queue bot
November 21, 2023 22:23 8m 20s master
master
November 21, 2023 22:23 8m 20s
Fix handswap runtime (#4967) Check for merge conflicts #16674: Commit ba6cb19 pushed by github-merge-queue bot
November 21, 2023 22:15 10m 24s master
master
November 21, 2023 22:15 10m 24s
Fix crate unpacking runtime (#4968) Check for merge conflicts #16673: Commit 5aadcee pushed by github-merge-queue bot
November 21, 2023 22:07 2m 17s master
master
November 21, 2023 22:07 2m 17s
Nullchecks client in tooltips (#4969) Check for merge conflicts #16672: Commit d6b0de8 pushed by github-merge-queue bot
November 21, 2023 21:55 8m 21s master
master
November 21, 2023 21:55 8m 21s
The return of the extra van sprites Check for merge conflicts #16671: Pull request #4993 synchronize by silencer-pl
November 21, 2023 21:50 3m 43s
November 21, 2023 21:50 3m 43s
The return of the extra van sprites Check for merge conflicts #16670: Pull request #4993 opened by silencer-pl
November 21, 2023 21:49 34s
November 21, 2023 21:49 34s
ports the tg profiler subsystem (#4793) Check for merge conflicts #16669: Commit 5ba86a0 pushed by github-merge-queue bot
November 21, 2023 21:39 10m 21s master
master
November 21, 2023 21:39 10m 21s
Mess tech scaling (#4983) Check for merge conflicts #16668: Commit c0caa87 pushed by github-merge-queue bot
November 21, 2023 21:12 4m 53s master
master
November 21, 2023 21:12 4m 53s
ports the tg profiler subsystem Check for merge conflicts #16667: Pull request #4793 reopened by fira
November 21, 2023 21:12 10s
November 21, 2023 21:12 10s
Adds external webbing vest to the IO's vendor as an alternative to the service jacket Check for merge conflicts #16666: Pull request #4963 synchronize by kirieee
November 21, 2023 20:54 11s
November 21, 2023 20:54 11s
/tg/ Status effects part 1 - fluid status updates Check for merge conflicts #16665: Pull request #4828 synchronize by fira
November 21, 2023 20:53 14s
November 21, 2023 20:53 14s
Refactors Xeno name generation and set hive and update Check for merge conflicts #16664: Pull request #4992 synchronize by Birdtalon
November 21, 2023 19:28 3m 18s
November 21, 2023 19:28 3m 18s
Refactors Xenomorph initialize Check for merge conflicts #16663: Pull request #4991 synchronize by Birdtalon
November 21, 2023 19:27 2m 44s
November 21, 2023 19:27 2m 44s
Research fire chemicals buff Check for merge conflicts #16662: Pull request #4982 synchronize by SubjectD9341
November 21, 2023 19:26 10s
November 21, 2023 19:26 10s
Refactors Xenomorph initialize Check for merge conflicts #16661: Pull request #4991 synchronize by Birdtalon
November 21, 2023 19:23 11s
November 21, 2023 19:23 11s
Bureau du commandant - CO office Check for merge conflicts #16660: Pull request #4827 ready_for_review by LC4492
November 21, 2023 19:17 10s
November 21, 2023 19:17 10s
More lifeboat launch options Check for merge conflicts #16659: Pull request #4976 ready_for_review by zzzmike
November 21, 2023 19:09 54s
November 21, 2023 19:09 54s
Bureau du commandant - CO office Check for merge conflicts #16658: Pull request #4827 synchronize by LC4492
November 21, 2023 19:06 15s
November 21, 2023 19:06 15s
Refactors Xeno name generation and set hive and update Check for merge conflicts #16657: Pull request #4992 opened by Birdtalon
November 21, 2023 19:03 9s
November 21, 2023 19:03 9s
More lifeboat launch options Check for merge conflicts #16656: Pull request #4976 synchronize by zzzmike
November 21, 2023 18:55 23s
November 21, 2023 18:55 23s
More lifeboat launch options Check for merge conflicts #16655: Pull request #4976 synchronize by zzzmike
November 21, 2023 18:54 13s
November 21, 2023 18:54 13s