Skip to content

Actions: Monkestation/Monkeris

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
153 workflow runs
153 workflow runs

Filter by Event

⌥ + click/return to exclude

Filter by Status

⌥ + click/return to exclude

Filter by Branch

⌥ + click/return to exclude

Filter by Actor

⌥ + click/return to exclude
fix display for nanojs Check for merge conflicts #209: Commit 58486fa pushed by flleeppyy
23s master
master
23s
uncomment blackbox call Check for merge conflicts #208: Commit 8dd3ec0 pushed by flleeppyy
25s master
master
25s
update tgs yml Check for merge conflicts #207: Commit 1b4261e pushed by flleeppyy
1m 37s master
master
1m 37s
Fixes drones shooting each other (#333) Check for merge conflicts #206: Commit 10064e2 pushed by Mycah142
23s master
master
23s
Adds peace on earth (#332) Check for merge conflicts #205: Commit d8aaacf pushed by Mycah142
20s master
master
20s
Fixes a weird nulling call in playsound (#330) Check for merge conflicts #204: Commit 58a55a9 pushed by Mycah142
3m 2s master
master
3m 2s
Move Help dropdown to end instead of it being weirdly placed. (#331) Check for merge conflicts #203: Commit 6de04f1 pushed by Mycah142
28s master
master
28s
fix: admin traitor panel unable to remove traitor status (#222) (#280) Check for merge conflicts #202: Commit 78980fc pushed by Mycah142
21s master
master
21s
More Runtime Fixes (#298) Check for merge conflicts #201: Commit f07748b pushed by Mycah142
22s master
master
22s
Improved quality gained from BIO and fix oven (#306) Check for merge conflicts #200: Commit b8263bd pushed by Mycah142
29s master
master
29s
Fix Thruster Chamber, IH SPACED maint (#321) Check for merge conflicts #199: Commit f847ce7 pushed by Mycah142
1m 28s master
master
1m 28s
Port 8631, 8642, 8638 AND 8637 because I think I'm above the law (#325) Check for merge conflicts #198: Commit f22fdf7 pushed by flleeppyy
32s master
master
32s
Bedsheets offset fix (#324) Check for merge conflicts #197: Commit 1dcf564 pushed by flleeppyy
24s master
master
24s
In_hand freezer sprites (#322) Check for merge conflicts #196: Commit d4181db pushed by flleeppyy
21s master
master
21s
Barbed wire fix (#318) Check for merge conflicts #195: Commit 5d4c71f pushed by flleeppyy
28s master
master
28s
Comment out debug_admins for window_scaling (#304) Check for merge conflicts #194: Commit a17a917 pushed by Mycah142
24s master
master
24s
Look down UI button (#296) Check for merge conflicts #193: Commit 454e2a8 pushed by Mycah142
29s master
master
29s
Code tidying 2 electric boogaloo (#295) Check for merge conflicts #192: Commit c702f9c pushed by Mycah142
26s master
master
26s
Small fixes; World topic fixes; PR announcer (#292) Check for merge conflicts #191: Commit 9b18284 pushed by Mycah142
38s master
master
38s
Filters but useful & Blurry Vision (#286) Check for merge conflicts #190: Commit 70b778a pushed by Mycah142
26s master
master
26s
fix: clicking View on AI law change now teleports ghost and shows law… Check for merge conflicts #189: Commit 420ea6e pushed by Mycah142
27s master
master
27s
Roach fart nerf (#279) Check for merge conflicts #188: Commit fe7683b pushed by Mycah142
31s master
master
31s
Collapses the Economy (#278) Check for merge conflicts #187: Commit 34a7ed7 pushed by Mycah142
27s master
master
27s
Adds a heart/bloodvessel requirement tip to the disgorger UI (#274) Check for merge conflicts #186: Commit fb7c54b pushed by Mycah142
30s master
master
30s
Hair Port from Monke Main (part 2 Electric boogalo) (#258) Check for merge conflicts #185: Commit 13276e7 pushed by Mycah142
22s master
master
22s