Skip to content

Actions: ParadiseSS13/Paradise

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
3,247 workflow runs
3,247 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Reduced dynamic budget at low player count (#28300)
Merge Conflict Detection #10052: Commit 9d227fe pushed by github-merge-queue bot
February 16, 2025 08:05 38s master
February 16, 2025 08:05 38s
NanoMap Auto-Update (Sat Feb 15 01:35:57 UTC 2025) (#28403)
Merge Conflict Detection #10051: Commit 7721d03 pushed by github-merge-queue bot
February 15, 2025 18:28 54s master
February 15, 2025 18:28 54s
Less magical flamethrowers (#28412)
Merge Conflict Detection #10050: Commit 04ed0ef pushed by github-merge-queue bot
February 15, 2025 18:27 51s master
February 15, 2025 18:27 51s
Migrates /obj/item/borg/stun to the new attack chain. (#28221)
Merge Conflict Detection #10049: Commit bfad632 pushed by github-merge-queue bot
February 15, 2025 07:51 43s master
February 15, 2025 07:51 43s
Remove admin detector (#28401)
Merge Conflict Detection #10048: Commit 6b13c9d pushed by github-merge-queue bot
February 15, 2025 06:54 49s master
February 15, 2025 06:54 49s
don't let mice chew through cables in map tests (#28395)
Merge Conflict Detection #10047: Commit 553601f pushed by github-merge-queue bot
February 14, 2025 18:28 40s master
February 14, 2025 18:28 40s
makes TOML files not format on save (#28372)
Merge Conflict Detection #10046: Commit cd8c9ec pushed by github-merge-queue bot
February 14, 2025 18:26 53s master
February 14, 2025 18:26 53s
Nerfs legion cores on-station (#28284)
Merge Conflict Detection #10045: Commit f75105d pushed by github-merge-queue bot
February 14, 2025 18:20 40s master
February 14, 2025 18:20 40s
Fixes an errant wall (#28386)
Merge Conflict Detection #10044: Commit db48548 pushed by github-merge-queue bot
February 14, 2025 05:20 48s master
February 14, 2025 05:20 48s
Gives evidence room its own access (#28217)
Merge Conflict Detection #10043: Commit acbe712 pushed by github-merge-queue bot
February 13, 2025 19:08 43s master
February 13, 2025 19:08 43s
fix engiborgs not being able to insert/remove lights from sockets (#2…
Merge Conflict Detection #10042: Commit 2fbbcb4 pushed by github-merge-queue bot
February 13, 2025 18:07 42s master
February 13, 2025 18:07 42s
Vending machine lock improvements (#28200)
Merge Conflict Detection #10041: Commit 5495930 pushed by github-merge-queue bot
February 13, 2025 02:34 44s master
February 13, 2025 02:34 44s
Botany QOL, Loadout Update (#28232)
Merge Conflict Detection #10040: Commit 719fe61 pushed by github-merge-queue bot
February 13, 2025 02:29 1m 0s master
February 13, 2025 02:29 1m 0s
[LORE] Fixes the cannabis leaf's description (#28313)
Merge Conflict Detection #10039: Commit 81db52a pushed by github-merge-queue bot
February 13, 2025 02:24 32s master
February 13, 2025 02:24 32s
Clonescanner fix (#28368)
Merge Conflict Detection #10038: Commit 4621e8e pushed by github-merge-queue bot
February 13, 2025 02:20 38s master
February 13, 2025 02:20 38s
Fix jetpacks and speedbikes (#28222)
Merge Conflict Detection #10037: Commit cb7c658 pushed by github-merge-queue bot
February 13, 2025 02:12 56s master
February 13, 2025 02:12 56s
Ports visible examines from Daedalus Dock (#27721)
Merge Conflict Detection #10036: Commit 444000c pushed by github-merge-queue bot
February 13, 2025 02:08 34s master
February 13, 2025 02:08 34s
Reduces Juggernaut laser resistance (#28290)
Merge Conflict Detection #10035: Commit b5b78b7 pushed by github-merge-queue bot
February 13, 2025 01:49 33s master
February 13, 2025 01:49 33s
that's a lot of actions (#28067)
Merge Conflict Detection #10034: Commit de79795 pushed by github-merge-queue bot
February 13, 2025 01:41 41s master
February 13, 2025 01:41 41s
SSair performance improvements (#28271)
Merge Conflict Detection #10033: Commit 194e851 pushed by github-merge-queue bot
February 12, 2025 22:51 1m 43s master
February 12, 2025 22:51 1m 43s
Paraplegia! (#27999)
Merge Conflict Detection #10032: Commit 2e2a778 pushed by github-merge-queue bot
February 12, 2025 22:48 1m 7s master
February 12, 2025 22:48 1m 7s
Initial (#28314)
Merge Conflict Detection #10031: Commit 1d82fc7 pushed by github-merge-queue bot
February 12, 2025 22:40 1m 33s master
February 12, 2025 22:40 1m 33s
Allow decompilation of shrapnel and cardboard tubes (#28306)
Merge Conflict Detection #10030: Commit b472a86 pushed by github-merge-queue bot
February 12, 2025 22:39 53s master
February 12, 2025 22:39 53s
Adjusts Y_Pixel translate to properly sit the mob on the tile they're…
Merge Conflict Detection #10029: Commit 4195958 pushed by github-merge-queue bot
February 12, 2025 22:33 1m 11s master
February 12, 2025 22:33 1m 11s
initial (#28311)
Merge Conflict Detection #10028: Commit 3c4a4ea pushed by github-merge-queue bot
February 12, 2025 22:28 1m 2s master
February 12, 2025 22:28 1m 2s