Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
253 workflow run results
253 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

New Healer Drone Ability: Sacrifice Check for merge conflicts #12945: Pull request #4055 synchronize by ihatethisengine
August 1, 2023 17:04 12s
August 1, 2023 17:04 12s
fixing care package for SG on WO spawning the old batteries. (#4069) Check for merge conflicts #12944: Commit 50e63bc pushed by github-merge-queue bot
August 1, 2023 16:50 4m 20s master
master
August 1, 2023 16:50 4m 20s
fix having inapropriate ammo in CL lockbox. Check for merge conflicts #12943: Pull request #4071 ready_for_review by Huffie56
August 1, 2023 15:49 13s
August 1, 2023 15:49 13s
fix having inapropriate ammo in CL lockbox. Check for merge conflicts #12942: Pull request #4071 synchronize by Huffie56
August 1, 2023 15:44 11s
August 1, 2023 15:44 11s
Brings automatic weaponry to the marine and surv arsenal Check for merge conflicts #12941: Pull request #4003 synchronize by Zonespace27
August 1, 2023 15:37 12s
August 1, 2023 15:37 12s
fix typo mistake from matchs to matches. Check for merge conflicts #12940: Pull request #4073 ready_for_review by Huffie56
August 1, 2023 14:57 12s
August 1, 2023 14:57 12s
fix typo mistake from matchs to matches. Check for merge conflicts #12939: Pull request #4073 opened by Huffie56
August 1, 2023 12:17 12s
August 1, 2023 12:17 12s
update clothing vendor in squad prep to hold all clothing items and use scaling. Check for merge conflicts #12938: Pull request #4065 ready_for_review by Huffie56
August 1, 2023 11:30 14s
August 1, 2023 11:30 14s
update clothing vendor in squad prep to hold all clothing items and use scaling. Check for merge conflicts #12937: Pull request #4065 synchronize by Huffie56
August 1, 2023 10:39 13s
August 1, 2023 10:39 13s
Brings automatic weaponry to the marine and surv arsenal Check for merge conflicts #12936: Pull request #4003 synchronize by Zonespace27
August 1, 2023 09:01 12s
August 1, 2023 09:01 12s
fix having inapropriate ammo in CL lockbox. Check for merge conflicts #12935: Pull request #4071 synchronize by Huffie56
August 1, 2023 07:36 2m 13s
August 1, 2023 07:36 2m 13s
Makes WJs spawn in the ARES core Check for merge conflicts #12934: Pull request #4068 synchronize by Zonespace27
July 31, 2023 22:49 11s
July 31, 2023 22:49 11s
fix having inapropriate ammo in CL lockbox. Check for merge conflicts #12933: Pull request #4071 ready_for_review by Huffie56
July 31, 2023 21:16 12s
July 31, 2023 21:16 12s
fix having inapropriate ammo in CL lockbox. Check for merge conflicts #12932: Pull request #4071 opened by Huffie56
July 31, 2023 20:08 14s
July 31, 2023 20:08 14s
Add security camera console to ARES Chamber Check for merge conflicts #12931: Pull request #4059 synchronize by Ben10083
July 31, 2023 19:13 12s
July 31, 2023 19:13 12s
Add security camera console to ARES Chamber Check for merge conflicts #12930: Pull request #4059 ready_for_review by Ben10083
July 31, 2023 19:13 11s
July 31, 2023 19:13 11s
Add security camera console to ARES Chamber Check for merge conflicts #12929: Pull request #4059 synchronize by Ben10083
July 31, 2023 19:13 15s
July 31, 2023 19:13 15s
fixing care package for SG on WO spawning the old batteries. Check for merge conflicts #12928: Pull request #4069 ready_for_review by Huffie56
July 31, 2023 18:43 15s
July 31, 2023 18:43 15s
fixing care package for SG on WO spawning the old batteries. Check for merge conflicts #12927: Pull request #4069 synchronize by Huffie56
July 31, 2023 18:24 1m 21s
July 31, 2023 18:24 1m 21s
Fix remove iv needing power to operate. Check for merge conflicts #12926: Pull request #4070 synchronize by Huffie56
July 31, 2023 18:23 14s
July 31, 2023 18:23 14s
Fix remove iv needing power to operate. Check for merge conflicts #12925: Pull request #4070 opened by Huffie56
July 31, 2023 18:18 15s
July 31, 2023 18:18 15s
Zombie Rework Check for merge conflicts #12924: Pull request #4060 synchronize by Ben10083
July 31, 2023 17:41 32s
July 31, 2023 17:41 32s
Zombie Rework Check for merge conflicts #12923: Pull request #4060 synchronize by Ben10083
July 31, 2023 17:40 14s
July 31, 2023 17:40 14s
fixing care package for SG on WO spawning the old batteries. Check for merge conflicts #12922: Pull request #4069 opened by Huffie56
July 31, 2023 17:29 13s
July 31, 2023 17:29 13s
Makes WJs spawn in the ARES core Check for merge conflicts #12921: Pull request #4068 synchronize by Zonespace27
July 31, 2023 17:19 13s
July 31, 2023 17:19 13s