Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
11,639 workflow run results
11,639 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

adds upgraded fuel tanks to the research biomass machine Check for merge conflicts #23785: Pull request #6415 synchronize by iloveloopers
June 19, 2024 02:33 10s
June 19, 2024 02:33 10s
adds upgraded fuel tanks to the research biomass machine Check for merge conflicts #23784: Pull request #6415 synchronize by iloveloopers
June 19, 2024 02:28 11s
June 19, 2024 02:28 11s
adds upgraded fuel tanks to the research biomass machine Check for merge conflicts #23783: Pull request #6415 synchronize by iloveloopers
June 19, 2024 02:08 10s
June 19, 2024 02:08 10s
adds upgraded fuel tanks to the research biomass machine Check for merge conflicts #23782: Pull request #6415 ready_for_review by iloveloopers
June 19, 2024 01:46 9s
June 19, 2024 01:46 9s
adds upgraded fuel tanks to the research biomass machine Check for merge conflicts #23781: Pull request #6415 synchronize by iloveloopers
June 19, 2024 01:45 14s
June 19, 2024 01:45 14s
adds upgraded fuel tanks to the research biomass machine Check for merge conflicts #23780: Pull request #6415 synchronize by iloveloopers
June 19, 2024 01:40 13s
June 19, 2024 01:40 13s
Synthetic Vendor Mask Additions (#6426) Check for merge conflicts #23779: Commit 8f756b8 pushed by github-merge-queue bot
June 19, 2024 01:28 4m 14s master
master
June 19, 2024 01:28 4m 14s
Ups protective form cost from 50 to 150 for synths (#6414) Check for merge conflicts #23778: Commit d7f26d7 pushed by github-merge-queue bot
June 19, 2024 01:09 4m 15s master
master
June 19, 2024 01:09 4m 15s
Makes Anti-parasitic slightly more powerful to match larva gestation … Check for merge conflicts #23777: Commit 07f5cbd pushed by github-merge-queue bot
June 19, 2024 01:02 4m 14s master
master
June 19, 2024 01:02 4m 14s
Changes the firing sound of the M44 combat revolver (#6356) Check for merge conflicts #23776: Commit 6dd490a pushed by github-merge-queue bot
June 19, 2024 00:32 4m 16s master
master
June 19, 2024 00:32 4m 16s
Dir assist now prioritises non-xenos (#6461) Check for merge conflicts #23775: Commit 86f1566 pushed by github-merge-queue bot
June 18, 2024 23:32 4m 15s master
master
June 18, 2024 23:32 4m 15s
Fix global list lookups by name for 3 GLOBs (#6421) Check for merge conflicts #23774: Commit ed2fdac pushed by github-merge-queue bot
June 18, 2024 22:50 4m 17s master
master
June 18, 2024 22:50 4m 17s
Adds a plantable UA flag in the CIC armoury Check for merge conflicts #23773: Pull request #6492 ready_for_review by VileBeggar
June 18, 2024 22:36 14s
June 18, 2024 22:36 14s
Adds a plantable UA flag in the CIC armoury Check for merge conflicts #23772: Pull request #6492 synchronize by VileBeggar
June 18, 2024 22:35 11s
June 18, 2024 22:35 11s
Fix global list lookups by name for 3 GLOBs Check for merge conflicts #23771: Pull request #6421 synchronize by Drulikar
June 18, 2024 21:55 13s
June 18, 2024 21:55 13s
Fix global list lookups by name for 3 GLOBs Check for merge conflicts #23770: Pull request #6421 ready_for_review by Drulikar
June 18, 2024 21:54 12s
June 18, 2024 21:54 12s
Fix global list lookups by name for 3 GLOBs Check for merge conflicts #23769: Pull request #6421 synchronize by Drulikar
June 18, 2024 21:53 11s
June 18, 2024 21:53 11s
[V] Sorokyne Strata: Expanded Small corridors, removed 3000 unused tiles, Xenos can now weed everything except LZ's and surrounding of LZ's, allow LAZ for CAS inside structures with light blue Areas on Tacmap (glass ceiling hallways) Check for merge conflicts #23768: Pull request #6071 reopened by Drulikar
June 18, 2024 20:04 2m 12s
June 18, 2024 20:04 2m 12s
Overwatch console now shows dead people by default (#6485) Check for merge conflicts #23767: Commit eae623b pushed by github-merge-queue bot
June 18, 2024 20:02 2m 17s master
master
June 18, 2024 20:02 2m 17s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #23766: Pull request #6248 synchronize by Drulikar
June 18, 2024 19:36 12s
June 18, 2024 19:36 12s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #23765: Pull request #6248 synchronize by Drulikar
June 18, 2024 19:29 12s
June 18, 2024 19:29 12s
adds upgraded fuel tanks to the research biomass machine Check for merge conflicts #23764: Pull request #6415 synchronize by iloveloopers
June 18, 2024 18:33 14s
June 18, 2024 18:33 14s
Project ARES TM Holder (v5) Check for merge conflicts #23763: Pull request #6039 synchronize by realforest2001
June 18, 2024 18:14 16s
June 18, 2024 18:14 16s
(WIP) Project ARES: AI Service Technician Check for merge conflicts #23762: Pull request #6191 synchronize by realforest2001
June 18, 2024 18:13 14s
June 18, 2024 18:13 14s
Makes worn_id a private var Check for merge conflicts #23761: Pull request #6505 opened by Zonespace27
June 18, 2024 17:37 12s
June 18, 2024 17:37 12s