Skip to content

Actions: ParadiseSS13/Paradise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
2,555 workflow run results
2,555 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fixes being unable to ignite bonfire in lavaland (#26648) Merge Conflict Detection #8924: Commit c919309 pushed by github-merge-queue bot
September 9, 2024 23:47 56s master
master
September 9, 2024 23:47 56s
The mech crusher module (#26550) Merge Conflict Detection #8923: Commit 20d2258 pushed by github-merge-queue bot
September 9, 2024 23:45 40s master
master
September 9, 2024 23:45 40s
Replaces the changeling gamemode with a vampires + changelings gamemo… Merge Conflict Detection #8922: Commit 7555aef pushed by github-merge-queue bot
September 9, 2024 19:23 45s master
master
September 9, 2024 19:23 45s
fix: R&D rework: convert rest of tgui_alert choices to lists (#26721) Merge Conflict Detection #8921: Commit da4e519 pushed by github-merge-queue bot
September 8, 2024 19:07 41s master
master
September 8, 2024 19:07 41s
add generic site description for social cards (#26720) Merge Conflict Detection #8920: Commit 22a9fb8 pushed by github-merge-queue bot
September 8, 2024 18:16 39s master
master
September 8, 2024 18:16 39s
docs: Add social card preview. (#26719) Merge Conflict Detection #8919: Commit cfcd488 pushed by github-merge-queue bot
September 8, 2024 17:45 37s master
master
September 8, 2024 17:45 37s
R&D Rework PT1 - The network refactor (#26420) Merge Conflict Detection #8918: Commit 03bc64a pushed by github-merge-queue bot
September 8, 2024 16:41 38s master
master
September 8, 2024 16:41 38s
Update cigs.dm (#26694) Merge Conflict Detection #8917: Commit e87982e pushed by github-merge-queue bot
September 6, 2024 09:31 38s master
master
September 6, 2024 09:31 38s
Fixes extended thrower recipes (#26698) Merge Conflict Detection #8916: Commit 2032afb pushed by github-merge-queue bot
September 6, 2024 01:34 37s master
master
September 6, 2024 01:34 37s
Adds Chemical flamethrowers (#25091) Merge Conflict Detection #8915: Commit e3c7311 pushed by github-merge-queue bot
September 5, 2024 23:16 47s master
master
September 5, 2024 23:16 47s
[TWEAK] Makes vampire warning for burning in space a bit more obvious… Merge Conflict Detection #8914: Commit 6ae5bfe pushed by github-merge-queue bot
September 5, 2024 23:11 36s master
master
September 5, 2024 23:11 36s
ci: watch mkdocs.yml for changes to publish (#26690) Merge Conflict Detection #8913: Commit e68b61a pushed by github-merge-queue bot
September 5, 2024 18:44 40s master
master
September 5, 2024 18:44 40s
docs: enable site search (#26689) Merge Conflict Detection #8912: Commit 8c557df pushed by github-merge-queue bot
September 5, 2024 14:05 39s master
master
September 5, 2024 14:05 39s
fix all occurrences of uppercase links in markdown (#26684) Merge Conflict Detection #8911: Commit ef10113 pushed by github-merge-queue bot
September 4, 2024 18:55 38s master
master
September 4, 2024 18:55 38s
Dev docs build rev 1 (#26682) Merge Conflict Detection #8910: Commit 641069e pushed by github-merge-queue bot
September 4, 2024 18:18 43s master
master
September 4, 2024 18:18 43s
Bump the npm_and_yarn group in /tgui with 2 updates (#26681) Merge Conflict Detection #8909: Commit a3eb595 pushed by github-merge-queue bot
September 4, 2024 16:50 36s master
master
September 4, 2024 16:50 36s
Centralize developer documentation. (#26485) Merge Conflict Detection #8908: Commit 1d538ad pushed by github-merge-queue bot
September 4, 2024 16:48 42s master
master
September 4, 2024 16:48 42s
update stealthmin handling (#26676) Merge Conflict Detection #8907: Commit 1b2b843 pushed by github-merge-queue bot
September 4, 2024 06:52 40s master
master
September 4, 2024 06:52 40s
Dev team chat (#26669) Merge Conflict Detection #8906: Commit 73e861b pushed by github-merge-queue bot
September 3, 2024 16:53 40s master
master
September 3, 2024 16:53 40s
Borgs get flashed again (#26674) Merge Conflict Detection #8905: Commit e0da59f pushed by github-merge-queue bot
September 3, 2024 14:05 39s master
master
September 3, 2024 14:05 39s
Demotion properly updates HUD icon (#26672) Merge Conflict Detection #8904: Commit e77ced3 pushed by github-merge-queue bot
September 3, 2024 13:31 36s master
master
September 3, 2024 13:31 36s
Wall flashers on deltastation now have the right ID (#26673) Merge Conflict Detection #8903: Commit 2426b85 pushed by github-merge-queue bot
September 3, 2024 13:30 1m 11s master
master
September 3, 2024 13:30 1m 11s
fix: Unfrozen mobs keep their bodies. (#26663) Merge Conflict Detection #8902: Commit 3ef9abf pushed by github-merge-queue bot
September 3, 2024 13:28 2m 25s master
master
September 3, 2024 13:28 2m 25s
fix: Standardize abandoned engi sat lockers. (#26654) Merge Conflict Detection #8901: Commit a2a1aa0 pushed by github-merge-queue bot
September 3, 2024 13:25 1m 45s master
master
September 3, 2024 13:25 1m 45s
Fixing syndicate tech on mining charges (#26639) Merge Conflict Detection #8900: Commit 4e2b517 pushed by github-merge-queue bot
September 3, 2024 13:24 2m 5s master
master
September 3, 2024 13:24 2m 5s