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

Player huggers now get second dibs if they hug a player (#3706) Check for merge conflicts #11292: Commit 5809f18 pushed by github-merge-queue bot
June 25, 2023 06:08 4m 17s master
master
June 25, 2023 06:08 4m 17s
Fix larva doubling when banished and returned to core (#3708) Check for merge conflicts #11291: Commit 5cc268b pushed by github-merge-queue bot
June 25, 2023 05:52 4m 15s master
master
June 25, 2023 05:52 4m 15s
[s] Require affirmative input from the admin to run sdql2 verbs (#3710) Check for merge conflicts #11290: Commit 2fe028d pushed by github-merge-queue bot
June 25, 2023 05:44 2m 14s master
master
June 25, 2023 05:44 2m 14s
String Changes for Tips (#3707) Check for merge conflicts #11289: Commit cec2b4b pushed by github-merge-queue bot
June 25, 2023 05:29 4m 15s master
master
June 25, 2023 05:29 4m 15s
Fix yank object verb for others (#3705) Check for merge conflicts #11288: Commit 5ef4998 pushed by github-merge-queue bot
June 25, 2023 05:14 4m 17s master
master
June 25, 2023 05:14 4m 17s
New Varadero revamp Check for merge conflicts #11287: Pull request #3676 synchronize by AnuvKH
June 25, 2023 02:49 2m 18s
June 25, 2023 02:49 2m 18s
Project ARES - Resurrection Check for merge conflicts #11286: Pull request #3298 synchronize by realforest2001
June 24, 2023 19:02 13s
June 24, 2023 19:02 13s
Removes 2second queen building cooldown when building away from hive while boosted Check for merge conflicts #11285: Pull request #3718 opened by TheGamerdk
June 24, 2023 15:38 11s
June 24, 2023 15:38 11s
Fix Deterred Crashsite Offset Check for merge conflicts #11284: Pull request #3717 opened by Drulikar
June 24, 2023 14:27 16s
June 24, 2023 14:27 16s
Made filled resin holes and weed nodes destroyable by xenos Check for merge conflicts #11283: Pull request #3711 opened by JackieEstegado
June 24, 2023 11:41 32s
June 24, 2023 11:41 32s
[s] Require affirmative input from the admin to run sdql2 verbs Check for merge conflicts #11282: Pull request #3710 opened by Zonespace27
June 24, 2023 11:36 10s
June 24, 2023 11:36 10s
Hardy Weeds Upgrade Weeds Check for merge conflicts #11281: Pull request #3709 synchronize by Drulikar
June 24, 2023 11:17 10s
June 24, 2023 11:17 10s
Hardy Weeds Upgrade Weeds Check for merge conflicts #11280: Pull request #3709 opened by Drulikar
June 24, 2023 11:04 11s
June 24, 2023 11:04 11s
Fix larva doubling when banished and returned to core Check for merge conflicts #11279: Pull request #3708 opened by Drulikar
June 24, 2023 09:28 44s
June 24, 2023 09:28 44s
String Changes for Tips Check for merge conflicts #11278: Pull request #3707 synchronize by blackdragonTOW
June 24, 2023 09:23 10s
June 24, 2023 09:23 10s
String Changes for Tips Check for merge conflicts #11277: Pull request #3707 opened by blackdragonTOW
June 24, 2023 09:12 10s
June 24, 2023 09:12 10s
Player huggers now get second dibs if they hug a player Check for merge conflicts #11276: Pull request #3706 opened by Drulikar
June 24, 2023 08:49 28s
June 24, 2023 08:49 28s
New Bunker Buster CAS Missile: GBU-67-EP 'Paveway XXI' Check for merge conflicts #11274: Pull request #3648 synchronize by blackdragonTOW
June 24, 2023 08:40 1m 56s
June 24, 2023 08:40 1m 56s
New Bunker Buster CAS Missile: GBU-67-EP 'Paveway XXI' Check for merge conflicts #11275: Pull request #3648 synchronize by blackdragonTOW
June 24, 2023 08:40 2m 4s
June 24, 2023 08:40 2m 4s
New Bunker Buster CAS Missile: GBU-67-EP 'Paveway XXI' Check for merge conflicts #11273: Pull request #3648 synchronize by blackdragonTOW
June 24, 2023 08:40 14s
June 24, 2023 08:40 14s
Email rewrites (#3701) Check for merge conflicts #11272: Commit db5a389 pushed by github-merge-queue bot
June 24, 2023 08:11 4m 14s master
master
June 24, 2023 08:11 4m 14s
Hive core and dead larvas. (#3700) Check for merge conflicts #11271: Commit 610c8b3 pushed by github-merge-queue bot
June 24, 2023 07:56 4m 13s master
master
June 24, 2023 07:56 4m 13s
Fix for dummy rotation in character setup. (#3699) Check for merge conflicts #11270: Commit 71455d4 pushed by github-merge-queue bot
June 24, 2023 07:41 4m 18s master
master
June 24, 2023 07:41 4m 18s
Fix yank object verb for others Check for merge conflicts #11269: Pull request #3705 opened by Drulikar
June 24, 2023 07:26 13s
June 24, 2023 07:26 13s
The weeds are hungry: Bodies for the weeds Check for merge conflicts #11268: Pull request #3644 synchronize by Drulikar
June 24, 2023 06:47 9s
June 24, 2023 06:47 9s
ProTip! You can narrow down the results and go further in time using created:<2023-06-24 or the other filters available.