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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Farragus: Remaps Service Asteroid and Locker Room Area (#26493) Merge Conflict Detection #8960: Commit 9704445 pushed by github-merge-queue bot
September 13, 2024 00:52 36s master
master
September 13, 2024 00:52 36s
Adds Syndicate organizations (#24040) Merge Conflict Detection #8959: Commit 20f47a7 pushed by github-merge-queue bot
September 12, 2024 19:12 41s master
master
September 12, 2024 19:12 41s
Conveyer belts and Disposals units no longer steal items on nonhelp i… Merge Conflict Detection #8958: Commit 2b90084 pushed by github-merge-queue bot
September 12, 2024 17:41 38s master
master
September 12, 2024 17:41 38s
[SPRITES] Emissive mechs (#26589) Merge Conflict Detection #8957: Commit 6e36351 pushed by github-merge-queue bot
September 12, 2024 17:29 37s master
master
September 12, 2024 17:29 37s
Captain's sabre - Resprite and rebrand (#26592) Merge Conflict Detection #8956: Commit 1f9945e pushed by github-merge-queue bot
September 12, 2024 17:27 37s master
master
September 12, 2024 17:27 37s
Fixes and Changes for Devchat (#26726) Merge Conflict Detection #8955: Commit 809769b pushed by github-merge-queue bot
September 12, 2024 17:18 36s master
master
September 12, 2024 17:18 36s
Updates some salvage lore (#26595) Merge Conflict Detection #8954: Commit fe834bf pushed by github-merge-queue bot
September 12, 2024 17:15 2m 24s master
master
September 12, 2024 17:15 2m 24s
Makes the cryo anomaly more dangerous (#26614) Merge Conflict Detection #8953: Commit 0a7873c pushed by github-merge-queue bot
September 12, 2024 17:12 6m 3s master
master
September 12, 2024 17:12 6m 3s
Update chameleon.dm (#26691) Merge Conflict Detection #8952: Commit 7c3d87d pushed by github-merge-queue bot
September 12, 2024 17:10 4m 59s master
master
September 12, 2024 17:10 4m 59s
Various chemthrower fixes (#26697) Merge Conflict Detection #8951: Commit 62601ab pushed by github-merge-queue bot
September 12, 2024 17:07 5m 0s master
master
September 12, 2024 17:07 5m 0s
[FIX] Floorbots now actually use the colour of the toolbox they were … Merge Conflict Detection #8950: Commit f7472de pushed by github-merge-queue bot
September 12, 2024 17:05 6m 22s master
master
September 12, 2024 17:05 6m 22s
refactor: use signal for explosion sensors. (#26703) Merge Conflict Detection #8949: Commit f67dbca pushed by github-merge-queue bot
September 12, 2024 17:03 5m 27s master
master
September 12, 2024 17:03 5m 27s
Move global access procs to the mapping subsystem (#26664) Merge Conflict Detection #8948: Commit a450ad9 pushed by github-merge-queue bot
September 12, 2024 17:02 4m 58s master
master
September 12, 2024 17:02 4m 58s
Fix SMES not working after recharge (#26711) Merge Conflict Detection #8947: Commit d01fca6 pushed by github-merge-queue bot
September 12, 2024 17:01 3m 30s master
master
September 12, 2024 17:01 3m 30s
Adds the new R&D boards to secure tech storage on all maps (#26722) Merge Conflict Detection #8946: Commit d8eb231 pushed by github-merge-queue bot
September 12, 2024 17:00 2m 16s master
master
September 12, 2024 17:00 2m 16s
Re-add removed toggle for prayer sounds (#26739) Merge Conflict Detection #8945: Commit 512ec5c pushed by github-merge-queue bot
September 12, 2024 16:59 1m 23s master
master
September 12, 2024 16:59 1m 23s
Update medical_designs.dm (#26723) Merge Conflict Detection #8944: Commit 64f49e0 pushed by github-merge-queue bot
September 12, 2024 14:33 42s master
master
September 12, 2024 14:33 42s
fix: remove two unused vardecls (#26756) Merge Conflict Detection #8943: Commit 716428d pushed by github-merge-queue bot
September 11, 2024 18:05 41s master
master
September 11, 2024 18:05 41s
[FIX] Cult Shadow Shackles can now cuff people who are missing an arm… Merge Conflict Detection #8942: Commit 965b42b pushed by github-merge-queue bot
September 11, 2024 17:38 40s master
master
September 11, 2024 17:38 40s
Update hierophant_loot.dm (#26634) Merge Conflict Detection #8941: Commit 4f6641c pushed by github-merge-queue bot
September 11, 2024 17:32 1m 53s master
master
September 11, 2024 17:32 1m 53s
Gas Meter Resprite (#26625) Merge Conflict Detection #8940: Commit 19536aa pushed by github-merge-queue bot
September 11, 2024 17:31 40s master
master
September 11, 2024 17:31 40s
[FIX] Red engineering ERT suits have their species sprites back. (#26… Merge Conflict Detection #8939: Commit 0579912 pushed by github-merge-queue bot
September 11, 2024 17:30 53s master
master
September 11, 2024 17:30 53s
refactor: remove CanPass height arg (#26700) Merge Conflict Detection #8938: Commit 9a5db8f pushed by github-merge-queue bot
September 11, 2024 14:53 39s master
master
September 11, 2024 14:53 39s
refactor: dead signals removal (#26704) Merge Conflict Detection #8937: Commit 9f8c2c2 pushed by github-merge-queue bot
September 11, 2024 14:47 40s master
master
September 11, 2024 14:47 40s
Debug logs an admin log about things taking too long to del (#26748) Merge Conflict Detection #8936: Commit 3d0e8f7 pushed by github-merge-queue bot
September 11, 2024 14:45 43s master
master
September 11, 2024 14:45 43s