Skip to content

Actions: discordia-space/CEV-Eris

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
186 workflow runs
186 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Aberrant Organs: Minor rework and fixes (#8476) Check for merge conflicts #1574: Commit 5698979 pushed by TheShown911
May 10, 2024 18:29 47s master
master
May 10, 2024 18:29 47s
Mech drill rework (#8481) Check for merge conflicts #1573: Commit cd92cc6 pushed by TheShown911
May 10, 2024 18:28 39s master
master
May 10, 2024 18:28 39s
Restrict combat mech users from entering with any suits/armors (#8471) Check for merge conflicts #1572: Commit 8c0a397 pushed by TheShown911
May 10, 2024 18:22 38s master
master
May 10, 2024 18:22 38s
removed random miss chances for living and projectiles (#8483) Check for merge conflicts #1571: Commit 85507ed pushed by TheShown911
May 10, 2024 17:55 39s master
master
May 10, 2024 17:55 39s
New Material Exchange Vendor (#8459) Check for merge conflicts #1570: Commit 78b2fe2 pushed by Humonitarian
May 6, 2024 13:17 44s master
master
May 6, 2024 13:17 44s
Rework the mech shield generator to have an internal capacitor, refac… Check for merge conflicts #1569: Commit 400b2a5 pushed by hyperioo
April 26, 2024 17:44 39s master
master
April 26, 2024 17:44 39s
Stat panel fixes (#8480) Check for merge conflicts #1568: Commit 7fefac9 pushed by hyperioo
April 26, 2024 17:43 41s master
master
April 26, 2024 17:43 41s
Sabotage yourself now (#8479) Check for merge conflicts #1567: Commit c1881a2 pushed by hyperioo
April 26, 2024 17:40 41s master
master
April 26, 2024 17:40 41s
Mapped Central Fuel Chamber, plus various atmos related troubleshooti… Check for merge conflicts #1566: Commit d05a8e4 pushed by hyperioo
April 26, 2024 17:39 38s master
master
April 26, 2024 17:39 38s
add new examines to cooking (#8478) Check for merge conflicts #1565: Commit b5ad5e3 pushed by TheShown911
April 19, 2024 23:33 39s master
master
April 19, 2024 23:33 39s
assisted surgery and bone replacement fixes (#8477) Check for merge conflicts #1564: Commit dd6ca21 pushed by TheShown911
April 19, 2024 18:47 37s master
master
April 19, 2024 18:47 37s
Violent ejections (#8474) Check for merge conflicts #1563: Commit 4344283 pushed by TheShown911
April 19, 2024 18:45 40s master
master
April 19, 2024 18:45 40s
Cooking Adjustments 2 (#8475) Check for merge conflicts #1562: Commit fde647a pushed by TheShown911
April 19, 2024 18:29 40s master
master
April 19, 2024 18:29 40s
hcases QoL and bugfix (#8472) Check for merge conflicts #1561: Commit f8532cc pushed by TheShown911
April 19, 2024 18:26 37s master
master
April 19, 2024 18:26 37s
Upgrade to Fullscreen Edition (#8461) Check for merge conflicts #1560: Commit e2f39a3 pushed by TheShown911
April 19, 2024 09:34 38s master
master
April 19, 2024 09:34 38s
Cooking hotfixes (#8473) Check for merge conflicts #1559: Commit b63f1c2 pushed by Humonitarian
April 13, 2024 22:26 38s master
master
April 13, 2024 22:26 38s
Mech additions(3 weapons, new chassis, fixes) (#8463) Check for merge conflicts #1558: Commit 8343bc5 pushed by TheShown911
April 12, 2024 18:44 43s master
master
April 12, 2024 18:44 43s
Jesse, it's time to cook (Fundamental Cooking Rework) (#8404) Check for merge conflicts #1557: Commit ba4ed77 pushed by TheShown911
April 12, 2024 18:03 46s master
master
April 12, 2024 18:03 46s
Removes: Mech Armor, Adds: Mech armor to Mech Components (#8405) Check for merge conflicts #1556: Commit 06011bf pushed by hyperioo
April 5, 2024 18:02 47s master
master
April 5, 2024 18:02 47s
Update recipes.dm (#8464) Check for merge conflicts #1555: Commit cc4d43f pushed by TheShown911
March 28, 2024 22:45 37s master
master
March 28, 2024 22:45 37s
Adds the other 3 40 milll rounds (#8455) Check for merge conflicts #1554: Commit c20970a pushed by TheShown911
March 28, 2024 22:42 38s master
master
March 28, 2024 22:42 38s
Slime fix (#8465) Check for merge conflicts #1553: Commit f7e124b pushed by TheShown911
March 28, 2024 22:32 38s master
master
March 28, 2024 22:32 38s
Updates: Material Icons (#8462) Check for merge conflicts #1552: Commit ebf7936 pushed by hyperioo
March 22, 2024 18:37 30s master
master
March 22, 2024 18:37 30s
Resprite thermals goggles (#8458) Check for merge conflicts #1551: Commit 01388e5 pushed by hyperioo
March 22, 2024 18:36 48s master
master
March 22, 2024 18:36 48s
Better shelter 2: Bluespace boogaloo (#8314) Check for merge conflicts #1550: Commit 680e95a pushed by TheShown911
March 15, 2024 20:01 41s master
master
March 15, 2024 20:01 41s