Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
2,201 workflow run results
2,201 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

updating MP and warden vendors. adding handgun case. Check for merge conflicts #13371: Pull request #4007 synchronize by Huffie56
August 9, 2023 18:35 13s
August 9, 2023 18:35 13s
SMG Gun+Mag Holster (#3825) Check for merge conflicts #13370: Commit d54ba97 pushed by github-merge-queue bot
August 9, 2023 17:39 4m 28s master
master
August 9, 2023 17:39 4m 28s
Fixes Breaching Hammer Mob Sprite Check for merge conflicts #13369: Pull request #4147 opened by Steelpoint
August 9, 2023 16:46 16s
August 9, 2023 16:46 16s
SMG Gun+Mag Holster Check for merge conflicts #13368: Pull request #3825 synchronize by Steelpoint
August 9, 2023 16:00 4m 45s
August 9, 2023 16:00 4m 45s
Combistick can now be yanked if dropped Check for merge conflicts #13367: Pull request #4146 opened by Zonespace27
August 9, 2023 15:59 45s
August 9, 2023 15:59 45s
SMG Gun+Mag Holster Check for merge conflicts #13366: Pull request #3825 synchronize by Steelpoint
August 9, 2023 15:58 14s
August 9, 2023 15:58 14s
Zombie Rework Check for merge conflicts #13365: Pull request #4060 synchronize by Ben10083
August 9, 2023 14:29 31s
August 9, 2023 14:29 31s
Zombie Rework Check for merge conflicts #13364: Pull request #4060 synchronize by Ben10083
August 9, 2023 14:27 17s
August 9, 2023 14:27 17s
Combistick now uses a chain (#4104) Check for merge conflicts #13363: Commit a84aec2 pushed by github-merge-queue bot
August 9, 2023 13:44 4m 24s master
master
August 9, 2023 13:44 4m 24s
Brings automatic weaponry to the marine and surv arsenal Check for merge conflicts #13362: Pull request #4003 synchronize by Zonespace27
August 9, 2023 13:26 11s
August 9, 2023 13:26 11s
Adds vehicles skill to the Commanding Officer & Auxiliary Support Off… Check for merge conflicts #13361: Commit 9a663a6 pushed by github-merge-queue bot
August 9, 2023 13:10 4m 21s master
master
August 9, 2023 13:10 4m 21s
Fix Unnesting Mob Density (#4134) Check for merge conflicts #13360: Commit ad0481c pushed by github-merge-queue bot
August 9, 2023 12:56 4m 21s master
master
August 9, 2023 12:56 4m 21s
New UPP guns Check for merge conflicts #13359: Pull request #3865 synchronize by CapCamIII
August 9, 2023 12:39 11s
August 9, 2023 12:39 11s
update clothing vendor in squad prep to hold all clothing items and use scaling. Check for merge conflicts #13358: Pull request #4065 synchronize by Huffie56
August 9, 2023 12:25 1m 10s
August 9, 2023 12:25 1m 10s
New UPP guns Check for merge conflicts #13357: Pull request #3865 synchronize by CapCamIII
August 9, 2023 12:25 15s
August 9, 2023 12:25 15s
update clothing vendor in squad prep to hold all clothing items and use scaling. Check for merge conflicts #13356: Pull request #4065 synchronize by Huffie56
August 9, 2023 12:22 17s
August 9, 2023 12:22 17s
fix prevent belt flare being filled by dump in action leaving no space for flare gun. Check for merge conflicts #13355: Pull request #4110 synchronize by Huffie56
August 9, 2023 10:58 13s
August 9, 2023 10:58 13s
SMG Gun+Mag Holster Check for merge conflicts #13354: Pull request #3825 synchronize by Steelpoint
August 9, 2023 10:20 12s
August 9, 2023 10:20 12s
SMG Gun+Mag Holster Check for merge conflicts #13353: Pull request #3825 reopened by nauticall
August 9, 2023 09:49 14s
August 9, 2023 09:49 14s
Nerfs to defibrillators, changes to heart damage & bloodloss Check for merge conflicts #13352: Pull request #4137 ready_for_review by BeagleGaming1
August 9, 2023 06:22 2m 30s
August 9, 2023 06:22 2m 30s
Nerfs to defibrillators, changes to heart damage & bloodloss Check for merge conflicts #13351: Pull request #4137 synchronize by BeagleGaming1
August 9, 2023 06:22 1m 23s
August 9, 2023 06:22 1m 23s
Fix runtime with hijack burrowed PR Check for merge conflicts #13350: Pull request #4144 synchronize by Drulikar
August 9, 2023 06:21 11s
August 9, 2023 06:21 11s
Fix beams for IV drip machines when adding/removing a blood bag Check for merge conflicts #13349: Pull request #4145 opened by Drulikar
August 9, 2023 06:11 2m 15s
August 9, 2023 06:11 2m 15s
Fix remove iv needing power to operate. (#4070) Check for merge conflicts #13348: Commit d93e8da pushed by github-merge-queue bot
August 9, 2023 06:09 2m 15s master
master
August 9, 2023 06:09 2m 15s
Fix runtime with hijack burrowed PR Check for merge conflicts #13347: Pull request #4144 synchronize by Drulikar
August 9, 2023 06:00 1m 49s
August 9, 2023 06:00 1m 49s