Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
1,681 workflow run results
1,681 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Project ARES: Adds more APOLLO consoles (#4208) Check for merge conflicts #14365: Commit e6b3602 pushed by github-merge-queue bot
September 11, 2023 09:08 4m 15s master
master
September 11, 2023 09:08 4m 15s
Project ARES: Functional Access Tickets (#4111) Check for merge conflicts #14364: Commit bc1d21e pushed by github-merge-queue bot
September 11, 2023 08:53 4m 16s master
master
September 11, 2023 08:53 4m 16s
fixes WY access to research (#4381) Check for merge conflicts #14363: Commit 0d44285 pushed by github-merge-queue bot
September 11, 2023 08:38 4m 14s master
master
September 11, 2023 08:38 4m 14s
Cryorine changes (#4352) Check for merge conflicts #14362: Commit 1083587 pushed by github-merge-queue bot
September 11, 2023 08:23 4m 15s master
master
September 11, 2023 08:23 4m 15s
Makes gau able to hit resting mobs (#4304) Check for merge conflicts #14361: Commit d717166 pushed by github-merge-queue bot
September 11, 2023 08:08 4m 15s master
master
September 11, 2023 08:08 4m 15s
Project ARES: Release Gas Update (#4350) Check for merge conflicts #14360: Commit a0bc040 pushed by github-merge-queue bot
September 11, 2023 07:54 4m 19s master
master
September 11, 2023 07:54 4m 19s
TWE Tidy-up (#4367) Check for merge conflicts #14359: Commit 3e0755b pushed by github-merge-queue bot
September 11, 2023 07:40 4m 15s master
master
September 11, 2023 07:40 4m 15s
Stops queen prying open lifeboat hatches (#4374) Check for merge conflicts #14358: Commit a3e82c0 pushed by github-merge-queue bot
September 11, 2023 07:25 4m 15s master
master
September 11, 2023 07:25 4m 15s
Repaths /obj/item/projectile -> /obj/projectile (#4377) Check for merge conflicts #14357: Commit 589536e pushed by github-merge-queue bot
September 11, 2023 07:17 2m 21s master
master
September 11, 2023 07:17 2m 21s
End game timing changes (#4353) Check for merge conflicts #14356: Commit ec3e08c pushed by github-merge-queue bot
September 11, 2023 07:03 4m 17s master
master
September 11, 2023 07:03 4m 17s
Fixes repeatable techs not having correct overlays (#4356) Check for merge conflicts #14355: Commit 1e11f32 pushed by github-merge-queue bot
September 11, 2023 06:49 4m 15s master
master
September 11, 2023 06:49 4m 15s
Removes annoying and inaccurate to_chat from join response team menu … Check for merge conflicts #14354: Commit c2d8304 pushed by github-merge-queue bot
September 11, 2023 06:31 4m 15s master
master
September 11, 2023 06:31 4m 15s
Removes some mapped clown gear Check for merge conflicts #14353: Pull request #4388 synchronize by morrowwolf
September 11, 2023 06:18 2m 2s
September 11, 2023 06:18 2m 2s
Firing flares into the air now produces light again (#4360) Check for merge conflicts #14352: Commit 8b01bba pushed by github-merge-queue bot
September 11, 2023 06:16 4m 18s master
master
September 11, 2023 06:16 4m 18s
Removes some mapped clown gear Check for merge conflicts #14351: Pull request #4388 opened by morrowwolf
September 11, 2023 06:06 3m 30s
September 11, 2023 06:06 3m 30s
Powerloader wreckage now can be attacked by xenos (#4371) Check for merge conflicts #14350: Commit 6084a6b pushed by github-merge-queue bot
September 11, 2023 05:58 4m 14s master
master
September 11, 2023 05:58 4m 14s
Cryo spec one time tech purchase Check for merge conflicts #14349: Pull request #4354 ready_for_review by morrowwolf
September 11, 2023 05:48 2m 35s
September 11, 2023 05:48 2m 35s
Cryo spec one time tech purchase Check for merge conflicts #14348: Pull request #4354 synchronize by morrowwolf
September 11, 2023 05:46 1m 44s
September 11, 2023 05:46 1m 44s
Recalibrate limbs tweak (#4372) Check for merge conflicts #14347: Commit 922ecc2 pushed by github-merge-queue bot
September 11, 2023 05:42 4m 14s master
master
September 11, 2023 05:42 4m 14s
Working Joe Announcement Removal (#4373) Check for merge conflicts #14346: Commit 0cc8562 pushed by github-merge-queue bot
September 11, 2023 05:29 4m 18s master
master
September 11, 2023 05:29 4m 18s
LV522: Changes to map decortation, loot tables and renaming of colony airlocks Check for merge conflicts #14345: Pull request #4386 synchronize by spartanbobby
September 11, 2023 02:48 12s
September 11, 2023 02:48 12s
LV522: Changes to map decortation, loot tables and renaming of colony airlocks Check for merge conflicts #14344: Pull request #4386 opened by spartanbobby
September 10, 2023 23:12 12s
September 10, 2023 23:12 12s
[Balance] Hive weeds now look for a supporting structure Check for merge conflicts #14343: Pull request #4385 opened by TeDGamer
September 10, 2023 21:04 13s
September 10, 2023 21:04 13s
Science Annex Yard Readdition Check for merge conflicts #14342: Pull request #4379 synchronize by morrowwolf
September 10, 2023 20:35 15s
September 10, 2023 20:35 15s
Makes subtle messages more noticeable Check for merge conflicts #14341: Pull request #4384 opened by Waseemq1235
September 10, 2023 19:16 14s
September 10, 2023 19:16 14s