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,247 workflow runs
3,247 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Removing all lightswitches in an area will turn the lights back on (#… Merge Conflict Detection #10102: Commit 20337dc pushed by github-merge-queue bot
February 24, 2025 17:09 1m 43s master
master
February 24, 2025 17:09 1m 43s
Farragus security disposals now sorts correctly (#28382) Merge Conflict Detection #10101: Commit cfcc463 pushed by github-merge-queue bot
February 24, 2025 17:00 4m 8s master
master
February 24, 2025 17:00 4m 8s
access added (#28356) Merge Conflict Detection #10100: Commit 33e5176 pushed by github-merge-queue bot
February 24, 2025 16:59 1m 0s master
master
February 24, 2025 16:59 1m 0s
it bothered me (#28379) Merge Conflict Detection #10099: Commit 9954e5f pushed by github-merge-queue bot
February 24, 2025 16:57 1m 21s master
master
February 24, 2025 16:57 1m 21s
Attack chain migration: slime potions. (#28514) Merge Conflict Detection #10098: Commit 383c330 pushed by github-merge-queue bot
February 24, 2025 16:46 2m 0s master
master
February 24, 2025 16:46 2m 0s
pda.dmi resprite (#28254) Merge Conflict Detection #10097: Commit 80c6d6b pushed by github-merge-queue bot
February 24, 2025 16:42 1m 41s master
master
February 24, 2025 16:42 1m 41s
Device resprite (#28302) Merge Conflict Detection #10096: Commit 1a955ca pushed by github-merge-queue bot
February 24, 2025 16:40 2m 5s master
master
February 24, 2025 16:40 2m 5s
Soap resprite2: electric boogaloo (#28287) Merge Conflict Detection #10095: Commit f54a493 pushed by github-merge-queue bot
February 24, 2025 16:37 1m 11s master
master
February 24, 2025 16:37 1m 11s
Adds more functionality to bouncy charging spells (#28080) Merge Conflict Detection #10094: Commit c5cd625 pushed by github-merge-queue bot
February 24, 2025 16:34 1m 50s master
master
February 24, 2025 16:34 1m 50s
Update disposal.dm (#28240) Merge Conflict Detection #10093: Commit 78c153d pushed by github-merge-queue bot
February 24, 2025 16:32 2m 17s master
master
February 24, 2025 16:32 2m 17s
changed the proc (#28249) Merge Conflict Detection #10092: Commit 72bf019 pushed by github-merge-queue bot
February 24, 2025 16:30 1m 44s master
master
February 24, 2025 16:30 1m 44s
Changes Diagoras storefront maints corpse into remains and gibs (#28448) Merge Conflict Detection #10091: Commit 106c422 pushed by github-merge-queue bot
February 24, 2025 16:26 1m 8s master
master
February 24, 2025 16:26 1m 8s
Add Pump Up to the list of stims in Haloperidol and Nanocalcium (#28444) Merge Conflict Detection #10090: Commit 6b45c63 pushed by github-merge-queue bot
February 24, 2025 16:20 1m 35s master
master
February 24, 2025 16:20 1m 35s
Make the cigar bigger, so I can pack some explosives there. (#28443) Merge Conflict Detection #10089: Commit 7af5bd0 pushed by github-merge-queue bot
February 24, 2025 16:18 2m 55s master
master
February 24, 2025 16:18 2m 55s
Make a floor first silly (#28411) Merge Conflict Detection #10088: Commit b2c4a6f pushed by github-merge-queue bot
February 24, 2025 16:15 1m 22s master
master
February 24, 2025 16:15 1m 22s
Fixes a runtime in PDA gas scanner code (#28310) Merge Conflict Detection #10087: Commit f9c7f9f pushed by github-merge-queue bot
February 24, 2025 16:13 3m 13s master
master
February 24, 2025 16:13 3m 13s
Replaces server room windows with plasmaglass (#28387) Merge Conflict Detection #10086: Commit 6d36d8b pushed by github-merge-queue bot
February 24, 2025 16:12 3m 2s master
master
February 24, 2025 16:12 3m 2s
remove unnecessary proc get_roletext (#28520) Merge Conflict Detection #10085: Commit c293dd3 pushed by github-merge-queue bot
February 24, 2025 16:08 1m 3s master
master
February 24, 2025 16:08 1m 3s
Vendors can be righted much faster (#28475) Merge Conflict Detection #10084: Commit 104b6ec pushed by github-merge-queue bot
February 24, 2025 14:33 1m 0s master
master
February 24, 2025 14:33 1m 0s
Fix Legion megafauna being able to enrage() for more than 1 time an… Merge Conflict Detection #10083: Commit cfe71b4 pushed by github-merge-queue bot
February 24, 2025 14:31 1m 3s master
master
February 24, 2025 14:31 1m 3s
Surprisingly was missing that unlike other machinery (#28500) Merge Conflict Detection #10082: Commit 6e5260b pushed by github-merge-queue bot
February 24, 2025 14:30 1m 27s master
master
February 24, 2025 14:30 1m 27s
[S] Fixes mindflayer grapple having a lower cooldown than it should (… Merge Conflict Detection #10081: Commit 3db0313 pushed by github-merge-queue bot
February 23, 2025 07:26 41s master
master
February 23, 2025 07:26 41s
Friggin frames (#28494) Merge Conflict Detection #10080: Commit 04ea43a pushed by github-merge-queue bot
February 22, 2025 23:38 41s master
master
February 22, 2025 23:38 41s
BLEED FOR ME (#28489) Merge Conflict Detection #10079: Commit e8e22f0 pushed by github-merge-queue bot
February 22, 2025 20:00 42s master
master
February 22, 2025 20:00 42s
Dead carp no longer block lasers / interact weirdly (#28487) Merge Conflict Detection #10078: Commit 3f60bb3 pushed by github-merge-queue bot
February 22, 2025 17:50 38s master
master
February 22, 2025 17:50 38s