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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Cleans up /obj/effect/decal/cleanable (#26631) Merge Conflict Detection #8899: Commit 8482c55 pushed by github-merge-queue bot
September 3, 2024 13:22 2m 20s master
master
September 3, 2024 13:22 2m 20s
Runtimes begone! (#26629) Merge Conflict Detection #8898: Commit 0d5a15b pushed by github-merge-queue bot
September 3, 2024 13:20 1m 53s master
master
September 3, 2024 13:20 1m 53s
fix: stop damage to delivery chutes from items thrown through space (… Merge Conflict Detection #8897: Commit d244f13 pushed by github-merge-queue bot
September 3, 2024 13:19 2m 41s master
master
September 3, 2024 13:19 2m 41s
Prevents pseudo-exploit with heal_on_apply reagents and IV bags (#26610) Merge Conflict Detection #8896: Commit f6f19c3 pushed by github-merge-queue bot
September 3, 2024 13:19 46s master
master
September 3, 2024 13:19 46s
Fix runtimes when events cannot find a valid event area (#26594) Merge Conflict Detection #8895: Commit 00a0b8f pushed by github-merge-queue bot
September 3, 2024 13:18 1m 13s master
master
September 3, 2024 13:18 1m 13s
Documents and standardizes power and energy units. Fixes a pulse demo… Merge Conflict Detection #8894: Commit 6f1a90c pushed by github-merge-queue bot
September 3, 2024 13:17 2m 9s master
master
September 3, 2024 13:17 2m 9s
Fairly Sizable Fed Lore Drop (#26600) Merge Conflict Detection #8893: Commit 58c7fa9 pushed by github-merge-queue bot
September 3, 2024 13:13 37s master
master
September 3, 2024 13:13 37s
makes slimes clear target on death, and delete actions, and abort wal… Merge Conflict Detection #8892: Commit 482089e pushed by github-merge-queue bot
September 3, 2024 13:08 56s master
master
September 3, 2024 13:08 56s
improves tarot card logging (#26618) Merge Conflict Detection #8891: Commit 4be3cde pushed by github-merge-queue bot
September 3, 2024 13:06 1m 58s master
master
September 3, 2024 13:06 1m 58s
Adds and Adjusts Loadout Items (#26441) Merge Conflict Detection #8890: Commit de1250a pushed by github-merge-queue bot
September 3, 2024 13:06 42s master
master
September 3, 2024 13:06 42s
replaces hex2num proc with define (#26649) Merge Conflict Detection #8889: Commit c7340b0 pushed by github-merge-queue bot
August 30, 2024 22:50 36s master
master
August 30, 2024 22:50 36s
Balls (#26652) Merge Conflict Detection #8888: Commit b962a24 pushed by github-merge-queue bot
August 30, 2024 21:35 38s master
master
August 30, 2024 21:35 38s
VV open logs (#26647) Merge Conflict Detection #8887: Commit 018cc40 pushed by github-merge-queue bot
August 30, 2024 18:06 37s master
master
August 30, 2024 18:06 37s
Fix runtimes in Lavaland river procgen. (#26606) Merge Conflict Detection #8886: Commit 1de5df2 pushed by github-merge-queue bot
August 30, 2024 13:31 35s master
master
August 30, 2024 13:31 35s
mapping: Fix last varedited request consoles and forbid their use. (#… Merge Conflict Detection #8885: Commit a74f957 pushed by github-merge-queue bot
August 30, 2024 13:28 38s master
master
August 30, 2024 13:28 38s
Tweaks to Dvoraks telecomns sat ruin (#26429) Merge Conflict Detection #8884: Commit 3c7c9ca pushed by github-merge-queue bot
August 30, 2024 13:25 40s master
master
August 30, 2024 13:25 40s
Update HolodeckControl.dm (#26632) Merge Conflict Detection #8883: Commit 5ca1036 pushed by github-merge-queue bot
August 29, 2024 18:35 40s master
master
August 29, 2024 18:35 40s
Little adjustments for 516 (#26624) Merge Conflict Detection #8882: Commit 1612047 pushed by github-merge-queue bot
August 29, 2024 06:35 38s master
master
August 29, 2024 06:35 38s
Reflectors now need to be anchored to reflect, as well as lowered the… Merge Conflict Detection #8881: Commit d39cd4b pushed by github-merge-queue bot
August 29, 2024 00:16 58s master
master
August 29, 2024 00:16 58s
blackbox: Track Lavaland mob/tendril spawn counts. (#26602) Merge Conflict Detection #8880: Commit 9dca367 pushed by github-merge-queue bot
August 29, 2024 00:13 2m 10s master
master
August 29, 2024 00:13 2m 10s
[SPRITES] Adds mising secure briefcase inhand sprites (#26593) Merge Conflict Detection #8879: Commit a20f1c4 pushed by github-merge-queue bot
August 29, 2024 00:11 3m 20s master
master
August 29, 2024 00:11 3m 20s
Improves Fax Logging (#26506) Merge Conflict Detection #8878: Commit b36bb57 pushed by github-merge-queue bot
August 29, 2024 00:10 2m 14s master
master
August 29, 2024 00:10 2m 14s
Makes the vortex anomaly more dangerous (#26508) Merge Conflict Detection #8877: Commit ccf70d5 pushed by github-merge-queue bot
August 29, 2024 00:10 1m 49s master
master
August 29, 2024 00:10 1m 49s
removed an accidental combat broom (#26601) Merge Conflict Detection #8876: Commit 1459568 pushed by github-merge-queue bot
August 29, 2024 00:06 58s master
master
August 29, 2024 00:06 58s
You can no longer get abductor rnd level 3+ from 1 (#26598) Merge Conflict Detection #8875: Commit 681ad6c pushed by github-merge-queue bot
August 29, 2024 00:05 48s master
master
August 29, 2024 00:05 48s