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

Mindflayers v0.9, Playable Edition! (#26596) Merge Conflict Detection #237: Commit 036b8e0 pushed by Contrabang
October 30, 2024 18:42 34s master
master
October 30, 2024 18:42 34s
[s] Fixes a lot of stuff (#27238) Merge Conflict Detection #236: Commit c4521dc pushed by Contrabang
October 30, 2024 12:59 32s master
master
October 30, 2024 12:59 32s
Can't do that. (#27236) Merge Conflict Detection #235: Commit d2f097c pushed by Contrabang
October 30, 2024 01:46 29s master
master
October 30, 2024 01:46 29s
Fixes a machine analyzer runtime (#27143) Merge Conflict Detection #234: Commit 1fea7d1 pushed by Contrabang
October 28, 2024 13:22 31s master
master
October 28, 2024 13:22 31s
added disaster counters to deltastation (#27158) Merge Conflict Detection #233: Commit 21321ca pushed by Contrabang
October 27, 2024 20:21 33s master
master
October 27, 2024 20:21 33s
Improved CrewMonitor interface (#27140) Merge Conflict Detection #232: Commit 253b7f1 pushed by Contrabang
October 26, 2024 00:26 31s master
master
October 26, 2024 00:26 31s
refactor/ci: enforce mapload in Initialize args (#26878) Merge Conflict Detection #231: Commit 9465b56 pushed by Contrabang
October 23, 2024 21:11 33s master
master
October 23, 2024 21:11 33s
blackbox: Record biohazard pop at intervals. (#26930) Merge Conflict Detection #230: Commit f27feae pushed by Contrabang
October 22, 2024 12:38 32s master
master
October 22, 2024 12:38 32s
refactor: Remove unused grill machine (#27122) Merge Conflict Detection #229: Commit 20dfb3a pushed by Contrabang
October 17, 2024 12:21 33s master
master
October 17, 2024 12:21 33s
Update gun_attachments.dm (#26956) Merge Conflict Detection #228: Commit b0895a1 pushed by Contrabang
October 15, 2024 22:31 31s master
master
October 15, 2024 22:31 31s
Fixes chat language colours (#27099) Merge Conflict Detection #227: Commit 344de81 pushed by Contrabang
October 15, 2024 15:24 34s master
master
October 15, 2024 15:24 34s
fix: duplicate mapped fire-extinguishers (#27105) Merge Conflict Detection #226: Commit f5ee256 pushed by Contrabang
October 14, 2024 22:02 29s master
master
October 14, 2024 22:02 29s
Fixes the blood drunk miner not having a death animation (#27097) Merge Conflict Detection #225: Commit bfca46b pushed by Contrabang
October 14, 2024 15:20 31s master
master
October 14, 2024 15:20 31s
[PORT/FEATURE] Animated closet doors (#26832) Merge Conflict Detection #224: Commit b51cc0f pushed by Contrabang
October 14, 2024 14:59 35s master
master
October 14, 2024 14:59 35s
fixes some walls I missed (#27089) Merge Conflict Detection #223: Commit cd14b61 pushed by Contrabang
October 14, 2024 13:23 28s master
master
October 14, 2024 13:23 28s
bungo growo (#27053) Merge Conflict Detection #222: Commit 1b16e13 pushed by Contrabang
October 11, 2024 13:04 29s master
master
October 11, 2024 13:04 29s
[REFACTOR] Helper proc for unbuckling a mob (#26918) Merge Conflict Detection #221: Commit a060093 pushed by Contrabang
October 10, 2024 13:04 31s master
master
October 10, 2024 13:04 31s
Light restyling of Boxed Messages and removal of unnecessary CSS styl… Merge Conflict Detection #220: Commit 7ed4ef4 pushed by Contrabang
October 10, 2024 12:51 31s master
master
October 10, 2024 12:51 31s
fuck me whyyy (#26988) Merge Conflict Detection #219: Commit 1d447c5 pushed by Contrabang
October 7, 2024 02:01 29s master
master
October 7, 2024 02:01 29s
fixes an exploit (#26984) Merge Conflict Detection #218: Commit dab6fc5 pushed by Contrabang
October 5, 2024 00:01 31s master
master
October 5, 2024 00:01 31s
Added shadowperson healing case for when inside locker (#26837) Merge Conflict Detection #217: Commit 0f58720 pushed by Contrabang
September 28, 2024 14:08 44s master
master
September 28, 2024 14:08 44s
Updates OD lints (#26729) Merge Conflict Detection #216: Commit 900271a pushed by Contrabang
September 27, 2024 17:07 32s master
master
September 27, 2024 17:07 32s
Fix: byond tracy init (#26872) Merge Conflict Detection #215: Commit f4e20a3 pushed by Contrabang
September 26, 2024 21:21 28s master
master
September 26, 2024 21:21 28s
Fixes False Wall Smoothing (FOR GOOD THIS TIME) (#26828) Merge Conflict Detection #214: Commit 902b898 pushed by Contrabang
September 26, 2024 02:44 29s master
master
September 26, 2024 02:44 29s
[s] [FIX] Exploit fix (#26889) Merge Conflict Detection #213: Commit 6987ffc pushed by Contrabang
September 25, 2024 01:26 28s master
master
September 25, 2024 01:26 28s