Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
4,331 workflow run results
4,331 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

ert tweaks Check for merge conflicts #15603: Pull request #4484 synchronize by CapCamIII
October 18, 2023 23:21 12s
October 18, 2023 23:21 12s
Makes dartboards functional Check for merge conflicts #15602: Pull request #4677 synchronize by VileBeggar
October 18, 2023 22:32 15s
October 18, 2023 22:32 15s
Makes dartboards functional Check for merge conflicts #15601: Pull request #4677 synchronize by VileBeggar
October 18, 2023 22:28 14s
October 18, 2023 22:28 14s
Remove SSearlyruntimes Check for merge conflicts #15600: Pull request #4718 opened by fira
October 18, 2023 22:05 14s
October 18, 2023 22:05 14s
Fixes deleted mobs not unbuckling Check for merge conflicts #15599: Pull request #4717 opened by fira
October 18, 2023 21:49 2m 18s
October 18, 2023 21:49 2m 18s
Almayer Maintenance, Fixes for the USS Almayers recent change(s) (#4701) Check for merge conflicts #15598: Commit 36f7779 pushed by github-merge-queue bot
October 18, 2023 21:48 2m 19s master
master
October 18, 2023 21:48 2m 19s
refactor skill.dm into multiple file inside skills folder (#4633) Check for merge conflicts #15597: Commit 5a79496 pushed by github-merge-queue bot
October 18, 2023 21:38 2m 17s master
master
October 18, 2023 21:38 2m 17s
Equipped squad presets start with full stomachs (#4671) Check for merge conflicts #15596: Commit 163f692 pushed by github-merge-queue bot
October 18, 2023 21:19 4m 20s master
master
October 18, 2023 21:19 4m 20s
Reimplements halloween pumpkin helmets event Check for merge conflicts #15595: Pull request #4623 synchronize by fira
October 18, 2023 21:10 4m 32s
October 18, 2023 21:10 4m 32s
Fixes a typo causing caps to display contained items when not worn (#… Check for merge conflicts #15594: Commit 114fe8d pushed by github-merge-queue bot
October 18, 2023 21:00 2m 16s master
master
October 18, 2023 21:00 2m 16s
Reimplements halloween pumpkin helmets event Check for merge conflicts #15593: Pull request #4623 synchronize by fira
October 18, 2023 20:56 13s
October 18, 2023 20:56 13s
Fixes minor runtime in CAS Guidance system (#4705) Check for merge conflicts #15592: Commit 9b655b5 pushed by github-merge-queue bot
October 18, 2023 20:52 2m 19s master
master
October 18, 2023 20:52 2m 19s
Combines standard apparel into one button for every squad prep vendor… Check for merge conflicts #15591: Commit f95fcf3 pushed by github-merge-queue bot
October 18, 2023 20:36 10m 22s master
master
October 18, 2023 20:36 10m 22s
Handheld Beacon Refactor (#4676) Check for merge conflicts #15590: Commit e4a35d9 pushed by github-merge-queue bot
October 18, 2023 20:21 4m 21s master
master
October 18, 2023 20:21 4m 21s
Bandaid the null clients in GLOB.clients Check for merge conflicts #15589: Pull request #4700 synchronize by Drulikar
October 18, 2023 20:14 2m 14s
October 18, 2023 20:14 2m 14s
Allows MT, CT, and Nurse to take the "Bad Leg" trait. (#4704) Check for merge conflicts #15588: Commit 219e819 pushed by github-merge-queue bot
October 18, 2023 19:57 2m 18s master
master
October 18, 2023 19:57 2m 18s
Xeno landmark changes Check for merge conflicts #15587: Pull request #4711 synchronize by BeagleGaming1
October 18, 2023 19:49 1m 50s
October 18, 2023 19:49 1m 50s
Refactor ammo_datums file. (#4682) Check for merge conflicts #15586: Commit 65d9e8e pushed by github-merge-queue bot
October 18, 2023 19:43 4m 24s master
master
October 18, 2023 19:43 4m 24s
Eggsac carrier revival Check for merge conflicts #15585: Pull request #4716 synchronize by Birdtalon
October 18, 2023 19:22 11s
October 18, 2023 19:22 11s
Eggsac carrier revival Check for merge conflicts #15584: Pull request #4716 opened by Birdtalon
October 18, 2023 19:18 16s
October 18, 2023 19:18 16s
Xeno landmark changes Check for merge conflicts #15583: Pull request #4711 synchronize by BeagleGaming1
October 18, 2023 19:12 18s
October 18, 2023 19:12 18s
Xeno landmark changes Check for merge conflicts #15582: Pull request #4711 synchronize by BeagleGaming1
October 18, 2023 18:29 17s
October 18, 2023 18:29 17s
Reimplements halloween pumpkin helmets event Check for merge conflicts #15581: Pull request #4623 synchronize by fira
October 18, 2023 18:02 17s
October 18, 2023 18:02 17s
Reimplements halloween pumpkin helmets event Check for merge conflicts #15580: Pull request #4623 synchronize by fira
October 18, 2023 17:18 45s
October 18, 2023 17:18 45s
Xeno landmark changes Check for merge conflicts #15579: Pull request #4711 synchronize by BeagleGaming1
October 18, 2023 17:17 16s
October 18, 2023 17:17 16s