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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fixes oxygen related alerts sticking in your hud if you loose the nee… Merge Conflict Detection #9597: Commit a652f57 pushed by github-merge-queue bot
December 24, 2024 21:41 40s master
master
December 24, 2024 21:41 40s
Improve CI output for legacy attack chain check (#27587) Merge Conflict Detection #9596: Commit cc9b5fb pushed by github-merge-queue bot
December 24, 2024 21:35 42s master
master
December 24, 2024 21:35 42s
Add submap requirements and guidelines to devdocs. (#27689) Merge Conflict Detection #9595: Commit 6825da4 pushed by github-merge-queue bot
December 24, 2024 02:34 3m 7s master
master
December 24, 2024 02:34 3m 7s
Do not break pulls on Z-level transitions. (#27702) Merge Conflict Detection #9594: Commit e520abf pushed by github-merge-queue bot
December 24, 2024 02:33 3m 1s master
master
December 24, 2024 02:33 3m 1s
Fixes duplicate vanilla cake by renaming it to its real type (#27686) Merge Conflict Detection #9593: Commit b3f54ce pushed by github-merge-queue bot
December 24, 2024 02:30 3m 59s master
master
December 24, 2024 02:30 3m 59s
Fixes some tiles on the space bar, USSP, and box being broken (#27685) Merge Conflict Detection #9592: Commit e042f24 pushed by github-merge-queue bot
December 24, 2024 02:30 3m 29s master
master
December 24, 2024 02:30 3m 29s
holobadgefix (#27677) Merge Conflict Detection #9591: Commit b466e66 pushed by github-merge-queue bot
December 24, 2024 02:29 4m 32s master
master
December 24, 2024 02:29 4m 32s
pixels (#27666) Merge Conflict Detection #9590: Commit a15cfeb pushed by github-merge-queue bot
December 24, 2024 02:27 59s master
master
December 24, 2024 02:27 59s
Remove hopefully unused 'unpowered' airlock subtype. (#27732) Merge Conflict Detection #9589: Commit c6fc2fb pushed by github-merge-queue bot
December 24, 2024 02:18 44s master
master
December 24, 2024 02:18 44s
[Fix] for anti drop being able to equip some items (#27713) Merge Conflict Detection #9588: Commit c299d98 pushed by github-merge-queue bot
December 23, 2024 17:43 42s master
master
December 23, 2024 17:43 42s
it's nothing, it's for free (#27730) Merge Conflict Detection #9587: Commit 2e38c61 pushed by github-merge-queue bot
December 23, 2024 17:32 46s master
master
December 23, 2024 17:32 46s
Extra Plushies + Plushify Spell (#27384) Merge Conflict Detection #9586: Commit a5726ef pushed by github-merge-queue bot
December 23, 2024 16:13 42s master
master
December 23, 2024 16:13 42s
Create interaction test harness. (#27643) Merge Conflict Detection #9585: Commit 33eaf8a pushed by github-merge-queue bot
December 23, 2024 00:24 40s master
master
December 23, 2024 00:24 40s
Tweak for meatpackers ruin turrets (#27422) Merge Conflict Detection #9584: Commit 5c549ad pushed by github-merge-queue bot
December 22, 2024 17:00 41s master
master
December 22, 2024 17:00 41s
Allows wallets to hold candy cash and chocolate coins (#27574) Merge Conflict Detection #9583: Commit 7511539 pushed by github-merge-queue bot
December 22, 2024 16:58 53s master
master
December 22, 2024 16:58 53s
sprites (#27675) Merge Conflict Detection #9582: Commit 64de4d2 pushed by github-merge-queue bot
December 22, 2024 16:54 52s master
master
December 22, 2024 16:54 52s
expand size (#27708) Merge Conflict Detection #9581: Commit 7a29d77 pushed by github-merge-queue bot
December 22, 2024 02:18 40s master
master
December 22, 2024 02:18 40s
fit viewport (#27707) Merge Conflict Detection #9580: Commit 9b87bbd pushed by github-merge-queue bot
December 22, 2024 01:54 42s master
master
December 22, 2024 01:54 42s
Revert "Fixes for inserting/removing storage items/swapping items bet… Merge Conflict Detection #9579: Commit 718b578 pushed by github-merge-queue bot
December 22, 2024 00:14 43s master
master
December 22, 2024 00:14 43s
Fixes for inserting/removing storage items/swapping items between han… Merge Conflict Detection #9578: Commit 012e1f1 pushed by github-merge-queue bot
December 21, 2024 21:39 43s master
master
December 21, 2024 21:39 43s
unit->game tests, /tg/ assertions and allocations (#27646) Merge Conflict Detection #9577: Commit bb60a02 pushed by github-merge-queue bot
December 21, 2024 21:23 40s master
master
December 21, 2024 21:23 40s
Movement cross/uncross implementation. (#26762) Merge Conflict Detection #9576: Commit 79bad42 pushed by github-merge-queue bot
December 21, 2024 08:11 44s master
master
December 21, 2024 08:11 44s
TRAIT_UNKNOWN (#27471) Merge Conflict Detection #9575: Commit 3a3bdc8 pushed by github-merge-queue bot
December 20, 2024 21:12 42s master
master
December 20, 2024 21:12 42s
Fixes a few typos on Emeraldstation's Camera List (#27650) Merge Conflict Detection #9574: Commit 083f358 pushed by github-merge-queue bot
December 20, 2024 21:10 53s master
master
December 20, 2024 21:10 53s
Fix !build_rust by updating lib32gcc (#27688) Merge Conflict Detection #9573: Commit bf32b91 pushed by github-merge-queue bot
December 20, 2024 15:31 40s master
master
December 20, 2024 15:31 40s