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
2,098 workflow run results
2,098 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

add: gate evil santa reborn 2.0 Merge Conflict Detection #6573: Pull request #4130 synchronize by ArtemDerp
December 29, 2023 23:19 10s
December 29, 2023 23:19 10s
tweak: frag grenade faster and cheaper Merge Conflict Detection #6572: Pull request #4155 opened by WolfLox
December 29, 2023 22:55 12s
December 29, 2023 22:55 12s
tweak: lots of small, varied and not too noticeable changes ERT loadout Merge Conflict Detection #6571: Pull request #4154 opened by WolfLox
December 29, 2023 22:25 11s
December 29, 2023 22:25 11s
add: Added Ded Moroz and his magic artifacts Merge Conflict Detection #6570: Pull request #4148 synchronize by Vladisvell
December 29, 2023 16:02 17s
December 29, 2023 16:02 17s
add: Added Ded Moroz and his magic artifacts Merge Conflict Detection #6569: Pull request #4148 synchronize by Vladisvell
December 29, 2023 15:47 11s
December 29, 2023 15:47 11s
bugfix: missed mining harsuit textures Merge Conflict Detection #6568: Pull request #4153 opened by NightDawnFox
December 29, 2023 14:15 14s
December 29, 2023 14:15 14s
add: Added Ded Moroz and his magic artifacts Merge Conflict Detection #6567: Pull request #4148 ready_for_review by Vladisvell
December 29, 2023 13:37 8s
December 29, 2023 13:37 8s
add: Added Ded Moroz and his magic artifacts Merge Conflict Detection #6566: Pull request #4148 synchronize by Vladisvell
December 29, 2023 13:37 2m 16s
December 29, 2023 13:37 2m 16s
Automatic changelog generation Merge Conflict Detection #6565: Commit d809a0a pushed by changelog-bot bot
December 29, 2023 08:19 2m 15s master220
master220
December 29, 2023 08:19 2m 15s
bugfix: post target cryo message (#4152) Merge Conflict Detection #6564: Commit eea81bc pushed by Dimach
December 29, 2023 08:17 4m 28s master220
master220
December 29, 2023 08:17 4m 28s
add: Added nice presents positioning around Christmas trees (#4146) Merge Conflict Detection #6563: Commit a51286a pushed by Dimach
December 29, 2023 08:17 4m 16s master220
master220
December 29, 2023 08:17 4m 16s
bugfix: APC no longer can be unlocked by binds from distance (#4147) Merge Conflict Detection #6562: Commit c6f8bf1 pushed by Dimach
December 29, 2023 08:16 4m 16s master220
master220
December 29, 2023 08:16 4m 16s
bugfix: tgui lists can in lists with doubles and return None (#4150) Merge Conflict Detection #6561: Commit 9a5aafb pushed by Dimach
December 29, 2023 08:15 4m 15s master220
master220
December 29, 2023 08:15 4m 15s
bugfix: edit shuttle timer announcment update (#4145) Merge Conflict Detection #6560: Commit 3a34d16 pushed by Dimach
December 29, 2023 08:12 8m 17s master220
master220
December 29, 2023 08:12 8m 17s
add: cargo quest console etc Merge Conflict Detection #6559: Pull request #4047 synchronize by Rerik007
December 29, 2023 07:06 15s
December 29, 2023 07:06 15s
add: exploit records for uplink and pick darkness for ghosts Merge Conflict Detection #6558: Pull request #3909 synchronize by ROdenFL
December 28, 2023 23:53 12s
December 28, 2023 23:53 12s
add: exploit records for uplink and pick darkness for ghosts Merge Conflict Detection #6557: Pull request #3909 synchronize by ROdenFL
December 28, 2023 23:45 11s
December 28, 2023 23:45 11s
bugfix: post target cryo message Merge Conflict Detection #6556: Pull request #4152 opened by ROdenFL
December 28, 2023 22:36 14s
December 28, 2023 22:36 14s
Add: Leopard tail for Tajaran Merge Conflict Detection #6555: Pull request #4151 opened by BeebBeebBoob
December 28, 2023 22:19 10s
December 28, 2023 22:19 10s
add: makeshift MOD-revolver. Merge Conflict Detection #6554: Pull request #4131 synchronize by Daeberdir
December 28, 2023 22:18 14s
December 28, 2023 22:18 14s
remap: Delta & Cerestation & Cyberiad New Year update Merge Conflict Detection #6553: Pull request #4119 synchronize by aeternaclose
December 28, 2023 22:09 12s
December 28, 2023 22:09 12s
add: makeshift MOD-revolver. Merge Conflict Detection #6552: Pull request #4131 synchronize by Daeberdir
December 28, 2023 22:08 12s
December 28, 2023 22:08 12s
bugfix: tgui lists can in lists with doubles and return None Merge Conflict Detection #6551: Pull request #4150 opened by ROdenFL
December 28, 2023 22:03 14s
December 28, 2023 22:03 14s
remap: Delta & Cerestation & Cyberiad New Year update Merge Conflict Detection #6550: Pull request #4119 synchronize by aeternaclose
December 28, 2023 21:50 10s
December 28, 2023 21:50 10s
add: UnusualVision protection for all gates areas Merge Conflict Detection #6549: Pull request #4149 synchronize by aeternaclose
December 28, 2023 20:41 10s
December 28, 2023 20:41 10s