Skip to content

Actions: Contrabang/Paradise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
238 workflow runs
238 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Adds Tend Wounds/Tend Burns surgeries (#28105) Merge Conflict Detection #312: Commit e8a61cf pushed by Contrabang
February 5, 2025 19:47 29s master
master
February 5, 2025 19:47 29s
Changes a lot of lighting colors, ranges, and powers (#28226) Merge Conflict Detection #311: Commit e3f73e1 pushed by Contrabang
February 5, 2025 06:52 29s master
master
February 5, 2025 06:52 29s
No VV/proccall click runtime (#28243) Merge Conflict Detection #310: Commit fd04e5a pushed by Contrabang
February 4, 2025 17:48 27s master
master
February 4, 2025 17:48 27s
Changes reset code to 1000 instead of 0 (#28231) Merge Conflict Detection #309: Commit 39d58e2 pushed by Contrabang
February 3, 2025 19:58 32s master
master
February 3, 2025 19:58 32s
yolo (#28227) Merge Conflict Detection #308: Commit a9b181e pushed by Contrabang
February 2, 2025 23:06 26s master
master
February 2, 2025 23:06 26s
Clean up firedoors and add proper emag behavior (#28087) Merge Conflict Detection #307: Commit 8a47c1a pushed by Contrabang
February 2, 2025 20:31 30s master
master
February 2, 2025 20:31 30s
minor test fixture improvements (#28207) Merge Conflict Detection #306: Commit 99ad70a pushed by Contrabang
February 1, 2025 16:44 27s master
master
February 1, 2025 16:44 27s
Re-bonk reagents on kitchen appliances (#28185) Merge Conflict Detection #305: Commit 7f9305f pushed by Contrabang
January 30, 2025 18:07 31s master
master
January 30, 2025 18:07 31s
Update VV to work better in 516 (#28078) Merge Conflict Detection #304: Commit e8f7806 pushed by Contrabang
January 25, 2025 15:55 28s master
master
January 25, 2025 15:55 28s
oops (#28045) Merge Conflict Detection #303: Commit 08d4ab7 pushed by Contrabang
January 20, 2025 21:34 33s master
master
January 20, 2025 21:34 33s
"Dynamic" Gamemode using rulesets (#27600) Merge Conflict Detection #302: Commit 8954a8e pushed by Contrabang
January 19, 2025 20:13 32s master
master
January 19, 2025 20:13 32s
fix random bookcase icon (#28034) Merge Conflict Detection #301: Commit 61802a7 pushed by Contrabang
January 19, 2025 15:59 31s master
master
January 19, 2025 15:59 31s
make all sec clothing in the loadout menu available to the detective … Merge Conflict Detection #300: Commit 97e99fe pushed by Contrabang
January 19, 2025 04:19 27s master
master
January 19, 2025 04:19 27s
Adjust depot loot a little and remove some irrelevant items. (#27398) Merge Conflict Detection #299: Commit 5337cc1 pushed by Contrabang
January 13, 2025 17:15 31s master
master
January 13, 2025 17:15 31s
NanoMap Auto-Update (Sat Jan 11 01:37:56 UTC 2025) (#27938) Merge Conflict Detection #298: Commit a64e52e pushed by Contrabang
January 11, 2025 18:43 33s master
master
January 11, 2025 18:43 33s
Fixes old Humanoid cyborg sprites, to actually be able to wear hats. … Merge Conflict Detection #297: Commit c35174c pushed by Contrabang
January 8, 2025 02:32 26s master
master
January 8, 2025 02:32 26s
Dragging storage bags now drops items around the mouse pointer (#27790) Merge Conflict Detection #296: Commit 8e60888 pushed by Contrabang
January 6, 2025 18:46 27s master
master
January 6, 2025 18:46 27s
Adds Contrabang to Headcoders in CONTRIBUTING.md Merge Conflict Detection #295: Commit 995b6dc pushed by Contrabang
January 6, 2025 18:41 34s master
master
January 6, 2025 18:41 34s
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