Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
850 workflow run results
850 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Helmet Visors/Optics and built-in HUDs Check for merge conflicts #13464: Pull request #4156 synchronize by morrowwolf
August 11, 2023 15:39 13s
August 11, 2023 15:39 13s
OOC prefix proc Check for merge conflicts #13463: Pull request #2536 synchronize by realforest2001
August 11, 2023 15:29 12s
August 11, 2023 15:29 12s
Nerfs to defibrillators, changes to heart damage & bloodloss (#4137) Check for merge conflicts #13462: Commit 589a1a6 pushed by github-merge-queue bot
August 11, 2023 15:17 4m 19s master
master
August 11, 2023 15:17 4m 19s
update clothing vendor in squad prep to hold all clothing items and u… Check for merge conflicts #13461: Commit 23ab6ba pushed by github-merge-queue bot
August 11, 2023 15:03 4m 16s master
master
August 11, 2023 15:03 4m 16s
Fix backpack sprayers Check for merge conflicts #13460: Pull request #4161 ready_for_review by Huffie56
August 11, 2023 14:55 14s
August 11, 2023 14:55 14s
Stops new specs using all gear Check for merge conflicts #13459: Pull request #4162 opened by realforest2001
August 11, 2023 14:43 16s
August 11, 2023 14:43 16s
New UPP guns Check for merge conflicts #13458: Pull request #3865 synchronize by CapCamIII
August 11, 2023 14:27 12s
August 11, 2023 14:27 12s
Fix backpack sprayers Check for merge conflicts #13457: Pull request #4161 opened by Huffie56
August 11, 2023 14:14 1m 27s
August 11, 2023 14:14 1m 27s
Adds Provost radio & radio channel Check for merge conflicts #13456: Pull request #4160 opened by realforest2001
August 11, 2023 14:13 16s
August 11, 2023 14:13 16s
Helmet Visors/Optics and built-in HUDs Check for merge conflicts #13455: Pull request #4156 synchronize by morrowwolf
August 11, 2023 12:16 13s
August 11, 2023 12:16 13s
Helmet Visors/Optics and built-in HUDs Check for merge conflicts #13454: Pull request #4156 synchronize by morrowwolf
August 11, 2023 12:00 14s
August 11, 2023 12:00 14s
Faction Access & Almayer Security Overhaul Check for merge conflicts #13453: Pull request #4035 synchronize by realforest2001
August 11, 2023 11:21 13s
August 11, 2023 11:21 13s
OOC prefix proc Check for merge conflicts #13452: Pull request #2536 synchronize by realforest2001
August 11, 2023 10:30 12s
August 11, 2023 10:30 12s
fix prevent belt flare being filled by dump in action leaving no space for flare gun. Check for merge conflicts #13451: Pull request #4110 ready_for_review by Huffie56
August 11, 2023 09:23 2m 41s
August 11, 2023 09:23 2m 41s
fix prevent belt flare being filled by dump in action leaving no space for flare gun. Check for merge conflicts #13450: Pull request #4110 synchronize by Huffie56
August 11, 2023 09:21 11s
August 11, 2023 09:21 11s
EVAC-3F & EVAC-3O Decoration Fighter Craft (USS Almayer & New Varadaro) Check for merge conflicts #13449: Pull request #4158 synchronize by Misttyy
August 11, 2023 09:18 14s
August 11, 2023 09:18 14s
fix prevent belt flare being filled by dump in action leaving no space for flare gun. Check for merge conflicts #13448: Pull request #4110 synchronize by Huffie56
August 11, 2023 09:01 12s
August 11, 2023 09:01 12s
EVAC-3F & EVAC-3O Decoration Fighter Craft (USS Almayer & New Varadaro) Check for merge conflicts #13447: Pull request #4158 synchronize by Misttyy
August 11, 2023 08:56 1m 39s
August 11, 2023 08:56 1m 39s
EVAC-3F & EVAC-3O Decoration Fighter Craft (USS Almayer & New Varadaro) Check for merge conflicts #13446: Pull request #4158 synchronize by Misttyy
August 11, 2023 08:55 1m 11s
August 11, 2023 08:55 1m 11s
EVAC-3F & EVAC-3O Decoration Fighter Craft (USS Almayer & New Varadaro) Check for merge conflicts #13445: Pull request #4158 synchronize by Misttyy
August 11, 2023 08:55 2m 18s
August 11, 2023 08:55 2m 18s
EVAC-3F & EVAC-3O Decoration Fighter Craft (USS Almayer & New Varadaro) Check for merge conflicts #13444: Pull request #4158 synchronize by Misttyy
August 11, 2023 08:55 11s
August 11, 2023 08:55 11s
Alters ASay chat color back to the old MSay color Check for merge conflicts #13443: Pull request #4151 synchronize by harryob
August 11, 2023 08:44 13s
August 11, 2023 08:44 13s
EVAC-3F & EVAC-3O Decoration Fighter Craft (USS Almayer & New Varadaro) Check for merge conflicts #13442: Pull request #4158 synchronize by Misttyy
August 11, 2023 08:22 13s
August 11, 2023 08:22 13s
EVAC-3F & EVAC-3O Decoration Fighter Craft (USS Almayer & New Varadaro) Check for merge conflicts #13441: Pull request #4158 synchronize by Misttyy
August 11, 2023 08:18 12s
August 11, 2023 08:18 12s
EVAC-3F & EVAC-3O Decoration Fighter Craft (USS Almayer & New Varadaro) Check for merge conflicts #13440: Pull request #4158 synchronize by Misttyy
August 11, 2023 08:16 12s
August 11, 2023 08:16 12s