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

Fixes runtime with fire extinguisher cabinets on lifeboats Check for merge conflicts #16729: Pull request #5009 opened by Birdtalon
November 22, 2023 20:11 3m 9s
November 22, 2023 20:11 3m 9s
Clarity on hijack announcements (#4989) Check for merge conflicts #16728: Commit 2dfbb94 pushed by github-merge-queue bot
November 22, 2023 19:55 15m 0s master
master
November 22, 2023 19:55 15m 0s
Dropship sidedoors Check for merge conflicts #16727: Pull request #4995 synchronize by Doubleumc
November 22, 2023 19:51 3m 24s
November 22, 2023 19:51 3m 24s
Dropship sidedoors Check for merge conflicts #16726: Pull request #4995 synchronize by Doubleumc
November 22, 2023 19:50 4m 20s
November 22, 2023 19:50 4m 20s
Phone QOL - Last Caller ID Check for merge conflicts #16725: Pull request #5008 opened by realforest2001
November 22, 2023 19:41 3m 51s
November 22, 2023 19:41 3m 51s
Match Unlock Time in Nuke Timelock Message with Nuke Techtree Descrip… Check for merge conflicts #16724: Commit fa6ee9c pushed by github-merge-queue bot
November 22, 2023 19:38 4m 20s master
master
November 22, 2023 19:38 4m 20s
Radio TGUI backend Tidy-up & Adds Listening Devices Check for merge conflicts #16723: Pull request #4866 synchronize by realforest2001
November 22, 2023 19:24 8m 27s
November 22, 2023 19:24 8m 27s
Makes Thunderdome Floor Explosion-Proof (#4994) Check for merge conflicts #16722: Commit cbfb9f3 pushed by github-merge-queue bot
November 22, 2023 19:23 8m 20s master
master
November 22, 2023 19:23 8m 20s
Project ARES TM Holder (v4) Check for merge conflicts #16721: Pull request #5007 opened by realforest2001
November 22, 2023 19:05 45s
November 22, 2023 19:05 45s
Project ARES: Admin Console Check for merge conflicts #16720: Pull request #4182 synchronize by realforest2001
November 22, 2023 19:04 10s
November 22, 2023 19:04 10s
Project ARES: Admin Console Check for merge conflicts #16719: Pull request #4182 synchronize by realforest2001
November 22, 2023 18:58 15s
November 22, 2023 18:58 15s
Project ARES: Admin Console Check for merge conflicts #16718: Pull request #4182 reopened by realforest2001
November 22, 2023 18:58 13s
November 22, 2023 18:58 13s
Project ARES: Added Tech Unlock logs Check for merge conflicts #16717: Pull request #5006 synchronize by realforest2001
November 22, 2023 18:56 16s
November 22, 2023 18:56 16s
Project ARES: Added Tech Unlock logs Check for merge conflicts #16716: Pull request #5006 synchronize by realforest2001
November 22, 2023 18:47 2m 11s
November 22, 2023 18:47 2m 11s
Adds DISCORDURL to the example config (#5002) Check for merge conflicts #16715: Commit c448d8a pushed by github-merge-queue bot
November 22, 2023 18:41 6m 21s master
master
November 22, 2023 18:41 6m 21s
Lesser drones now die upon ghosting Check for merge conflicts #16714: Pull request #4978 synchronize by Birdtalon
November 22, 2023 18:33 13s
November 22, 2023 18:33 13s
Sentinel Neuro Combo Check for merge conflicts #16713: Pull request #4822 synchronize by Diegoflores31
November 22, 2023 17:24 17s
November 22, 2023 17:24 17s
Sentinel Neuro Combo Check for merge conflicts #16712: Pull request #4822 synchronize by Diegoflores31
November 22, 2023 17:03 16s
November 22, 2023 17:03 16s
Project ARES: Added Tech Unlock logs Check for merge conflicts #16711: Pull request #5006 opened by realforest2001
November 22, 2023 16:56 33s
November 22, 2023 16:56 33s
Keycard authenticator can call ERT winout admin intervention Check for merge conflicts #16710: Pull request #4477 synchronize by Diegoflores31
November 22, 2023 16:53 16s
November 22, 2023 16:53 16s
Fixes Trijent Mapping Error(?) Check for merge conflicts #16709: Pull request #5005 opened by HeresKozmos
November 22, 2023 16:14 12s
November 22, 2023 16:14 12s
LV624 Fog Removal + River Change V2 Check for merge conflicts #16708: Pull request #4997 synchronize by Steelpoint
November 22, 2023 16:10 12s
November 22, 2023 16:10 12s
Fixes fortified defender headbutt Check for merge conflicts #16707: Pull request #5004 opened by Birdtalon
November 22, 2023 15:05 17s
November 22, 2023 15:05 17s
Adds DISCORDURL to the example config Check for merge conflicts #16706: Pull request #5002 opened by silencer-pl
November 22, 2023 13:56 16s
November 22, 2023 13:56 16s
Kutjevo Mapping Fix Check for merge conflicts #16705: Pull request #5001 opened by HeresKozmos
November 22, 2023 11:43 13s
November 22, 2023 11:43 13s