Skip to content

Actions: space-wizards/space-station-14

Actions

Check Merge Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflict-labeler.yml
36,318 workflow runs
36,318 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Glue and lube refactor Check Merge Conflicts #62532: Pull request #26765 synchronize by beck-thompson
November 10, 2024 08:57 20s
November 10, 2024 08:57 20s
Glue and lube refactor Check Merge Conflicts #62531: Pull request #26765 synchronize by beck-thompson
November 10, 2024 08:27 15s
November 10, 2024 08:27 15s
Antag Playtime Tracking Check Merge Conflicts #62530: Pull request #33228 synchronize by Cojoke-dot
November 10, 2024 07:42 2s
November 10, 2024 07:42 2s
Increase recharger wattage and charge speeds, blacklists cells from rechargers Check Merge Conflicts #62529: Pull request #32809 synchronize by K-Dynamic
November 10, 2024 07:25 14s
November 10, 2024 07:25 14s
Adds more improvised shotgun shells Check Merge Conflicts #62528: Pull request #33241 opened by SpaceRox1244
November 10, 2024 07:23 12s
November 10, 2024 07:23 12s
Fix: Examine Damage now specifies no damage Check Merge Conflicts #62527: Pull request #33064 synchronize by thetolbean
November 10, 2024 06:46 17s
November 10, 2024 06:46 17s
Correct mobster suffix Check Merge Conflicts #62526: Pull request #33240 opened by thetolbean
November 10, 2024 06:45 13s
November 10, 2024 06:45 13s
Antag Playtime Tracking Check Merge Conflicts #62525: Pull request #33228 synchronize by Cojoke-dot
November 10, 2024 05:37 18s
November 10, 2024 05:37 18s
Add Reagent gold and silver solification with frost oil Check Merge Conflicts #62524: Pull request #33239 opened by Minty642
November 10, 2024 04:29 10m 23s
November 10, 2024 04:29 10m 23s
Clumsy system refactor Check Merge Conflicts #62523: Pull request #31147 synchronize by beck-thompson
November 10, 2024 04:11 12s
November 10, 2024 04:11 12s
Clumsy system refactor Check Merge Conflicts #62522: Pull request #31147 synchronize by beck-thompson
November 10, 2024 04:08 15s
November 10, 2024 04:08 15s
Gas pipe sensors Check Merge Conflicts #62521: Pull request #33128 synchronize by chromiumboy
November 10, 2024 04:02 4m 17s
November 10, 2024 04:02 4m 17s
Gas pipe sensors Check Merge Conflicts #62520: Pull request #33128 synchronize by chromiumboy
November 10, 2024 03:54 10m 24s
November 10, 2024 03:54 10m 24s
haha delete readme Check Merge Conflicts #62519: Pull request #33238 opened by omgitsatrex
November 10, 2024 02:32 13s
November 10, 2024 02:32 13s
Make Droppers Respect Closed/Sealed Containers Check Merge Conflicts #62518: Pull request #33011 synchronize by thetolbean
November 10, 2024 01:19 2m 14s
November 10, 2024 01:19 2m 14s
Implementation of Username Restrictions Check Merge Conflicts #62517: Pull request #32535 synchronize by benev0
November 10, 2024 01:02 10m 25s
November 10, 2024 01:02 10m 25s
Antag Playtime Tracking Check Merge Conflicts #62516: Pull request #33228 ready_for_review by Cojoke-dot
November 10, 2024 00:14 19s
November 10, 2024 00:14 19s
Antag Playtime Tracking Check Merge Conflicts #62515: Pull request #33228 synchronize by Cojoke-dot
November 10, 2024 00:13 2s
November 10, 2024 00:13 2s
Adds gorilla gauntlet storage sprite and updates hit sound Check Merge Conflicts #62514: Pull request #33167 synchronize by SpaceRox1244
November 9, 2024 22:12 15s
November 9, 2024 22:12 15s
Adds new sprites for shotgun shell boxes Check Merge Conflicts #62513: Pull request #33176 synchronize by SpaceRox1244
November 9, 2024 20:59 13s
November 9, 2024 20:59 13s
Warden headset Check Merge Conflicts #62512: Pull request #33234 opened by kosticia
November 9, 2024 19:47 10m 22s
November 9, 2024 19:47 10m 22s
Removed bola stam damage Check Merge Conflicts #62511: Pull request #32989 synchronize by ARMOKS
November 9, 2024 19:02 16s
November 9, 2024 19:02 16s
Glue and lube refactor Check Merge Conflicts #62510: Pull request #26765 synchronize by beck-thompson
November 9, 2024 17:28 18s
November 9, 2024 17:28 18s
Intellicards now have a doAfter. Check Merge Conflicts #62509: Pull request #33198 synchronize by ScarKy0
November 9, 2024 15:57 16s
November 9, 2024 15:57 16s
Moff plushies Extended. Part 1. Attempt №2 Check Merge Conflicts #62508: Pull request #31923 synchronize by Pgriha
November 9, 2024 13:21 2s
November 9, 2024 13:21 2s