Skip to content

Actions: ss220-space/Paradise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
11,468 workflow run results
11,468 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

bugfix: Brains in mmi can cast spells Merge Conflict Detection #16334: Pull request #6021 opened by timchigaming
October 14, 2024 11:36 16s
October 14, 2024 11:36 16s
bugfix: Babylon Fever runtime fix Merge Conflict Detection #16333: Pull request #6020 opened by timchigaming
October 14, 2024 11:31 13s
October 14, 2024 11:31 13s
Add: ASHIE UPDATE Merge Conflict Detection #16332: Pull request #5875 synchronize by Antoonij
October 14, 2024 10:37 17s
October 14, 2024 10:37 17s
Add: ASHIE UPDATE Merge Conflict Detection #16331: Pull request #5875 synchronize by Antoonij
October 14, 2024 10:33 11s
October 14, 2024 10:33 11s
add: Syndicate affiliates 2.0 Merge Conflict Detection #16330: Pull request #5993 synchronize by Anorak2024
October 14, 2024 08:00 12s
October 14, 2024 08:00 12s
tweak: sets up audio emotes cooldown Merge Conflict Detection #16329: Pull request #6019 opened by Vladisvell
October 14, 2024 07:37 9s
October 14, 2024 07:37 9s
add: Syndicate affiliates 2.0 Merge Conflict Detection #16328: Pull request #5993 synchronize by Anorak2024
October 14, 2024 07:35 11s
October 14, 2024 07:35 11s
add: Syndicate affiliates 2.0 Merge Conflict Detection #16327: Pull request #5993 synchronize by Anorak2024
October 14, 2024 07:32 12s
October 14, 2024 07:32 12s
Automatic NanoMap Update (#5946) Merge Conflict Detection #16326: Commit b954d7d pushed by Bizzonium
October 13, 2024 15:00 2m 15s master220
master220
October 13, 2024 15:00 2m 15s
bugfix: Spells can be used in MMI Merge Conflict Detection #16325: Pull request #6018 synchronize by timchigaming
October 13, 2024 14:00 10s
October 13, 2024 14:00 10s
refactor: reagent attacks & Unarmed attacks Merge Conflict Detection #16324: Pull request #5926 synchronize by Antoonij
October 13, 2024 13:13 2m 57s
October 13, 2024 13:13 2m 57s
bugfix: Spells can be used in MMI Merge Conflict Detection #16323: Pull request #6018 synchronize by timchigaming
October 13, 2024 13:13 2m 2s
October 13, 2024 13:13 2m 2s
bugfix: Spells can be used in MMI Merge Conflict Detection #16322: Pull request #6018 synchronize by timchigaming
October 13, 2024 13:12 1m 25s
October 13, 2024 13:12 1m 25s
bugfix: Spells can be used in MMI Merge Conflict Detection #16321: Pull request #6018 synchronize by timchigaming
October 13, 2024 13:11 1m 46s
October 13, 2024 13:11 1m 46s
qol: Morph antag datum + feat for admins Merge Conflict Detection #16320: Pull request #5835 synchronize by Antoonij
October 13, 2024 13:11 3m 22s
October 13, 2024 13:11 3m 22s
bugfix: Spells can be used in MMI Merge Conflict Detection #16319: Pull request #6018 synchronize by timchigaming
October 13, 2024 13:08 3m 10s
October 13, 2024 13:08 3m 10s
bugfix: Spells can be used in MMI Merge Conflict Detection #16318: Pull request #6018 synchronize by timchigaming
October 13, 2024 13:07 2m 51s
October 13, 2024 13:07 2m 51s
tweak: ashstorm immunity for minebots. (#6006) Merge Conflict Detection #16317: Commit 69cd9f6 pushed by Bizzonium
October 13, 2024 13:03 5m 42s master220
master220
October 13, 2024 13:03 5m 42s
tweak: Engi areas type shuffling. Supermatter and sub-engine areas ov… Merge Conflict Detection #16316: Commit 9d665e4 pushed by Bizzonium
October 13, 2024 13:02 5m 3s master220
master220
October 13, 2024 13:02 5m 3s
Bugfix: reinforced.wall deconstruction Fix (#6017) Merge Conflict Detection #16315: Commit cf59fa8 pushed by Bizzonium
October 13, 2024 13:00 5m 24s master220
master220
October 13, 2024 13:00 5m 24s
bugfix: thick tape roll fix (#6013) Merge Conflict Detection #16314: Commit a453a11 pushed by Bizzonium
October 13, 2024 13:00 4m 20s master220
master220
October 13, 2024 13:00 4m 20s
bugfix: diona blood regen (#6011) Merge Conflict Detection #16313: Commit f0c4e74 pushed by Bizzonium
October 13, 2024 13:00 3m 40s master220
master220
October 13, 2024 13:00 3m 40s
bugfix: Fixed tos consent acception (#6012) Merge Conflict Detection #16312: Commit c4ceaea pushed by Bizzonium
October 13, 2024 12:59 5m 29s master220
master220
October 13, 2024 12:59 5m 29s
add: NektoeN Abandoned Storage Map. (#5996) Merge Conflict Detection #16311: Commit f606286 pushed by Bizzonium
October 13, 2024 12:59 2m 49s master220
master220
October 13, 2024 12:59 2m 49s
BugFix: fix some inhand sprites (#6004) Merge Conflict Detection #16310: Commit a6e6108 pushed by Bizzonium
October 13, 2024 12:58 6m 17s master220
master220
October 13, 2024 12:58 6m 17s