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,412 workflow run results
12,412 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

New Map: LV-759 Hybrisa Prospera Check for merge conflicts #25023: Pull request #6248 synchronize by Zenith00000
July 26, 2024 06:40 12s
July 26, 2024 06:40 12s
XM-CL ANCW: Caustic Armor for research Check for merge conflicts #25022: Pull request #6592 synchronize by TheManWithNoHands
July 26, 2024 05:06 2m 16s
July 26, 2024 05:06 2m 16s
Minimap/orbit icons resprite and remake Check for merge conflicts #25021: Pull request #6791 synchronize by Blundir
July 25, 2024 23:57 29s
July 25, 2024 23:57 29s
Minimap/orbit icons resprite and remake Check for merge conflicts #25020: Pull request #6791 opened by Blundir
July 25, 2024 23:55 14s
July 25, 2024 23:55 14s
Xeno Special Stuctures now ignore Nests. Check for merge conflicts #25019: Pull request #6790 opened by Venuska1117
July 25, 2024 23:52 15s
July 25, 2024 23:52 15s
Phone sounds update Check for merge conflicts #25018: Pull request #6789 synchronize by Blundir
July 25, 2024 23:35 12s
July 25, 2024 23:35 12s
Phone sounds update Check for merge conflicts #25017: Pull request #6789 opened by Blundir
July 25, 2024 23:34 2m 12s
July 25, 2024 23:34 2m 12s
Adds same hats available to Staff Officers to the ASO vendor (#6716) Check for merge conflicts #25016: Commit 7d456c9 pushed by github-merge-queue bot
July 25, 2024 22:53 4m 19s master
master
July 25, 2024 22:53 4m 19s
CMB Riot Control Unit Check for merge conflicts #25015: Pull request #6649 synchronize by Blundir
July 25, 2024 21:46 13s
July 25, 2024 21:46 13s
CMB Riot Control Unit Check for merge conflicts #25014: Pull request #6649 synchronize by Blundir
July 25, 2024 21:31 13s
July 25, 2024 21:31 13s
[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 #25013: Pull request #6071 ready_for_review by Venuska1117
July 25, 2024 21:17 14s
July 25, 2024 21:17 14s
autoclimbable handrails on harm intent Check for merge conflicts #25012: Pull request #6652 synchronize by cuberound
July 25, 2024 21:06 23s
July 25, 2024 21:06 23s
Nanotrasen to weyland_yutani Check for merge conflicts #25011: Pull request #6752 synchronize by cuberound
July 25, 2024 16:56 9s
July 25, 2024 16:56 9s
[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 #25010: Pull request #6071 synchronize by Venuska1117
July 25, 2024 16:12 11s
July 25, 2024 16:12 11s
XM-CL ANCW: Caustic Armor for research Check for merge conflicts #25009: Pull request #6592 synchronize by TheManWithNoHands
July 25, 2024 15:51 10s
July 25, 2024 15:51 10s
XM-CL ANCW: Caustic Armor for research Check for merge conflicts #25008: Pull request #6592 synchronize by TheManWithNoHands
July 25, 2024 15:38 11s
July 25, 2024 15:38 11s
XM-CL ANCW: Caustic Armor for research Check for merge conflicts #25007: Pull request #6592 synchronize by TheManWithNoHands
July 25, 2024 15:04 15s
July 25, 2024 15:04 15s
XM-CL ANCW: Caustic Armor for research Check for merge conflicts #25006: Pull request #6592 synchronize by TheManWithNoHands
July 25, 2024 15:04 19s
July 25, 2024 15:04 19s
Scimitar sprite changes Check for merge conflicts #25005: Pull request #6747 synchronize by JustLat
July 25, 2024 13:52 10s
July 25, 2024 13:52 10s
CMB Riot Control Unit Check for merge conflicts #25004: Pull request #6649 synchronize by Blundir
July 25, 2024 12:02 12s
July 25, 2024 12:02 12s
CO armor resprite Check for merge conflicts #25003: Pull request #6647 synchronize by Blundir
July 25, 2024 11:59 10s
July 25, 2024 11:59 10s
CO armor resprite Check for merge conflicts #25002: Pull request #6647 synchronize by Blundir
July 25, 2024 11:57 13s
July 25, 2024 11:57 13s
Adds Urban Sprite For Ghillie Suit (#6563) Check for merge conflicts #25001: Commit 8ceaaf9 pushed by github-merge-queue bot
July 25, 2024 10:03 4m 22s master
master
July 25, 2024 10:03 4m 22s
Loading Lobby Art (#6684) Check for merge conflicts #25000: Commit 775112b pushed by github-merge-queue bot
July 25, 2024 09:56 4m 17s master
master
July 25, 2024 09:56 4m 17s
Shoes resprite (#6581) Check for merge conflicts #24999: Commit 36ab967 pushed by github-merge-queue bot
July 25, 2024 09:48 4m 19s master
master
July 25, 2024 09:48 4m 19s