Skip to content

Actions: Monkestation/Monkestation2.0

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
1,396 workflow run results
1,396 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

wowie (#3421) Check for merge conflicts #1582: Commit 8d50069 pushed by ThePooba
September 16, 2024 21:37 56s master
master
September 16, 2024 21:37 56s
CentCom Office Upgrades (Pooba, NT Helpdesk) (#3416) Check for merge conflicts #1581: Commit 6495e18 pushed by ThePooba
September 16, 2024 21:15 46m 42s master
master
September 16, 2024 21:15 46m 42s
Aphid hive exits are now anchored (#3406) Check for merge conflicts #1580: Commit 16ae859 pushed by Absolucy
September 16, 2024 20:44 1m 3s master
master
September 16, 2024 20:44 1m 3s
BoxStation Post-Merge Fixes 4.1 (#3405) Check for merge conflicts #1579: Commit de55beb pushed by Absolucy
September 16, 2024 18:13 42s master
master
September 16, 2024 18:13 42s
Fix cleaning stickers off the floor runtiming (#3423) Check for merge conflicts #1578: Commit 9f078f6 pushed by Absolucy
September 16, 2024 18:12 48s master
master
September 16, 2024 18:12 48s
fixminer (#3316) Check for merge conflicts #1577: Commit ba3c936 pushed by Absolucy
September 16, 2024 18:11 42s master
master
September 16, 2024 18:11 42s
should make the lavaland icebox bar fucking usable (#3398) Check for merge conflicts #1576: Commit a1f0aec pushed by Absolucy
September 16, 2024 16:51 42s master
master
September 16, 2024 16:51 42s
Fixes bot pathfinding on kilo (#3419) Check for merge conflicts #1575: Commit 9b862f9 pushed by Absolucy
September 16, 2024 16:51 1m 4s master
master
September 16, 2024 16:51 1m 4s
voidraptor fix-batch (#3347) Check for merge conflicts #1574: Commit 7347a8c pushed by Absolucy
September 16, 2024 16:50 46s master
master
September 16, 2024 16:50 46s
fix sec department suits (#3424) Check for merge conflicts #1573: Commit bb6ba47 pushed by Absolucy
September 16, 2024 16:47 49s master
master
September 16, 2024 16:47 49s
[MIRROR] 13 year old singularity bug fixed (#3432) Check for merge conflicts #1572: Commit d940149 pushed by ThePooba
September 16, 2024 13:57 45s master
master
September 16, 2024 13:57 45s
fix botpad and medbot sprites (#3397) Check for merge conflicts #1571: Commit 4dffe30 pushed by Absolucy
September 16, 2024 09:53 1m 9s master
master
September 16, 2024 09:53 1m 9s
[PORT] GetFlatIcon improvements (#3422) Check for merge conflicts #1570: Commit e78dd90 pushed by Absolucy
September 16, 2024 09:52 27s master
master
September 16, 2024 09:52 27s
Fix the Goldeneye shuttle console becoming a nukie shuttle console wh… Check for merge conflicts #1569: Commit 8c80a1d pushed by Absolucy
September 16, 2024 09:51 59s master
master
September 16, 2024 09:51 59s
Buget cuts (#2942) Check for merge conflicts #1568: Commit 6812ade pushed by wraith-54321
September 15, 2024 00:23 43s master
master
September 15, 2024 00:23 43s
Even more runtime + hard delete fixes (#3349) Check for merge conflicts #1567: Commit 53d4c91 pushed by Absolucy
September 14, 2024 17:02 11m 15s master
master
September 14, 2024 17:02 11m 15s
More 516 prep (rename caller vars) (#3370) Check for merge conflicts #1566: Commit b73b126 pushed by Absolucy
September 14, 2024 17:02 10m 59s master
master
September 14, 2024 17:02 10m 59s
halves liquid pump wrench time (#3393) Check for merge conflicts #1565: Commit 2290da2 pushed by Absolucy
September 14, 2024 17:02 11m 0s master
master
September 14, 2024 17:02 11m 0s
fix mood (#3390) Check for merge conflicts #1564: Commit 49e5196 pushed by Absolucy
September 14, 2024 17:01 10m 17s master
master
September 14, 2024 17:01 10m 17s
Lets Ash Walkers use flight potion (#3395) Check for merge conflicts #1563: Commit 896d174 pushed by Absolucy
September 14, 2024 17:01 10m 16s master
master
September 14, 2024 17:01 10m 16s
Fixes and enables antag tokens for cortical borers (#3402) Check for merge conflicts #1562: Commit 395553f pushed by Absolucy
September 14, 2024 17:00 10m 30s master
master
September 14, 2024 17:00 10m 30s
Cybernetics for recent jobs during cybernetic revolution. (#3221) Check for merge conflicts #1561: Commit 772f37a pushed by ThePooba
September 13, 2024 21:12 44s master
master
September 13, 2024 21:12 44s
Makes the confusion symptom tolerable (hopefully) (#3336) Check for merge conflicts #1560: Commit 12b3505 pushed by ThePooba
September 13, 2024 21:11 39s master
master
September 13, 2024 21:11 39s
Removes FOV from the bio hood (#3319) Check for merge conflicts #1559: Commit 846f3bb pushed by ThePooba
September 13, 2024 21:05 1m 15s master
master
September 13, 2024 21:05 1m 15s
Making robotic surgery steps more transparent (#3385) Check for merge conflicts #1558: Commit cf10748 pushed by ThePooba
September 13, 2024 21:03 40s master
master
September 13, 2024 21:03 40s