Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
361 workflow run results
361 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Emote panel for WJs Check for merge conflicts #11615: Pull request #3792 synchronize by Zonespace27
July 3, 2023 21:53 2m 36s
July 3, 2023 21:53 2m 36s
Emote panel for WJs Check for merge conflicts #11614: Pull request #3792 opened by Zonespace27
July 3, 2023 21:49 13s
July 3, 2023 21:49 13s
Adds improvisation skill Check for merge conflicts #11613: Pull request #3791 synchronize by Katskan
July 3, 2023 20:30 12s
July 3, 2023 20:30 12s
Adds improvisation skill Check for merge conflicts #11612: Pull request #3791 opened by Katskan
July 3, 2023 19:35 11s
July 3, 2023 19:35 11s
Project ARES - Apollo Controller Check for merge conflicts #11611: Pull request #3783 synchronize by realforest2001
July 3, 2023 19:13 10s
July 3, 2023 19:13 10s
Changes evac pod crash chance from a define to a var Check for merge conflicts #11610: Pull request #3790 synchronize by BeagleGaming1
July 3, 2023 19:00 10s
July 3, 2023 19:00 10s
Changes evac pod crash chance from a define to a var Check for merge conflicts #11609: Pull request #3790 opened by BeagleGaming1
July 3, 2023 19:00 13s
July 3, 2023 19:00 13s
Acid Runner can no longer get acid stacks from Synthetics and Working Joes Check for merge conflicts #11608: Pull request #3789 opened by Ben10083
July 3, 2023 18:24 13s
July 3, 2023 18:24 13s
Made Research nightmare insert blast doors no longer be invulnerable Check for merge conflicts #11607: Pull request #3788 opened by JackieEstegado
July 3, 2023 16:02 11s
July 3, 2023 16:02 11s
added drawing functionality to tactical maps Check for merge conflicts #11606: Pull request #3363 synchronize by ghost
July 3, 2023 14:32 11s
July 3, 2023 14:32 11s
Changes pod crash land probability to 33% from 50%. (#3684) Check for merge conflicts #11605: Commit f3fdb28 pushed by github-merge-queue bot
July 3, 2023 13:46 4m 15s master
master
July 3, 2023 13:46 4m 15s
restores the paper assets working on webroot assets (#3780) Check for merge conflicts #11604: Commit 194bb97 pushed by github-merge-queue bot
July 3, 2023 07:04 4m 18s master
master
July 3, 2023 07:04 4m 18s
Fix time of death persistence for larva queue (#3781) Check for merge conflicts #11603: Commit 27f6d2b pushed by github-merge-queue bot
July 3, 2023 06:45 4m 15s master
master
July 3, 2023 06:45 4m 15s
Colonial Marshals gets bandages & RP Comms Check for merge conflicts #11602: Pull request #3787 synchronize by QuickLode
July 3, 2023 04:52 9s
July 3, 2023 04:52 9s
added drawing functionality to tactical maps Check for merge conflicts #11601: Pull request #3363 synchronize by ghost
July 3, 2023 04:37 11s
July 3, 2023 04:37 11s
Colonial Marshals gets bandages & RP Comms Check for merge conflicts #11600: Pull request #3787 opened by QuickLode
July 3, 2023 04:27 2m 13s
July 3, 2023 04:27 2m 13s
Synth armour sprite change Check for merge conflicts #11599: Pull request #3728 synchronize by Steelpoint
July 3, 2023 01:16 11s
July 3, 2023 01:16 11s
Fountain pen Check for merge conflicts #11598: Pull request #3727 synchronize by Hopekz
July 3, 2023 00:01 12s
July 3, 2023 00:01 12s
added drawing functionality to tactical maps Check for merge conflicts #11597: Pull request #3363 synchronize by ghost
July 2, 2023 23:50 11s
July 2, 2023 23:50 11s
Who/Staffwho in TGUI Check for merge conflicts #11596: Pull request #3786 reopened by morrowwolf
July 2, 2023 23:38 12s
July 2, 2023 23:38 12s
Who/Staffwho in TGUI Check for merge conflicts #11595: Pull request #3786 synchronize by Ssshizoprenia
July 2, 2023 23:22 32s
July 2, 2023 23:22 32s
Who/Staffwho in TGUI Check for merge conflicts #11594: Pull request #3786 synchronize by Ssshizoprenia
July 2, 2023 23:08 45s
July 2, 2023 23:08 45s
Who/Staffwho in TGUI Check for merge conflicts #11593: Pull request #3786 synchronize by Ssshizoprenia
July 2, 2023 23:07 1m 35s
July 2, 2023 23:07 1m 35s
Who/Staffwho in TGUI Check for merge conflicts #11592: Pull request #3786 opened by Ssshizoprenia
July 2, 2023 22:51 11s
July 2, 2023 22:51 11s
Hazard Joe Naming Check for merge conflicts #11591: Pull request #3785 opened by Ben10083
July 2, 2023 22:09 11s
July 2, 2023 22:09 11s