Skip to content

Actions: Retrino/goonstation

Actions

Label Merge Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge_conflict_labeler.yml
45 workflow runs
45 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fix firelocks not being pryable when placed on windoors (#21749) Label Merge Conflicts #76: Commit 47da7d6 pushed by Retrino
January 6, 2025 08:31 4s master
master
January 6, 2025 08:31 4s
Fix map varedit on wrestlemap runtiming camera monitors (#21755) Label Merge Conflicts #75: Commit 1664c9d pushed by Retrino
December 20, 2024 08:58 4s master
master
December 20, 2024 08:58 4s
revert temp error on missing inhand icon states Label Merge Conflicts #74: Commit 9cebd5f pushed by Retrino
December 9, 2024 22:37 4s master
master
December 9, 2024 22:37 4s
adds martyrdom trait. Basically useless lmao Label Merge Conflicts #73: Commit b817ab2 pushed by Retrino
December 3, 2024 22:58 4s master
master
December 3, 2024 22:58 4s
Merge branch 'master' of https://github.com/goonstation/goonstation Label Merge Conflicts #72: Commit 05388d4 pushed by Retrino
November 24, 2024 23:44 4s master
master
November 24, 2024 23:44 4s
hazardous chocolate eggs Label Merge Conflicts #71: Commit 274114c pushed by Retrino
November 15, 2024 19:05 4s master
master
November 15, 2024 19:05 4s
Revert "Revert "new uncool ircbot interface"" (#21312) Label Merge Conflicts #70: Commit 4f114c0 pushed by Retrino
November 13, 2024 04:38 4s master
master
November 13, 2024 04:38 4s
A widdle medbay for salvagers. At least they have band aids. Label Merge Conflicts #69: Commit be5d757 pushed by Retrino
October 30, 2024 09:23 5s master
master
October 30, 2024 09:23 5s
Resprites Berets (#20666) Label Merge Conflicts #68: Commit 5b6ca99 pushed by Retrino
September 27, 2024 23:50 3s master
master
September 27, 2024 23:50 3s
Merge branch 'master' of https://github.com/goonstation/goonstation Label Merge Conflicts #67: Commit 3452cae pushed by Retrino
September 27, 2024 09:04 3s master
master
September 27, 2024 09:04 3s
Merge branch 'master' of https://github.com/goonstation/goonstation Label Merge Conflicts #66: Commit dab2876 pushed by Retrino
September 23, 2024 01:27 4s master
master
September 23, 2024 01:27 4s
fix divide by zero in holy water handling Label Merge Conflicts #65: Commit 9b68f0a pushed by Retrino
August 25, 2024 04:24 3s master
master
August 25, 2024 04:24 3s
make sponge capsules a little more dangerous for no particular reason Label Merge Conflicts #64: Commit 6d82cf0 pushed by Retrino
August 1, 2024 21:45 4s master
master
August 1, 2024 21:45 4s
add a couple ifdefs for podwars stuff that was missing it Label Merge Conflicts #63: Commit e9955f3 pushed by Retrino
August 1, 2024 05:26 3s master
master
August 1, 2024 05:26 3s
copy relative path bad Label Merge Conflicts #62: Commit 2d2fd76 pushed by Retrino
July 23, 2024 22:24 4s master
master
July 23, 2024 22:24 4s
- removed poo Label Merge Conflicts #61: Commit 435bddd pushed by Retrino
July 12, 2024 05:43 4s master
master
July 12, 2024 05:43 4s
critter heat resist should check godmode etc as well jfc Label Merge Conflicts #60: Commit b28cf3e pushed by Retrino
July 7, 2024 04:28 2s master
master
July 7, 2024 04:28 2s
Merge branch 'master' of github:goonstation/goonstation Label Merge Conflicts #59: Commit 3dde976 pushed by Retrino
July 2, 2024 22:53 4s master
master
July 2, 2024 22:53 4s
clog Label Merge Conflicts #58: Commit c5d040f pushed by Retrino
June 30, 2024 03:38 3s master
master
June 30, 2024 03:38 3s
fix sawfly remote mechscan (#19685) Label Merge Conflicts #57: Commit 7b55791 pushed by Retrino
June 26, 2024 08:16 4s master
master
June 26, 2024 08:16 4s
Merge branch 'master' of https://github.com/goonstation/goonstation Label Merge Conflicts #56: Commit ed34e67 pushed by Retrino
June 25, 2024 05:43 3s master
master
June 25, 2024 05:43 3s
Improve mining magnet's clearing with terrainify Label Merge Conflicts #55: Commit 1f5cb06 pushed by Retrino
June 6, 2024 22:31 4s master
master
June 6, 2024 22:31 4s
flock speak ion storm interference Label Merge Conflicts #54: Commit d603550 pushed by Retrino
May 27, 2024 23:04 2s master
master
May 27, 2024 23:04 2s
add streamer3 to redirect/maptext servers Label Merge Conflicts #53: Commit 35d9bb0 pushed by Retrino
May 24, 2024 04:12 3s master
master
May 24, 2024 04:12 3s
Beachball resprite (#19033) Label Merge Conflicts #52: Commit 81fed0a pushed by Retrino
May 23, 2024 05:36 3s master
master
May 23, 2024 05:36 3s