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
3,703 workflow run results
3,703 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

bugfix: walking on tables Merge Conflict Detection #8460: Pull request #4508 synchronize by xTrogwaRx
March 3, 2024 21:59 13s
March 3, 2024 21:59 13s
qol: Borgs can now move pulled objects and creatures. Merge Conflict Detection #8459: Pull request #4556 opened by Vladisvell
March 3, 2024 20:21 13s
March 3, 2024 20:21 13s
refactor: (?) simple replacement slot_l_hand -> SLOT_HUD_LEFT_HAND etc Merge Conflict Detection #8458: Pull request #4515 synchronize by Rerik007
March 3, 2024 18:34 13s
March 3, 2024 18:34 13s
bugfix: walking on tables Merge Conflict Detection #8457: Pull request #4508 synchronize by xTrogwaRx
March 3, 2024 16:20 11s
March 3, 2024 16:20 11s
bugfix: walking on tables Merge Conflict Detection #8456: Pull request #4508 synchronize by xTrogwaRx
March 3, 2024 16:18 12s
March 3, 2024 16:18 12s
bugfix: walking on tables Merge Conflict Detection #8455: Pull request #4508 synchronize by xTrogwaRx
March 3, 2024 16:17 10s
March 3, 2024 16:17 10s
bugfix: walking on tables Merge Conflict Detection #8454: Pull request #4508 synchronize by xTrogwaRx
March 3, 2024 16:16 14s
March 3, 2024 16:16 14s
Automatic changelog generation Merge Conflict Detection #8453: Commit 0581dc6 pushed by changelog-bot bot
March 3, 2024 16:13 1m 24s master220
master220
March 3, 2024 16:13 1m 24s
bugfix: Localhost-configured admin access is now working (#4542) Merge Conflict Detection #8452: Commit 30b7fa1 pushed by Dimach
March 3, 2024 16:11 1m 32s master220
master220
March 3, 2024 16:11 1m 32s
add: glowsticks box in artvend (#4532) Merge Conflict Detection #8451: Commit 1957539 pushed by Dimach
March 3, 2024 16:10 1m 43s master220
master220
March 3, 2024 16:10 1m 43s
refactor: Optimized organ handling (#4523) Merge Conflict Detection #8450: Commit 9df30e8 pushed by Dimach
March 3, 2024 16:10 1m 57s master220
master220
March 3, 2024 16:10 1m 57s
refactor: antag checking optimization (#4521) Merge Conflict Detection #8449: Commit da95cf9 pushed by Dimach
March 3, 2024 16:09 2m 51s master220
master220
March 3, 2024 16:09 2m 51s
tweak: adrenaline for changelings (#4488) Merge Conflict Detection #8448: Commit 85f01bf pushed by Dimach
March 3, 2024 16:09 2m 42s master220
master220
March 3, 2024 16:09 2m 42s
Automatic NanoMap Update (#4536) Merge Conflict Detection #8447: Commit b845a48 pushed by Dimach
March 3, 2024 16:08 4m 37s master220
master220
March 3, 2024 16:08 4m 37s
add: Biohazard bodybags (#4465) Merge Conflict Detection #8446: Commit 47d28fc pushed by Dimach
March 3, 2024 16:08 4m 18s master220
master220
March 3, 2024 16:08 4m 18s
bugfix: fix drop_on_fail logic in inventory (#4524) Merge Conflict Detection #8445: Commit 22e2b5b pushed by github-merge-queue bot
March 3, 2024 16:07 8m 19s master220
master220
March 3, 2024 16:07 8m 19s
bugfix: chat_box fixes (#4526) Merge Conflict Detection #8444: Commit 726c49b pushed by github-merge-queue bot
March 3, 2024 16:05 2m 11s master220
master220
March 3, 2024 16:05 2m 11s
bugfix: Antag Paradise hotfix 4 (#4533) Merge Conflict Detection #8443: Commit 724efed pushed by github-merge-queue bot
March 3, 2024 16:05 10m 23s master220
master220
March 3, 2024 16:05 10m 23s
bugfix: fixes respawn as npc verb (#4543) Merge Conflict Detection #8442: Commit 1b2671e pushed by github-merge-queue bot
March 3, 2024 16:04 2m 15s master220
master220
March 3, 2024 16:04 2m 15s
bugfix: Clockwork armor is no longer rainbow error after enchanting (… Merge Conflict Detection #8441: Commit 920987f pushed by github-merge-queue bot
March 3, 2024 16:02 3m 11s master220
master220
March 3, 2024 16:02 3m 11s
bugfix: Wisp Lantern Icons Fix (#4548) Merge Conflict Detection #8440: Commit c66892a pushed by github-merge-queue bot
March 3, 2024 16:01 2m 15s master220
master220
March 3, 2024 16:01 2m 15s
bugfix: normalize guitar volume (#4552) Merge Conflict Detection #8439: Commit f366e5d pushed by Dimach
March 3, 2024 15:55 2m 13s master220
master220
March 3, 2024 15:55 2m 13s
bugfix: Revolver Ammo Count Fix (#4553) Merge Conflict Detection #8438: Commit 68a62ac pushed by Dimach
March 3, 2024 15:55 2m 13s master220
master220
March 3, 2024 15:55 2m 13s
bugfix: fixes access in quest console (#4554) Merge Conflict Detection #8437: Commit ed14301 pushed by Dimach
March 3, 2024 15:54 2m 13s master220
master220
March 3, 2024 15:54 2m 13s
add: CereImprovement-pt10 (#4555) Merge Conflict Detection #8436: Commit c7ac86a pushed by Dimach
March 3, 2024 15:54 2m 17s master220
master220
March 3, 2024 15:54 2m 17s