Skip to content

Actions: ParadiseSS13/Paradise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
2,499 workflow run results
2,499 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fixes spellblade floating pixels while inhand DAMN YOU MERASMUS! (#27… Merge Conflict Detection #9362: Commit 0b3c770 pushed by github-merge-queue bot
November 14, 2024 12:16 39s master
master
November 14, 2024 12:16 39s
better pistol sprite by Salted-Zen (#27290) Merge Conflict Detection #9361: Commit 96c88a6 pushed by github-merge-queue bot
November 14, 2024 09:40 40s master
master
November 14, 2024 09:40 40s
Adds a new Janitorial "Rover" cyborg skin (#27310) Merge Conflict Detection #9360: Commit 5cd987f pushed by github-merge-queue bot
November 14, 2024 09:31 45s master
master
November 14, 2024 09:31 45s
updates posibrain icon (#27318) Merge Conflict Detection #9359: Commit fdd4c98 pushed by github-merge-queue bot
November 13, 2024 20:33 38s master
master
November 13, 2024 20:33 38s
[FIX] Removes a Stray Disposals Pipe From Emerald Station (#27325) Merge Conflict Detection #9358: Commit 459e7b3 pushed by github-merge-queue bot
November 13, 2024 20:28 53s master
master
November 13, 2024 20:28 53s
Slightly Revamps the Departmental Shuttle (#27217) Merge Conflict Detection #9357: Commit 5225073 pushed by github-merge-queue bot
November 13, 2024 20:04 1m 2s master
master
November 13, 2024 20:04 1m 2s
Deltastation Arrivals Remap (#27218) Merge Conflict Detection #9356: Commit f316789 pushed by github-merge-queue bot
November 13, 2024 20:03 55s master
master
November 13, 2024 20:03 55s
Wizard focus staff, and brooms resprite ROUND TWO [ icons/obj/wizard.… Merge Conflict Detection #9355: Commit 47b3e62 pushed by github-merge-queue bot
November 13, 2024 19:32 3m 19s master
master
November 13, 2024 19:32 3m 19s
CMO Mantle Resprite (#27240) Merge Conflict Detection #9354: Commit a205258 pushed by github-merge-queue bot
November 13, 2024 19:28 5m 42s master
master
November 13, 2024 19:28 5m 42s
Updates sprite and description (#27320) Merge Conflict Detection #9353: Commit 6b0d405 pushed by github-merge-queue bot
November 13, 2024 19:25 4m 45s master
master
November 13, 2024 19:25 4m 45s
Brass light fixtures (#27312) Merge Conflict Detection #9352: Commit bd7cbb1 pushed by github-merge-queue bot
November 13, 2024 19:23 5m 18s master
master
November 13, 2024 19:23 5m 18s
Wizard Inhand staves/spellblade resprites [ Merge with #27280 , #2728… Merge Conflict Detection #9351: Commit 37412b2 pushed by github-merge-queue bot
November 13, 2024 19:22 5m 7s master
master
November 13, 2024 19:22 5m 7s
Wizard Staff/Wand/Spellblade resprites ROUND TWO [ guns / magic.dmi ]… Merge Conflict Detection #9350: Commit 3088920 pushed by github-merge-queue bot
November 13, 2024 19:20 4m 47s master
master
November 13, 2024 19:20 4m 47s
HUD Resprite (soul retained edition??) (#27278) Merge Conflict Detection #9349: Commit 3d25acf pushed by github-merge-queue bot
November 13, 2024 19:19 4m 35s master
master
November 13, 2024 19:19 4m 35s
Adds a new cyborg skin, "Rover" (#27243) Merge Conflict Detection #9348: Commit 4f2c406 pushed by github-merge-queue bot
November 13, 2024 19:19 46s master
master
November 13, 2024 19:19 46s
fix (#27301) Merge Conflict Detection #9347: Commit 0780f53 pushed by github-merge-queue bot
November 13, 2024 18:17 51s master
master
November 13, 2024 18:17 51s
dmdoc: Some cleanups. (#27242) Merge Conflict Detection #9346: Commit bfb18b4 pushed by github-merge-queue bot
November 13, 2024 13:41 44s master
master
November 13, 2024 13:41 44s
Fixes Autoinjectors and Some Hyposprays Working on Robotic/Missing Li… Merge Conflict Detection #9345: Commit f6a45ae pushed by github-merge-queue bot
November 13, 2024 13:39 47s master
master
November 13, 2024 13:39 47s
Energy field generators Refactor/Tweak (#26919) Merge Conflict Detection #9344: Commit 0218b54 pushed by github-merge-queue bot
November 13, 2024 13:27 46s master
master
November 13, 2024 13:27 46s
Nerf bible healing (#27100) Merge Conflict Detection #9343: Commit 513a60b pushed by github-merge-queue bot
November 13, 2024 13:12 46s master
master
November 13, 2024 13:12 46s
[REFACTOR] Consolidates SLOT_FLAG and SLOT_HUD into one ITEM_SLOT fla… Merge Conflict Detection #9342: Commit d90a70e pushed by github-merge-queue bot
November 13, 2024 13:06 41s master
master
November 13, 2024 13:06 41s
[s] Stealth box fix (#27351) Merge Conflict Detection #9341: Commit c297dde pushed by github-merge-queue bot
November 13, 2024 02:31 45s master
master
November 13, 2024 02:31 45s
fix (#27258) Merge Conflict Detection #9340: Commit 7d035db pushed by github-merge-queue bot
November 12, 2024 11:45 43s master
master
November 12, 2024 11:45 43s
Removes the last nucleation stuff (#27241) Merge Conflict Detection #9339: Commit 38100d9 pushed by github-merge-queue bot
November 12, 2024 00:19 40s master
master
November 12, 2024 00:19 40s
thermite no more makes walls with 5u max reagents (#27330) Merge Conflict Detection #9338: Commit e4af6ca pushed by github-merge-queue bot
November 11, 2024 15:21 1m 9s master
master
November 11, 2024 15:21 1m 9s