Skip to content

Actions: ParadiseSS13/Paradise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
3,402 workflow runs
3,402 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

[s] Fixes an issue with dynamic late spawning (#28047) Merge Conflict Detection #9823: Commit 8b817aa pushed by github-merge-queue bot
January 21, 2025 01:08 43s master
master
January 21, 2025 01:08 43s
oops (#28045) Merge Conflict Detection #9822: Commit 08d4ab7 pushed by github-merge-queue bot
January 20, 2025 19:07 39s master
master
January 20, 2025 19:07 39s
Assorted atmos performance improvements. (#27966) Merge Conflict Detection #9821: Commit fdbd2b2 pushed by github-merge-queue bot
January 20, 2025 15:22 40s master
master
January 20, 2025 15:22 40s
"Dynamic" Gamemode using rulesets (#27600) Merge Conflict Detection #9820: Commit 8954a8e pushed by github-merge-queue bot
January 19, 2025 19:44 42s master
master
January 19, 2025 19:44 42s
Attack Chain Migration: Screwdriver (#27563) Merge Conflict Detection #9819: Commit fa333bb pushed by github-merge-queue bot
January 19, 2025 17:22 33s master
master
January 19, 2025 17:22 33s
fix random bookcase icon (#28034) Merge Conflict Detection #9818: Commit 61802a7 pushed by github-merge-queue bot
January 19, 2025 15:51 37s master
master
January 19, 2025 15:51 37s
make all sec clothing in the loadout menu available to the detective … Merge Conflict Detection #9817: Commit 97e99fe pushed by github-merge-queue bot
January 18, 2025 20:28 35s master
master
January 18, 2025 20:28 35s
Fix: Economy machinery now uses TGUI input + global bank pin range de… Merge Conflict Detection #9816: Commit 4af0352 pushed by github-merge-queue bot
January 18, 2025 19:43 55s master
master
January 18, 2025 19:43 55s
updated the engineering and service icons (#27967) Merge Conflict Detection #9815: Commit 1491299 pushed by github-merge-queue bot
January 18, 2025 18:40 2m 51s master
master
January 18, 2025 18:40 2m 51s
Advertises double-examine lore blurbs on a single examine (#27974) Merge Conflict Detection #9814: Commit 9328128 pushed by github-merge-queue bot
January 18, 2025 18:35 2m 57s master
master
January 18, 2025 18:35 2m 57s
get_out_of_the_closet (#27986) Merge Conflict Detection #9813: Commit a521827 pushed by github-merge-queue bot
January 18, 2025 18:31 2m 44s master
master
January 18, 2025 18:31 2m 44s
make hud permanent (#27992) Merge Conflict Detection #9812: Commit c375e37 pushed by github-merge-queue bot
January 18, 2025 18:27 3m 41s master
master
January 18, 2025 18:27 3m 41s
Small device resprite (#27987) Merge Conflict Detection #9811: Commit db65295 pushed by github-merge-queue bot
January 18, 2025 18:24 2m 12s master
master
January 18, 2025 18:24 2m 12s
Fix cyborg arm sprite (#27997) Merge Conflict Detection #9810: Commit b109c28 pushed by github-merge-queue bot
January 18, 2025 18:16 6m 22s master
master
January 18, 2025 18:16 6m 22s
Fix sword sheaths disappearing when clicked with telekinesis (#27998) Merge Conflict Detection #9809: Commit a236b9c pushed by github-merge-queue bot
January 18, 2025 18:14 5m 42s master
master
January 18, 2025 18:14 5m 42s
Bookcase rework/resprite (#28003) Merge Conflict Detection #9808: Commit a9d36a6 pushed by github-merge-queue bot
January 18, 2025 18:10 4m 20s master
master
January 18, 2025 18:10 4m 20s
Makes Nanofrost Pretty (#28016) Merge Conflict Detection #9807: Commit 8e254c4 pushed by github-merge-queue bot
January 18, 2025 18:07 5m 54s master
master
January 18, 2025 18:07 5m 54s
[FIX] Fix for a runtime error in deathsquad.dm (#28012) Merge Conflict Detection #9806: Commit 4d7e14f pushed by github-merge-queue bot
January 18, 2025 18:05 2m 13s master
master
January 18, 2025 18:05 2m 13s
poor borgs (#28013) Merge Conflict Detection #9805: Commit 66c663b pushed by github-merge-queue bot
January 18, 2025 17:59 2m 58s master
master
January 18, 2025 17:59 2m 58s
Cheeseboard Crate (#28000) Merge Conflict Detection #9804: Commit d0982f9 pushed by github-merge-queue bot
January 18, 2025 17:55 4m 15s master
master
January 18, 2025 17:55 4m 15s
Re-buff immovable rods (#27985) Merge Conflict Detection #9803: Commit f907e8a pushed by github-merge-queue bot
January 18, 2025 17:53 1m 25s master
master
January 18, 2025 17:53 1m 25s
makes carp infestation less likely to happen (#27931) Merge Conflict Detection #9802: Commit 4815d1a pushed by github-merge-queue bot
January 18, 2025 17:44 47s master
master
January 18, 2025 17:44 47s
wrenching (#27564) Merge Conflict Detection #9801: Commit b1fa5f9 pushed by github-merge-queue bot
January 18, 2025 09:37 41s master
master
January 18, 2025 09:37 41s
Refactors AI / camera eyes and slows holopad holograms to walk speed … Merge Conflict Detection #9800: Commit 93ed0f0 pushed by github-merge-queue bot
January 17, 2025 18:29 37s master
master
January 17, 2025 18:29 37s
[PORT] Add mantis blades (new traitor item) (#27594) Merge Conflict Detection #9799: Commit dac5700 pushed by github-merge-queue bot
January 17, 2025 18:21 41s master
master
January 17, 2025 18:21 41s