Skip to content

Actions: Jezithyr/space-station-14

Actions

Check Merge Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Add Unique wounds for woundables Check Merge Conflicts #74: Pull request #4 synchronize by nikthechampiongr
May 5, 2024 10:55 10s
May 5, 2024 10:55 10s
Add Unique wounds for woundables Check Merge Conflicts #73: Pull request #4 opened by nikthechampiongr
May 5, 2024 10:50 10s
May 5, 2024 10:50 10s
Automatic changelog update Check Merge Conflicts #72: Commit fc7839e pushed by Jezithyr
April 20, 2024 05:39 14s master
master
April 20, 2024 05:39 14s
Automatic changelog update Check Merge Conflicts #71: Commit 6fa90e0 pushed by Jezithyr
April 12, 2024 03:49 15s master
master
April 12, 2024 03:49 15s
Automatic changelog update Check Merge Conflicts #70: Commit 35134fc pushed by Jezithyr
April 4, 2024 00:46 15s master
master
April 4, 2024 00:46 15s
Body code cleanup (#24946) Check Merge Conflicts #69: Commit 37b8d78 pushed by Jezithyr
March 28, 2024 00:50 13s master
master
March 28, 2024 00:50 13s
Fix barotrauma pressure protection (#26236) Check Merge Conflicts #68: Commit db81438 pushed by Jezithyr
March 18, 2024 19:37 14s master
master
March 18, 2024 19:37 14s
SS14-12462 Nerf food and drink vending machines (#25999) Check Merge Conflicts #67: Commit 41093ab pushed by Jezithyr
March 15, 2024 23:40 12s master
master
March 15, 2024 23:40 12s
Typo in guidebook for cyro pressure (#26094) Check Merge Conflicts #66: Commit 0cba172 pushed by Jezithyr
March 14, 2024 01:42 12s master
master
March 14, 2024 01:42 12s
Add nutribricks to other survival boxes (#25749) Check Merge Conflicts #65: Commit b66bad2 pushed by Jezithyr
March 5, 2024 22:41 14s master
master
March 5, 2024 22:41 14s
Add curtain spawner (#25729) Check Merge Conflicts #64: Commit 70307f9 pushed by Jezithyr
March 1, 2024 00:16 14s master
master
March 1, 2024 00:16 14s
Fix PDA home icon (#25721) Check Merge Conflicts #63: Commit 8c6c19c pushed by Jezithyr
February 29, 2024 21:09 13s master
master
February 29, 2024 21:09 13s
Give "DO NOT MAP" suffix to handheld crew monitor (#25473) Check Merge Conflicts #62: Commit b774759 pushed by Jezithyr
February 22, 2024 22:14 14s master
master
February 22, 2024 22:14 14s
Death acidifier fix (#25251) Check Merge Conflicts #61: Commit be29a05 pushed by Jezithyr
February 15, 2024 01:38 19s master
master
February 15, 2024 01:38 19s
Fix spawn priority persistence on reconnect and restart (#25246) Check Merge Conflicts #60: Commit 2f0c837 pushed by Jezithyr
February 15, 2024 00:39 10s master
master
February 15, 2024 00:39 10s
Vox names, species prototype cleanup, some cosmetic changes (#24994) Check Merge Conflicts #59: Commit 5a9ab3b pushed by Jezithyr
February 14, 2024 04:21 11s master
master
February 14, 2024 04:21 11s
Buff emergency toolbox fill (#24225) Check Merge Conflicts #58: Commit 33c2f37 pushed by Jezithyr
February 12, 2024 18:23 11s master
master
February 12, 2024 18:23 11s
Add overlay decals for mini tiles and bricks (#24949) Check Merge Conflicts #57: Commit ffca807 pushed by Jezithyr
February 12, 2024 04:54 16s master
master
February 12, 2024 04:54 16s
Adding a period to an object description (#25138) Check Merge Conflicts #56: Commit ab175d6 pushed by Jezithyr
February 12, 2024 01:22 12s master
master
February 12, 2024 01:22 12s
Gibbing contents hotfix (#25114) Check Merge Conflicts #55: Commit 8e59b4f pushed by Jezithyr
February 11, 2024 00:41 11s master
master
February 11, 2024 00:41 11s
Automatic changelog update Check Merge Conflicts #54: Commit 0495b17 pushed by Jezithyr
February 11, 2024 00:14 14s master
master
February 11, 2024 00:14 14s
Automatic changelog update Check Merge Conflicts #53: Commit b34931b pushed by Jezithyr
February 6, 2024 06:56 11s master
master
February 6, 2024 06:56 11s
Automatic changelog update Check Merge Conflicts #52: Commit 79fa3c7 pushed by Jezithyr
January 31, 2024 04:33 11s master
master
January 31, 2024 04:33 11s
SyndiCat (#22554) Check Merge Conflicts #51: Commit d22fe3f pushed by Jezithyr
January 7, 2024 02:12 13s master
master
January 7, 2024 02:12 13s
Fix atmos UI decimal separator bug (#23009) Check Merge Conflicts #50: Commit 3d911a6 pushed by Jezithyr
January 5, 2024 06:00 12s master
master
January 5, 2024 06:00 12s