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,501 workflow runs
3,501 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

adds new camera inhands (#27841) Merge Conflict Detection #9687: Commit 2fd9200 pushed by github-merge-queue bot
January 6, 2025 20:13 45s master
master
January 6, 2025 20:13 45s
Initial ghost offering logs (#27817) Merge Conflict Detection #9686: Commit 30e3284 pushed by github-merge-queue bot
January 6, 2025 18:49 45s master
master
January 6, 2025 18:49 45s
Dragging storage bags now drops items around the mouse pointer (#27790) Merge Conflict Detection #9685: Commit 8e60888 pushed by github-merge-queue bot
January 6, 2025 18:06 44s master
master
January 6, 2025 18:06 44s
Adds a New Ruin - Abandoned Clockwork Monastery (#27636) Merge Conflict Detection #9684: Commit a387c18 pushed by github-merge-queue bot
January 6, 2025 17:52 1m 16s master
master
January 6, 2025 17:52 1m 16s
Respect return values of legacy attack in chain negotiation (#27724) Merge Conflict Detection #9683: Commit 1277a01 pushed by github-merge-queue bot
January 6, 2025 17:52 51s master
master
January 6, 2025 17:52 51s
Adds 3 suits to loadout menu (#27758) Merge Conflict Detection #9682: Commit 06940dd pushed by github-merge-queue bot
January 6, 2025 17:49 50s master
master
January 6, 2025 17:49 50s
Improved plant bag harvesting (#27789) Merge Conflict Detection #9681: Commit 568a509 pushed by github-merge-queue bot
January 6, 2025 17:34 1m 25s master
master
January 6, 2025 17:34 1m 25s
Adds Additional Logging for AutoTraitor Game mode (#27764) Merge Conflict Detection #9680: Commit 14f4fee pushed by github-merge-queue bot
January 6, 2025 17:08 7m 41s master
master
January 6, 2025 17:08 7m 41s
strip and dress times (#27773) Merge Conflict Detection #9679: Commit dc155ee pushed by github-merge-queue bot
January 6, 2025 17:05 4m 50s master
master
January 6, 2025 17:05 4m 50s
Fixes nullspace breathing runtime. (#27777) Merge Conflict Detection #9678: Commit 265e462 pushed by github-merge-queue bot
January 6, 2025 17:04 2m 43s master
master
January 6, 2025 17:04 2m 43s
Makes the xeno pounce a manager. Also enables it again (#27656) Merge Conflict Detection #9677: Commit 5cd21a0 pushed by github-merge-queue bot
January 6, 2025 17:02 1m 59s master
master
January 6, 2025 17:02 1m 59s
NCT Beret fixes (#27778) Merge Conflict Detection #9676: Commit 7b91294 pushed by github-merge-queue bot
January 6, 2025 16:42 5m 46s master
master
January 6, 2025 16:42 5m 46s
thefix (#27776) Merge Conflict Detection #9675: Commit 2fbb873 pushed by github-merge-queue bot
January 6, 2025 16:40 6m 49s master
master
January 6, 2025 16:40 6m 49s
Makes the power biochip more normal to use, and makes it use TG cool … Merge Conflict Detection #9674: Commit f740a77 pushed by github-merge-queue bot
January 6, 2025 16:39 8m 33s master
master
January 6, 2025 16:39 8m 33s
Removes accidental smoke greande buff (#27787) Merge Conflict Detection #9673: Commit b1b8cc8 pushed by github-merge-queue bot
January 6, 2025 16:36 1m 1s master
master
January 6, 2025 16:36 1m 1s
red gang (#27854) Merge Conflict Detection #9672: Commit 93ca9ef pushed by github-merge-queue bot
January 6, 2025 12:35 40s master
master
January 6, 2025 12:35 40s
bolded keybinds, added accessory keybind to helmets, clarified tactic… Merge Conflict Detection #9671: Commit 53f8860 pushed by github-merge-queue bot
January 6, 2025 08:25 1m 20s master
master
January 6, 2025 08:25 1m 20s
Makes mining/gulag shuttle request message clearer (#27667) Merge Conflict Detection #9670: Commit 5515392 pushed by github-merge-queue bot
January 6, 2025 08:22 55s master
master
January 6, 2025 08:22 55s
PTL North and South perspective shift (#27791) Merge Conflict Detection #9669: Commit 2bf81a3 pushed by github-merge-queue bot
January 6, 2025 08:13 42s master
master
January 6, 2025 08:13 42s
Give USSP traders the Zvezhan language (#27747) Merge Conflict Detection #9668: Commit 5decf5a pushed by github-merge-queue bot
January 6, 2025 07:08 30s master
master
January 6, 2025 07:08 30s
BSH Improvement Fix: Cleaning and Event Prob (#27852) Merge Conflict Detection #9667: Commit 5229d13 pushed by github-merge-queue bot
January 6, 2025 07:06 2m 37s master
master
January 6, 2025 07:06 2m 37s
Fixed TGUI text input jumping to end of line constantly. (#27827) Merge Conflict Detection #9666: Commit 234cac7 pushed by github-merge-queue bot
January 6, 2025 07:05 1m 0s master
master
January 6, 2025 07:05 1m 0s
botanyover (#27754) Merge Conflict Detection #9665: Commit fe63294 pushed by github-merge-queue bot
January 5, 2025 12:53 44s master
master
January 5, 2025 12:53 44s
Bluespace Harvester: Loot changes, Events, and more (#27438) Merge Conflict Detection #9664: Commit 1c1eb2d pushed by github-merge-queue bot
January 5, 2025 11:32 44s master
master
January 5, 2025 11:32 44s
Fix a couple runtimes (#27839) Merge Conflict Detection #9663: Commit 57c0d13 pushed by github-merge-queue bot
January 5, 2025 11:14 40s master
master
January 5, 2025 11:14 40s