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,555 workflow run results
2,555 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

makes you unable to to see inventory from another zlvl (#26793) Merge Conflict Detection #8974: Commit 44694d8 pushed by github-merge-queue bot
September 15, 2024 20:23 36s master
master
September 15, 2024 20:23 36s
whoopsie (#26777) Merge Conflict Detection #8973: Commit 04e65c7 pushed by github-merge-queue bot
September 14, 2024 18:43 40s master
master
September 14, 2024 18:43 40s
Paradise's soul removal part 7: engineering jumpsuits and accessories… Merge Conflict Detection #8972: Commit e2a7c80 pushed by github-merge-queue bot
September 14, 2024 07:05 41s master
master
September 14, 2024 07:05 41s
Fixes missing Unanchored Gas Meter Item sprite (#26767) Merge Conflict Detection #8971: Commit e571255 pushed by github-merge-queue bot
September 14, 2024 06:05 35s master
master
September 14, 2024 06:05 35s
fix: cere jani closet disposal pipe (#26773) Merge Conflict Detection #8970: Commit e4d9337 pushed by github-merge-queue bot
September 14, 2024 04:34 36s master
master
September 14, 2024 04:34 36s
fix squeak component (#26709) Merge Conflict Detection #8969: Commit 148eae5 pushed by github-merge-queue bot
September 14, 2024 03:11 40s master
master
September 14, 2024 03:11 40s
Makes chemical flamethrowers more efficient (#26742) Merge Conflict Detection #8968: Commit 515d3eb pushed by github-merge-queue bot
September 14, 2024 03:05 34s master
master
September 14, 2024 03:05 34s
Removes hoverboard from SOO starting inventory (#26661) Merge Conflict Detection #8967: Commit 52442e6 pushed by github-merge-queue bot
September 14, 2024 03:00 2m 41s master
master
September 14, 2024 03:00 2m 41s
reflectors anchor on mapload (#26745) Merge Conflict Detection #8966: Commit 7be7ec7 pushed by github-merge-queue bot
September 14, 2024 02:58 2m 37s master
master
September 14, 2024 02:58 2m 37s
The cloner once again mulches people on emag or emp (#26653) Merge Conflict Detection #8965: Commit 9c4a4c6 pushed by github-merge-queue bot
September 14, 2024 02:57 40s master
master
September 14, 2024 02:57 40s
Pipe reconnection (#26708) Merge Conflict Detection #8964: Commit 3b5cbf5 pushed by github-merge-queue bot
September 13, 2024 21:14 40s master
master
September 13, 2024 21:14 40s
Adds map: EmeraldStation (NSS Diagoras) (#26438) Merge Conflict Detection #8963: Commit 32719e2 pushed by github-merge-queue bot
September 13, 2024 18:22 42s master
master
September 13, 2024 18:22 42s
dsquad and SST to 45 (#26705) Merge Conflict Detection #8962: Commit a1e250c pushed by github-merge-queue bot
September 13, 2024 17:47 38s master
master
September 13, 2024 17:47 38s
Changes the permissions for the Door Remote of the RD, QM, Command. (… Merge Conflict Detection #8961: Commit a71424d pushed by github-merge-queue bot
September 13, 2024 17:27 38s master
master
September 13, 2024 17:27 38s
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