Skip to content

Actions: CRUNCH-Borg/CRUNCHParadise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
205 workflow runs
205 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge Conflict Detection Merge Conflict Detection #317: by CRUNCH-Borg
31s master
master
31s
Adds action button for nian wings (#31563) Merge Conflict Detection #316: Commit b0ee52c pushed by CRUNCH-Borg
25s master
master
25s
fix firesuit (#31703) Merge Conflict Detection #315: Commit 71670f7 pushed by CRUNCH-Borg
29s master
master
29s
Fixes missing Tranquillite floor damaged texture (#31685) Merge Conflict Detection #314: Commit 8aedc66 pushed by CRUNCH-Borg
28s master
master
28s
Fixes door buzz (#31632) Merge Conflict Detection #313: Commit fd3be1a pushed by CRUNCH-Borg
30s master
master
30s
Prevents Swarmers from Interacting from NGCR-Related Things (#31584) Merge Conflict Detection #312: Commit 3a5fdc5 pushed by CRUNCH-Borg
40s master
master
40s
Fixes typos and British spelling in Advanced Hypospray description (#… Merge Conflict Detection #311: Commit 506e5b7 pushed by CRUNCH-Borg
23s master
master
23s
Titanium moderator buffs (#31476) Merge Conflict Detection #310: Commit 8a7da5c pushed by CRUNCH-Borg
25s master
master
25s
Miner locker room change to prevent Brad from dying (#31500) Merge Conflict Detection #309: Commit a0ed4b0 pushed by CRUNCH-Borg
26s master
master
26s
[IDB Ignore] Heretic: The Mansus Re-Opened (#30738) Merge Conflict Detection #308: Commit 2031057 pushed by CRUNCH-Borg
26s master
master
26s
Recolor headwear when adjusted for Skkulakin. (#31464) Merge Conflict Detection #307: Commit 3821fec pushed by CRUNCH-Borg
23s master
master
23s
Converts mimic mobs to basic mobs (#31424) Merge Conflict Detection #306: Commit 095f93c pushed by CRUNCH-Borg
24s master
master
24s
Adds Holy Hand Grenades (#31293) Merge Conflict Detection #305: Commit 7ec133a pushed by CRUNCH-Borg
24s master
master
24s
Migrates Null Rods to the New Attack Chain (#31370) Merge Conflict Detection #304: Commit 2d636ff pushed by CRUNCH-Borg
25s master
master
25s
Expansion of Chemmaster 3000 capabilities + minor QoL for chemistry e… Merge Conflict Detection #303: Commit 99bdc91 pushed by CRUNCH-Borg
30s master
master
30s
Add missing commas to a couple of gibber messages (#31444) Merge Conflict Detection #302: Commit 2da9270 pushed by CRUNCH-Borg
23s master
master
23s
refactor user verb sources (#31411) Merge Conflict Detection #301: Commit 9e7a98c pushed by CRUNCH-Borg
29s master
master
29s
add flash protection to structure attack chain test puppet (#31420) Merge Conflict Detection #300: Commit 1cbd93f pushed by CRUNCH-Borg
24s master
master
24s
overlays woo (#31396) Merge Conflict Detection #299: Commit 090671b pushed by CRUNCH-Borg
26s master
master
26s
Wire up client mobs to the spatial grid (#31330) Merge Conflict Detection #298: Commit 2df60ba pushed by CRUNCH-Borg
23s master
master
23s
Re-adds the meta kitchen rework (#31416) Merge Conflict Detection #297: Commit 7787a26 pushed by CRUNCH-Borg
25s master
master
25s
Locker Resprite (#31351) Merge Conflict Detection #296: Commit c8d32f8 pushed by CRUNCH-Borg
25s master
master
25s
[s] Fixes a issue with modsuits (#31385) Merge Conflict Detection #295: Commit 5f880d7 pushed by CRUNCH-Borg
29s master
master
29s
Update syndicate_mobs.dm (#31336) Merge Conflict Detection #294: Commit 8c68130 pushed by CRUNCH-Borg
27s master
master
27s
Adds SolGov winter coat. (#31335) Merge Conflict Detection #293: Commit d37f014 pushed by CRUNCH-Borg
28s master
master
28s