Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
779 workflow run results
779 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fix corpses merging with weeds when hung Check for merge conflicts #12895: Pull request #4051 ready_for_review by Drulikar
July 31, 2023 01:57 12s
July 31, 2023 01:57 12s
Zombie Rework Check for merge conflicts #12894: Pull request #4060 opened by Ben10083
July 31, 2023 01:54 2m 14s
July 31, 2023 01:54 2m 14s
Add security camera console to ARES Chamber Check for merge conflicts #12893: Pull request #4059 opened by Ben10083
July 31, 2023 00:07 14s
July 31, 2023 00:07 14s
Dropship turf direction sprites Check for merge conflicts #12892: Pull request #3642 synchronize by mullenpaul
July 30, 2023 22:36 13s
July 30, 2023 22:36 13s
Brings automatic weaponry to the marine and surv arsenal Check for merge conflicts #12891: Pull request #4003 ready_for_review by Zonespace27
July 30, 2023 21:31 12s
July 30, 2023 21:31 12s
Falcon Drone appears on marine MD Check for merge conflicts #12890: Pull request #4057 opened by realforest2001
July 30, 2023 20:48 13s
July 30, 2023 20:48 13s
Brings automatic weaponry to the marine and surv arsenal Check for merge conflicts #12889: Pull request #4003 synchronize by Zonespace27
July 30, 2023 20:45 13s
July 30, 2023 20:45 13s
Faction Access & Almayer Security Overhaul Check for merge conflicts #12888: Pull request #4035 synchronize by realforest2001
July 30, 2023 18:13 13s
July 30, 2023 18:13 13s
fixes press door access Check for merge conflicts #12887: Pull request #4056 opened by realforest2001
July 30, 2023 18:11 12s
July 30, 2023 18:11 12s
New Healer Drone Ability: Sacrifice Check for merge conflicts #12886: Pull request #4055 synchronize by ihatethisengine
July 30, 2023 17:55 16s
July 30, 2023 17:55 16s
Brain nerf (#4052) Check for merge conflicts #12885: Commit 9228ea6 pushed by github-merge-queue bot
July 30, 2023 17:37 4m 17s master
master
July 30, 2023 17:37 4m 17s
New Healer Drone Ability: Sacrifice Check for merge conflicts #12884: Pull request #4055 opened by ihatethisengine
July 30, 2023 17:23 14s
July 30, 2023 17:23 14s
More portable cades tweaks and buffs (#3967) Check for merge conflicts #12883: Commit f5784da pushed by github-merge-queue bot
July 30, 2023 10:27 4m 17s master
master
July 30, 2023 10:27 4m 17s
Unnested Larva Maturation Prompts (#4041) Check for merge conflicts #12882: Commit a349d55 pushed by github-merge-queue bot
July 30, 2023 09:07 4m 16s master
master
July 30, 2023 09:07 4m 16s
Another Banishment Check For Observers Joining as a Xeno (#4039) Check for merge conflicts #12881: Commit f7cb109 pushed by github-merge-queue bot
July 30, 2023 08:35 4m 15s master
master
July 30, 2023 08:35 4m 15s
Law spelling/grammar fixes (#4040) Check for merge conflicts #12880: Commit 1fa3c71 pushed by github-merge-queue bot
July 30, 2023 08:21 4m 14s master
master
July 30, 2023 08:21 4m 14s
More Xeno Alliances Tweaks Check for merge conflicts #12879: Pull request #4053 opened by ihatethisengine
July 30, 2023 08:01 2m 13s
July 30, 2023 08:01 2m 13s
More portable cades tweaks and buffs Check for merge conflicts #12878: Pull request #3967 ready_for_review by ihatethisengine
July 30, 2023 01:06 11s
July 30, 2023 01:06 11s
More portable cades tweaks and buffs Check for merge conflicts #12877: Pull request #3967 synchronize by ihatethisengine
July 30, 2023 00:53 14s
July 30, 2023 00:53 14s
Brain nerf Check for merge conflicts #12876: Pull request #4052 synchronize by morrowwolf
July 29, 2023 23:14 11s
July 29, 2023 23:14 11s
Dropship turf direction sprites Check for merge conflicts #12875: Pull request #3642 synchronize by mullenpaul
July 29, 2023 23:14 13s
July 29, 2023 23:14 13s
Standardize hugger attack windup and attack windup duration Check for merge conflicts #12874: Pull request #4044 synchronize by Drulikar
July 29, 2023 23:11 10s
July 29, 2023 23:11 10s
Brain nerf Check for merge conflicts #12873: Pull request #4052 opened by morrowwolf
July 29, 2023 22:31 13s
July 29, 2023 22:31 13s
Fix corpses merging with weeds when hung Check for merge conflicts #12872: Pull request #4051 opened by Drulikar
July 29, 2023 22:28 12s
July 29, 2023 22:28 12s
HPR-addings Check for merge conflicts #12871: Pull request #4049 opened by Dorodomki
July 29, 2023 20:22 13s
July 29, 2023 20:22 13s