Skip to content

Actions: ParadiseSS13/Paradise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
3,731 workflow runs
3,731 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Aaaaa how did I not notice this before (#26835) Merge Conflict Detection #9010: Commit 7199e80 pushed by github-merge-queue bot
September 19, 2024 13:14 41s master
master
September 19, 2024 13:14 41s
Administration tool: Build mode offer tool to quickly offer large amo… Merge Conflict Detection #9009: Commit a091516 pushed by github-merge-queue bot
September 19, 2024 10:50 40s master
master
September 19, 2024 10:50 40s
Fixes the abductor belt having incorrect overlays (#26829) Merge Conflict Detection #9008: Commit c1c1ef9 pushed by github-merge-queue bot
September 19, 2024 10:44 39s master
master
September 19, 2024 10:44 39s
fix: Farragus disposal outlet direction (#26831) Merge Conflict Detection #9007: Commit 6f4e592 pushed by github-merge-queue bot
September 19, 2024 10:41 37s master
master
September 19, 2024 10:41 37s
[FIX] Bottles created in the chemmaster now use the right chemical ov… Merge Conflict Detection #9006: Commit a135a9d pushed by github-merge-queue bot
September 19, 2024 10:35 35s master
master
September 19, 2024 10:35 35s
Adds missing railing to Cerestation security (#26807) Merge Conflict Detection #9005: Commit 880cd7d pushed by github-merge-queue bot
September 19, 2024 10:33 38s master
master
September 19, 2024 10:33 38s
Bluespace closet no longer has a random offset when printed (#26827) Merge Conflict Detection #9004: Commit de00530 pushed by github-merge-queue bot
September 19, 2024 02:40 2m 59s master
master
September 19, 2024 02:40 2m 59s
fix too much squeaking (#26813) Merge Conflict Detection #9003: Commit 8efbb58 pushed by github-merge-queue bot
September 19, 2024 02:39 3m 0s master
master
September 19, 2024 02:39 3m 0s
the wizard voice of god no longer makes you drop your own items (#26794) Merge Conflict Detection #9002: Commit 479c80d pushed by github-merge-queue bot
September 19, 2024 02:37 3m 14s master
master
September 19, 2024 02:37 3m 14s
fix: AI Eye movement runtimes (#26792) Merge Conflict Detection #9001: Commit 63855ed pushed by github-merge-queue bot
September 19, 2024 02:36 4m 0s master
master
September 19, 2024 02:36 4m 0s
Fix: Prevent Mech Fabricator output into the wall (#26790) Merge Conflict Detection #9000: Commit 3998a76 pushed by github-merge-queue bot
September 19, 2024 02:35 1m 15s master
master
September 19, 2024 02:35 1m 15s
Fixes gas grenades not going away after detonation (#26770) Merge Conflict Detection #8999: Commit fc1d202 pushed by github-merge-queue bot
September 19, 2024 02:31 3m 19s master
master
September 19, 2024 02:31 3m 19s
fixes saber spelling (#26766) Merge Conflict Detection #8998: Commit fb199c8 pushed by github-merge-queue bot
September 19, 2024 02:29 1m 28s master
master
September 19, 2024 02:29 1m 28s
Stat Panel font size/family settings & more TGUI-like look (#26535) Merge Conflict Detection #8997: Commit 5f29576 pushed by github-merge-queue bot
September 18, 2024 19:09 42s master
master
September 18, 2024 19:09 42s
refactor: ore bag pickup (#26699) Merge Conflict Detection #8996: Commit 89fd8c6 pushed by github-merge-queue bot
September 18, 2024 17:00 43s master
master
September 18, 2024 17:00 43s
Improved cloning UI (#26753) Merge Conflict Detection #8995: Commit 9adbe39 pushed by github-merge-queue bot
September 17, 2024 18:39 36s master
master
September 17, 2024 18:39 36s
Fixes borgs being unable to pick up some items. (#26791) Merge Conflict Detection #8994: Commit 8883a72 pushed by github-merge-queue bot
September 17, 2024 17:27 40s master
master
September 17, 2024 17:27 40s
not my fault! (#26811) Merge Conflict Detection #8993: Commit 9b0967a pushed by github-merge-queue bot
September 17, 2024 17:13 42s master
master
September 17, 2024 17:13 42s
oopsie (#26810) Merge Conflict Detection #8992: Commit 8925b33 pushed by github-merge-queue bot
September 17, 2024 16:23 39s master
master
September 17, 2024 16:23 39s
Nerf Clown minibomb (#26806) Merge Conflict Detection #8991: Commit bac06b2 pushed by github-merge-queue bot
September 17, 2024 09:22 37s master
master
September 17, 2024 09:22 37s
Fixes AI's VOX system saying 'farragus' twice (#26772) Merge Conflict Detection #8990: Commit fc7a0e4 pushed by github-merge-queue bot
September 17, 2024 01:04 39s master
master
September 17, 2024 01:04 39s
Fix heat-proof doors (#26757) Merge Conflict Detection #8989: Commit 9fd3c36 pushed by github-merge-queue bot
September 16, 2024 16:31 37s master
master
September 16, 2024 16:31 37s
Vaporizes NT Supreme Court (#26732) Merge Conflict Detection #8988: Commit 17098fe pushed by github-merge-queue bot
September 16, 2024 16:07 41s master
master
September 16, 2024 16:07 41s
[RUNTIME] Fixes trying to open the head marking menu for certain IPC … Merge Conflict Detection #8987: Commit 2f9182b pushed by github-merge-queue bot
September 16, 2024 14:58 40s master
master
September 16, 2024 14:58 40s
Make Gravitational Anomalies exist above items. (#26683) Merge Conflict Detection #8986: Commit d642cd1 pushed by github-merge-queue bot
September 16, 2024 14:46 1m 14s master
master
September 16, 2024 14:46 1m 14s