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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

refactor: antag checking optimization Merge Conflict Detection #8335: Pull request #4521 synchronize by Vladisvell
February 29, 2024 09:22 2m 15s
February 29, 2024 09:22 2m 15s
refactor: antag checking optimization Merge Conflict Detection #8334: Pull request #4521 opened by Vladisvell
February 29, 2024 09:07 15s
February 29, 2024 09:07 15s
tweak: Events and cargo quests now count alive station players for scaling Merge Conflict Detection #8333: Pull request #4520 opened by Vladisvell
February 29, 2024 07:34 12s
February 29, 2024 07:34 12s
refactor: (?) simple replacement slot_l_hand -> SLOT_HUD_LEFT_HAND etc Merge Conflict Detection #8332: Pull request #4515 synchronize by Rerik007
February 29, 2024 07:31 2m 13s
February 29, 2024 07:31 2m 13s
bugfix: now hideheadseat for mask really hide headseats (#4519) Merge Conflict Detection #8331: Commit 9bb1eab pushed by github-merge-queue bot
February 29, 2024 07:08 2m 17s master220
master220
February 29, 2024 07:08 2m 17s
Automatic changelog generation Merge Conflict Detection #8330: Commit 7af28d6 pushed by changelog-bot bot
February 29, 2024 06:42 2m 11s master220
master220
February 29, 2024 06:42 2m 11s
Bugfix: Spacehotel shard steal (#4506) Merge Conflict Detection #8329: Commit a0ad882 pushed by Dimach
February 29, 2024 06:41 2m 17s master220
master220
February 29, 2024 06:41 2m 17s
Automatic NanoMap Update (#4501) Merge Conflict Detection #8328: Commit d2a4ec4 pushed by Dimach
February 29, 2024 06:29 2m 13s master220
master220
February 29, 2024 06:29 2m 13s
add: CereImprovement-pt9 (#4178) Merge Conflict Detection #8327: Commit b45e775 pushed by Dimach
February 29, 2024 06:28 2m 19s master220
master220
February 29, 2024 06:28 2m 19s
refactor: (?) simple replacement slot_l_hand -> SLOT_HUD_LEFT_HAND etc Merge Conflict Detection #8326: Pull request #4515 synchronize by Rerik007
February 28, 2024 22:09 11s
February 28, 2024 22:09 11s
add: Gorillas! OOGA! OOGA! OOGA! (#3969) Merge Conflict Detection #8325: Commit 2ab9271 pushed by github-merge-queue bot
February 28, 2024 22:04 2m 15s master220
master220
February 28, 2024 22:04 2m 15s
refactor: (?) simple replacement slot_l_hand -> SLOT_HUD_LEFT_HAND etc Merge Conflict Detection #8324: Pull request #4515 synchronize by Rerik007
February 28, 2024 21:50 10s
February 28, 2024 21:50 10s
bugfix: ShelterCapsuleFix (#4121) Merge Conflict Detection #8323: Commit 3175306 pushed by github-merge-queue bot
February 28, 2024 21:46 2m 14s master220
master220
February 28, 2024 21:46 2m 14s
bugfix: now hideheadseat for mask really hide headseats Merge Conflict Detection #8322: Pull request #4519 synchronize by Rerik007
February 28, 2024 21:43 12s
February 28, 2024 21:43 12s
bugfix: Monkey Emotes Fix (#4511) Merge Conflict Detection #8321: Commit 31ba588 pushed by github-merge-queue bot
February 28, 2024 21:40 2m 13s master220
master220
February 28, 2024 21:40 2m 13s
bugfix: APC usability again. (#4486) Merge Conflict Detection #8320: Commit 250bb39 pushed by github-merge-queue bot
February 28, 2024 21:39 2m 14s master220
master220
February 28, 2024 21:39 2m 14s
bugfix: Hardsuit Fixes (#4496) Merge Conflict Detection #8319: Commit 960cd9d pushed by github-merge-queue bot
February 28, 2024 21:38 2m 19s master220
master220
February 28, 2024 21:38 2m 19s
bugfix: borer respawn from "Respawn as NPC" (#4494) Merge Conflict Detection #8318: Commit d256454 pushed by github-merge-queue bot
February 28, 2024 21:34 2m 11s master220
master220
February 28, 2024 21:34 2m 11s
bugfix: 3 -> 4 for CALTROP_BYPASS_ROBOTIC_LEGS (#4505) Merge Conflict Detection #8317: Commit 925f562 pushed by github-merge-queue bot
February 28, 2024 21:32 4m 17s master220
master220
February 28, 2024 21:32 4m 17s
bugfix: Toggling thunderdome enrolling state no longer causes runtime… Merge Conflict Detection #8316: Commit 997aaa3 pushed by github-merge-queue bot
February 28, 2024 21:32 2m 16s master220
master220
February 28, 2024 21:32 2m 16s
bugfix: Keycard Authentication Devices are broken (#4516) Merge Conflict Detection #8315: Commit 55b963e pushed by github-merge-queue bot
February 28, 2024 21:31 2m 16s master220
master220
February 28, 2024 21:31 2m 16s
bugfix: broken loadout of cargo items (#4509) Merge Conflict Detection #8314: Commit 71f92dd pushed by github-merge-queue bot
February 28, 2024 19:46 2m 12s master220
master220
February 28, 2024 19:46 2m 12s
add: loadout icons (#4507) Merge Conflict Detection #8313: Commit d58fce3 pushed by github-merge-queue bot
February 28, 2024 19:45 2m 15s master220
master220
February 28, 2024 19:45 2m 15s
bugfix: Library Computer Icons Fix (#4512) Merge Conflict Detection #8312: Commit 279728d pushed by github-merge-queue bot
February 28, 2024 19:44 2m 47s master220
master220
February 28, 2024 19:44 2m 47s
bugfix: Eye of god isn't deleting when improving (#4517) Merge Conflict Detection #8311: Commit 35c8427 pushed by github-merge-queue bot
February 28, 2024 19:44 2m 14s master220
master220
February 28, 2024 19:44 2m 14s