Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
12,520 workflow run results
12,520 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

autoclimbable handrails on harm intent Check for merge conflicts #25147: Pull request #6652 synchronize by cuberound
July 29, 2024 18:19 12s
July 29, 2024 18:19 12s
Re: Add Directional APC's sprites, reduces lines of code by adding and using Updatepaths.txt file. Check for merge conflicts #25146: Pull request #6686 synchronize by Venuska1117
July 29, 2024 17:16 25s
July 29, 2024 17:16 25s
You can use russian warcry if you know russian Check for merge conflicts #25145: Pull request #6816 opened by Blundir
July 29, 2024 17:16 12s
July 29, 2024 17:16 12s
Brig Detainment Cameras now have their own Console (#6762) Check for merge conflicts #25144: Commit 57a11c3 pushed by github-merge-queue bot
July 29, 2024 17:01 4m 24s master
master
July 29, 2024 17:01 4m 24s
stops attempted stripping when stunned etc. (#6810) Check for merge conflicts #25143: Commit 66375e9 pushed by github-merge-queue bot
July 29, 2024 16:53 4m 20s master
master
July 29, 2024 16:53 4m 20s
lifeboat can now be unhacked by pilot (#6661) Check for merge conflicts #25142: Commit 4f9ea4e pushed by github-merge-queue bot
July 29, 2024 16:45 4m 23s master
master
July 29, 2024 16:45 4m 23s
[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 #25141: Pull request #6071 synchronize by Venuska1117
July 29, 2024 15:52 17s
July 29, 2024 15:52 17s
lifeboat can now be unhacked by pilot Check for merge conflicts #25140: Pull request #6661 ready_for_review by zzzmike
July 29, 2024 15:44 13s
July 29, 2024 15:44 13s
lifeboat can now be unhacked by pilot Check for merge conflicts #25139: Pull request #6661 synchronize by zzzmike
July 29, 2024 15:38 1m 10s
July 29, 2024 15:38 1m 10s
Re: Add Directional APC's sprites, reduces lines of code by adding and using Updatepaths.txt file. Check for merge conflicts #25138: Pull request #6686 ready_for_review by Venuska1117
July 29, 2024 15:37 1m 13s
July 29, 2024 15:37 1m 13s
Re: Add Directional APC's sprites, reduces lines of code by adding and using Updatepaths.txt file. Check for merge conflicts #25137: Pull request #6686 synchronize by Venuska1117
July 29, 2024 15:37 49s
July 29, 2024 15:37 49s
lifeboat can now be unhacked by pilot Check for merge conflicts #25136: Pull request #6661 synchronize by zzzmike
July 29, 2024 15:36 12s
July 29, 2024 15:36 12s
Re: Add Directional APC's sprites, reduces lines of code by adding and using Updatepaths.txt file. Check for merge conflicts #25135: Pull request #6686 synchronize by Venuska1117
July 29, 2024 15:30 11s
July 29, 2024 15:30 11s
Phone sounds update Check for merge conflicts #25134: Pull request #6789 ready_for_review by Blundir
July 29, 2024 14:50 14s
July 29, 2024 14:50 14s
Phone sounds update Check for merge conflicts #25133: Pull request #6789 synchronize by Blundir
July 29, 2024 14:50 11s
July 29, 2024 14:50 11s
Solar Devils ERT [PvE Marines] Check for merge conflicts #25132: Pull request #6811 synchronize by Steelpoint
July 29, 2024 14:42 12s
July 29, 2024 14:42 12s
Solar Devils ERT [PvE Marines] Check for merge conflicts #25131: Pull request #6811 synchronize by Steelpoint
July 29, 2024 14:34 10s
July 29, 2024 14:34 10s
[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 #25130: Pull request #6071 synchronize by Venuska1117
July 29, 2024 14:06 14s
July 29, 2024 14:06 14s
[Solaris Ridge] Aesthetic Update V2 Check for merge conflicts #25129: Pull request #6602 synchronize by Steelpoint
July 29, 2024 08:48 1h 31m 29s
July 29, 2024 08:48 1h 31m 29s
[Solaris Ridge] Aesthetic Update V2 Check for merge conflicts #25128: Pull request #6602 ready_for_review by Steelpoint
July 29, 2024 08:48 1h 33m 24s
July 29, 2024 08:48 1h 33m 24s
Comtech Stuff Check for merge conflicts #25127: Pull request #6650 synchronize by Git-Nivrak
July 29, 2024 07:29 2h 52m 0s
July 29, 2024 07:29 2h 52m 0s
changes circuit board name in vendor from auxiliar --> auxiliary power storage unit Check for merge conflicts #25126: Pull request #6814 opened by ghost
July 29, 2024 00:42 12s
July 29, 2024 00:42 12s
capitalize W in workshop for ordnance workshop area Check for merge conflicts #25125: Pull request #6813 synchronize by ghost
July 29, 2024 00:33 13s
July 29, 2024 00:33 13s
capitalize W in workshop for ordnance workshop area Check for merge conflicts #25124: Pull request #6813 opened by ghost
July 29, 2024 00:33 15s
July 29, 2024 00:33 15s
Comtech Stuff Check for merge conflicts #25123: Pull request #6650 synchronize by Git-Nivrak
July 28, 2024 21:57 11s
July 28, 2024 21:57 11s