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,499 workflow run results
2,499 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Adds a new candy , chocolate bar, to the vending machine. (#27086) Merge Conflict Detection #9412: Commit c044ff1 pushed by github-merge-queue bot
November 23, 2024 14:24 1m 22s master
master
November 23, 2024 14:24 1m 22s
Recounts rise_number and related variables every once in a while (#… Merge Conflict Detection #9411: Commit 9ab117a pushed by github-merge-queue bot
November 23, 2024 13:56 1m 24s master
master
November 23, 2024 13:56 1m 24s
Adds a new spellblade enchantment: Temporal. Also adds lightning knoc… Merge Conflict Detection #9410: Commit c50ff7c pushed by github-merge-queue bot
November 23, 2024 13:55 38s master
master
November 23, 2024 13:55 38s
Revert "init (#27394)" (#27429) Merge Conflict Detection #9409: Commit 3a5bfaa pushed by github-merge-queue bot
November 22, 2024 19:32 39s master
master
November 22, 2024 19:32 39s
init (#27394) Merge Conflict Detection #9408: Commit fc3dceb pushed by github-merge-queue bot
November 22, 2024 19:17 34s master
master
November 22, 2024 19:17 34s
API: Spawn pools, a distributed loot manager. (#27199) Merge Conflict Detection #9407: Commit c4e4487 pushed by github-merge-queue bot
November 22, 2024 19:05 2m 14s master
master
November 22, 2024 19:05 2m 14s
Adds plasmaman envirosuits to departments (#27255) Merge Conflict Detection #9406: Commit cb1e9df pushed by github-merge-queue bot
November 22, 2024 18:18 42s master
master
November 22, 2024 18:18 42s
Adding and wiring some new guitar sounds. (#27184) Merge Conflict Detection #9405: Commit c3cca9d pushed by github-merge-queue bot
November 22, 2024 13:57 40s master
master
November 22, 2024 13:57 40s
Fixes revinfo (#27382) Merge Conflict Detection #9404: Commit 467740f pushed by github-merge-queue bot
November 22, 2024 13:22 1m 51s master
master
November 22, 2024 13:22 1m 51s
makes AI's in mechs or ai cards not blast us with false reports (#27412) Merge Conflict Detection #9403: Commit 722fe35 pushed by github-merge-queue bot
November 22, 2024 13:21 2m 41s master
master
November 22, 2024 13:21 2m 41s
Particle beam now consistently imparts the singularity with energy an… Merge Conflict Detection #9402: Commit 24dc69d pushed by github-merge-queue bot
November 22, 2024 13:20 1m 42s master
master
November 22, 2024 13:20 1m 42s
fix (#27420) Merge Conflict Detection #9401: Commit e333cd9 pushed by github-merge-queue bot
November 22, 2024 13:14 50s master
master
November 22, 2024 13:14 50s
refactor: /New -> /Initialize: simple animals (#27265) Merge Conflict Detection #9400: Commit 9009e3a pushed by github-merge-queue bot
November 21, 2024 05:09 35s master
master
November 21, 2024 05:09 35s
Fixes bridges breaking sometimes (#27417) Merge Conflict Detection #9399: Commit 4dafe78 pushed by github-merge-queue bot
November 21, 2024 03:30 40s master
master
November 21, 2024 03:30 40s
Adds chemical basetypes to the blacklist (#27404) Merge Conflict Detection #9398: Commit ccf7f0d pushed by github-merge-queue bot
November 21, 2024 03:08 46s master
master
November 21, 2024 03:08 46s
Fixes #26844 - Labeled condiment bottle loses its label when contents… Merge Conflict Detection #9397: Commit 9e6d405 pushed by github-merge-queue bot
November 21, 2024 03:07 39s master
master
November 21, 2024 03:07 39s
Reverant can now hear and speak chat (#27282) Merge Conflict Detection #9396: Commit 0f272d1 pushed by github-merge-queue bot
November 21, 2024 02:59 2m 7s master
master
November 21, 2024 02:59 2m 7s
Makes abductor experimentor slightly less stupid and fixes a electroc… Merge Conflict Detection #9395: Commit 9be6038 pushed by github-merge-queue bot
November 21, 2024 02:59 49s master
master
November 21, 2024 02:59 49s
[s] no, bad, no good, icky (#27413) Merge Conflict Detection #9394: Commit e99d167 pushed by github-merge-queue bot
November 20, 2024 21:32 42s master
master
November 20, 2024 21:32 42s
fix: broken minesweeper leaderboard (#27409) Merge Conflict Detection #9393: Commit 449c106 pushed by github-merge-queue bot
November 20, 2024 19:37 36s master
master
November 20, 2024 19:37 36s
add: minesweeper PDA game (#26860) Merge Conflict Detection #9392: Commit 59dd3a6 pushed by github-merge-queue bot
November 20, 2024 16:44 42s master
master
November 20, 2024 16:44 42s
Adds Space Ruin: Voidhopper of Nexus (#26809) Merge Conflict Detection #9391: Commit f56c5df pushed by github-merge-queue bot
November 19, 2024 21:21 41s master
master
November 19, 2024 21:21 41s
refactor: Elementize decals. (#27104) Merge Conflict Detection #9390: Commit 16672e4 pushed by github-merge-queue bot
November 19, 2024 18:20 42s master
master
November 19, 2024 18:20 42s
Makes some code tidy (#27391) Merge Conflict Detection #9389: Commit 1cda30a pushed by github-merge-queue bot
November 19, 2024 10:55 46s master
master
November 19, 2024 10:55 46s
feat: dynamic Lavaland bridge lengths. (#27173) Merge Conflict Detection #9388: Commit 105a2fa pushed by github-merge-queue bot
November 19, 2024 10:42 40s master
master
November 19, 2024 10:42 40s