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

Erismed fixes. Welding eye damage. Nanites rebalance. Surgery hand sl… Check for merge conflicts #1499: Commit 6ce0c21 pushed by hyperioo
January 5, 2024 19:15 42s master
master
January 5, 2024 19:15 42s
Fixes 2 funnny mech oopsies again (#8393) Check for merge conflicts #1498: Commit 9c397bd pushed by hyperioo
January 5, 2024 18:40 40s master
master
January 5, 2024 18:40 40s
Fixes missing mag icons for nodular AK (#8385) Check for merge conflicts #1497: Commit 1e34ac3 pushed by TheShown911
December 29, 2023 18:26 40s master
master
December 29, 2023 18:26 40s
gives ks23 actual frame (#8387) Check for merge conflicts #1496: Commit 6b09e1f pushed by TheShown911
December 29, 2023 17:43 26s master
master
December 29, 2023 17:43 26s
i love to work with dmi's (#8388) Check for merge conflicts #1495: Commit aecd989 pushed by TheShown911
December 29, 2023 17:43 28s master
master
December 29, 2023 17:43 28s
Adds missing sounds and feedbacks to mechs, buffs mech melee armour (… Check for merge conflicts #1494: Commit 1e14ec9 pushed by TheShown911
December 29, 2023 17:43 40s master
master
December 29, 2023 17:43 40s
add recipies (#8392) Check for merge conflicts #1493: Commit 21af4bd pushed by TheShown911
December 29, 2023 17:42 39s master
master
December 29, 2023 17:42 39s
fixes aidkit color (#8389) Check for merge conflicts #1492: Commit 7a01a76 pushed by TheShown911
December 29, 2023 17:22 41s master
master
December 29, 2023 17:22 41s
Fixes 3 mech oppsies (#8384) Check for merge conflicts #1491: Commit 8316e67 pushed by hyperioo
December 22, 2023 17:43 38s master
master
December 22, 2023 17:43 38s
Resprite: Blast Doors + adds more blast doors to the map (#8383) Check for merge conflicts #1490: Commit 47f71b3 pushed by hyperioo
December 15, 2023 18:34 41s master
master
December 15, 2023 18:34 41s
Mech update 3 (The forklifting update) (#8378) Check for merge conflicts #1489: Commit fcc3202 pushed by hyperioo
December 15, 2023 18:32 42s master
master
December 15, 2023 18:32 42s
Battery rack update (#8382) Check for merge conflicts #1488: Commit 8ec1ce7 pushed by hyperioo
December 9, 2023 10:19 37s master
master
December 9, 2023 10:19 37s
New medkit, bandaid and adv medkit sprites **UPDATED** + Morgue slabs… Check for merge conflicts #1487: Commit cd1250a pushed by hyperioo
December 8, 2023 18:45 39s master
master
December 8, 2023 18:45 39s
Resprites: Cow , Bear, Fish, Generator & Power Bank (#8380) Check for merge conflicts #1486: Commit 5c9e722 pushed by hyperioo
December 8, 2023 18:40 43s master
master
December 8, 2023 18:40 43s
[BOUNTY] New type of shutter + shutter respriting (#8355) Check for merge conflicts #1485: Commit 8097530 pushed by hyperioo
December 1, 2023 18:19 39s master
master
December 1, 2023 18:19 39s
convert holoposter to TGUI (#8377) Check for merge conflicts #1484: Commit 54171ec pushed by hyperioo
December 1, 2023 18:11 45s master
master
December 1, 2023 18:11 45s
adds random ID card to maint (#8360) Check for merge conflicts #1483: Commit 8814ec9 pushed by hyperioo
December 1, 2023 17:45 43s master
master
December 1, 2023 17:45 43s
aa (#8376) Check for merge conflicts #1482: Commit d75bd7c pushed by Firefox13
November 25, 2023 14:07 38s master
master
November 25, 2023 14:07 38s
Removes painkilling effects from alcohol in blood and makes it metabo… Check for merge conflicts #1481: Commit c2d2165 pushed by Firefox13
November 25, 2023 11:35 39s master
master
November 25, 2023 11:35 39s
Update food-Drinks.dm (#8374) Check for merge conflicts #1480: Commit 81ab44a pushed by Firefox13
November 25, 2023 10:42 42s master
master
November 25, 2023 10:42 42s
Tones down excel redirector requirements (#8373) Check for merge conflicts #1479: Commit d77fab0 pushed by Firefox13
November 25, 2023 10:26 37s master
master
November 25, 2023 10:26 37s
Excelsior game-end scenario (#8368) Check for merge conflicts #1478: Commit 40127bf pushed by hyperioo
November 24, 2023 18:44 39s master
master
November 24, 2023 18:44 39s
Excel timer revert (#8367) Check for merge conflicts #1477: Commit e630839 pushed by hyperioo
November 24, 2023 18:25 41s master
master
November 24, 2023 18:25 41s
The dead vote no polls (#8372) Check for merge conflicts #1476: Commit a2de018 pushed by hyperioo
November 24, 2023 18:22 41s master
master
November 24, 2023 18:22 41s
Fixes mech climbing (#8370) Check for merge conflicts #1475: Commit 39702b3 pushed by hyperioo
November 24, 2023 18:21 40s master
master
November 24, 2023 18:21 40s