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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

camera console now uses camera manager Check for merge conflicts #19081: Pull request #5310 synchronize by mullenpaul
January 28, 2024 13:48 13s
January 28, 2024 13:48 13s
Fixes missing poncho sprites Check for merge conflicts #19080: Pull request #5582 opened by SabreML
January 28, 2024 13:29 12s
January 28, 2024 13:29 12s
Resolve sticky messages in STUI Check for merge conflicts #19079: Pull request #5581 opened by mullenpaul
January 28, 2024 12:10 25s
January 28, 2024 12:10 25s
Camera Autoname change (#5456) Check for merge conflicts #19078: Commit e143889 pushed by github-merge-queue bot
January 28, 2024 12:06 4m 15s master
master
January 28, 2024 12:06 4m 15s
Fixes facehuggers being able to flip tables Check for merge conflicts #19077: Pull request #5580 opened by SabreML
January 28, 2024 11:59 3m 12s
January 28, 2024 11:59 3m 12s
Adds a Researcher and CMB variants on Trijent, also touched up RD Clo… Check for merge conflicts #19076: Commit 640ca75 pushed by github-merge-queue bot
January 28, 2024 11:53 4m 15s master
master
January 28, 2024 11:53 4m 15s
CO Biometrics (#5520) Check for merge conflicts #19075: Commit a9b7b17 pushed by github-merge-queue bot
January 28, 2024 11:39 4m 15s master
master
January 28, 2024 11:39 4m 15s
get_line() refactor (#5452) Check for merge conflicts #19074: Commit 12f5f35 pushed by github-merge-queue bot
January 28, 2024 11:26 4m 14s master
master
January 28, 2024 11:26 4m 14s
Tweak Game Mode Start Handling (#5506) Check for merge conflicts #19073: Commit 20db241 pushed by github-merge-queue bot
January 28, 2024 11:12 4m 14s master
master
January 28, 2024 11:12 4m 14s
Civilian survs now spawn with snow gear (#5533) Check for merge conflicts #19072: Commit 92f00bd pushed by github-merge-queue bot
January 28, 2024 10:58 4m 13s master
master
January 28, 2024 10:58 4m 13s
fix some stuff on almayer and refactor some upper deck areas. Check for merge conflicts #19071: Pull request #5572 ready_for_review by Huffie56
January 28, 2024 10:50 2m 3s
January 28, 2024 10:50 2m 3s
Fixes edited .jsx files not triggering a TGUI recompile (#5562) Check for merge conflicts #19070: Commit ef25cff pushed by github-merge-queue bot
January 28, 2024 10:49 2m 16s master
master
January 28, 2024 10:49 2m 16s
Fixes a bunch of spelling mistakes (#5555) Check for merge conflicts #19069: Commit ee339c1 pushed by github-merge-queue bot
January 28, 2024 10:32 2m 39s master
master
January 28, 2024 10:32 2m 39s
fix some stuff on almayer and refactor some upper deck areas. Check for merge conflicts #19068: Pull request #5572 synchronize by Huffie56
January 28, 2024 10:31 12s
January 28, 2024 10:31 12s
Makes observers see the marine version of CAS warnings (#5561) Check for merge conflicts #19067: Commit d3f8ed9 pushed by github-merge-queue bot
January 28, 2024 10:18 4m 16s master
master
January 28, 2024 10:18 4m 16s
Allow surgery on crashed ships (and new tile variants allowing surgury & construction) Check for merge conflicts #19066: Pull request #5579 opened by hislittlecuzingames
January 28, 2024 09:31 12s
January 28, 2024 09:31 12s
Food processor can be used to remove carpotoxin and acidic blood with master domestic skill Check for merge conflicts #19065: Pull request #5577 synchronize by LaylaMcC
January 28, 2024 09:04 10s
January 28, 2024 09:04 10s
Food processor can be used to remove carpotoxin and acidic blood with master domestic skill Check for merge conflicts #19064: Pull request #5577 synchronize by LaylaMcC
January 28, 2024 09:03 11s
January 28, 2024 09:03 11s
Food processor can be used to remove carpotoxin and acidic blood with master domestic skill Check for merge conflicts #19063: Pull request #5577 synchronize by LaylaMcC
January 28, 2024 09:02 9s
January 28, 2024 09:02 9s
Food processor can be used to remove carpotoxin and acidic blood with master domestic skill Check for merge conflicts #19062: Pull request #5577 synchronize by LaylaMcC
January 28, 2024 09:01 13s
January 28, 2024 09:01 13s
Food processor can be used to remove carpotoxin and acidic blood with master domestic skill Check for merge conflicts #19061: Pull request #5577 opened by LaylaMcC
January 28, 2024 05:31 11s
January 28, 2024 05:31 11s
Chestbursting larva no longer get hive orders when there are no hive orders Check for merge conflicts #19060: Pull request #5576 opened by Contrabang
January 28, 2024 02:38 18s
January 28, 2024 02:38 18s
MP QoL : part 1 Check for merge conflicts #19059: Pull request #5554 synchronize by Diegoflores31
January 27, 2024 23:43 10s
January 27, 2024 23:43 10s
Réorganisation de l'équipe médicale - 1 Check for merge conflicts #19058: Pull request #5458 synchronize by LC4492
January 27, 2024 21:40 12s
January 27, 2024 21:40 12s
M3-L Pattern Light Armor Added to IO Prep Check for merge conflicts #19057: Pull request #5574 opened by MobiusWon
January 27, 2024 20:23 10s
January 27, 2024 20:23 10s