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

[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
NanoMap Auto-Update (Tue Dec 31 01:37:04 UTC 2024) (#27779) Merge Conflict Detection #9634: Commit c196de0 pushed by github-merge-queue bot
December 31, 2024 15:52 42s master
master
December 31, 2024 15:52 42s
Hotfix (#27780) Merge Conflict Detection #9633: Commit 06bbd77 pushed by github-merge-queue bot
December 31, 2024 02:02 43s master
master
December 31, 2024 02:02 43s
Nanotrasen Career Trainer - REVIVAL (PT1) (#26512) Merge Conflict Detection #9632: Commit b55bef2 pushed by github-merge-queue bot
December 30, 2024 21:17 2m 27s master
master
December 30, 2024 21:17 2m 27s
Create a map template for tests and use an empty space level for plac… Merge Conflict Detection #9631: Commit 2559287 pushed by github-merge-queue bot
December 30, 2024 18:42 3m 33s master
master
December 30, 2024 18:42 3m 33s
fix magic touch spells false deleting, fix spelling, allow escape (#2… Merge Conflict Detection #9630: Commit a3508e0 pushed by github-merge-queue bot
December 30, 2024 18:39 6m 23s master
master
December 30, 2024 18:39 6m 23s
Removed Wedding Clothes from Chaplain Garments (#27544) Merge Conflict Detection #9629: Commit 3888b35 pushed by github-merge-queue bot
December 30, 2024 18:34 9m 4s master
master
December 30, 2024 18:34 9m 4s
updates harvester sound (#27709) Merge Conflict Detection #9628: Commit c07e044 pushed by github-merge-queue bot
December 30, 2024 18:30 11m 14s master
master
December 30, 2024 18:30 11m 14s
Remove ancient random spawners. (#27682) Merge Conflict Detection #9627: Commit c6ec62f pushed by github-merge-queue bot
December 30, 2024 18:29 11m 3s master
master
December 30, 2024 18:29 11m 3s
Update cerestation.dmm (#27735) Merge Conflict Detection #9626: Commit 99e4877 pushed by github-merge-queue bot
December 30, 2024 18:26 6m 1s master
master
December 30, 2024 18:26 6m 1s
Adds some new Paradise-themed band posters (#27741) Merge Conflict Detection #9625: Commit 45f6c68 pushed by github-merge-queue bot
December 30, 2024 18:25 3m 9s master
master
December 30, 2024 18:25 3m 9s
Resprites Mecha Cursor (#27743) Merge Conflict Detection #9624: Commit b2a5c50 pushed by github-merge-queue bot
December 30, 2024 18:22 2m 26s master
master
December 30, 2024 18:22 2m 26s
More spell var removals (#27704) Merge Conflict Detection #9623: Commit d99c9b2 pushed by github-merge-queue bot
December 30, 2024 14:57 4m 16s master
master
December 30, 2024 14:57 4m 16s