Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
397 workflow run results
397 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Defender and Crusher tail smash has a 1% chance of doing a BONK! sound instead. Check for merge conflicts #11451: Pull request #3750 reopened by Diegoflores31
June 28, 2023 11:31 1m 30s
June 28, 2023 11:31 1m 30s
Synth armour sprite change Check for merge conflicts #11450: Pull request #3728 synchronize by Steelpoint
June 28, 2023 11:30 11s
June 28, 2023 11:30 11s
LV522: Moves breaching charge again, buffs sec armoury as optional lo… Check for merge conflicts #11449: Commit 151f92e pushed by github-merge-queue bot
June 28, 2023 10:31 4m 16s master
master
June 28, 2023 10:31 4m 16s
Port TG#74500: Adds VERB_REF and derivative Check for merge conflicts #11448: Pull request #3753 opened by Drulikar
June 28, 2023 10:10 15s
June 28, 2023 10:10 15s
Fix minimap removeimage proc not checking z level correctly Check for merge conflicts #11447: Pull request #3752 opened by Drulikar
June 28, 2023 08:38 2m 16s
June 28, 2023 08:38 2m 16s
Xenos no longer can pull dead xenos (#3666) Check for merge conflicts #11446: Commit 613e967 pushed by github-merge-queue bot
June 28, 2023 08:00 2m 26s master
master
June 28, 2023 08:00 2m 26s
added drawing functionality to tactical maps Check for merge conflicts #11445: Pull request #3363 synchronize by ghost
June 28, 2023 07:54 1m 7s
June 28, 2023 07:54 1m 7s
Fixes communications intel objective being instantly completed (#3723) Check for merge conflicts #11444: Commit 5d1c11e pushed by github-merge-queue bot
June 28, 2023 07:28 4m 18s master
master
June 28, 2023 07:28 4m 18s
Removes toxin mags on shivas (#3736) Check for merge conflicts #11443: Commit 10fcbde pushed by github-merge-queue bot
June 28, 2023 06:56 4m 18s master
master
June 28, 2023 06:56 4m 18s
Removes wrong warden locker Check for merge conflicts #11442: Pull request #3751 opened by morrowwolf
June 28, 2023 06:39 1m 8s
June 28, 2023 06:39 1m 8s
Xenos no longer can pull dead xenos Check for merge conflicts #11441: Pull request #3666 synchronize by morrowwolf
June 28, 2023 06:35 13s
June 28, 2023 06:35 13s
Fix Deterred Crashsite Offset (#3717) Check for merge conflicts #11440: Commit 8b7d442 pushed by github-merge-queue bot
June 28, 2023 06:17 4m 18s master
master
June 28, 2023 06:17 4m 18s
Removes 2second queen building cooldown when building away from hive … Check for merge conflicts #11439: Commit b710769 pushed by github-merge-queue bot
June 28, 2023 06:02 4m 15s master
master
June 28, 2023 06:02 4m 15s
Fix Infinite Recursion in Hugger Custom Rebound (#3730) Check for merge conflicts #11438: Commit 108751c pushed by github-merge-queue bot
June 28, 2023 05:44 2m 13s master
master
June 28, 2023 05:44 2m 13s
New facehugger strain: Watcher Check for merge conflicts #11437: Pull request #3726 ready_for_review by Hopekz
June 28, 2023 05:41 26s
June 28, 2023 05:41 26s
New facehugger strain: Watcher Check for merge conflicts #11436: Pull request #3726 synchronize by Hopekz
June 28, 2023 05:41 14s
June 28, 2023 05:41 14s
Almayer Maintenence Light Adjustments (#3731) Check for merge conflicts #11435: Commit 662abf1 pushed by github-merge-queue bot
June 28, 2023 05:29 4m 15s master
master
June 28, 2023 05:29 4m 15s
Big Red Liaison Survivor Check for merge conflicts #11434: Pull request #3746 synchronize by toolmind
June 28, 2023 02:30 15s
June 28, 2023 02:30 15s
Defender and Crusher tail smash has a 1% chance of doing a BONK! sound instead. Check for merge conflicts #11433: Pull request #3750 synchronize by Diegoflores31
June 28, 2023 02:26 2m 17s
June 28, 2023 02:26 2m 17s
Defender and Crusher tail smash has a 1% chance of doing a BONK! sound instead. Check for merge conflicts #11432: Pull request #3750 opened by Diegoflores31
June 28, 2023 00:22 1m 20s
June 28, 2023 00:22 1m 20s
added drawing functionality to tactical maps Check for merge conflicts #11431: Pull request #3363 synchronize by ghost
June 28, 2023 00:16 1m 38s
June 28, 2023 00:16 1m 38s
added drawing functionality to tactical maps Check for merge conflicts #11430: Pull request #3363 reopened by ghost
June 28, 2023 00:16 12s
June 28, 2023 00:16 12s
added camera shake to ob Check for merge conflicts #11429: Pull request #3658 ready_for_review by ghost
June 28, 2023 00:01 11s
June 28, 2023 00:01 11s
added camera shake to ob Check for merge conflicts #11428: Pull request #3658 synchronize by ghost
June 27, 2023 23:52 13s
June 27, 2023 23:52 13s
added camera shake to ob Check for merge conflicts #11427: Pull request #3658 synchronize by ghost
June 27, 2023 23:39 10s
June 27, 2023 23:39 10s