Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
7,897 workflow run results
7,897 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Jumping out of a dropship heading towards an LZ now throws your body at the ground, instead of deleting it. Check for merge conflicts #19129: Pull request #5584 synchronize by Contrabang
January 29, 2024 18:31 10s
January 29, 2024 18:31 10s
Adds One ACCESSORY ONLY Slot for Helmets Check for merge conflicts #19128: Pull request #5573 synchronize by Staykeu
January 29, 2024 17:51 10s
January 29, 2024 17:51 10s
Research Fire Properties rework/rebalance Check for merge conflicts #19127: Pull request #5519 synchronize by iloveloopers
January 29, 2024 17:30 11s
January 29, 2024 17:30 11s
Research Fire Properties rework/rebalance Check for merge conflicts #19126: Pull request #5519 synchronize by iloveloopers
January 29, 2024 17:25 22s
January 29, 2024 17:25 22s
Research Fire Properties rework/rebalance Check for merge conflicts #19125: Pull request #5519 synchronize by iloveloopers
January 29, 2024 17:24 13s
January 29, 2024 17:24 13s
Fixes Queen xenos not automatically climbing ledges Check for merge conflicts #19124: Pull request #5591 opened by SabreML
January 29, 2024 16:06 14s
January 29, 2024 16:06 14s
Abomination rework and predator plasma rifle buff. Check for merge conflicts #19123: Pull request #5432 synchronize by Red-byte3D
January 29, 2024 15:29 12s
January 29, 2024 15:29 12s
Abomination rework and predator plasma rifle buff. Check for merge conflicts #19122: Pull request #5432 synchronize by Red-byte3D
January 29, 2024 15:26 12s
January 29, 2024 15:26 12s
Jumping out of a dropship heading towards an LZ now throws your body at the ground, instead of deleting it. Check for merge conflicts #19121: Pull request #5584 synchronize by Contrabang
January 29, 2024 12:59 49s
January 29, 2024 12:59 49s
M3-L Pattern Light Armor Added to IO Prep Check for merge conflicts #19120: Pull request #5574 synchronize by MobiusWon
January 29, 2024 12:58 20s
January 29, 2024 12:58 20s
Fixes a stray pixel in the warrior 'walking' sprite. Check for merge conflicts #19119: Pull request #5590 opened by SabreML
January 29, 2024 12:58 11s
January 29, 2024 12:58 11s
XM4 Armor Integral Motion Detector Check for merge conflicts #19118: Pull request #5586 synchronize by MobiusWon
January 29, 2024 12:35 11s
January 29, 2024 12:35 11s
scout ammo and economy nerf Check for merge conflicts #19117: Pull request #5539 synchronize by Red-byte3D
January 29, 2024 12:19 13s
January 29, 2024 12:19 13s
Fixes missing poncho sprites (#5582) Check for merge conflicts #19116: Commit 50a51ce pushed by github-merge-queue bot
January 29, 2024 11:26 4m 17s master
master
January 29, 2024 11:26 4m 17s
fix some stuff on almayer and refactor some upper deck areas. (#5572) Check for merge conflicts #19115: Commit 4ea98ae pushed by github-merge-queue bot
January 29, 2024 11:13 4m 15s master
master
January 29, 2024 11:13 4m 15s
Resolve sticky messages in STUI (#5581) Check for merge conflicts #19114: Commit 4e81ee7 pushed by github-merge-queue bot
January 29, 2024 10:59 4m 16s master
master
January 29, 2024 10:59 4m 16s
Queen give_evo changes (#5505) Check for merge conflicts #19113: Commit 22baea3 pushed by github-merge-queue bot
January 29, 2024 10:11 4m 16s master
master
January 29, 2024 10:11 4m 16s
Normalizes dropship_crash to -6db Check for merge conflicts #19112: Pull request #5588 opened by blackdragonTOW
January 29, 2024 07:28 13s
January 29, 2024 07:28 13s
XM4 Armor Integral Motion Detector Check for merge conflicts #19111: Pull request #5586 opened by MobiusWon
January 29, 2024 04:54 11s
January 29, 2024 04:54 11s
Jumping out of a dropship heading towards an LZ now throws your body at the ground, instead of deleting it. Check for merge conflicts #19110: Pull request #5584 ready_for_review by Contrabang
January 29, 2024 04:20 12s
January 29, 2024 04:20 12s
Dropship Fabricator UI Fix Check for merge conflicts #19109: Pull request #5585 synchronize by Oyu07
January 29, 2024 02:00 2m 13s
January 29, 2024 02:00 2m 13s
Dropship Fabricator UI Fix Check for merge conflicts #19108: Pull request #5585 opened by Oyu07
January 29, 2024 00:22 10s
January 29, 2024 00:22 10s
Jumping out of a dropship heading towards an LZ now throws your body at the ground, instead of deleting it. Check for merge conflicts #19107: Pull request #5584 opened by Contrabang
January 29, 2024 00:20 11s
January 29, 2024 00:20 11s
Allow surgery on crashed ships (and new tile variants allowing surgury & construction) Check for merge conflicts #19106: Pull request #5579 synchronize by hislittlecuzingames
January 28, 2024 20:14 1m 31s
January 28, 2024 20:14 1m 31s
Removes Squad Optics as Default Helmet Visors Check for merge conflicts #19105: Pull request #5583 opened by Staykeu
January 28, 2024 20:06 1m 33s
January 28, 2024 20:06 1m 33s