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

Excelsior machinery only works shipside (#8366) Check for merge conflicts #1474: Commit 6c825a7 pushed by hyperioo
November 24, 2023 18:13 43s master
master
November 24, 2023 18:13 43s
[BOUNTY] Quick-equipped items go into open inventories (#8354) Check for merge conflicts #1473: Commit 90ae243 pushed by hyperioo
November 24, 2023 17:53 41s master
master
November 24, 2023 17:53 41s
Multiple mech related fixes (#8363) Check for merge conflicts #1472: Commit b36cf78 pushed by hyperioo
November 18, 2023 12:26 40s master
master
November 18, 2023 12:26 40s
Mech equipment can now be used with an open hatch (#8365) Check for merge conflicts #1471: Commit 50ac0f4 pushed by hyperioo
November 17, 2023 17:37 1m 1s master
master
November 17, 2023 17:37 1m 1s
Update combat.dm (#8364) Check for merge conflicts #1470: Commit a8ba914 pushed by hyperioo
November 17, 2023 17:36 49s master
master
November 17, 2023 17:36 49s
Adds a check if input proc return value is null (#8362) Check for merge conflicts #1469: Commit e440beb pushed by hyperioo
November 17, 2023 17:32 46s master
master
November 17, 2023 17:32 46s
Resprites girders, SMES coils (stock parts), RPED and lattices by Inf… Check for merge conflicts #1468: Commit 884d013 pushed by hyperioo
November 17, 2023 17:31 39s master
master
November 17, 2023 17:31 39s
The long awaited proper fix for SSchunks tracking going wrong (#8359) Check for merge conflicts #1467: Commit 5887a20 pushed by hyperioo
November 17, 2023 17:30 40s master
master
November 17, 2023 17:30 40s
Fixes mech ballistic shields not showing (#8358) Check for merge conflicts #1466: Commit 4957f05 pushed by hyperioo
November 17, 2023 17:15 42s master
master
November 17, 2023 17:15 42s
hotfix2 (#8357) Check for merge conflicts #1465: Commit 79a177b pushed by Firefox13
November 10, 2023 22:03 1m 2s master
master
November 10, 2023 22:03 1m 2s
fix (#8356) Check for merge conflicts #1464: Commit 56f7c88 pushed by TheShown911
November 10, 2023 19:25 40s master
master
November 10, 2023 19:25 40s
[BNTY] Mech Update (#8349) Check for merge conflicts #1463: Commit 8171fed pushed by hyperioo
November 10, 2023 18:47 53s master
master
November 10, 2023 18:47 53s
Death is Our Destination (New funeral rite) (#8346) Check for merge conflicts #1462: Commit 77f895e pushed by hyperioo
November 10, 2023 18:41 53s master
master
November 10, 2023 18:41 53s
Another door hotfix (#8352) Check for merge conflicts #1461: Commit e257bff pushed by hyperioo
November 4, 2023 10:30 51s master
master
November 4, 2023 10:30 51s
Hotfix for windoor bumping (#8351) Check for merge conflicts #1460: Commit 25a3ffe pushed by hyperioo
November 3, 2023 23:39 50s master
master
November 3, 2023 23:39 50s
Decreases Captain Bank account to 300k, fixes moebius name in paychec… Check for merge conflicts #1459: Commit a664e34 pushed by hyperioo
November 3, 2023 21:07 38s master
master
November 3, 2023 21:07 38s
[BNTY] Adds shutter/blast construction/deconstruction , fixes door bu… Check for merge conflicts #1458: Commit 62861fe pushed by hyperioo
November 3, 2023 21:07 53s master
master
November 3, 2023 21:07 53s
New Stock Parts Sprites by Baron (#8347) Check for merge conflicts #1457: Commit b0c1b87 pushed by hyperioo
November 3, 2023 18:18 49s master
master
November 3, 2023 18:18 49s
Fix BioReactor Respawn Reward (#8348) Check for merge conflicts #1456: Commit 0f11f43 pushed by hyperioo
November 3, 2023 18:15 30s master
master
November 3, 2023 18:15 30s
Adjust Voting Values (#8345) Check for merge conflicts #1455: Commit 37ca7cb pushed by hyperioo
November 3, 2023 18:14 56s master
master
November 3, 2023 18:14 56s
Mapping disk smartfridges (#8343) Check for merge conflicts #1454: Commit c59ba42 pushed by hyperioo
October 27, 2023 16:55 58s master
master
October 27, 2023 16:55 58s
New mid-threat antag: Pirates (#8340) Check for merge conflicts #1453: Commit 4b7e693 pushed by hyperioo
October 20, 2023 17:07 1m 2s master
master
October 20, 2023 17:07 1m 2s
Add K.A.R.L mining tool (#8339) Check for merge conflicts #1452: Commit 4de81c8 pushed by hyperioo
October 20, 2023 17:05 57s master
master
October 20, 2023 17:05 57s
Sorter Room Disposal Chute Fix, Shipping Supplies (General Map PR) (#… Check for merge conflicts #1451: Commit 90569b8 pushed by hyperioo
October 20, 2023 17:04 1m 0s master
master
October 20, 2023 17:04 1m 0s
Prevent deep drill unwrenching during collapse (#8338) Check for merge conflicts #1450: Commit 7d0e625 pushed by hyperioo
October 20, 2023 17:02 1m 2s master
master
October 20, 2023 17:02 1m 2s