Skip to content

Actions: Contrabang/Paradise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
237 workflow runs
237 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Dragging storage bags now drops items around the mouse pointer (#27790) Merge Conflict Detection #294: Commit 8e60888 pushed by Contrabang
January 6, 2025 18:26 31s master
master
January 6, 2025 18:26 31s
[s] Vtec fix (#27819) Merge Conflict Detection #293: Commit 0b35706 pushed by Contrabang
January 3, 2025 21:13 28s master
master
January 3, 2025 21:13 28s
fix small typo in cybersun trader (#27810) Merge Conflict Detection #292: Commit 7c03da8 pushed by Contrabang
January 3, 2025 00:01 29s master
master
January 3, 2025 00:01 29s
Tweak for meatpackers ruin turrets (#27422) Merge Conflict Detection #291: Commit 5c549ad pushed by Contrabang
December 22, 2024 22:46 25s master
master
December 22, 2024 22:46 25s
expand size (#27708) Merge Conflict Detection #290: Commit 7a29d77 pushed by Contrabang
December 22, 2024 16:50 30s master
master
December 22, 2024 16:50 30s
final major 516 fixes (#27676) Merge Conflict Detection #289: Commit 18604d9 pushed by Contrabang
December 19, 2024 13:46 31s master
master
December 19, 2024 13:46 31s
Ports Backpacks from TG, until we can resprite them individually per.… Merge Conflict Detection #288: Commit 539783a pushed by Contrabang
December 18, 2024 15:03 1m 1s master
master
December 18, 2024 15:03 1m 1s
Fix wallets not ingesting cards on click. (#27655) Merge Conflict Detection #287: Commit 02a37c8 pushed by Contrabang
December 16, 2024 03:27 31s master
master
December 16, 2024 03:27 31s
NanoMap Auto-Update (Sat Dec 14 01:42:45 UTC 2024) (#27624) Merge Conflict Detection #286: Commit 3898728 pushed by Contrabang
December 14, 2024 14:19 27s master
master
December 14, 2024 14:19 27s
mhm (#27623) Merge Conflict Detection #285: Commit 1eab5f1 pushed by Contrabang
December 12, 2024 16:14 33s master
master
December 12, 2024 16:14 33s
Remaps Delta's Brig and Courtroom (#27385) Merge Conflict Detection #284: Commit 07a394c pushed by Contrabang
December 11, 2024 22:46 30s master
master
December 11, 2024 22:46 30s
Makes VV hallucination not shit (#27609) Merge Conflict Detection #283: Commit 92c663e pushed by Contrabang
December 11, 2024 00:26 27s master
master
December 11, 2024 00:26 27s
NanoMap Auto-Update (Tue Dec 10 01:47:51 UTC 2024) (#27602) Merge Conflict Detection #282: Commit 27a7da7 pushed by Contrabang
December 10, 2024 14:12 30s master
master
December 10, 2024 14:12 30s
Slightly Remaps the Farragus AI Satellite (#27513) Merge Conflict Detection #281: Commit 8136122 pushed by Contrabang
December 10, 2024 00:04 31s master
master
December 10, 2024 00:04 31s
Create directional helpers for newscasters. (#27583) Merge Conflict Detection #280: Commit 5872c37 pushed by Contrabang
December 9, 2024 22:24 31s master
master
December 9, 2024 22:24 31s
Fixes managers runtiming on delete (#27585) Merge Conflict Detection #279: Commit 79938b3 pushed by Contrabang
December 9, 2024 13:15 30s master
master
December 9, 2024 13:15 30s
Missing Attribute (#27569) Merge Conflict Detection #278: Commit ae7f74a pushed by Contrabang
December 7, 2024 05:35 28s master
master
December 7, 2024 05:35 28s
Fixes several attack chain call sites (#27553) Merge Conflict Detection #277: Commit d23c808 pushed by Contrabang
December 6, 2024 23:02 29s master
master
December 6, 2024 23:02 29s
[FIX] Slimepeople can pick a bloodtype on agent IDs again (#27509) Merge Conflict Detection #276: Commit a0c326c pushed by Contrabang
December 4, 2024 14:06 29s master
master
December 4, 2024 14:06 29s
Remove non-existant mapmerge doc link (#27525) Merge Conflict Detection #275: Commit dad1776 pushed by Contrabang
December 3, 2024 00:48 34s master
master
December 3, 2024 00:48 34s
Adds logging to Custom Tips (#27501) Merge Conflict Detection #274: Commit e6c376b pushed by Contrabang
December 2, 2024 15:07 31s master
master
December 2, 2024 15:07 31s
Documentation for SQL changes (#27478) Merge Conflict Detection #273: Commit e8dc995 pushed by Contrabang
December 1, 2024 15:18 29s master
master
December 1, 2024 15:18 29s
Admin Jsons now have proper assignments and ranks (#27502) Merge Conflict Detection #272: Commit 51a8312 pushed by Contrabang
December 1, 2024 07:35 27s master
master
December 1, 2024 07:35 27s
Rename all non-snake_case types. (#27268) Merge Conflict Detection #271: Commit 0ffa830 pushed by Contrabang
November 30, 2024 19:17 28s master
master
November 30, 2024 19:17 28s
Fixes Stacking with the Check AI Laws verb (#27497) Merge Conflict Detection #270: Commit eea4872 pushed by Contrabang
November 30, 2024 15:26 28s master
master
November 30, 2024 15:26 28s