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,248 workflow run results
3,248 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

[s] Vtec fix (#27819) Merge Conflict Detection #9659: Commit 0b35706 pushed by github-merge-queue bot
January 3, 2025 17:57 40s master
master
January 3, 2025 17:57 40s
NanoMap Auto-Update (Fri Jan 3 01:37:46 UTC 2025) (#27812) Merge Conflict Detection #9658: Commit d92a403 pushed by github-merge-queue bot
January 3, 2025 16:36 42s master
master
January 3, 2025 16:36 42s
emerald: fix bad hallway area designation (#27815) Merge Conflict Detection #9657: Commit 2582b3c pushed by github-merge-queue bot
January 3, 2025 02:36 39s master
master
January 3, 2025 02:36 39s
adds NCT to antag blacklists (#27811) Merge Conflict Detection #9656: Commit 1ee6833 pushed by github-merge-queue bot
January 3, 2025 00:06 39s master
master
January 3, 2025 00:06 39s
fix small typo in cybersun trader (#27810) Merge Conflict Detection #9655: Commit 7c03da8 pushed by github-merge-queue bot
January 2, 2025 23:34 39s master
master
January 2, 2025 23:34 39s
Converts a bunch of items into using neck slot (#27474) Merge Conflict Detection #9654: Commit 6a63097 pushed by AffectedArc07
January 2, 2025 22:47 41s master
master
January 2, 2025 22:47 41s
Fixes missed pixel on the NTC sechud icon (#27806) Merge Conflict Detection #9653: Commit 6f13d44 pushed by github-merge-queue bot
January 2, 2025 20:30 39s master
master
January 2, 2025 20:30 39s
Lets you wear emag on your ID slot and tweaks quick equip (#27573) Merge Conflict Detection #9652: Commit 2bc0388 pushed by github-merge-queue bot
January 2, 2025 10:08 42s master
master
January 2, 2025 10:08 42s
Ports Anti-magic from TG. (#27560) Merge Conflict Detection #9651: Commit 7bbebbb pushed by github-merge-queue bot
January 2, 2025 08:42 40s master
master
January 2, 2025 08:42 40s
Relocates Farragus Genetics to the Science Asteroid (#27601) Merge Conflict Detection #9650: Commit 6057ff5 pushed by github-merge-queue bot
January 2, 2025 08:40 56s master
master
January 2, 2025 08:40 56s
Various his grace buffs. (#27581) Merge Conflict Detection #9649: Commit 62c2a05 pushed by github-merge-queue bot
January 2, 2025 08:06 41s master
master
January 2, 2025 08:06 41s
fix return value of check_datum_loop CI check (#27798) Merge Conflict Detection #9648: Commit 8aaad57 pushed by github-merge-queue bot
January 2, 2025 07:14 43s master
master
January 2, 2025 07:14 43s
[S] Fixes a bad oversight (#27793) Merge Conflict Detection #9647: Commit 3129a43 pushed by github-merge-queue bot
January 1, 2025 21:58 33s master
master
January 1, 2025 21:58 33s
Datumizes Event Antags (#27546) Merge Conflict Detection #9646: Commit ef0dedb pushed by github-merge-queue bot
January 1, 2025 21:23 41s master
master
January 1, 2025 21:23 41s
MILLA phase 2 (#27659) Merge Conflict Detection #9645: Commit e6f9904 pushed by github-merge-queue bot
January 1, 2025 20:16 44s master
master
January 1, 2025 20:16 44s
fixes some ipc mindflayer shenanigan (#27719) Merge Conflict Detection #9644: Commit b7c8007 pushed by github-merge-queue bot
January 1, 2025 04:52 1m 24s master
master
January 1, 2025 04:52 1m 24s
Fixes errors from the recent TG backpack port + new leather satchel a… Merge Conflict Detection #9643: Commit a67f8ff pushed by github-merge-queue bot
January 1, 2025 04:47 1m 26s master
master
January 1, 2025 04:47 1m 26s
Adds 2 item traits (heretic requirements) (#27680) Merge Conflict Detection #9642: Commit d1409ca pushed by github-merge-queue bot
January 1, 2025 04:46 1m 13s master
master
January 1, 2025 04:46 1m 13s
Resprites the Rapid Crate Sender (#27679) Merge Conflict Detection #9641: Commit 08c2af9 pushed by github-merge-queue bot
January 1, 2025 04:43 1m 3s master
master
January 1, 2025 04:43 1m 3s
Hand Tele resprite V2 (#27673) Merge Conflict Detection #9640: Commit a7bcbd2 pushed by github-merge-queue bot
January 1, 2025 04:41 1m 21s master
master
January 1, 2025 04:41 1m 21s
Emerald Station solars are now built by default [NOT WIRED] and prope… Merge Conflict Detection #9639: Commit a20dafd pushed by github-merge-queue bot
January 1, 2025 04:29 46s master
master
January 1, 2025 04:29 46s
Add customized welding helmets to the loadout (#27528) Merge Conflict Detection #9638: Commit d6259d9 pushed by github-merge-queue bot
January 1, 2025 04:14 1m 51s master
master
January 1, 2025 04:14 1m 51s
Removes the fake fake trick revolver, and the weird old (cursed)russi… Merge Conflict Detection #9637: Commit 9cb9392 pushed by github-merge-queue bot
January 1, 2025 04:06 2m 1s master
master
January 1, 2025 04:06 2m 1s
Adds Autolathes to Engineering on All Stations (#27532) Merge Conflict Detection #9636: Commit 2b283f9 pushed by github-merge-queue bot
January 1, 2025 04:04 55s master
master
January 1, 2025 04:04 55s
PTL Camera name fix (#27591) Merge Conflict Detection #9635: Commit 16c8e2d pushed by github-merge-queue bot
January 1, 2025 01:51 39s master
master
January 1, 2025 01:51 39s