Skip to content

Actions: Ilya246/space-station-14

Actions

Check Merge Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflict-labeler.yml
40 workflow runs
40 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

move decoy syndicate bomb to deception Check Merge Conflicts #40: Pull request #11 opened by Ilya246
March 17, 2024 10:10 2m 13s
March 17, 2024 10:10 2m 13s
Obsolete Logger cleanup for EntitySystems part 2 (#26159) Check Merge Conflicts #39: Commit 7d275a4 pushed by Ilya246
March 17, 2024 10:09 12s master
master
March 17, 2024 10:09 12s
Fix StrippableSystem blunders (#26166) Check Merge Conflicts #38: Commit 8ecb78e pushed by Ilya246
March 16, 2024 05:49 11s master
master
March 16, 2024 05:49 11s
Sleep on Stasis Beds (#26129) Check Merge Conflicts #37: Commit 5912b06 pushed by Ilya246
March 15, 2024 14:22 15s master
master
March 15, 2024 14:22 15s
Throttle people trying to connect to a full server. (#20972) Check Merge Conflicts #36: Commit 0ecc5e8 pushed by Ilya246
March 14, 2024 13:47 15s master
master
March 14, 2024 13:47 15s
Automatic changelog update Check Merge Conflicts #35: Commit 5b72f3f pushed by Ilya246
March 13, 2024 11:18 13s master
master
March 13, 2024 11:18 13s
Update Core (#25927) Check Merge Conflicts #34: Commit dc0e4ad pushed by Ilya246
March 12, 2024 09:52 15s master
master
March 12, 2024 09:52 15s
Automatic changelog update Check Merge Conflicts #33: Commit 3f32fa8 pushed by Ilya246
March 9, 2024 10:56 18s master
master
March 9, 2024 10:56 18s
Automatic changelog update Check Merge Conflicts #32: Commit 3c82e00 pushed by Ilya246
March 8, 2024 10:49 15s master
master
March 8, 2024 10:49 15s
Hotfix for errors in handheld lights and radio jammers (#25880) Check Merge Conflicts #31: Commit e5536e0 pushed by Ilya246
March 6, 2024 16:31 12s master
master
March 6, 2024 16:31 12s
Enforce Space Heater max/min temperatures server side (#25835) Check Merge Conflicts #30: Commit bad1174 pushed by Ilya246
March 5, 2024 16:07 12s master
master
March 5, 2024 16:07 12s
Automatic changelog update Check Merge Conflicts #29: Commit 977bd1b pushed by Ilya246
March 3, 2024 07:03 13s master
master
March 3, 2024 07:03 13s
Automatic changelog update Check Merge Conflicts #28: Commit 2b34970 pushed by Ilya246
February 22, 2024 12:14 15s master
master
February 22, 2024 12:14 15s
Fix PlayerListControl re-raising selection changed when repopulated. … Check Merge Conflicts #27: Commit 84d455b pushed by Ilya246
February 20, 2024 13:41 14s master
master
February 20, 2024 13:41 14s
Increase printing price for neck clothes (#25375) Check Merge Conflicts #26: Commit 65d8228 pushed by Ilya246
February 19, 2024 10:58 15s master
master
February 19, 2024 10:58 15s
Automatic changelog update Check Merge Conflicts #25: Commit 74b5b72 pushed by Ilya246
February 17, 2024 12:27 12s master
master
February 17, 2024 12:27 12s
Automatic changelog update Check Merge Conflicts #24: Commit d6502cd pushed by Ilya246
February 15, 2024 11:55 16s master
master
February 15, 2024 11:55 16s
bagel update (#24191) Check Merge Conflicts #23: Commit 9383ad5 pushed by Ilya246
January 17, 2024 16:37 14s master
master
January 17, 2024 16:37 14s
Fixed shuttle movements on some systems (#24008) Check Merge Conflicts #22: Commit cb6aafc pushed by Ilya246
January 13, 2024 11:11 14s master
master
January 13, 2024 11:11 14s
More pirate weapon content(two new cannon ammo types, a musket and fl… Check Merge Conflicts #21: Commit 5fd3d45 pushed by Ilya246
January 9, 2024 14:15 14s master
master
January 9, 2024 14:15 14s
Turbo Recharger (#23723) Check Merge Conflicts #20: Commit c861b66 pushed by Ilya246
January 8, 2024 09:46 13s master
master
January 8, 2024 09:46 13s
Hellfire Thermomachines (#23543) Check Merge Conflicts #19: Commit a78e9a8 pushed by Ilya246
January 7, 2024 14:24 15s master
master
January 7, 2024 14:24 15s
Add hand labeler to autolathe (#23457) Check Merge Conflicts #18: Commit 868622a pushed by Ilya246
January 3, 2024 19:33 12s master
master
January 3, 2024 19:33 12s
fix tests (#23369) Check Merge Conflicts #17: Commit 522e332 pushed by Ilya246
January 2, 2024 11:25 10s master
master
January 2, 2024 11:25 10s
fix emagged lathes (#23318) Check Merge Conflicts #16: Commit 49dbbc5 pushed by Ilya246
January 2, 2024 07:12 14s master
master
January 2, 2024 07:12 14s