Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
1,189 workflow run results
1,189 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Drastic Changes to the USS Almayer research department Check for merge conflicts #12443: Pull request #3962 synchronize by spartanbobby
July 21, 2023 23:10 10s
July 21, 2023 23:10 10s
Drastic Changes to the USS Almayer research department Check for merge conflicts #12442: Pull request #3962 synchronize by spartanbobby
July 21, 2023 23:07 13s
July 21, 2023 23:07 13s
Drastic Changes to the USS Almayer research department Check for merge conflicts #12441: Pull request #3962 synchronize by spartanbobby
July 21, 2023 21:58 11s
July 21, 2023 21:58 11s
Drastic Changes to the USS Almayer research department Check for merge conflicts #12440: Pull request #3962 synchronize by spartanbobby
July 21, 2023 21:51 11s
July 21, 2023 21:51 11s
Drastic Changes to the USS Almayer research department Check for merge conflicts #12439: Pull request #3962 synchronize by spartanbobby
July 21, 2023 21:49 10s
July 21, 2023 21:49 10s
Fix bodybags requiring ToD even if unreviveable Check for merge conflicts #12438: Pull request #3964 synchronize by Drulikar
July 21, 2023 21:43 9s
July 21, 2023 21:43 9s
Fix bodybags requiring ToD even if unreviveable Check for merge conflicts #12437: Pull request #3964 opened by Drulikar
July 21, 2023 21:27 10s
July 21, 2023 21:27 10s
Adds a new jacket for the Commanding Officer Check for merge conflicts #12436: Pull request #3963 opened by BeagleGaming1
July 21, 2023 20:15 16s
July 21, 2023 20:15 16s
New CAS Weapon: BLU-200 Dragons Breath, thermobaric bomb Check for merge conflicts #12435: Pull request #3832 ready_for_review by blackdragonTOW
July 21, 2023 18:34 14s
July 21, 2023 18:34 14s
New CAS Weapon: BLU-200 Dragons Breath, thermobaric bomb Check for merge conflicts #12434: Pull request #3832 synchronize by blackdragonTOW
July 21, 2023 18:26 13s
July 21, 2023 18:26 13s
Drastic Changes to the USS Almayer research department Check for merge conflicts #12433: Pull request #3962 synchronize by spartanbobby
July 21, 2023 18:24 12s
July 21, 2023 18:24 12s
Drastic Changes to the USS Almayer research department Check for merge conflicts #12432: Pull request #3962 opened by spartanbobby
July 21, 2023 18:18 16s
July 21, 2023 18:18 16s
Zone de commandement général - 1 - Mapping CIC Rework Check for merge conflicts #12431: Pull request #3903 synchronize by LC4492
July 21, 2023 14:06 12s
July 21, 2023 14:06 12s
New blood bags Check for merge conflicts #12430: Pull request #3961 synchronize by nauticall
July 21, 2023 14:02 13s
July 21, 2023 14:02 13s
New blood bags Check for merge conflicts #12429: Pull request #3961 synchronize by nauticall
July 21, 2023 13:50 11s
July 21, 2023 13:50 11s
New blood bags Check for merge conflicts #12428: Pull request #3961 opened by nauticall
July 21, 2023 13:43 12s
July 21, 2023 13:43 12s
fixes xenos being blocked by humans fireman-carrying Check for merge conflicts #12427: Pull request #3960 opened by realkhad
July 21, 2023 11:35 13s
July 21, 2023 11:35 13s
fixes welder tool using up fuel on clicks that produce no action Check for merge conflicts #12426: Pull request #3959 opened by realkhad
July 21, 2023 11:23 12s
July 21, 2023 11:23 12s
Fix the first prompt to ghost when nested (#3943) Check for merge conflicts #12425: Commit fa16ee3 pushed by github-merge-queue bot
July 21, 2023 09:48 4m 18s master
master
July 21, 2023 09:48 4m 18s
Ghosts now notified when larva are about to chestburst out of un-nest… Check for merge conflicts #12424: Commit fee91f7 pushed by github-merge-queue bot
July 21, 2023 09:35 4m 19s master
master
July 21, 2023 09:35 4m 19s
Minor Chem ERT objective description change. (#3948) Check for merge conflicts #12423: Commit 2e27d03 pushed by github-merge-queue bot
July 21, 2023 09:22 4m 20s master
master
July 21, 2023 09:22 4m 20s
Decreases blood bag IV insertion time (#3950) Check for merge conflicts #12422: Commit 10d3038 pushed by github-merge-queue bot
July 21, 2023 09:09 4m 19s master
master
July 21, 2023 09:09 4m 19s
Adds var to tents to make them deployable on the Almayer/Tdome (#3953) Check for merge conflicts #12421: Commit 60c520c pushed by github-merge-queue bot
July 21, 2023 08:55 4m 15s master
master
July 21, 2023 08:55 4m 15s
Minor Chem ERT objective description change. Check for merge conflicts #12420: Pull request #3948 synchronize by ClairionCM
July 21, 2023 07:57 11s
July 21, 2023 07:57 11s
Fix Xeno Tacmap Persistence Check for merge conflicts #12419: Pull request #3957 synchronize by Drulikar
July 21, 2023 04:58 2m 13s
July 21, 2023 04:58 2m 13s