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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

[FEATURE] New chameleon pen for forging [signs] (#27128) Merge Conflict Detection #9435: Commit 5656f34 pushed by github-merge-queue bot
November 27, 2024 05:20 34s master
master
November 27, 2024 05:20 34s
Particle Accelerator Console TGUI update (#26949) Merge Conflict Detection #9434: Commit d1cfe46 pushed by github-merge-queue bot
November 26, 2024 23:08 36s master
master
November 26, 2024 23:08 36s
Fixes missing name on some PTL orbital strike sprites (#27461) Merge Conflict Detection #9433: Commit 95c60f6 pushed by github-merge-queue bot
November 26, 2024 16:28 43s master
master
November 26, 2024 16:28 43s
Update Script for PR #27257 - Language Changes & Lore Pt. 1 (#27458) Merge Conflict Detection #9432: Commit e3bc7e3 pushed by github-merge-queue bot
November 25, 2024 20:15 34s master
master
November 25, 2024 20:15 34s
Deadchat now has runechat (#27366) Merge Conflict Detection #9431: Commit e63b2ee pushed by github-merge-queue bot
November 25, 2024 18:42 36s master
master
November 25, 2024 18:42 36s
Power laser port 2 electric bogaloo (#27171) Merge Conflict Detection #9430: Commit 7aeb174 pushed by github-merge-queue bot
November 25, 2024 16:40 38s master
master
November 25, 2024 16:40 38s
Language Changes & Lore Pt. 1 (#27257) Merge Conflict Detection #9429: Commit 09830b2 pushed by github-merge-queue bot
November 25, 2024 11:29 34s master
master
November 25, 2024 11:29 34s
Polishes the Syndicate Listening Post (#27353) Merge Conflict Detection #9428: Commit 72ae2ed pushed by github-merge-queue bot
November 25, 2024 11:23 39s master
master
November 25, 2024 11:23 39s
SS13 isn't that sort of fantasy game (#27364) Merge Conflict Detection #9427: Commit 053470e pushed by github-merge-queue bot
November 24, 2024 22:42 33s master
master
November 24, 2024 22:42 33s
Improves the Dark Gygax Slightly (#27378) Merge Conflict Detection #9426: Commit 3d06cd6 pushed by github-merge-queue bot
November 24, 2024 21:38 35s master
master
November 24, 2024 21:38 35s
fix: remove stray cig vendor from USSP (#27447) Merge Conflict Detection #9425: Commit c8c3a3c pushed by github-merge-queue bot
November 24, 2024 21:12 41s master
master
November 24, 2024 21:12 41s
Unfucks Bulldog Bundles (#27376) Merge Conflict Detection #9424: Commit aa2651f pushed by github-merge-queue bot
November 24, 2024 20:08 34s master
master
November 24, 2024 20:08 34s
[FIX] You can knock climbers off of tables again (#27423) Merge Conflict Detection #9423: Commit a28c1a4 pushed by github-merge-queue bot
November 24, 2024 20:03 36s master
master
November 24, 2024 20:03 36s
lowers sniper rifle execution speed to 4 seconds (#27396) Merge Conflict Detection #9422: Commit faaf3bb pushed by github-merge-queue bot
November 24, 2024 19:58 27s master
master
November 24, 2024 19:58 27s
Makes triple citrus tick on life instead of ingest (#27418) Merge Conflict Detection #9421: Commit 4c5a326 pushed by github-merge-queue bot
November 24, 2024 19:57 44s master
master
November 24, 2024 19:57 44s
Metastation Megafix (#27302) Merge Conflict Detection #9420: Commit 3dd27b5 pushed by github-merge-queue bot
November 24, 2024 18:45 1m 24s master
master
November 24, 2024 18:45 1m 24s
Fix Nanomaps (#27444) Merge Conflict Detection #9419: Commit 80c7a59 pushed by github-merge-queue bot
November 24, 2024 15:49 38s master
master
November 24, 2024 15:49 38s
Unreverts Updates the technical names of BoxStation and DeltaStation … Merge Conflict Detection #9418: Commit a7557eb pushed by github-merge-queue bot
November 24, 2024 14:30 1m 27s master
master
November 24, 2024 14:30 1m 27s
Adds toggles3 (#27397) Merge Conflict Detection #9417: Commit 5e5c75b pushed by github-merge-queue bot
November 24, 2024 14:27 1m 36s master
master
November 24, 2024 14:27 1m 36s
Enforce ruin cost as factor of ruin size. (#27198) Merge Conflict Detection #9416: Commit e37b83a pushed by github-merge-queue bot
November 24, 2024 14:14 39s master
master
November 24, 2024 14:14 39s
Fixes surgery delays (#27440) Merge Conflict Detection #9415: Commit f978108 pushed by github-merge-queue bot
November 23, 2024 22:08 34s master
master
November 23, 2024 22:08 34s
refactor: move damaged ruin ripley to subtype (#27294) Merge Conflict Detection #9414: Commit 0de5514 pushed by github-merge-queue bot
November 23, 2024 16:47 1m 25s master
master
November 23, 2024 16:47 1m 25s
refactor: Migrate more random_spawners to random/spawners and mapping… Merge Conflict Detection #9413: Commit 586805a pushed by github-merge-queue bot
November 23, 2024 14:28 1m 26s master
master
November 23, 2024 14:28 1m 26s
Adds a new candy , chocolate bar, to the vending machine. (#27086) Merge Conflict Detection #9412: Commit c044ff1 pushed by github-merge-queue bot
November 23, 2024 14:24 1m 22s master
master
November 23, 2024 14:24 1m 22s
Recounts rise_number and related variables every once in a while (#… Merge Conflict Detection #9411: Commit 9ab117a pushed by github-merge-queue bot
November 23, 2024 13:56 1m 24s master
master
November 23, 2024 13:56 1m 24s