Skip to content

Actions: Aexxie/space-station-14

Actions

Check Merge Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Automatic changelog update Check Merge Conflicts #49: Commit 7f6f9c1 pushed by Aexxie
April 24, 2024 13:23 12s master
master
April 24, 2024 13:23 12s
Fixed grammar when drinking empty drink (#27218) Check Merge Conflicts #48: Commit 877ccd6 pushed by Aexxie
April 21, 2024 21:00 11s master
master
April 21, 2024 21:00 11s
Make YAML Linter validate server/client-only components (#26809) Check Merge Conflicts #47: Commit 299da35 pushed by Aexxie
April 19, 2024 21:29 12s master
master
April 19, 2024 21:29 12s
fix double interaction popup (#26684) Check Merge Conflicts #46: Commit 6b84a04 pushed by Aexxie
April 3, 2024 13:31 51s master
master
April 3, 2024 13:31 51s
Automatic changelog update Check Merge Conflicts #45: Commit bd5031f pushed by Aexxie
April 2, 2024 13:59 14s master
master
April 2, 2024 13:59 14s
Automatic changelog update Check Merge Conflicts #44: Commit 144798b pushed by Aexxie
April 1, 2024 23:37 11s master
master
April 1, 2024 23:37 11s
Rats eyes glow in dark + reorganize rat textures (#26300) Check Merge Conflicts #43: Commit 12f94b3 pushed by Aexxie
March 21, 2024 13:17 16s master
master
March 21, 2024 13:17 16s
Fix build (#26258) Check Merge Conflicts #42: Commit 6de5fbf pushed by Aexxie
March 19, 2024 19:03 13s master
master
March 19, 2024 19:03 13s
Make fireaxe & shotgun cabinets destructible (#25962) Check Merge Conflicts #41: Commit 6574681 pushed by Aexxie
March 13, 2024 17:03 15s master
master
March 13, 2024 17:03 15s
Automatic changelog update Check Merge Conflicts #40: Commit 3914e59 pushed by Aexxie
February 28, 2024 22:47 10s master
master
February 28, 2024 22:47 10s
Automatic changelog update Check Merge Conflicts #39: Commit a749744 pushed by Aexxie
February 27, 2024 19:57 17s master
master
February 27, 2024 19:57 17s
Automatic changelog update Check Merge Conflicts #38: Commit d6502cd pushed by Aexxie
February 15, 2024 14:10 13s master
master
February 15, 2024 14:10 13s
Adds always powered variants of colored lights (#25185) Check Merge Conflicts #37: Commit 95990c4 pushed by Aexxie
February 14, 2024 18:16 10s master
master
February 14, 2024 18:16 10s
Maybe fix dead bug (#24445) Check Merge Conflicts #36: Commit 016e535 pushed by Aexxie
January 24, 2024 18:37 12s master
master
January 24, 2024 18:37 12s
coloured lights for mapping (#24402) Check Merge Conflicts #35: Commit 0ad804b pushed by Aexxie
January 22, 2024 16:21 13s master
master
January 22, 2024 16:21 13s
Fix solution corruption when grinding a stack of items (#24242) Check Merge Conflicts #34: Commit 20dadf4 pushed by Aexxie
January 18, 2024 21:50 13s master
master
January 18, 2024 21:50 13s
Add pacifism description and clean up traits a little (#24216) Check Merge Conflicts #33: Commit da7ed4b pushed by Aexxie
January 18, 2024 16:35 16s master
master
January 18, 2024 16:35 16s
Automatic changelog update Check Merge Conflicts #32: Commit a32f0da pushed by Aexxie
January 18, 2024 01:10 14s master
master
January 18, 2024 01:10 14s
Automatic changelog update Check Merge Conflicts #31: Commit d3bea28 pushed by Aexxie
January 15, 2024 01:11 16s master
master
January 15, 2024 01:11 16s
Automatic changelog update Check Merge Conflicts #30: Commit c41bf7e pushed by Aexxie
January 14, 2024 05:06 16s master
master
January 14, 2024 05:06 16s
Automatic changelog update Check Merge Conflicts #29: Commit a7a76ce pushed by Aexxie
January 13, 2024 06:58 11s master
master
January 13, 2024 06:58 11s
Split cargo shuttle to its own component (#23926) Check Merge Conflicts #28: Commit 55a60b0 pushed by Aexxie
January 11, 2024 16:37 14s master
master
January 11, 2024 16:37 14s
make intercoms draw above table (#23897) Check Merge Conflicts #27: Commit c7ad10d pushed by Aexxie
January 10, 2024 23:40 11s master
master
January 10, 2024 23:40 11s
Reduce vendor thank you message spam and add variety (#23746) Check Merge Conflicts #26: Commit eb9770e pushed by Aexxie
January 9, 2024 01:46 13s master
master
January 9, 2024 01:46 13s
Salvage wrecks (#23733) Check Merge Conflicts #25: Commit e0e4d76 pushed by Aexxie
January 8, 2024 22:38 15s master
master
January 8, 2024 22:38 15s