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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Touches up buildmode code (#28506) Merge Conflict Detection #10127: Commit 8e6c2f3 pushed by github-merge-queue bot
February 27, 2025 12:13 44s master
master
February 27, 2025 12:13 44s
Makes shuttles lazy load (#28315) Merge Conflict Detection #10126: Commit 781c6e9 pushed by github-merge-queue bot
February 26, 2025 22:49 42s master
master
February 26, 2025 22:49 42s
more ci wooo (#28530) Merge Conflict Detection #10125: Commit 3e373d2 pushed by github-merge-queue bot
February 26, 2025 22:30 43s master
master
February 26, 2025 22:30 43s
Increase max EFTPOS charge to 1000 (#28442) Merge Conflict Detection #10124: Commit 4ba141b pushed by github-merge-queue bot
February 26, 2025 22:17 46s master
master
February 26, 2025 22:17 46s
tweak syndie mobs (#28486) Merge Conflict Detection #10123: Commit 488f232 pushed by github-merge-queue bot
February 26, 2025 22:08 47s master
master
February 26, 2025 22:08 47s
*web edits ur maintainer list* (#28541) Merge Conflict Detection #10122: Commit 721262d pushed by github-merge-queue bot
February 26, 2025 19:55 46s master
master
February 26, 2025 19:55 46s
Emagman buff (#28460) Merge Conflict Detection #10121: Commit 47a89d5 pushed by github-merge-queue bot
February 26, 2025 10:32 44s master
master
February 26, 2025 10:32 44s
AI eyes see emotes. (#28247) Merge Conflict Detection #10120: Commit 43d48e5 pushed by github-merge-queue bot
February 26, 2025 10:30 56s master
master
February 26, 2025 10:30 56s
C4 voice analyzer fix (#28466) Merge Conflict Detection #10119: Commit 56a29c4 pushed by github-merge-queue bot
February 26, 2025 10:26 1m 8s master
master
February 26, 2025 10:26 1m 8s
Fix forcewall, temporal spellblades + H.E.C.K. suit processing (#28413) Merge Conflict Detection #10118: Commit b3bdb3b pushed by github-merge-queue bot
February 26, 2025 10:18 1m 19s master
master
February 26, 2025 10:18 1m 19s
Fixes heartbeat warnings when stacking deployments (#28427) Merge Conflict Detection #10117: Commit b5595af pushed by github-merge-queue bot
February 26, 2025 10:14 2m 10s master
master
February 26, 2025 10:14 2m 10s
Adds a Portal mode to Build Mode (#28123) Merge Conflict Detection #10116: Commit 48a29b9 pushed by github-merge-queue bot
February 26, 2025 10:12 1m 3s master
master
February 26, 2025 10:12 1m 3s
Reworks Curtains (#28163) Merge Conflict Detection #10115: Commit 0d968d7 pushed by github-merge-queue bot
February 26, 2025 10:09 2m 24s master
master
February 26, 2025 10:09 2m 24s
Adds user to pump call to fix a bug (#28461) Merge Conflict Detection #10114: Commit 0ca8305 pushed by github-merge-queue bot
February 26, 2025 10:05 1m 12s master
master
February 26, 2025 10:05 1m 12s
yeah (#28496) Merge Conflict Detection #10113: Commit cecec5a pushed by github-merge-queue bot
February 26, 2025 10:03 1m 41s master
master
February 26, 2025 10:03 1m 41s
Attack chain migration: laz injector. (#28515) Merge Conflict Detection #10112: Commit 5cec7b1 pushed by github-merge-queue bot
February 26, 2025 09:59 2m 19s master
master
February 26, 2025 09:59 2m 19s
fixing improper message for biogenerator interaction (#28522) Merge Conflict Detection #10111: Commit 7d65d1d pushed by github-merge-queue bot
February 26, 2025 09:58 2m 44s master
master
February 26, 2025 09:58 2m 44s
NanoMap Auto-Update (Wed Feb 26 01:39:50 UTC 2025) (#28526) Merge Conflict Detection #10110: Commit d68aa00 pushed by github-merge-queue bot
February 26, 2025 09:52 1m 25s master
master
February 26, 2025 09:52 1m 25s
Emergency lights turn off after 2 minutes again (#28517) Merge Conflict Detection #10109: Commit f44ee1d pushed by github-merge-queue bot
February 26, 2025 09:50 1m 18s master
master
February 26, 2025 09:50 1m 18s
migrates /obj/effect to the new attack chain (#28066) Merge Conflict Detection #10108: Commit 202249a pushed by github-merge-queue bot
February 26, 2025 09:48 1m 58s master
master
February 26, 2025 09:48 1m 58s
Fix penetrator projectiles (#28434) Merge Conflict Detection #10107: Commit 6ded778 pushed by github-merge-queue bot
February 26, 2025 09:46 1m 59s master
master
February 26, 2025 09:46 1m 59s
Enlarges Emerald AI Sat's External Airlocks (#28338) Merge Conflict Detection #10106: Commit 9574428 pushed by github-merge-queue bot
February 24, 2025 18:00 1m 17s master
master
February 24, 2025 18:00 1m 17s
Update metastation.dmm (#28337) Merge Conflict Detection #10105: Commit cc624d0 pushed by github-merge-queue bot
February 24, 2025 18:00 1m 35s master
master
February 24, 2025 18:00 1m 35s
Replaces Delta AI Sat Airlock With 2x2 Airlock (#28335) Merge Conflict Detection #10104: Commit 5006f79 pushed by github-merge-queue bot
February 24, 2025 17:59 2m 30s master
master
February 24, 2025 17:59 2m 30s
Replaces Cyberiad AI Sat Airlock With 2x2 Airlock (#28332) Merge Conflict Detection #10103: Commit 1d29b61 pushed by github-merge-queue bot
February 24, 2025 17:57 59s master
master
February 24, 2025 17:57 59s