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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

fix (#28099) Merge Conflict Detection #9864: Commit 98bf5f0 pushed by Contrabang
January 25, 2025 20:45 52s master
master
January 25, 2025 20:45 52s
Makes One-Click-Antag report who was made antag (#28058) Merge Conflict Detection #9863: Commit 47cec93 pushed by github-merge-queue bot
January 25, 2025 20:09 58s master
master
January 25, 2025 20:09 58s
making it better? (#27828) Merge Conflict Detection #9862: Commit 4e06e69 pushed by github-merge-queue bot
January 25, 2025 20:03 1m 18s master
master
January 25, 2025 20:03 1m 18s
[FIX] Better slices (#27807) Merge Conflict Detection #9861: Commit 754a868 pushed by github-merge-queue bot
January 25, 2025 19:58 1m 12s master
master
January 25, 2025 19:58 1m 12s
Remove an old proc (#28041) Merge Conflict Detection #9860: Commit 99d18c8 pushed by github-merge-queue bot
January 25, 2025 19:55 51s master
master
January 25, 2025 19:55 51s
adds fire alarm to kerberos medbay (#28061) Merge Conflict Detection #9859: Commit 445e691 pushed by github-merge-queue bot
January 25, 2025 19:49 1m 33s master
master
January 25, 2025 19:49 1m 33s
Adds color boxes to View Variable hex colors (#28064) Merge Conflict Detection #9858: Commit 6c715ae pushed by github-merge-queue bot
January 25, 2025 19:46 2m 9s master
master
January 25, 2025 19:46 2m 9s
fixes mantis blade implant surgery (#28073) Merge Conflict Detection #9857: Commit 9de6d5b pushed by github-merge-queue bot
January 25, 2025 19:40 1m 43s master
master
January 25, 2025 19:40 1m 43s
Fixes cone spells accidentally going diagonal (#28077) Merge Conflict Detection #9856: Commit 9c9bdab pushed by github-merge-queue bot
January 25, 2025 19:37 2m 0s master
master
January 25, 2025 19:37 2m 0s
Which is which does matter (#28079) Merge Conflict Detection #9855: Commit bde8b03 pushed by github-merge-queue bot
January 25, 2025 19:35 2m 14s master
master
January 25, 2025 19:35 2m 14s
One space!!! (#28081) Merge Conflict Detection #9854: Commit f8e0e28 pushed by github-merge-queue bot
January 25, 2025 19:34 2m 59s master
master
January 25, 2025 19:34 2m 59s
Fixes some display issues with the next step on the surgical computer… Merge Conflict Detection #9853: Commit 1668427 pushed by github-merge-queue bot
January 25, 2025 19:31 3m 32s master
master
January 25, 2025 19:31 3m 32s
Update VV to work better in 516 (#28078) Merge Conflict Detection #9852: Commit e8f7806 pushed by github-merge-queue bot
January 25, 2025 14:06 32s master
master
January 25, 2025 14:06 32s
[PTBF] Hallucination: The Backrooms (#27710) Merge Conflict Detection #9851: Commit ad4e5a6 pushed by github-merge-queue bot
January 25, 2025 13:31 42s master
master
January 25, 2025 13:31 42s
add slime people to the magic mirror (#28027) Merge Conflict Detection #9850: Commit 0a08b79 pushed by github-merge-queue bot
January 25, 2025 00:14 45s master
master
January 25, 2025 00:14 45s
Lazarus Reagent no longer forces you Alive (#28011) Merge Conflict Detection #9849: Commit b7e1042 pushed by github-merge-queue bot
January 25, 2025 00:12 1m 14s master
master
January 25, 2025 00:12 1m 14s
this one is correct (#28001) Merge Conflict Detection #9848: Commit 01e19a0 pushed by github-merge-queue bot
January 25, 2025 00:08 1m 22s master
master
January 25, 2025 00:08 1m 22s
Kills changeling autoparry (#27868) Merge Conflict Detection #9847: Commit ef0fe20 pushed by github-merge-queue bot
January 25, 2025 00:03 1m 30s master
master
January 25, 2025 00:03 1m 30s
Handheld EFTPOS offering (#27978) Merge Conflict Detection #9846: Commit a809609 pushed by github-merge-queue bot
January 24, 2025 23:59 2m 22s master
master
January 24, 2025 23:59 2m 22s
Gives full tile R-Windows and Plasma R-Windows and Plastitanium heavy… Merge Conflict Detection #9845: Commit 72a06a1 pushed by github-merge-queue bot
January 24, 2025 23:56 56s master
master
January 24, 2025 23:56 56s
Scatter depot loot to the solar winds. (#27954) Merge Conflict Detection #9844: Commit 5b516c3 pushed by github-merge-queue bot
January 23, 2025 07:46 32s master
master
January 23, 2025 07:46 32s
[LORE] Decently Sized Armor Lore Drop (#27750) Merge Conflict Detection #9843: Commit 69b87f8 pushed by github-merge-queue bot
January 23, 2025 07:43 52s master
master
January 23, 2025 07:43 52s
[LORE] Bluespace Lore Pass Pt. 1 (#27809) Merge Conflict Detection #9842: Commit 4bdd8a0 pushed by github-merge-queue bot
January 23, 2025 07:34 44s master
master
January 23, 2025 07:34 44s
Port /tg/ move manager, drift and jetpack components. (#27698) Merge Conflict Detection #9841: Commit 157276d pushed by github-merge-queue bot
January 22, 2025 22:53 33s master
master
January 22, 2025 22:53 33s
Adds conical spells from TG (#27979) Merge Conflict Detection #9840: Commit 3954981 pushed by github-merge-queue bot
January 22, 2025 22:12 40s master
master
January 22, 2025 22:12 40s