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
188 workflow runs
188 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fixes missing sprite for /obj/item/ammo_magazine/ammobox/shotgun_smal… Check for merge conflicts #1624: Commit 6bd2c6a pushed by TheShown911
December 21, 2024 13:22 38s master
master
December 21, 2024 13:22 38s
Floor-ripping commit (#8535) Check for merge conflicts #1623: Commit c9642aa pushed by TheShown911
December 21, 2024 13:21 49s master
master
December 21, 2024 13:21 49s
unfuck ZAS (#8537) Check for merge conflicts #1622: Commit 389af8d pushed by TheShown911
December 21, 2024 13:20 36s master
master
December 21, 2024 13:20 36s
remove plasma contamination mechanic (#8538) Check for merge conflicts #1621: Commit 362e4a8 pushed by TheShown911
December 21, 2024 13:20 1m 3s master
master
December 21, 2024 13:20 1m 3s
Blacklists Excelsior's heavy armor's pieces from spawning (#8533) Check for merge conflicts #1620: Commit 990838c pushed by TheShown911
December 6, 2024 21:06 42s master
master
December 6, 2024 21:06 42s
switching to persistent tts token (#8532) Check for merge conflicts #1619: Commit b7c3ac5 pushed by TheShown911
October 27, 2024 18:53 38s master
master
October 27, 2024 18:53 38s
Oddity variety pack (#8529) Check for merge conflicts #1618: Commit 3dffc62 pushed by Humonitarian
October 26, 2024 10:47 41s master
master
October 26, 2024 10:47 41s
Revert "Neotheology Taint (#8064)" (#8530) Check for merge conflicts #1617: Commit 4fbdb96 pushed by Humonitarian
October 13, 2024 23:42 39s master
master
October 13, 2024 23:42 39s
Revert "Eris Spooktober update (#8526)" (#8528) Check for merge conflicts #1616: Commit 13dc696 pushed by Humonitarian
October 5, 2024 19:43 37s master
master
October 5, 2024 19:43 37s
Neotheology Taint (#8064) Check for merge conflicts #1615: Commit 20c694e pushed by Humonitarian
October 2, 2024 17:19 56s master
master
October 2, 2024 17:19 56s
Eris Spooktober update (#8526) Check for merge conflicts #1614: Commit ee3f5e8 pushed by Humonitarian
October 1, 2024 16:56 43s master
master
October 1, 2024 16:56 43s
Halloween update Remade (#8527) Check for merge conflicts #1613: Commit df81fe2 pushed by Humonitarian
October 1, 2024 15:50 54s master
master
October 1, 2024 15:50 54s
Disposable gun: ... Svalinn! (#8139) Check for merge conflicts #1612: Commit 854591a pushed by SirRichardFrancis
September 24, 2024 09:05 39s master
master
September 24, 2024 09:05 39s
Shield generator and Long range scanner refactor + Bioreactor fixes (… Check for merge conflicts #1611: Commit 954370b pushed by Humonitarian
September 23, 2024 10:22 56s master
master
September 23, 2024 10:22 56s
Excelsior armor and starter kit crates (#8503) Check for merge conflicts #1610: Commit 983a6bf pushed by Humonitarian
September 14, 2024 20:38 54s master
master
September 14, 2024 20:38 54s
Description Updates (#8524) Check for merge conflicts #1609: Commit 976a40f pushed by Humonitarian
September 14, 2024 20:37 26s master
master
September 14, 2024 20:37 26s
Fixing power consumption everywhere (#8517) Check for merge conflicts #1608: Commit 207d817 pushed by Humonitarian
September 14, 2024 20:36 40s master
master
September 14, 2024 20:36 40s
Channeling fix (#8518) Check for merge conflicts #1607: Commit 1eb429a pushed by Humonitarian
September 14, 2024 20:32 1m 5s master
master
September 14, 2024 20:32 1m 5s
me when the (#8525) Check for merge conflicts #1606: Commit c7afe20 pushed by Humonitarian
September 14, 2024 20:16 53s master
master
September 14, 2024 20:16 53s
Update nanites.dm (#8520) Check for merge conflicts #1605: Commit ce50ada pushed by TheShown911
September 6, 2024 15:42 40s master
master
September 6, 2024 15:42 40s
Remove satchel gathering limit of 15. (#8521) Check for merge conflicts #1604: Commit 270f934 pushed by TheShown911
September 6, 2024 15:40 27s master
master
September 6, 2024 15:40 27s
better 515 compatibility (#8522) Check for merge conflicts #1603: Commit 85cfec5 pushed by TheShown911
September 6, 2024 15:40 50s master
master
September 6, 2024 15:40 50s
Fix window interactions (#8523) Check for merge conflicts #1602: Commit 4d45b40 pushed by TheShown911
September 6, 2024 15:39 45s master
master
September 6, 2024 15:39 45s
Fixes excel redirector again (#8519) Check for merge conflicts #1601: Commit 06a3b8a pushed by Firefox13
August 18, 2024 10:38 53s master
master
August 18, 2024 10:38 53s
Blood loss fix (#8512) Check for merge conflicts #1600: Commit f564972 pushed by TheShown911
August 16, 2024 14:21 39s master
master
August 16, 2024 14:21 39s