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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Remove nonfunctional, unused code for golem waves and burrows + misc … Check for merge conflicts #1633: Commit 5cc3501 pushed by SirRichardFrancis
February 7, 2025 14:51 1m 10s master
master
February 7, 2025 14:51 1m 10s
Small erismed fix (#8548) Check for merge conflicts #1632: Commit 39ed847 pushed by SirRichardFrancis
January 31, 2025 12:26 52s master
master
January 31, 2025 12:26 52s
Insulated technomancer helmet's icon can be swapped with a wrench (#8… Check for merge conflicts #1631: Commit 28c82de pushed by SirRichardFrancis
January 31, 2025 12:21 1m 2s master
master
January 31, 2025 12:21 1m 2s
Brings back chunk hearing (#8544) Check for merge conflicts #1630: Commit f7e5c4e pushed by SirRichardFrancis
January 31, 2025 12:10 45s master
master
January 31, 2025 12:10 45s
supergule changes (#8543) Check for merge conflicts #1629: Commit 2fd5a58 pushed by SirRichardFrancis
January 31, 2025 12:07 48s master
master
January 31, 2025 12:07 48s
Fixes shutter buttons breaking for rounds that play near 24:00 GMT an… Check for merge conflicts #1628: Commit 56f89f1 pushed by TheShown911
January 24, 2025 18:54 53s master
master
January 24, 2025 18:54 53s
fix liberty hud not working & unify functions (#8542) Check for merge conflicts #1627: Commit dc26e16 pushed by SirRichardFrancis
January 10, 2025 18:12 52s master
master
January 10, 2025 18:12 52s
added missing is_human() checks to overdose procs (#8541) Check for merge conflicts #1626: Commit 9b4f9f3 pushed by SirRichardFrancis
January 10, 2025 18:12 48s master
master
January 10, 2025 18:12 48s
Optimize action buttons (#8539) Check for merge conflicts #1625: Commit 61947d2 pushed by SirRichardFrancis
January 10, 2025 18:11 49s master
master
January 10, 2025 18:11 49s
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