Skip to content

Actions: GesuBackups/goonstation

Actions

Label Merge Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge_conflict_labeler.yml
118 workflow runs
118 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Use pyro airlocks as the default shuttle airlocks (#22277) Label Merge Conflicts #238: Commit 7b5a39a pushed by pull bot
February 12, 2025 22:16 4s master
master
February 12, 2025 22:16 4s
Fix HealBleeding proc not working for critters (#22278) Label Merge Conflicts #237: Commit 8f777d8 pushed by pull bot
February 12, 2025 10:16 4s master
master
February 12, 2025 10:16 4s
Make scuttlebot hat immune to acid (#22163) Label Merge Conflicts #236: Commit acc467b pushed by pull bot
February 11, 2025 22:16 7s master
master
February 11, 2025 22:16 7s
Crash notifications Label Merge Conflicts #235: Commit cccba5a pushed by pull bot
February 11, 2025 16:16 7s master
master
February 11, 2025 16:16 7s
Fix rockbox pda app bricking your pda if any rockbox was disabled (#2… Label Merge Conflicts #234: Commit 767bf9f pushed by pull bot
February 11, 2025 04:16 5s master
master
February 11, 2025 04:16 5s
Merge branch 'master' of https://github.com/goonstation/goonstation Label Merge Conflicts #233: Commit 9f563ff pushed by pull bot
February 10, 2025 22:16 6s master
master
February 10, 2025 22:16 6s
stop gib procs runtiming on AI shells and causing jank Label Merge Conflicts #232: Commit 69b9a8f pushed by pull bot
February 10, 2025 16:16 5s master
master
February 10, 2025 16:16 5s
Fix nano-fabricator (#22253) Label Merge Conflicts #231: Commit a8d91cf pushed by pull bot
February 9, 2025 22:16 5s master
master
February 9, 2025 22:16 5s
stop skittering when grabbed Label Merge Conflicts #230: Commit c71ee96 pushed by pull bot
February 9, 2025 16:16 6s master
master
February 9, 2025 16:16 6s
adds the "allow_on_others"-Input on /datum/component/assembly (#22202) Label Merge Conflicts #229: Commit fed20eb pushed by pull bot
February 9, 2025 10:16 4s master
master
February 9, 2025 10:16 4s
Fix COMPONENT_DUPE_HIGHLANDER (#22179) Label Merge Conflicts #228: Commit ac7edad pushed by pull bot
February 9, 2025 04:16 3s master
master
February 9, 2025 04:16 3s
Minor nano-crucible code improvements (#22235) Label Merge Conflicts #227: Commit 1321607 pushed by pull bot
February 8, 2025 16:16 5s master
master
February 8, 2025 16:16 5s
_SendSignal micro optimization Label Merge Conflicts #226: Commit 74af1fd pushed by pull bot
February 8, 2025 04:16 3s master
master
February 8, 2025 04:16 3s
skitter improvements Label Merge Conflicts #225: Commit 319496d pushed by pull bot
February 7, 2025 16:16 4s master
master
February 7, 2025 16:16 4s
airbridge turfs and walls block foreground parallax (#22214) Label Merge Conflicts #224: Commit a25feaf pushed by pull bot
February 6, 2025 10:16 4s master
master
February 6, 2025 10:16 4s
MINOR SPELLING MISTAKE!!!! Fix #22162 Label Merge Conflicts #223: Commit e969358 pushed by pull bot
February 5, 2025 16:16 5s master
master
February 5, 2025 16:16 5s
custom proc calling lever Label Merge Conflicts #222: Commit 8f931e4 pushed by pull bot
February 4, 2025 10:16 5s master
master
February 4, 2025 10:16 5s
give them a name Label Merge Conflicts #221: Commit c8f4948 pushed by pull bot
February 4, 2025 04:16 5s master
master
February 4, 2025 04:16 5s
Fix reagent transfer targets not being updated properly (#22189) Label Merge Conflicts #220: Commit 1ac5715 pushed by pull bot
February 2, 2025 04:16 2s master
master
February 2, 2025 04:16 2s
Fix admin accents Label Merge Conflicts #219: Commit e2a6d22 pushed by pull bot
February 1, 2025 22:16 3s master
master
February 1, 2025 22:16 3s
Change the radio station putt frame to the preassembled type (#22181) Label Merge Conflicts #218: Commit fcf693b pushed by pull bot
February 1, 2025 16:16 4s master
master
February 1, 2025 16:16 4s
fix icon error on destiny maint doors (#22171) Label Merge Conflicts #217: Commit 1ea0734 pushed by pull bot
February 1, 2025 10:16 6s master
master
February 1, 2025 10:16 6s
Missed a clean up step Label Merge Conflicts #216: Commit 0bfe874 pushed by pull bot
January 30, 2025 16:16 4s master
master
January 30, 2025 16:16 4s
Server start and update changes ahead of CI refactor Label Merge Conflicts #215: Commit dbf794a pushed by pull bot
January 29, 2025 22:16 6s master
master
January 29, 2025 22:16 6s
cooler description for angry shotgun Label Merge Conflicts #214: Commit e668165 pushed by pull bot
January 29, 2025 04:16 3s master
master
January 29, 2025 04:16 3s